From 98e28a09672b4f19a19dcc6fd91664a5f4430325 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 14 Jan 2016 22:44:50 -0600 Subject: [PATCH] Made some things one sided only --- .../common/block/tile/TileCraftCrate.java | 5 ++++- .../botania/common/block/tile/TileEnderEye.java | 9 +++++++-- .../botania/common/block/tile/TileForestEye.java | 2 ++ .../botania/common/block/tile/TileHourglass.java | 6 ++++-- .../botania/common/block/tile/TileManaFlame.java | 2 +- .../botania/common/block/tile/TileOpenCrate.java | 6 ++++-- .../common/block/tile/TileTeruTeruBozu.java | 3 +++ .../common/block/tile/mana/TileBellows.java | 6 +++--- .../common/block/tile/mana/TileManaDetector.java | 16 +++++++--------- .../common/block/tile/mana/TileTurntable.java | 3 +++ 10 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 0a0bd8129..59ea029c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -92,7 +92,10 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void updateEntity() { - if(!worldObj.isRemote && (craft(true) && canEject() || isFull())) + if (worldObj.isRemote) + return; + + if(craft(true) && canEject() || isFull()) ejectAll(); int newSignal = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 76ef55b68..b7a17df7e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile; import java.util.List; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -20,6 +21,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -28,6 +30,9 @@ public class TileEnderEye extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); @@ -52,8 +57,8 @@ public class TileEnderEye extends TileMod { double x = getPos().getX() - 0.1 + Math.random() * 1.2; double y = getPos().getY() - 0.1 + Math.random() * 1.2; double z = getPos().getZ() - 0.1 + Math.random() * 1.2; - - worldObj.spawnParticle(EnumParticleTypes.REDSTONE, x, y, z, 1, 0, 0); + + ((WorldServer) worldObj).spawnParticle(EnumParticleTypes.REDSTONE, false, x, y, z, 0, 1.0D, 0.0D, 0.0D, 1.0D); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 4e15d11d3..a2bdc8658 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -20,6 +20,8 @@ public class TileForestEye extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; int range = 6; int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 12288692b..2456219c3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -52,8 +52,10 @@ public class TileHourglass extends TileSimpleInventory { time = 0; flip = !flip; flipTicks = 4; - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); + if (!worldObj.isRemote) { + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); + } } timeFraction = (float) time / (float) totalTime; } else { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 20fe601f1..263d43cc9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -35,7 +35,7 @@ public class TileManaFlame extends TileMod { public void updateEntity() { float c = 0.3F; - if(Math.random() < c) { + if(worldObj.isRemote && Math.random() < c) { float v = 0.1F; float r = (float) (color >> 16 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index cb806a9e1..fca46222d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -42,6 +42,9 @@ public class TileOpenCrate extends TileSimpleInventory { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); @@ -73,8 +76,7 @@ public class TileOpenCrate extends TileSimpleInventory { ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, item, -200, LibObfuscation.AGE); setInventorySlotContents(0, null); - if(!worldObj.isRemote) - worldObj.spawnEntityInWorld(item); + worldObj.spawnEntityInWorld(item); } public boolean onWanded(EntityPlayer player, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 5657c5e40..afed2e16b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -16,6 +16,9 @@ public class TileTeruTeruBozu extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean isRaining = worldObj.isRaining(); if(isRaining && worldObj.rand.nextInt(9600) == 0) worldObj.getWorldInfo().setRaining(false); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 36abd8cfa..ac5c251b0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; @@ -115,9 +116,8 @@ public class TileBellows extends TileMod { } public TileEntity getLinkedTile() { - return null; -// EnumFacing side = ((EnumFacing) worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS)); -// return worldObj.getTileEntity(getPos().offset(side)); + EnumFacing side = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); + return worldObj.getTileEntity(getPos().offset(side)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index d583364a6..3f7780184 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -25,16 +25,14 @@ public class TileManaDetector extends TileMod implements IManaCollisionGhost { @Override public void updateEntity() { - if(!worldObj.isRemote) { - boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); - boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; - if(state != expectedState) - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); + boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; + if(state != expectedState && !worldObj.isRemote) + worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); - if(expectedState) - for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); - } + if(expectedState) + for(int i = 0; i < 4; i++) + Botania.proxy.sparkleFX(getWorld(), pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 20f095d1d..a4230ff83 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -36,6 +36,9 @@ public class TileTurntable extends TileMod { @Override public void updateEntity() { + if (worldObj.isRemote) + return; + boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) {