From 68560a335e9b4f4da000b5ba58a6595f3befe754 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 13 May 2016 22:47:18 -0500 Subject: [PATCH] Minor cleanup --- .../block/subtile/functional/SubTileHopperhock.java | 9 ++------- .../java/vazkii/botania/common/lib/LibObfuscation.java | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index a9cc06c1c..5bc0ba728 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -52,8 +52,6 @@ public class SubTileHopperhock extends SubTileFunctional { private static final int RANGE_MANA_MINI = 2; private static final int RANGE_MINI = 1; - private static Set particled = Collections.newSetFromMap(new WeakHashMap<>()); - private int filterType = 0; @Override @@ -97,7 +95,7 @@ public class SubTileHopperhock extends SubTileFunctional { boolean canAccept = canAcceptItem(stack, filter, filterType); ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); - int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); // todo this is broken for vanilla single chests. investigate? + int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); canAccept &= availablePut > 0; @@ -118,10 +116,7 @@ public class SubTileHopperhock extends SubTileFunctional { } if(invToPutItemIn != null && !item.isDead) { - if(!particled.contains(item)) { - SubTileSpectranthemum.spawnExplosionParticles(item, 3); // todo packet - particled.add(item); - } + SubTileSpectranthemum.spawnExplosionParticles(item, 3); ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. if(item.getEntityItem().stackSize == 0) diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 91b4e94f8..832c6ea22 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -51,7 +51,6 @@ public final class LibObfuscation { // EntityHorse public static final String[] HORSE_JUMP_STRENGTH = new String[] { "horseJumpStrength", "field_110271_bv", "bC" }; - public static final String[] HORSE_CHEST = new String[] { "horseChest", "field_110296_bG", "bR" }; // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" };