Fixed void bug with full pocket storages. Closes #33

Bumped version for release. Updated neoforge. Fixed path structure.
Flanks255 · Aug 14, 2024 · 7dedd26 · 7dedd26
1 parent f3c39c8
commit 7dedd26
Show file tree

Hide file tree

Showing 30 changed files with 100 additions and 101 deletions.
diff --git 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
@@ -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
@@ -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/...java/com/flanks255/psu/PocketStorage.java → ...lanks255/pocketstorage/PocketStorage.java b/...java/com/flanks255/psu/PocketStorage.java → ...lanks255/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/...java/com/flanks255/psu/commands/List.java → ...lanks255/pocketstorage/commands/List.java b/...java/com/flanks255/psu/commands/List.java → ...lanks255/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/...java/com/flanks255/psu/commands/Open.java → ...lanks255/pocketstorage/commands/Open.java b/...java/com/flanks255/psu/commands/Open.java → ...lanks255/pocketstorage/commands/Open.java
@@ -1,17 +1,16 @@
-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;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 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/...m/flanks255/psu/commands/PSUCommands.java → ...5/pocketstorage/commands/PSUCommands.java b/...m/flanks255/psu/commands/PSUCommands.java → ...5/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/...a/com/flanks255/psu/commands/Recover.java → ...ks255/pocketstorage/commands/Recover.java b/...a/com/flanks255/psu/commands/Recover.java → ...ks255/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/...flanks255/psu/crafting/UpgradeRecipe.java → ...pocketstorage/crafting/UpgradeRecipe.java b/...flanks255/psu/crafting/UpgradeRecipe.java → ...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/...ava/com/flanks255/psu/data/Generator.java → ...anks255/pocketstorage/data/Generator.java b/...ava/com/flanks255/psu/data/Generator.java → ...anks255/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/...com/flanks255/psu/data/PSUItemModels.java → ...255/pocketstorage/data/PSUItemModels.java b/...com/flanks255/psu/data/PSUItemModels.java → ...255/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/.../java/com/flanks255/psu/data/PSULang.java → ...flanks255/pocketstorage/data/PSULang.java b/.../java/com/flanks255/psu/data/PSULang.java → ...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/...va/com/flanks255/psu/data/PSURecipes.java → ...nks255/pocketstorage/data/PSURecipes.java b/...va/com/flanks255/psu/data/PSURecipes.java → ...nks255/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/...a/com/flanks255/psu/gui/LockableSlot.java → ...ks255/pocketstorage/gui/LockableSlot.java b/...a/com/flanks255/psu/gui/LockableSlot.java → ...ks255/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/...a/com/flanks255/psu/gui/PSUContainer.java → ...ks255/pocketstorage/gui/PSUContainer.java b/...a/com/flanks255/psu/gui/PSUContainer.java → ...ks255/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/...in/java/com/flanks255/psu/gui/PSUGui.java → ...m/flanks255/pocketstorage/gui/PSUGui.java b/...in/java/com/flanks255/psu/gui/PSUGui.java → ...m/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/.../com/flanks255/psu/inventory/PSUData.java → ...s255/pocketstorage/inventory/PSUData.java b/.../com/flanks255/psu/inventory/PSUData.java → ...s255/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/...anks255/psu/inventory/PSUItemHandler.java → ...cketstorage/inventory/PSUItemHandler.java b/...anks255/psu/inventory/PSUItemHandler.java → ...cketstorage/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/.../com/flanks255/psu/inventory/PSUSlot.java → ...s255/pocketstorage/inventory/PSUSlot.java b/.../com/flanks255/psu/inventory/PSUSlot.java → ...s255/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/...anks255/psu/inventory/StorageManager.java → ...cketstorage/inventory/StorageManager.java b/...anks255/psu/inventory/StorageManager.java → ...cketstorage/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/...java/com/flanks255/psu/items/PSUTier.java → ...lanks255/pocketstorage/items/PSUTier.java b/...java/com/flanks255/psu/items/PSUTier.java → ...lanks255/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/...lanks255/psu/items/PocketStorageUnit.java → ...ocketstorage/items/PocketStorageUnit.java b/...lanks255/psu/items/PocketStorageUnit.java → ...ocketstorage/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/...com/flanks255/psu/network/PSUNetwork.java → ...255/pocketstorage/network/PSUNetwork.java b/...com/flanks255/psu/network/PSUNetwork.java → ...255/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/...lanks255/psu/network/SlotClickPacket.java → ...ocketstorage/network/SlotClickPacket.java b/...lanks255/psu/network/SlotClickPacket.java → ...ocketstorage/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/.../flanks255/psu/network/SlotKeyPacket.java → .../pocketstorage/network/SlotKeyPacket.java b/.../flanks255/psu/network/SlotKeyPacket.java → .../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/...ava/com/flanks255/psu/util/CapHelper.java → ...anks255/pocketstorage/util/CapHelper.java b/...ava/com/flanks255/psu/util/CapHelper.java → ...anks255/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/...flanks255/psu/util/NoAdvRecipeOutput.java → ...pocketstorage/util/NoAdvRecipeOutput.java b/...flanks255/psu/util/NoAdvRecipeOutput.java → ...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/.../java/com/flanks255/psu/util/PSUtils.java → ...flanks255/pocketstorage/util/PSUtils.java b/.../java/com/flanks255/psu/util/PSUtils.java → ...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/...om/flanks255/psu/util/RecipeInjector.java → ...55/pocketstorage/util/RecipeInjector.java b/...om/flanks255/psu/util/RecipeInjector.java → ...55/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/...om/flanks255/psu/util/RecipeUnlocker.java → ...55/pocketstorage/util/RecipeUnlocker.java b/...om/flanks255/psu/util/RecipeUnlocker.java → ...55/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;