Fix #1465 1.10.2-5.2.14.276 - Electrical Engines no longer allow levers to attach to the back

This commit is contained in:
Nedelosk committed 2016-10-18 17:53:23 +02:00
1 parent f01dab6f58
commit 5e0e045053
5 files changed
+18 -8

No files matched your search

@@ -34,7 +34,7 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr {
private final IMachinePropertiesTesr<?> machineProperties;
<T extends TileForestry> BlockTypeApicultureTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> 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
@@ -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);
}
}
@@ -20,17 +20,28 @@ public class MachinePropertiesTesr<T extends TileForestry> extends MachineProper
private final TileEntitySpecialRenderer<? super T> renderer;
@Nonnull
private final String particleTextureLocation;
private final boolean isFullCube;
public MachinePropertiesTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, @Nonnull String particleTextureLocation) {
super(teClass, name);
this.renderer = renderer;
this.particleTextureLocation = particleTextureLocation;
this(teClass, name, renderer, particleTextureLocation, true);
}
public MachinePropertiesTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, @Nonnull AxisAlignedBB boundingBox, @Nonnull String particleTextureLocation) {
this(teClass, name, renderer, boundingBox, particleTextureLocation, true);
}
public MachinePropertiesTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> renderer, @Nonnull String particleTextureLocation, boolean isFullCube) {
super(teClass, name);
this.renderer = renderer;
this.particleTextureLocation = particleTextureLocation;
this.isFullCube = isFullCube;
}
public MachinePropertiesTesr(@Nonnull Class<T> teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer<? super T> 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<T extends TileForestry> extends MachineProper
@Override
public boolean isFullCube(IBlockState state) {
return false;
return isFullCube;
}
}
@@ -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;
@@ -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);
}
}