upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-10-26 14:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor opt to red string interceptor

Browse Source
This commit is contained in:
Vincent Lee committed 2016-06-19 10:05:10 -05:00
1 parent 71edb3abb1
commit 028f0c4c82
2 files changed
+14 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java
+1 -2
View File
@@ -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;
src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java
+13 -13
View File
@@ -26,12 +26,13 @@ import java.util.Set;
public class TileRedStringInterceptor extends TileRedString {
private static final ThreadLocal<Set<TileRedStringInterceptor>> interceptors = ThreadLocal.withInitial(HashSet::new);;
private static final Set<TileRedStringInterceptor> 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<TileRedStringInterceptor> 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);
}
}