From 32c6cefd803b161d39d594c5fa8cb6d7c4d58fa0 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Thu, 8 Oct 2015 20:04:23 +0200 Subject: [PATCH] Removed Herobrine --- .../enderio/textures/blocks/overlays/dirt.png | Bin 0 -> 2678 bytes .../enderio/machine/AbstractMachineBlock.java | 4 +++- .../enderio/machine/AbstractMachineEntity.java | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 resources/assets/enderio/textures/blocks/overlays/dirt.png diff --git a/resources/assets/enderio/textures/blocks/overlays/dirt.png b/resources/assets/enderio/textures/blocks/overlays/dirt.png new file mode 100644 index 0000000000000000000000000000000000000000..fee13414c13b3c78e20ae6a32141b86303e53756 GIT binary patch literal 2678 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 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 94ed22be..b19687da 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -41,6 +41,7 @@ public abstract class AbstractMachineBlock exte public IIcon overlayIconPushPull; public IIcon overlayIconDisabled; public IIcon overlayIconNone; + public IIcon overlayIconDirty; public IIcon selectedFaceIcon; @@ -132,6 +133,7 @@ public abstract class AbstractMachineBlock exte overlayIconDisabled = iIconRegister.registerIcon("enderio:overlays/disabled"); overlayIconNone = iIconRegister.registerIcon("enderio:overlays/none"); selectedFaceIcon = iIconRegister.registerIcon("enderio:overlays/selectedFace"); + overlayIconDirty = iIconRegister.registerIcon("enderio:overlays/dirt"); } @SideOnly(Side.CLIENT) @@ -149,7 +151,7 @@ public abstract class AbstractMachineBlock exte case PUSH_PULL: return overlayIconPushPull; default: - return null; + return tile.isDirty ? overlayIconDirty : null; } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index cfbdc391..3cdcab3d 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine; import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; +import java.util.Random; import java.util.Set; import net.minecraft.block.Block; @@ -60,6 +61,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi private final ResourceLocation soundRes; + public boolean isDirty = false; + public static ResourceLocation getSoundFor(String sound) { return sound == null ? null : new ResourceLocation(EnderIO.DOMAIN + ":" + sound); } @@ -291,6 +294,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } if(forceClientUpdate) { + if (worldObj.rand.nextInt(1024) <= (isDirty ? 256 : 0)) { + isDirty = !isDirty; + } worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); forceClientUpdate = false; }