diff --git a/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java b/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java index 3a87c9d80..94fe84411 100644 --- a/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java +++ b/electrical/src/main/java/resonantinduction/electrical/tesla/TileTesla.java @@ -213,16 +213,18 @@ public class TileTesla extends TileElectrical implements IMultiBlockStructure implements IRailing, TSlottedPart, JNormalOcclusion, IHollowConnect { + public PartRailing() + { + super(null); + } + RedstoneControl control; @Override diff --git a/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java b/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java index 88d008424..654230443 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java @@ -29,7 +29,12 @@ public abstract class PartColorableMaterial extends PartAdvanced public M material; public boolean isInsulated = false; public boolean requiresInsulation = true; - protected Item insulationType = Electrical.itemInsulation; + protected final Item insulationType; + + public PartColorableMaterial(Item insulationType) + { + this.insulationType = insulationType; + } /** * Material Methods diff --git a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java index 8a5358801..2f75a613c 100644 --- a/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java +++ b/src/main/java/resonantinduction/core/prefab/part/PartFramedConnection.java @@ -6,6 +6,7 @@ import java.util.Set; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; @@ -34,7 +35,6 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class PartFramedConnection, N extends INodeNetwork> extends PartColorableMaterial implements IConnector, TSlottedPart, JNormalOcclusion, IHollowConnect { - public static IndexedCuboid6[] sides = new IndexedCuboid6[7]; public static IndexedCuboid6[] insulatedSides = new IndexedCuboid6[7]; @@ -72,6 +72,11 @@ public abstract class PartFramedConnection extends PartColorableMaterial implements INodeProvider, TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects { + public static IndexedCuboid6[] sides = new IndexedCuboid6[7]; public static IndexedCuboid6[] insulatedSides = new IndexedCuboid6[7]; @@ -72,6 +74,11 @@ public abstract class PartFramedNode