lunchable on 1.12.2

PTOM76 · Aug 12, 2024 · cf3d358 · cf3d358
1 parent bf910ef
commit cf3d358
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/net/pitan76/storagebox/StorageBoxClient.java b/src/main/java/net/pitan76/storagebox/StorageBoxClient.java
@@ -32,8 +32,6 @@ public void onInitializeClient() {
 
         ItemModelRegistry.registerItemModel(StorageBoxItem.instance, StorageBoxMod.id("storagebox"));
 
-
-
         //.register(StorageBoxScreenHandler.SCREEN_HANDLER_TYPE, StorageBoxScreen::new);
 
         /*

diff --git a/src/main/java/net/pitan76/storagebox/mixin/ItemPickupMixin.java b/src/main/java/net/pitan76/storagebox/mixin/ItemPickupMixin.java
@@ -1,7 +1,9 @@
 package net.pitan76.storagebox.mixin;
 
+import net.minecraft.block.Blocks;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stat.Stats;
@@ -107,11 +109,11 @@ private void onPickup(PlayerEntity player, CallbackInfo ci) {
                 // インベントリ
                 for (ItemStack inStack : player.inventory.field_15082) {
                     // エンダーチェストが含まれていたらエンダーチェストもループ処理
-                    /*
-                    if (supportEnderChest && inStack.getItem() == Items.ENDER_CHEST && !checkedEnderChest) {
+
+                    if (supportEnderChest && inStack.getItem() == BlockItem.fromBlock(Blocks.ENDERCHEST) && !checkedEnderChest) {
                         for (int i = 0; i < player.getEnderChestInventory().getInvSize(); i++) {
                             ItemStack enderChestStack = player.getEnderChestInventory().getInvStack(i);
-                            if (enderChestStack.hasTag()) {
+                            if (enderChestStack.hasNbt()) {
                                 if (process(enderChestStack, itemStack)) {
                                     insertedBox = true;
                                     itemStack = ItemStack.EMPTY;
@@ -122,7 +124,7 @@ private void onPickup(PlayerEntity player, CallbackInfo ci) {
                         }
                     }
 
-                     */
+
                     if (inStack.hasNbt()) {
                         if (process(inStack, itemStack)) {
                             insertedBox = true;