From c0864ccb482e1bcf76e8b112c1b9fd5deb89f327 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Thu, 17 Sep 2015 00:47:05 +0200 Subject: [PATCH] Central handling for Comparator output --- .../com/enderio/core/common/BlockEnder.java | 19 +++++++++++++++++++ .../common/interfaces/IComparatorOutput.java | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 src/main/java/com/enderio/core/common/interfaces/IComparatorOutput.java diff --git a/src/main/java/com/enderio/core/common/BlockEnder.java b/src/main/java/com/enderio/core/common/BlockEnder.java index 16b07b1..891bd8b 100644 --- a/src/main/java/com/enderio/core/common/BlockEnder.java +++ b/src/main/java/com/enderio/core/common/BlockEnder.java @@ -16,6 +16,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import com.enderio.core.api.common.util.ITankAccess; +import com.enderio.core.common.interfaces.IComparatorOutput; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.Log; import com.google.common.collect.Lists; @@ -28,6 +29,7 @@ public abstract class BlockEnder extends Block { protected final Class teClass; protected final String name; + protected final boolean hasComparatorInputOverride; protected BlockEnder(String name, Class teClass) { this(name, teClass, new Material(MapColor.ironColor)); @@ -41,6 +43,7 @@ public abstract class BlockEnder extends Block { setBlockName(name); setStepSound(Block.soundTypeMetal); setHarvestLevel("pickaxe", 0); + hasComparatorInputOverride = teClass != null && IComparatorOutput.class.isAssignableFrom(teClass); } protected void init() { @@ -168,6 +171,22 @@ public abstract class BlockEnder extends Block { } } + @Override + public boolean hasComparatorInputOverride() { + return hasComparatorInputOverride; + } + + @Override + public int getComparatorInputOverride(World w, int x, int y, int z, int side) { + if (hasComparatorInputOverride) { + TileEntityEnder te = getTileEntityEio(w, x, y, z); + if (te != null) { + return ((IComparatorOutput) te).getComparatorOutput(); + } + } + return 0; + } + //Because the vanilla method takes floats... public void setBlockBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { this.minX = minX; diff --git a/src/main/java/com/enderio/core/common/interfaces/IComparatorOutput.java b/src/main/java/com/enderio/core/common/interfaces/IComparatorOutput.java new file mode 100644 index 0000000..b993a5c --- /dev/null +++ b/src/main/java/com/enderio/core/common/interfaces/IComparatorOutput.java @@ -0,0 +1,6 @@ +package com.enderio.core.common.interfaces; + +public interface IComparatorOutput { + + int getComparatorOutput(); +}