From e1e238de3e189d1a6ffb7e517aad4973b90de12c Mon Sep 17 00:00:00 2001 From: Buuz135 Date: Wed, 22 Dec 2021 21:37:20 +0100 Subject: [PATCH] Removed some todo's --- .../functionalstorage/block/CompactingDrawerBlock.java | 4 ++-- .../com/buuz135/functionalstorage/client/DrawerRenderer.java | 2 -- .../functionalstorage/inventory/BigInventoryHandler.java | 2 +- .../inventory/CompactingInventoryHandler.java | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/buuz135/functionalstorage/block/CompactingDrawerBlock.java b/src/main/java/com/buuz135/functionalstorage/block/CompactingDrawerBlock.java index 26eeb77..8554e81 100644 --- a/src/main/java/com/buuz135/functionalstorage/block/CompactingDrawerBlock.java +++ b/src/main/java/com/buuz135/functionalstorage/block/CompactingDrawerBlock.java @@ -96,7 +96,7 @@ public class CompactingDrawerBlock extends RotatableBlock private static List getShapes(BlockState state, BlockGetter source, BlockPos pos){ List boxes = new ArrayList<>(); - CACHED_SHAPES.get(state.getValue(RotatableBlock.FACING_HORIZONTAL)).forEach(boxes::add); //TODO + CACHED_SHAPES.get(state.getValue(RotatableBlock.FACING_HORIZONTAL)).forEach(boxes::add); VoxelShape total = Shapes.block(); boxes.add(total); return boxes; @@ -134,7 +134,7 @@ public class CompactingDrawerBlock extends RotatableBlock VoxelShape hit = RayTraceUtils.rayTraceVoxelShape((BlockHitResult) result, worldIn, player, 32, 0); if (hit != null) { if (hit.equals(Shapes.block())) return -1; - List shapes = new ArrayList<>(CACHED_SHAPES.get(state.getValue(RotatableBlock.FACING_HORIZONTAL))); //TODO + List shapes = new ArrayList<>(CACHED_SHAPES.get(state.getValue(RotatableBlock.FACING_HORIZONTAL))); for (int i = 0; i < shapes.size(); i++) { if (Shapes.joinIsNotEmpty(shapes.get(i), hit, BooleanOp.AND)) { return i; diff --git a/src/main/java/com/buuz135/functionalstorage/client/DrawerRenderer.java b/src/main/java/com/buuz135/functionalstorage/client/DrawerRenderer.java index 96654d3..c937810 100644 --- a/src/main/java/com/buuz135/functionalstorage/client/DrawerRenderer.java +++ b/src/main/java/com/buuz135/functionalstorage/client/DrawerRenderer.java @@ -25,8 +25,6 @@ import net.minecraft.world.item.ItemStack; public class DrawerRenderer implements BlockEntityRenderer { - //TODO Fix rotation so it shows the front - private static final Matrix3f FAKE_NORMALS; static { diff --git a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java index 04fb897..bf18692 100644 --- a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java +++ b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java @@ -71,7 +71,7 @@ public abstract class BigInventoryHandler implements IItemHandler, INBTSerializa ItemStack out = bigStack.getStack().copy(); int newAmount = bigStack.getAmount(); if (!simulate) { - if (!isLocked()) bigStack.setStack(ItemStack.EMPTY); //TODO Dont change if locked + if (!isLocked()) bigStack.setStack(ItemStack.EMPTY); bigStack.setAmount(0); onChange(); } diff --git a/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java b/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java index c1ecd00..eff3a20 100644 --- a/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java +++ b/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java @@ -92,7 +92,6 @@ public abstract class CompactingInventoryHandler implements IItemHandler, INBTSe ItemStack out = bigStack.getResult().copy(); int newAmount = (int) Math.floor(this.amount / bigStack.getNeeded()); if (!simulate) { - //TODO Dont change if locked this.amount -= (newAmount * bigStack.getNeeded()); if (this.amount == 0) reset(); onChange();