Fixed tiles not dropping items, closes InnovativeOnlineIndustries/Ind…

…ustrial-Foregoing#998 and closes InnovativeOnlineIndustries/Industrial-Foregoing#995 and closes InnovativeOnlineIndustries/Industrial-Foregoing#991
InnovativeOnlineIndustries · Feb 4, 2021 · 65dd629 · 65dd629
1 parent 01ed87f
commit 65dd629
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/hrznstudio/titanium/block/BasicBlock.java b/src/main/java/com/hrznstudio/titanium/block/BasicBlock.java
@@ -10,6 +10,8 @@
 import com.hrznstudio.titanium.api.IFactory;
 import com.hrznstudio.titanium.api.IRecipeProvider;
 import com.hrznstudio.titanium.api.raytrace.DistanceRayTraceResult;
+import com.hrznstudio.titanium.block.tile.ActiveTile;
+import com.hrznstudio.titanium.component.inventory.InventoryComponent;
 import com.hrznstudio.titanium.datagenerator.loot.block.BasicBlockLootTables;
 import com.hrznstudio.titanium.datagenerator.loot.block.IBlockLootTableProvider;
 import com.hrznstudio.titanium.module.api.IAlternativeEntries;
@@ -36,7 +38,6 @@
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.items.CapabilityItemHandler;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -158,7 +159,7 @@ public void registerRecipe(Consumer<IFinishedRecipe> consumer) {
     @Override
     @SuppressWarnings("deprecation")
     public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
-        if (state.getBlock() != newState.getBlock()) {
+        if (!state.isIn(newState.getBlock())) {
             InventoryHelper.dropItems(worldIn, pos, getDynamicDrops(state, worldIn, pos, newState, isMoving));
             worldIn.updateComparatorOutputLevel(pos, this);
         }
@@ -168,12 +169,12 @@ public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState
     public NonNullList<ItemStack> getDynamicDrops(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
         NonNullList<ItemStack> stacks = NonNullList.create();
         TileEntity tileentity = worldIn.getTileEntity(pos);
-        if (tileentity != null) {
-            tileentity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).ifPresent(iItemHandler -> {
-                for (int i = 0; i < iItemHandler.getSlots(); i++) {
-                    stacks.add(iItemHandler.getStackInSlot(i));
+        if (tileentity instanceof ActiveTile) {
+            for (InventoryComponent<?> inventoryHandler : ((ActiveTile<?>) tileentity).getMultiInventoryComponent().getInventoryHandlers()) {
+                for (int i = 0; i < inventoryHandler.getSlots(); i++) {
+                    stacks.add(inventoryHandler.getStackInSlot(i));
                 }
-            });
+            }
         }
         return stacks;
     }

diff --git a/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java b/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java
@@ -359,7 +359,7 @@ public void invalidateCaps() {
         if (this.multiInventoryComponent != null) this.multiInventoryComponent.getLazyOptionals().forEach(LazyOptional::invalidate);
         if (this.multiTankComponent != null) this.multiTankComponent.getLazyOptionals().forEach(LazyOptional::invalidate);
     }
-      
+
     public boolean canInteract() {
         return this.world.getTileEntity(this.pos) == this;
     }