diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java index 37a82c959..0b0f05eaa 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java @@ -34,7 +34,7 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr { private final IMachinePropertiesTesr machineProperties; BlockTypeApicultureTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, AxisAlignedBB boundingBox) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0", false); } @Nonnull diff --git a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java index cc66fa778..10c204412 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java @@ -37,7 +37,7 @@ public enum BlockTypeArboricultureTesr implements IBlockTypeTesr { if (boundingBox != null) { this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); } else { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0", false); } } diff --git a/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java b/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java index 044d90529..61d1ae716 100644 --- a/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java +++ b/src/main/java/forestry/core/blocks/MachinePropertiesTesr.java @@ -20,17 +20,28 @@ public class MachinePropertiesTesr extends MachineProper private final TileEntitySpecialRenderer renderer; @Nonnull private final String particleTextureLocation; + private final boolean isFullCube; public MachinePropertiesTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nonnull String particleTextureLocation) { - super(teClass, name); - this.renderer = renderer; - this.particleTextureLocation = particleTextureLocation; + this(teClass, name, renderer, particleTextureLocation, true); } public MachinePropertiesTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nonnull AxisAlignedBB boundingBox, @Nonnull String particleTextureLocation) { + this(teClass, name, renderer, boundingBox, particleTextureLocation, true); + } + + public MachinePropertiesTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nonnull String particleTextureLocation, boolean isFullCube) { + super(teClass, name); + this.renderer = renderer; + this.particleTextureLocation = particleTextureLocation; + this.isFullCube = isFullCube; + } + + public MachinePropertiesTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nonnull AxisAlignedBB boundingBox, @Nonnull String particleTextureLocation, boolean isFullCube) { super(teClass, name, boundingBox); this.renderer = renderer; this.particleTextureLocation = particleTextureLocation; + this.isFullCube = isFullCube; } @Nullable @@ -59,6 +70,6 @@ public class MachinePropertiesTesr extends MachineProper @Override public boolean isFullCube(IBlockState state) { - return false; + return isFullCube; } } diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 9e9eaf85d..602b385f3 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -47,7 +47,6 @@ import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.arboriculture.proxy.ProxyArboricultureClient; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java index 70cb5af13..ac30b4751 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java @@ -37,7 +37,7 @@ public enum BlockTypeLepidopterologyTesr implements IBlockTypeTesr { if (boundingBox != null) { this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); } else { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0", false); } }