From 028f0c4c827c314af9d3b3abc80a523c6d8088ec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Jun 2016 10:05:10 -0500 Subject: [PATCH] Minor opt to red string interceptor --- .../tile/string/TileRedStringComparator.java | 3 +-- .../tile/string/TileRedStringInterceptor.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index d9de807b4..cb606bd48 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -16,13 +16,12 @@ import net.minecraft.util.math.BlockPos; public class TileRedStringComparator extends TileRedString { - int comparatorValue = 0; + private int comparatorValue = 0; @Override public void update() { super.update(); BlockPos binding = getBinding(); - EnumFacing dir = getOrientation(); IBlockState state = getStateAtBinding(); int origVal = comparatorValue; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 188b2d17c..b8dd24d5f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -26,12 +26,13 @@ import java.util.Set; public class TileRedStringInterceptor extends TileRedString { - private static final ThreadLocal> interceptors = ThreadLocal.withInitial(HashSet::new);; + private static final Set interceptors = new HashSet<>(); @Override public void update() { super.update(); - interceptors.get().add(this); + if(!worldObj.isRemote) + interceptors.add(this); } @Override @@ -44,11 +45,14 @@ public class TileRedStringInterceptor extends TileRedString { } public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { + if(world.isRemote) + return; + List remove = new ArrayList<>(); boolean did = false; - for(TileRedStringInterceptor inter : interceptors.get()) { + for(TileRedStringInterceptor inter : interceptors) { if(!inter.saneState()) { remove.add(inter); continue; @@ -57,22 +61,18 @@ public class TileRedStringInterceptor extends TileRedString { if(inter.worldObj == world) { BlockPos coords = inter.getBinding(); if(coords != null && coords.equals(pos)) { - if(!world.isRemote) { - Block block = inter.getBlockType(); - world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); - } - + Block block = inter.getBlockType(); + world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.scheduleUpdate(inter.getPos(), block, block.tickRate(world)); did = true; } } } - interceptors.get().removeAll(remove); + interceptors.removeAll(remove); if(did) { - if(world.isRemote) - player.swingArm(hand); - else world.playSound(null, pos, SoundEvents.BLOCK_DISPENSER_DISPENSE, SoundCategory.BLOCKS, 0.3F, 0.6F); + player.swingArm(hand); + world.playSound(null, pos, SoundEvents.BLOCK_DISPENSER_DISPENSE, SoundCategory.BLOCKS, 0.3F, 0.6F); } }