diff --git a/CHANGELOG.md b/CHANGELOG.md index e28a664..c4bc973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +[ 1.2.2+1.21 ] +- Fixed shift clicking other items into a full pocket storage voiding. + +[ 1.2.1+1.21 ] + - Fixed dupe. + ### [ 1.2.0+1.21 ] - Fixed voiding items taken from inventories. - Added the ability to press Q or CTRL + Q to drop items directly from a open pocket storage. diff --git a/build.gradle b/build.gradle index 69bc26c..7f0e3a6 100644 --- a/build.gradle +++ b/build.gradle @@ -68,9 +68,9 @@ runs { dependencies { implementation "net.neoforged:neoforge:${neo_version}" - compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"//new - compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}" - runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" + compileOnly "mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}"//new + compileOnly "mezz.jei:jei-${jei_mc_version}-neoforge-api:${jei_version}" + runtimeOnly "mezz.jei:jei-${jei_mc_version}-neoforge:${jei_version}" runtimeOnly "curse.maven:JADE-324717:5493270" // diff --git a/gradle.properties b/gradle.properties index 95fdc11..9e072ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ org.gradle.jvmargs=-Xmx6G org.gradle.daemon=false -mod_version=1.2.1 -minecraft_version=1.21 -neo_version=21.0.146 +mod_version=1.2.2 +minecraft_version=1.21.1 +neo_version=21.1.8 neogradle.subsystems.parchment.minecraftVersion=1.21 neogradle.subsystems.parchment.mappingsVersion=2024.06.23 jei_version=19.4.0.28 +jei_mc_version=1.21 curseforge_id=367734 diff --git a/src/main/java/com/flanks255/psu/PocketStorage.java b/src/main/java/com/flanks255/pocketstorage/PocketStorage.java similarity index 91% rename from src/main/java/com/flanks255/psu/PocketStorage.java rename to src/main/java/com/flanks255/pocketstorage/PocketStorage.java index 01cbab9..70976ed 100644 --- a/src/main/java/com/flanks255/psu/PocketStorage.java +++ b/src/main/java/com/flanks255/pocketstorage/PocketStorage.java @@ -1,15 +1,15 @@ -package com.flanks255.psu; - -import com.flanks255.psu.commands.PSUCommands; -import com.flanks255.psu.crafting.UpgradeRecipe; -import com.flanks255.psu.data.Generator; -import com.flanks255.psu.gui.PSUContainer; -import com.flanks255.psu.gui.PSUGui; -import com.flanks255.psu.inventory.StorageManager; -import com.flanks255.psu.items.PSUTier; -import com.flanks255.psu.items.PocketStorageUnit; -import com.flanks255.psu.network.PSUNetwork; -import com.flanks255.psu.util.RecipeUnlocker; +package com.flanks255.pocketstorage; + +import com.flanks255.pocketstorage.commands.PSUCommands; +import com.flanks255.pocketstorage.crafting.UpgradeRecipe; +import com.flanks255.pocketstorage.data.Generator; +import com.flanks255.pocketstorage.gui.PSUContainer; +import com.flanks255.pocketstorage.gui.PSUGui; +import com.flanks255.pocketstorage.inventory.StorageManager; +import com.flanks255.pocketstorage.items.PSUTier; +import com.flanks255.pocketstorage.items.PocketStorageUnit; +import com.flanks255.pocketstorage.network.PSUNetwork; +import com.flanks255.pocketstorage.util.RecipeUnlocker; import net.minecraft.core.UUIDUtil; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/flanks255/psu/commands/List.java b/src/main/java/com/flanks255/pocketstorage/commands/List.java similarity index 97% rename from src/main/java/com/flanks255/psu/commands/List.java rename to src/main/java/com/flanks255/pocketstorage/commands/List.java index d6291e5..6e96ccc 100644 --- a/src/main/java/com/flanks255/psu/commands/List.java +++ b/src/main/java/com/flanks255/pocketstorage/commands/List.java @@ -1,7 +1,7 @@ -package com.flanks255.psu.commands; +package com.flanks255.pocketstorage.commands; -import com.flanks255.psu.inventory.PSUData; -import com.flanks255.psu.inventory.StorageManager; +import com.flanks255.pocketstorage.inventory.PSUData; +import com.flanks255.pocketstorage.inventory.StorageManager; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; diff --git a/src/main/java/com/flanks255/psu/commands/Open.java b/src/main/java/com/flanks255/pocketstorage/commands/Open.java similarity index 88% rename from src/main/java/com/flanks255/psu/commands/Open.java rename to src/main/java/com/flanks255/pocketstorage/commands/Open.java index 2716eaf..cf356b4 100644 --- a/src/main/java/com/flanks255/psu/commands/Open.java +++ b/src/main/java/com/flanks255/pocketstorage/commands/Open.java @@ -1,9 +1,9 @@ -package com.flanks255.psu.commands; +package com.flanks255.pocketstorage.commands; -import com.flanks255.psu.util.PSUtils; -import com.flanks255.psu.gui.PSUContainer; -import com.flanks255.psu.inventory.PSUData; -import com.flanks255.psu.inventory.StorageManager; +import com.flanks255.pocketstorage.util.PSUtils; +import com.flanks255.pocketstorage.gui.PSUContainer; +import com.flanks255.pocketstorage.inventory.PSUData; +import com.flanks255.pocketstorage.inventory.StorageManager; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; @@ -11,7 +11,6 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.SharedSuggestionProvider; -import net.minecraft.core.RegistryAccess; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.SimpleMenuProvider; diff --git a/src/main/java/com/flanks255/psu/commands/PSUCommands.java b/src/main/java/com/flanks255/pocketstorage/commands/PSUCommands.java similarity index 93% rename from src/main/java/com/flanks255/psu/commands/PSUCommands.java rename to src/main/java/com/flanks255/pocketstorage/commands/PSUCommands.java index f7ef2bd..5222709 100644 --- a/src/main/java/com/flanks255/psu/commands/PSUCommands.java +++ b/src/main/java/com/flanks255/pocketstorage/commands/PSUCommands.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.commands; +package com.flanks255.pocketstorage.commands; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.LiteralCommandNode; diff --git a/src/main/java/com/flanks255/psu/commands/Recover.java b/src/main/java/com/flanks255/pocketstorage/commands/Recover.java similarity index 88% rename from src/main/java/com/flanks255/psu/commands/Recover.java rename to src/main/java/com/flanks255/pocketstorage/commands/Recover.java index 330d40e..be9d340 100644 --- a/src/main/java/com/flanks255/psu/commands/Recover.java +++ b/src/main/java/com/flanks255/pocketstorage/commands/Recover.java @@ -1,9 +1,9 @@ -package com.flanks255.psu.commands; +package com.flanks255.pocketstorage.commands; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.inventory.PSUData; -import com.flanks255.psu.inventory.StorageManager; -import com.flanks255.psu.util.PSUtils; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.inventory.PSUData; +import com.flanks255.pocketstorage.inventory.StorageManager; +import com.flanks255.pocketstorage.util.PSUtils; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; diff --git a/src/main/java/com/flanks255/psu/crafting/UpgradeRecipe.java b/src/main/java/com/flanks255/pocketstorage/crafting/UpgradeRecipe.java similarity index 94% rename from src/main/java/com/flanks255/psu/crafting/UpgradeRecipe.java rename to src/main/java/com/flanks255/pocketstorage/crafting/UpgradeRecipe.java index 420a19d..07a4108 100644 --- a/src/main/java/com/flanks255/psu/crafting/UpgradeRecipe.java +++ b/src/main/java/com/flanks255/pocketstorage/crafting/UpgradeRecipe.java @@ -1,7 +1,7 @@ -package com.flanks255.psu.crafting; +package com.flanks255.pocketstorage.crafting; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.items.PocketStorageUnit; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.items.PocketStorageUnit; import com.mojang.serialization.MapCodec; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistryAccess; diff --git a/src/main/java/com/flanks255/psu/data/Generator.java b/src/main/java/com/flanks255/pocketstorage/data/Generator.java similarity index 92% rename from src/main/java/com/flanks255/psu/data/Generator.java rename to src/main/java/com/flanks255/pocketstorage/data/Generator.java index f36efbd..e1a869a 100644 --- a/src/main/java/com/flanks255/psu/data/Generator.java +++ b/src/main/java/com/flanks255/pocketstorage/data/Generator.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.data; +package com.flanks255.pocketstorage.data; import net.minecraft.data.DataGenerator; import net.neoforged.neoforge.data.event.GatherDataEvent; diff --git a/src/main/java/com/flanks255/psu/data/PSUItemModels.java b/src/main/java/com/flanks255/pocketstorage/data/PSUItemModels.java similarity index 91% rename from src/main/java/com/flanks255/psu/data/PSUItemModels.java rename to src/main/java/com/flanks255/pocketstorage/data/PSUItemModels.java index e8d1582..023789e 100644 --- a/src/main/java/com/flanks255/psu/data/PSUItemModels.java +++ b/src/main/java/com/flanks255/pocketstorage/data/PSUItemModels.java @@ -1,6 +1,6 @@ -package com.flanks255.psu.data; +package com.flanks255.pocketstorage.data; -import com.flanks255.psu.PocketStorage; +import com.flanks255.pocketstorage.PocketStorage; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.DataGenerator; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/flanks255/psu/data/PSULang.java b/src/main/java/com/flanks255/pocketstorage/data/PSULang.java similarity index 96% rename from src/main/java/com/flanks255/psu/data/PSULang.java rename to src/main/java/com/flanks255/pocketstorage/data/PSULang.java index 7e8276c..89c1cb3 100644 --- a/src/main/java/com/flanks255/psu/data/PSULang.java +++ b/src/main/java/com/flanks255/pocketstorage/data/PSULang.java @@ -1,6 +1,6 @@ -package com.flanks255.psu.data; +package com.flanks255.pocketstorage.data; -import com.flanks255.psu.PocketStorage; +import com.flanks255.pocketstorage.PocketStorage; import net.minecraft.data.DataGenerator; import net.minecraft.world.item.Item; import net.neoforged.neoforge.common.data.LanguageProvider; diff --git a/src/main/java/com/flanks255/psu/data/PSURecipes.java b/src/main/java/com/flanks255/pocketstorage/data/PSURecipes.java similarity index 92% rename from src/main/java/com/flanks255/psu/data/PSURecipes.java rename to src/main/java/com/flanks255/pocketstorage/data/PSURecipes.java index 137cef0..689b631 100644 --- a/src/main/java/com/flanks255/psu/data/PSURecipes.java +++ b/src/main/java/com/flanks255/pocketstorage/data/PSURecipes.java @@ -1,9 +1,9 @@ -package com.flanks255.psu.data; +package com.flanks255.pocketstorage.data; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.crafting.UpgradeRecipe; -import com.flanks255.psu.util.NoAdvRecipeOutput; -import com.flanks255.psu.util.RecipeInjector; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.crafting.UpgradeRecipe; +import com.flanks255.pocketstorage.util.NoAdvRecipeOutput; +import com.flanks255.pocketstorage.util.RecipeInjector; import net.minecraft.advancements.Criterion; import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.core.HolderLookup; diff --git a/src/main/java/com/flanks255/psu/gui/LockableSlot.java b/src/main/java/com/flanks255/pocketstorage/gui/LockableSlot.java similarity index 94% rename from src/main/java/com/flanks255/psu/gui/LockableSlot.java rename to src/main/java/com/flanks255/pocketstorage/gui/LockableSlot.java index cb33485..57e06f4 100644 --- a/src/main/java/com/flanks255/psu/gui/LockableSlot.java +++ b/src/main/java/com/flanks255/pocketstorage/gui/LockableSlot.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.gui; +package com.flanks255.pocketstorage.gui; import net.minecraft.world.entity.player.Player; import net.minecraft.world.Container; diff --git a/src/main/java/com/flanks255/psu/gui/PSUContainer.java b/src/main/java/com/flanks255/pocketstorage/gui/PSUContainer.java similarity index 95% rename from src/main/java/com/flanks255/psu/gui/PSUContainer.java rename to src/main/java/com/flanks255/pocketstorage/gui/PSUContainer.java index 5cfffa7..72bbb59 100644 --- a/src/main/java/com/flanks255/psu/gui/PSUContainer.java +++ b/src/main/java/com/flanks255/pocketstorage/gui/PSUContainer.java @@ -1,11 +1,10 @@ -package com.flanks255.psu.gui; - -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.inventory.PSUItemHandler; -import com.flanks255.psu.items.PSUTier; -import com.flanks255.psu.network.SlotKeyPacket; -import com.flanks255.psu.util.PSUtils; -import net.minecraft.core.RegistryAccess; +package com.flanks255.pocketstorage.gui; + +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.inventory.PSUItemHandler; +import com.flanks255.pocketstorage.items.PSUTier; +import com.flanks255.pocketstorage.network.SlotKeyPacket; +import com.flanks255.pocketstorage.util.PSUtils; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/flanks255/psu/gui/PSUGui.java b/src/main/java/com/flanks255/pocketstorage/gui/PSUGui.java similarity index 97% rename from src/main/java/com/flanks255/psu/gui/PSUGui.java rename to src/main/java/com/flanks255/pocketstorage/gui/PSUGui.java index cef195f..b9175cc 100644 --- a/src/main/java/com/flanks255/psu/gui/PSUGui.java +++ b/src/main/java/com/flanks255/pocketstorage/gui/PSUGui.java @@ -1,8 +1,8 @@ -package com.flanks255.psu.gui; +package com.flanks255.pocketstorage.gui; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.network.SlotClickPacket; -import com.flanks255.psu.network.SlotKeyPacket; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.network.SlotClickPacket; +import com.flanks255.pocketstorage.network.SlotKeyPacket; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/flanks255/psu/inventory/PSUData.java b/src/main/java/com/flanks255/pocketstorage/inventory/PSUData.java similarity index 97% rename from src/main/java/com/flanks255/psu/inventory/PSUData.java rename to src/main/java/com/flanks255/pocketstorage/inventory/PSUData.java index 664e46f..eec1e9f 100644 --- a/src/main/java/com/flanks255/psu/inventory/PSUData.java +++ b/src/main/java/com/flanks255/pocketstorage/inventory/PSUData.java @@ -1,8 +1,7 @@ -package com.flanks255.psu.inventory; +package com.flanks255.pocketstorage.inventory; -import com.flanks255.psu.items.PSUTier; +import com.flanks255.pocketstorage.items.PSUTier; import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; import net.neoforged.neoforge.common.util.INBTSerializable; import net.neoforged.neoforge.items.IItemHandler; diff --git a/src/main/java/com/flanks255/psu/inventory/PSUItemHandler.java b/src/main/java/com/flanks255/pocketstorage/inventory/PSUItemHandler.java similarity index 97% rename from src/main/java/com/flanks255/psu/inventory/PSUItemHandler.java rename to src/main/java/com/flanks255/pocketstorage/inventory/PSUItemHandler.java index dc99f9c..1c41dc9 100644 --- a/src/main/java/com/flanks255/psu/inventory/PSUItemHandler.java +++ b/src/main/java/com/flanks255/pocketstorage/inventory/PSUItemHandler.java @@ -1,7 +1,7 @@ -package com.flanks255.psu.inventory; +package com.flanks255.pocketstorage.inventory; -import com.flanks255.psu.items.PSUTier; -import com.flanks255.psu.items.PocketStorageUnit; +import com.flanks255.pocketstorage.items.PSUTier; +import com.flanks255.pocketstorage.items.PocketStorageUnit; import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.core.component.DataComponents; @@ -119,7 +119,7 @@ public ItemStack insertItemSlotless(@Nonnull ItemStack stack, boolean allowEmpty } } } - return ItemStack.EMPTY; + return stack; } @Nonnull diff --git a/src/main/java/com/flanks255/psu/inventory/PSUSlot.java b/src/main/java/com/flanks255/pocketstorage/inventory/PSUSlot.java similarity index 94% rename from src/main/java/com/flanks255/psu/inventory/PSUSlot.java rename to src/main/java/com/flanks255/pocketstorage/inventory/PSUSlot.java index 1f24794..904c618 100644 --- a/src/main/java/com/flanks255/psu/inventory/PSUSlot.java +++ b/src/main/java/com/flanks255/pocketstorage/inventory/PSUSlot.java @@ -1,7 +1,5 @@ -package com.flanks255.psu.inventory; +package com.flanks255.pocketstorage.inventory; -import com.flanks255.psu.PocketStorage; -import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/flanks255/psu/inventory/StorageManager.java b/src/main/java/com/flanks255/pocketstorage/inventory/StorageManager.java similarity index 95% rename from src/main/java/com/flanks255/psu/inventory/StorageManager.java rename to src/main/java/com/flanks255/pocketstorage/inventory/StorageManager.java index d7113e3..9ecd495 100644 --- a/src/main/java/com/flanks255/psu/inventory/StorageManager.java +++ b/src/main/java/com/flanks255/pocketstorage/inventory/StorageManager.java @@ -1,7 +1,7 @@ -package com.flanks255.psu.inventory; +package com.flanks255.pocketstorage.inventory; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.items.PSUTier; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.items.PSUTier; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/com/flanks255/psu/items/PSUTier.java b/src/main/java/com/flanks255/pocketstorage/items/PSUTier.java similarity index 89% rename from src/main/java/com/flanks255/psu/items/PSUTier.java rename to src/main/java/com/flanks255/pocketstorage/items/PSUTier.java index 5f5d3e9..90fafef 100644 --- a/src/main/java/com/flanks255/psu/items/PSUTier.java +++ b/src/main/java/com/flanks255/pocketstorage/items/PSUTier.java @@ -1,6 +1,6 @@ -package com.flanks255.psu.items; +package com.flanks255.pocketstorage.items; -import com.flanks255.psu.PocketStorage; +import com.flanks255.pocketstorage.PocketStorage; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; import net.neoforged.neoforge.registries.DeferredItem; diff --git a/src/main/java/com/flanks255/psu/items/PocketStorageUnit.java b/src/main/java/com/flanks255/pocketstorage/items/PocketStorageUnit.java similarity index 96% rename from src/main/java/com/flanks255/psu/items/PocketStorageUnit.java rename to src/main/java/com/flanks255/pocketstorage/items/PocketStorageUnit.java index f53ba70..9783598 100644 --- a/src/main/java/com/flanks255/psu/items/PocketStorageUnit.java +++ b/src/main/java/com/flanks255/pocketstorage/items/PocketStorageUnit.java @@ -1,16 +1,15 @@ -package com.flanks255.psu.items; - -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.gui.PSUContainer; -import com.flanks255.psu.inventory.PSUData; -import com.flanks255.psu.inventory.PSUItemHandler; -import com.flanks255.psu.inventory.StorageManager; -import com.flanks255.psu.util.CapHelper; +package com.flanks255.pocketstorage.items; + +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.gui.PSUContainer; +import com.flanks255.pocketstorage.inventory.PSUData; +import com.flanks255.pocketstorage.inventory.PSUItemHandler; +import com.flanks255.pocketstorage.inventory.StorageManager; +import com.flanks255.pocketstorage.util.CapHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.BlockPos; -import net.minecraft.core.RegistryAccess; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/flanks255/psu/network/PSUNetwork.java b/src/main/java/com/flanks255/pocketstorage/network/PSUNetwork.java similarity index 81% rename from src/main/java/com/flanks255/psu/network/PSUNetwork.java rename to src/main/java/com/flanks255/pocketstorage/network/PSUNetwork.java index 3c7e0f7..7b0fc51 100644 --- a/src/main/java/com/flanks255/psu/network/PSUNetwork.java +++ b/src/main/java/com/flanks255/pocketstorage/network/PSUNetwork.java @@ -1,6 +1,6 @@ -package com.flanks255.psu.network; +package com.flanks255.pocketstorage.network; -import com.flanks255.psu.PocketStorage; +import com.flanks255.pocketstorage.PocketStorage; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; public class PSUNetwork { diff --git a/src/main/java/com/flanks255/psu/network/SlotClickPacket.java b/src/main/java/com/flanks255/pocketstorage/network/SlotClickPacket.java similarity index 90% rename from src/main/java/com/flanks255/psu/network/SlotClickPacket.java rename to src/main/java/com/flanks255/pocketstorage/network/SlotClickPacket.java index 0f88fb2..6713d3e 100644 --- a/src/main/java/com/flanks255/psu/network/SlotClickPacket.java +++ b/src/main/java/com/flanks255/pocketstorage/network/SlotClickPacket.java @@ -1,7 +1,7 @@ -package com.flanks255.psu.network; +package com.flanks255.pocketstorage.network; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.gui.PSUContainer; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.gui.PSUContainer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; diff --git a/src/main/java/com/flanks255/psu/network/SlotKeyPacket.java b/src/main/java/com/flanks255/pocketstorage/network/SlotKeyPacket.java similarity index 86% rename from src/main/java/com/flanks255/psu/network/SlotKeyPacket.java rename to src/main/java/com/flanks255/pocketstorage/network/SlotKeyPacket.java index 4a8c397..f9fe83c 100644 --- a/src/main/java/com/flanks255/psu/network/SlotKeyPacket.java +++ b/src/main/java/com/flanks255/pocketstorage/network/SlotKeyPacket.java @@ -1,14 +1,12 @@ -package com.flanks255.psu.network; +package com.flanks255.pocketstorage.network; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.gui.PSUContainer; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.gui.PSUContainer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.ExtraCodecs; -import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs; import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs; import net.neoforged.neoforge.network.handling.IPayloadContext; diff --git a/src/main/java/com/flanks255/psu/util/CapHelper.java b/src/main/java/com/flanks255/pocketstorage/util/CapHelper.java similarity index 96% rename from src/main/java/com/flanks255/psu/util/CapHelper.java rename to src/main/java/com/flanks255/pocketstorage/util/CapHelper.java index 5fcada2..e47bc52 100644 --- a/src/main/java/com/flanks255/psu/util/CapHelper.java +++ b/src/main/java/com/flanks255/pocketstorage/util/CapHelper.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.util; +package com.flanks255.pocketstorage.util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/flanks255/psu/util/NoAdvRecipeOutput.java b/src/main/java/com/flanks255/pocketstorage/util/NoAdvRecipeOutput.java similarity index 95% rename from src/main/java/com/flanks255/psu/util/NoAdvRecipeOutput.java rename to src/main/java/com/flanks255/pocketstorage/util/NoAdvRecipeOutput.java index af4cd47..a42d9e4 100644 --- a/src/main/java/com/flanks255/psu/util/NoAdvRecipeOutput.java +++ b/src/main/java/com/flanks255/pocketstorage/util/NoAdvRecipeOutput.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.util; +package com.flanks255.pocketstorage.util; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; diff --git a/src/main/java/com/flanks255/psu/util/PSUtils.java b/src/main/java/com/flanks255/pocketstorage/util/PSUtils.java similarity index 84% rename from src/main/java/com/flanks255/psu/util/PSUtils.java rename to src/main/java/com/flanks255/pocketstorage/util/PSUtils.java index de48751..3b78b2a 100644 --- a/src/main/java/com/flanks255/psu/util/PSUtils.java +++ b/src/main/java/com/flanks255/pocketstorage/util/PSUtils.java @@ -1,8 +1,8 @@ -package com.flanks255.psu.util; +package com.flanks255.pocketstorage.util; -import com.flanks255.psu.PocketStorage; -import com.flanks255.psu.inventory.StorageManager; -import com.flanks255.psu.items.PocketStorageUnit; +import com.flanks255.pocketstorage.PocketStorage; +import com.flanks255.pocketstorage.inventory.StorageManager; +import com.flanks255.pocketstorage.items.PocketStorageUnit; import com.mojang.brigadier.context.CommandContext; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.component.DataComponents; diff --git a/src/main/java/com/flanks255/psu/util/RecipeInjector.java b/src/main/java/com/flanks255/pocketstorage/util/RecipeInjector.java similarity index 96% rename from src/main/java/com/flanks255/psu/util/RecipeInjector.java rename to src/main/java/com/flanks255/pocketstorage/util/RecipeInjector.java index 20ea7cc..45b471d 100644 --- a/src/main/java/com/flanks255/psu/util/RecipeInjector.java +++ b/src/main/java/com/flanks255/pocketstorage/util/RecipeInjector.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.util; +package com.flanks255.pocketstorage.util; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder; diff --git a/src/main/java/com/flanks255/psu/util/RecipeUnlocker.java b/src/main/java/com/flanks255/pocketstorage/util/RecipeUnlocker.java similarity index 97% rename from src/main/java/com/flanks255/psu/util/RecipeUnlocker.java rename to src/main/java/com/flanks255/pocketstorage/util/RecipeUnlocker.java index 5ea2c92..d6556bb 100644 --- a/src/main/java/com/flanks255/psu/util/RecipeUnlocker.java +++ b/src/main/java/com/flanks255/pocketstorage/util/RecipeUnlocker.java @@ -1,4 +1,4 @@ -package com.flanks255.psu.util; +package com.flanks255.pocketstorage.util; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.MinecraftServer;