修改背包物品掉落逻辑

TartaricAcid · Oct 3, 2024 · 4460c93 · 4460c93
1 parent f30aaa1
commit 4460c93
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 58 deletions.
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/backpack/IMaidBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/api/backpack/IMaidBackpack.java
@@ -1,5 +1,6 @@
 package com.github.tartaricacid.touhoulittlemaid.api.backpack;
 
+import com.github.tartaricacid.touhoulittlemaid.entity.backpack.BackpackManager;
 import com.github.tartaricacid.touhoulittlemaid.entity.item.EntityTombstone;
 import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
 import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
@@ -60,4 +61,11 @@ public IBackpackData getBackpackData(EntityMaid maid) {
     protected final void dropAllItems(EntityMaid maid) {
         ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.EMPTY_CAPACITY);
     }
+
+    protected final void dropRelativeItems(ItemStack stack, EntityMaid maid) {
+        BackpackManager.findBackpack(stack).ifPresentOrElse(backpack -> {
+            int startIndex = backpack.getAvailableMaxContainerIndex();
+            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), startIndex);
+        }, () -> this.dropAllItems(maid));
+    }
 }
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/BigBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/BigBackpack.java
@@ -9,7 +9,6 @@
 import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
 import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.BigBackpackContainer;
 import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
-import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.EntityModelSet;
@@ -34,19 +33,7 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
 
     @Override
     public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_MIDDLE.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.MIDDLE_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override

diff --git a/.../java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/CraftingTableBackpack.java b/.../java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/CraftingTableBackpack.java
@@ -9,7 +9,6 @@
 import com.github.tartaricacid.touhoulittlemaid.inventory.container.AbstractMaidContainer;
 import com.github.tartaricacid.touhoulittlemaid.inventory.container.backpack.CraftingTableBackpackContainer;
 import com.github.tartaricacid.touhoulittlemaid.item.BackpackLevel;
-import com.github.tartaricacid.touhoulittlemaid.util.ItemsUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.EntityModelSet;
@@ -33,15 +32,7 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
 
     @Override
     public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/EmptyBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/EmptyBackpack.java
@@ -84,6 +84,7 @@ public ResourceLocation getBackpackTexture() {
     }
 
     @OnlyIn(Dist.CLIENT)
+    @Override
     public void offsetBackpackItem(PoseStack poseStack) {
         poseStack.translate(0, 0.625, 0.2);
     }

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/FurnaceBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/FurnaceBackpack.java
@@ -42,16 +42,7 @@ public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
             InvWrapper inv = new InvWrapper(furnaceBackpackData);
             ItemsUtil.dropEntityItems(maid, inv);
         }
-
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/MiddleBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/MiddleBackpack.java
@@ -35,15 +35,7 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
 
     @Override
     public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/SmallBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/SmallBackpack.java
@@ -33,11 +33,7 @@ public void onPutOn(ItemStack stack, Player player, EntityMaid maid) {
 
     @Override
     public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get() || item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override

diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/TankBackpack.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/backpack/TankBackpack.java
@@ -58,16 +58,7 @@ public void onTakeOff(ItemStack stack, Player player, EntityMaid maid) {
             InvWrapper inv = new InvWrapper(tankBackpackData);
             ItemsUtil.dropEntityItems(maid, inv);
         }
-
-        Item item = stack.getItem();
-        if (item == InitItems.MAID_BACKPACK_SMALL.get()) {
-            ItemsUtil.dropEntityItems(maid, maid.getMaidInv(), BackpackLevel.SMALL_CAPACITY);
-            return;
-        }
-        if (item == InitItems.MAID_BACKPACK_MIDDLE.get() || item == InitItems.MAID_BACKPACK_BIG.get()) {
-            return;
-        }
-        this.dropAllItems(maid);
+        dropRelativeItems(stack, maid);
     }
 
     @Override