diff --git a/src/main/java/forestry/api/core/ICamouflagedBlock.java b/src/main/java/forestry/api/core/ICamouflagedTile.java similarity index 92% rename from src/main/java/forestry/api/core/ICamouflagedBlock.java rename to src/main/java/forestry/api/core/ICamouflagedTile.java index 9020c3192..0b4623dc1 100644 --- a/src/main/java/forestry/api/core/ICamouflagedBlock.java +++ b/src/main/java/forestry/api/core/ICamouflagedTile.java @@ -8,7 +8,7 @@ package forestry.api.core; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public interface ICamouflagedBlock { +public interface ICamouflagedTile { EnumCamouflageType getCamouflageType(); diff --git a/src/main/java/forestry/api/greenhouse/GreenhouseEvents.java b/src/main/java/forestry/api/greenhouse/GreenhouseEvents.java index f59efc1b1..61d33d274 100644 --- a/src/main/java/forestry/api/greenhouse/GreenhouseEvents.java +++ b/src/main/java/forestry/api/greenhouse/GreenhouseEvents.java @@ -17,7 +17,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import forestry.api.core.EnumCamouflageType; import forestry.api.core.ICamouflageHandler; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; public class GreenhouseEvents extends Event { @@ -31,13 +31,13 @@ public class GreenhouseEvents extends Event { public static class CamouflageChangeEvent extends GreenhouseEvents{ @Nullable - public ICamouflagedBlock camouflagedBlock; + public ICamouflagedTile camouflagedBlock; @Nonnull public ICamouflageHandler camouflageHandler; @Nonnull public final EnumCamouflageType camouflageType; - public CamouflageChangeEvent(IGreenhouseState state, @Nullable ICamouflagedBlock camouflagedBlock, @Nonnull ICamouflageHandler camouflageHandler, @Nonnull EnumCamouflageType camouflageType) { + public CamouflageChangeEvent(IGreenhouseState state, @Nullable ICamouflagedTile camouflagedBlock, @Nonnull ICamouflageHandler camouflageHandler, @Nonnull EnumCamouflageType camouflageType) { super(state); this.camouflagedBlock = camouflagedBlock; diff --git a/src/main/java/forestry/core/utils/CamouflageUtil.java b/src/main/java/forestry/core/utils/CamouflageUtil.java index 6ce4bf495..ca01f38e8 100644 --- a/src/main/java/forestry/core/utils/CamouflageUtil.java +++ b/src/main/java/forestry/core/utils/CamouflageUtil.java @@ -14,7 +14,7 @@ import java.io.IOException; import forestry.api.core.EnumCamouflageType; import forestry.api.core.ICamouflageHandler; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.multiblock.IMultiblockComponent; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; @@ -79,8 +79,8 @@ public class CamouflageUtil { return null; } TileEntity tile = world.getTileEntity(pos); - if(tile instanceof ICamouflagedBlock){ - ICamouflagedBlock block = (ICamouflagedBlock) tile; + if(tile instanceof ICamouflagedTile){ + ICamouflagedTile block = (ICamouflagedTile) tile; return handler.getCamouflageBlock(block.getCamouflageType()); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java index 9cc0b2e41..542106260 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouse.java @@ -44,7 +44,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.core.IModelManager; import forestry.api.core.ISpriteRegister; import forestry.api.core.ITextureManager; diff --git a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java index 299dd927e..de54d3e13 100644 --- a/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java +++ b/src/main/java/forestry/greenhouse/logics/GreenhouseLogicGreenhouseEffect.java @@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import forestry.api.core.EnumCamouflageType; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.greenhouse.DefaultGreenhouseLogic; import forestry.api.greenhouse.EnumGreenhouseEventType; import forestry.api.greenhouse.GreenhouseManager; @@ -70,8 +70,8 @@ public class GreenhouseLogicGreenhouseEffect extends DefaultGreenhouseLogic impl World world = controller.getWorld(); for (IMultiblockComponent component : controller.getComponents()) { - if (component instanceof ICamouflagedBlock) { - ICamouflagedBlock block = (ICamouflagedBlock) component; + if (component instanceof ICamouflagedTile) { + ICamouflagedTile block = (ICamouflagedTile) component; if (block.getCamouflageType() == EnumCamouflageType.GLASS) { if (world.canBlockSeeSky(component.getCoordinates())) { ItemStack camouflageStack = CamouflageUtil.getCamouflageBlock(world, component.getCoordinates()); diff --git a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java index 58a5770db..6b025633e 100644 --- a/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/GreenhouseController.java @@ -34,7 +34,7 @@ import net.minecraftforge.fluids.FluidRegistry; import forestry.api.core.EnumCamouflageType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.greenhouse.EnumGreenhouseEventType; import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent; import forestry.api.greenhouse.GreenhouseEvents.CheckInternalBlockFaceEvent; @@ -308,8 +308,8 @@ public class GreenhouseController extends RectangularMultiblockControllerBase im if (worldObj != null) { if (worldObj.isRemote) { for (IMultiblockComponent comp : connectedParts) { - if (comp instanceof ICamouflagedBlock) { - ICamouflagedBlock camBlock = (ICamouflagedBlock) comp; + if (comp instanceof ICamouflagedTile) { + ICamouflagedTile camBlock = (ICamouflagedTile) comp; if (camBlock.getCamouflageType() == type) { worldObj.markBlockRangeForRenderUpdate(camBlock.getCoordinates(), camBlock.getCoordinates()); } diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java index 16c5704a4..e237d4c16 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouse.java @@ -22,7 +22,7 @@ import net.minecraftforge.common.MinecraftForge; import forestry.api.core.EnumCamouflageType; import forestry.api.core.ICamouflageHandler; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent; @@ -47,7 +47,7 @@ import forestry.greenhouse.gui.GuiGreenhouse; import forestry.greenhouse.multiblock.MultiblockLogicGreenhouse; import forestry.greenhouse.network.packets.PacketCamouflageUpdate; -public abstract class TileGreenhouse extends MultiblockTileEntityForestry implements IGreenhouseComponent, IHintSource, IStreamableGui, IErrorLogicSource, IRestrictedAccess, ITitled, ICamouflageHandler, ICamouflagedBlock { +public abstract class TileGreenhouse extends MultiblockTileEntityForestry implements IGreenhouseComponent, IHintSource, IStreamableGui, IErrorLogicSource, IRestrictedAccess, ITitled, ICamouflageHandler, ICamouflagedTile { private ItemStack camouflageBlock; diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java index 6f867a375..b1cd33925 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java @@ -33,7 +33,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import forestry.api.core.EnumCamouflageType; import forestry.api.core.ICamouflageHandler; -import forestry.api.core.ICamouflagedBlock; +import forestry.api.core.ICamouflagedTile; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; import forestry.api.greenhouse.GreenhouseEvents.CamouflageChangeEvent; @@ -58,7 +58,7 @@ import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -public class TileGreenhouseHatch extends MultiblockTileEntityBase implements IGreenhouseComponent, IHintSource, IErrorLogicSource, IRestrictedAccess, ICamouflageHandler, ICamouflagedBlock, IFluidHandler, IEnergyProvider, IEnergyReceiver { +public class TileGreenhouseHatch extends MultiblockTileEntityBase implements IGreenhouseComponent, IHintSource, IErrorLogicSource, IRestrictedAccess, ICamouflageHandler, ICamouflagedTile, IFluidHandler, IEnergyProvider, IEnergyReceiver { EnumFacing outwards; private ItemStack camouflageBlock;