clean up buildcraft.energy, for #2045

common/buildcraft/BuildCraftTransport.java

@@ -49,6 +49,7 @@ import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
 import buildcraft.core.ItemBuildCraft;
+import buildcraft.core.PowerMode;
 import buildcraft.core.Version;
 import buildcraft.core.network.BuildCraftChannelHandler;
 import buildcraft.core.proxy.CoreProxy;
@@ -107,7 +108,6 @@ import buildcraft.transport.pipes.PipePowerDiamond;
 import buildcraft.transport.pipes.PipePowerEmerald;
 import buildcraft.transport.pipes.PipePowerGold;
 import buildcraft.transport.pipes.PipePowerIron;
-import buildcraft.transport.pipes.PipePowerIron.PowerMode;
 import buildcraft.transport.pipes.PipePowerQuartz;
 import buildcraft.transport.pipes.PipePowerStone;
 import buildcraft.transport.pipes.PipePowerWood;

common/buildcraft/builders/BuilderProxyClient.java

@@ -10,7 +10,9 @@ package buildcraft.builders;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import buildcraft.builders.urbanism.TileUrbanist;
 import buildcraft.core.render.RenderBlockMultiTexture;
+import buildcraft.core.render.RenderBoxProvider;
 import buildcraft.core.render.RenderBuilder;
 
 public class BuilderProxyClient extends BuilderProxy {
@@ -26,6 +28,7 @@ public class BuilderProxyClient extends BuilderProxy {
 
 		RenderingRegistry.registerBlockHandler(new RenderBlockMultiTexture());
 
+		ClientRegistry.bindTileEntitySpecialRenderer(TileUrbanist.class, new RenderBoxProvider());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileArchitect.class, new RenderArchitect());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderBuilder());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilder());

common/buildcraft/core/PowerMode.java

@@ -0,0 +1,29 @@
+package buildcraft.core;
+
+public enum PowerMode {
+
+	M2(20), M4(40), M8(80), M16(160), M32(320), M64(640), M128(1280);
+	public static final PowerMode[] VALUES = values();
+	public final int maxPower;
+
+	private PowerMode(int max) {
+		this.maxPower = max;
+	}
+
+	public PowerMode getNext() {
+		PowerMode next = VALUES[(ordinal() + 1) % VALUES.length];
+		return next;
+	}
+
+	public PowerMode getPrevious() {
+		PowerMode previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length];
+		return previous;
+	}
+
+	public static PowerMode fromId(int id) {
+		if (id < 0 || id >= VALUES.length) {
+			return M128;
+		}
+		return VALUES[id];
+	}
+}

common/buildcraft/energy/EnergyProxyClient.java

@@ -10,7 +10,6 @@ package buildcraft.energy;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import buildcraft.BuildCraftEnergy;
-import buildcraft.builders.urbanism.TileUrbanist;
 import buildcraft.core.render.RenderBoxProvider;
 import buildcraft.core.render.RenderingEntityBlocks;
 import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex;
@@ -24,8 +23,6 @@ public class EnergyProxyClient extends EnergyProxy {
 		super.registerTileEntities();
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEngine.class, new RenderEngine());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyEmitter.class, new RenderEnergyEmitter());
-
-		ClientRegistry.bindTileEntitySpecialRenderer(TileUrbanist.class, new RenderBoxProvider());
 	}
 
 	@Override

common/buildcraft/energy/TileEngineCreative.java

@@ -13,18 +13,16 @@ import net.minecraft.item.Item;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.ResourceLocation;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.core.NetworkData;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.PowerMode;
 import buildcraft.core.utils.StringUtils;
-import buildcraft.transport.pipes.PipePowerIron;
 
 public class TileEngineCreative extends TileEngine {
 
 	@NetworkData
-	private PipePowerIron.PowerMode powerMode = PipePowerIron.PowerMode.M2;
+	private PowerMode powerMode = PowerMode.M2;
 
 	@Override
 	public ResourceLocation getBaseTexture() {
@@ -71,7 +69,7 @@ public class TileEngineCreative extends TileEngine {
 	public void readFromNBT(NBTTagCompound data) {
 		super.readFromNBT(data);
 
-		powerMode = PipePowerIron.PowerMode.fromId(data.getByte("mode"));
+		powerMode = PowerMode.fromId(data.getByte("mode"));
 	}
 
 	@Override

common/buildcraft/energy/TileEngineWood.java

@@ -10,11 +10,9 @@ package buildcraft.energy;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
+import buildcraft.api.transport.IPipeTile;
 import buildcraft.api.transport.IPipeTile.PipeType;
-import buildcraft.transport.TileGenericPipe;
 
 public class TileEngineWood extends TileEngine {
 
@@ -122,7 +120,7 @@ public class TileEngineWood extends TileEngine {
 	@Override
 	protected void sendPower() {
 		TileEntity tile = getTileBuffer(orientation).getTile();
-		if (tile instanceof TileGenericPipe && ((TileGenericPipe) tile).getPipeType() != PipeType.POWER) {
+		if (tile instanceof IPipeTile && ((IPipeTile) tile).getPipeType() != PipeType.POWER) {
 			super.sendPower();
 		} else { // pretend we're sending out our powers
 			this.energy = 0;

common/buildcraft/transport/pipes/PipePowerIron.java

@@ -14,16 +14,14 @@ import java.util.LinkedList;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.util.ChatComponentText;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.gates.IAction;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.PowerMode;
 import buildcraft.core.utils.StringUtils;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeIconProvider;
@@ -33,34 +31,6 @@ import buildcraft.transport.triggers.ActionPowerLimiter;
 
 public class PipePowerIron extends Pipe<PipeTransportPower> {
 
-	public static enum PowerMode {
-
-		M2(20), M4(40), M8(80), M16(160), M32(320), M64(640), M128(1280);
-		public static final PowerMode[] VALUES = values();
-		public final int maxPower;
-
-		private PowerMode(int max) {
-			this.maxPower = max;
-		}
-
-		public PowerMode getNext() {
-			PowerMode next = VALUES[(ordinal() + 1) % VALUES.length];
-			return next;
-		}
-
-		public PowerMode getPrevious() {
-			PowerMode previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length];
-			return previous;
-		}
-
-		public static PowerMode fromId(int id) {
-			if (id < 0 || id >= VALUES.length) {
-				return M128;
-			}
-			return VALUES[id];
-		}
-	}
-
 	public PipePowerIron(Item item) {
 		super(new PipeTransportPower(), item);
 		transport.initFromPipe(getClass());

common/buildcraft/transport/triggers/ActionPowerLimiter.java

@@ -11,9 +11,8 @@ package buildcraft.transport.triggers;
 import java.util.Locale;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
-
+import buildcraft.core.PowerMode;
 import buildcraft.core.triggers.BCActionPassive;
-import buildcraft.transport.pipes.PipePowerIron.PowerMode;
 
 public class ActionPowerLimiter extends BCActionPassive {