diff --git a/.gitignore b/.gitignore index fdb6b2a8..085ecc22 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /.gradle /eclipse /eclipseBin +/.classpath diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index b7a5fb06..d93d3c65 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -111,7 +111,7 @@ tile.blockPaintedDoubleSlab.name=Painted Slab //Items item.enderio.itemYetaWrench.name=Yeta Wrench -item.enderio.itemMJReader.name=Conduit Probe +item.enderio.itemConduitProbe.name=Conduit Probe enderio.itemEnderface.wrongDimension=EnderIO block is in a different dimension. enderio.itemEnderface.tooFar=EnderIO block is too distant. diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 50c79124..c5c0b5c8 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -41,7 +41,7 @@ import crazypants.enderio.machine.hypercube.HyperCubeRegister; import crazypants.enderio.machine.light.BlockElectricLight; import crazypants.enderio.machine.light.BlockLightNode; import crazypants.enderio.machine.monitor.BlockPowerMonitor; -import crazypants.enderio.machine.monitor.ItemMJReader; +import crazypants.enderio.machine.monitor.ItemConduitProbe; import crazypants.enderio.machine.painter.BlockPaintedFence; import crazypants.enderio.machine.painter.BlockPaintedFenceGate; import crazypants.enderio.machine.painter.BlockPaintedSlab; @@ -128,9 +128,8 @@ public class EnderIO { public static BlockLightNode blockLightNode; public static ItemYetaWrench itemYetaWench; - public static ItemMJReader itemMJReader; + public static ItemConduitProbe itemConduitProbe; - // // public static ITrigger triggerNoEnergy; // public static ITrigger triggerHasEnergy; // public static ITrigger triggerFullEnergy; @@ -192,7 +191,7 @@ public class EnderIO { itemYetaWench = ItemYetaWrench.create(); itemEnderface = ItemEnderface.create(); itemTravelStaff = ItemTravelStaff.create(); - itemMJReader = ItemMJReader.create(); + itemConduitProbe = ItemConduitProbe.create(); MaterialRecipes.registerOresInDictionary(); } @@ -214,7 +213,7 @@ public class EnderIO { new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 1, 3, 60)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemYetaWench, 1, 0), 1, 1, 15)); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemMJReader, 1, 0), 1, 1, 1)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemConduitProbe, 1, 0), 1, 1, 1)); ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); itemTravelStaff.setFull(staff); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index b83ef8fb..eca4db62 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -50,7 +50,7 @@ public enum ModObject { blockPaintedSlab, blockPaintedDoubleSlab, - itemMJReader, + itemConduitProbe, itemYetaWrench, blockTravelAnchor, diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index ca0c82f8..47f34e8d 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -252,7 +252,7 @@ public class ConduitUtil { if(equipped == null) { return false; } - return equipped.getItem() == EnderIO.itemMJReader; + return equipped.getItem() == EnderIO.itemConduitProbe; } public static T getConduit(IBlockAccess world, int x, int y, int z, Class type) { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index ced8b438..39ca6c73 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -26,7 +26,7 @@ import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.machine.monitor.MJReaderPacketHandler; +import crazypants.enderio.machine.monitor.PacketConduitProbe; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; @@ -120,7 +120,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { if(ConduitUtil.isProbeEquipped(player)) { if(!player.worldObj.isRemote) { - MJReaderPacketHandler.getInstance().sendInfoMessage(player, this, null); + PacketConduitProbe.sendInfoMessage(player, this, null); } return true; } else if(ConduitUtil.isToolEquipped(player)) { @@ -150,7 +150,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { ForgeDirection connDir = res.component.dir; if(connDir != null && connDir != ForgeDirection.UNKNOWN && containsExternalConnection(connDir)) { if(!player.worldObj.isRemote) { - MJReaderPacketHandler.getInstance().sendInfoMessage(player, this, player.getCurrentEquippedItem()); + PacketConduitProbe.sendInfoMessage(player, this, player.getCurrentEquippedItem()); } return true; } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index bddd48cd..892da9a7 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -32,7 +32,7 @@ import crazypants.enderio.conduit.geom.CollidableCache.CacheKey; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.machine.monitor.MJReaderPacketHandler; +import crazypants.enderio.machine.monitor.PacketConduitProbe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IPowerInterface; @@ -123,7 +123,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { DyeColor col = DyeColor.getColorFromDye(player.getCurrentEquippedItem()); if(ConduitUtil.isProbeEquipped(player)) { if(!player.worldObj.isRemote) { - MJReaderPacketHandler.getInstance().sendInfoMessage(player, this); + new PacketConduitProbe().sendInfoMessage(player, this); } return true; } else if(col != null && res.component != null && isColorBandRendered(res.component.dir)) { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index f13cf3f3..10c209fb 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -74,7 +74,7 @@ public class MachineRecipes { } //MJ Monitor - ItemStack mJReader = new ItemStack(EnderIO.itemMJReader, 1, 0); + ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0); ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); @@ -152,7 +152,7 @@ public class MachineRecipes { } //MJ Reader - ItemStack mJReader = new ItemStack(EnderIO.itemMJReader, 1, 0); + ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0); ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); diff --git a/src/main/java/crazypants/enderio/machine/monitor/ItemMJReader.java b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java similarity index 79% rename from src/main/java/crazypants/enderio/machine/monitor/ItemMJReader.java rename to src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java index ed83ed42..36a6d627 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/ItemMJReader.java +++ b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java @@ -21,22 +21,22 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; -public class ItemMJReader extends Item { +public class ItemConduitProbe extends Item { private static final NumberFormat NF = NumberFormat.getIntegerInstance(); - public static ItemMJReader create() { + public static ItemConduitProbe create() { - EnderIO.packetPipeline.registerPacket(MJReaderPacketHandler.class); + EnderIO.packetPipeline.registerPacket(PacketConduitProbe.class); - ItemMJReader result = new ItemMJReader(); + ItemConduitProbe result = new ItemConduitProbe(); result.init(); return result; } - protected ItemMJReader() { + protected ItemConduitProbe() { setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName("enderio." + ModObject.itemMJReader.name()); + setUnlocalizedName("enderio." + ModObject.itemConduitProbe.name()); setMaxStackSize(64); } @@ -68,9 +68,9 @@ public class ItemMJReader extends Item { } TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof IConduitBundle) && MJReaderPacketHandler.canCreatePacket(world, x, y, z)) { + if(!(te instanceof IConduitBundle) && PacketConduitProbe.canCreatePacket(world, x, y, z)) { if(world.isRemote) { - EnderIO.packetPipeline.sendToServer(new MJReaderPacketHandler(x, y, z, side)); + EnderIO.packetPipeline.sendToServer(new PacketConduitProbe(x, y, z, side)); } return true; } @@ -79,7 +79,7 @@ public class ItemMJReader extends Item { } protected void init() { - GameRegistry.registerItem(this, ModObject.itemMJReader.unlocalisedName); + GameRegistry.registerItem(this, ModObject.itemConduitProbe.unlocalisedName); } @Override diff --git a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java similarity index 94% rename from src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java rename to src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index 621b3945..96838909 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -30,7 +30,7 @@ import crazypants.enderio.network.IPacketEio; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.util.Lang; -public class MJReaderPacketHandler implements IPacketEio { +public class PacketConduitProbe implements IPacketEio { private static final String OF = " " + Lang.localize("gui.powerMonitor.of") + " "; private static final String CON_STORAGE = " " + Lang.localize("gui.powerMonitor.monHeading1") + ": "; @@ -73,14 +73,14 @@ public class MJReaderPacketHandler implements IPacketEio { private int z; private ForgeDirection side; - public MJReaderPacketHandler() { + public PacketConduitProbe() { } - public MJReaderPacketHandler(int x2, int y2, int z2, int side2) { + public PacketConduitProbe(int x2, int y2, int z2, int side2) { this(x2, y2, z2, ForgeDirection.getOrientation(side2)); } - public MJReaderPacketHandler(int x, int y, int z, ForgeDirection side) { + public PacketConduitProbe(int x, int y, int z, ForgeDirection side) { this.x = x; this.y = y; this.z = z; @@ -156,7 +156,7 @@ public class MJReaderPacketHandler implements IPacketEio { } } - public void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { + public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { if(tcb.getConduit(IItemConduit.class) != null) { sendInfoMessage(player, tcb.getConduit(IItemConduit.class), null); @@ -167,7 +167,7 @@ public class MJReaderPacketHandler implements IPacketEio { } } - public void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { + public static void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { PowerConduitNetwork pcn = (PowerConduitNetwork) conduit.getNetwork(); NetworkPowerManager pm = pcn.getPowerManager(); PowerTracker tracker = pm.getTracker(conduit); @@ -178,7 +178,7 @@ public class MJReaderPacketHandler implements IPacketEio { } } - public void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { + public static void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { String color = "\u00A7a "; StringBuilder sb = new StringBuilder(); sb.append(color); @@ -268,7 +268,7 @@ public class MJReaderPacketHandler implements IPacketEio { } - public void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { + public static void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { PowerTracker tracker = pm.getNetworkPowerTracker(); String color = "\u00A7a "; StringBuilder sb = new StringBuilder(); @@ -308,7 +308,7 @@ public class MJReaderPacketHandler implements IPacketEio { player.addChatComponentMessage(new ChatComponentText(sb.toString())); } - private void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { + public static void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { String color = "\u00A7a "; StringBuilder sb = new StringBuilder(); sb.append(color);