From f1205a4251c4779b96b569707988478f00094fef Mon Sep 17 00:00:00 2001 From: altrisi Date: Sat, 22 Apr 2023 20:41:12 +0200 Subject: [PATCH] Make hoppers use the getter for `HopperCounter` in their mixin And very minor cleanup in it --- .../carpet/mixins/HopperBlockEntity_counterMixin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java b/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java index 1c05b463..7f09d7de 100644 --- a/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java +++ b/src/main/java/carpet/mixins/HopperBlockEntity_counterMixin.java @@ -40,17 +40,17 @@ public abstract class HopperBlockEntity_counterMixin extends RandomizableContain private static void onInsert(Level world, BlockPos blockPos, BlockState blockState, Container inventory, CallbackInfoReturnable cir) { if (CarpetSettings.hopperCounters) { - DyeColor wool_color = WoolTool.getWoolColorAtPosition( + DyeColor woolColor = WoolTool.getWoolColorAtPosition( world, - blockPos.relative(blockState.getValue(HopperBlock.FACING))); // offset - if (wool_color != null) + blockPos.relative(blockState.getValue(HopperBlock.FACING))); + if (woolColor != null) { for (int i = 0; i < inventory.getContainerSize(); ++i) { if (!inventory.getItem(i).isEmpty()) { ItemStack itemstack = inventory.getItem(i);//.copy(); - HopperCounter.COUNTERS.get(wool_color).add(world.getServer(), itemstack); + HopperCounter.getCounter(woolColor).add(world.getServer(), itemstack); inventory.setItem(i, ItemStack.EMPTY); } }