From 88b3daf5a21c0c8fe7e3419db2ba821db9b68fae Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 31 Aug 2014 01:46:51 +0800 Subject: [PATCH] Soul binder is a go! --- resources/assets/enderio/lang/en_US.lang | 5 ++++ ...blockSoulFuser.png => blockSoulBinder.png} | Bin ...kSoulFuserOn.png => blockSoulBinderOn.png} | Bin src/main/java/crazypants/enderio/EnderIO.java | 6 ++-- .../java/crazypants/enderio/GuiHandler.java | 2 +- .../java/crazypants/enderio/ModObject.java | 2 +- .../crazypants/enderio/config/Config.java | 27 ++++++++++++------ ...ockSoulFuser.java => BlockSoulBinder.java} | 26 ++++++++--------- ...oulFuser.java => ContainerSoulBinder.java} | 4 +-- .../{GuiSoulFuser.java => GuiSoulBinder.java} | 6 ++-- ...cipe.java => SoulBinderSpawnerRecipe.java} | 8 +++--- ...TileSoulFuser.java => TileSoulBinder.java} | 14 ++++----- .../machine/spawner/BlockPoweredSpawner.java | 3 +- .../machine/spawner/ItemBrokenSpawner.java | 3 +- 14 files changed, 62 insertions(+), 44 deletions(-) rename resources/assets/enderio/textures/blocks/{blockSoulFuser.png => blockSoulBinder.png} (100%) rename resources/assets/enderio/textures/blocks/{blockSoulFuserOn.png => blockSoulBinderOn.png} (100%) rename src/main/java/crazypants/enderio/machine/soul/{BlockSoulFuser.java => BlockSoulBinder.java} (70%) rename src/main/java/crazypants/enderio/machine/soul/{ContainerSoulFuser.java => ContainerSoulBinder.java} (88%) rename src/main/java/crazypants/enderio/machine/soul/{GuiSoulFuser.java => GuiSoulBinder.java} (87%) rename src/main/java/crazypants/enderio/machine/soul/{SoulFuserSpawnerRecipe.java => SoulBinderSpawnerRecipe.java} (91%) rename src/main/java/crazypants/enderio/machine/soul/{TileSoulFuser.java => TileSoulBinder.java} (87%) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 2ab9f74f..0ffd2db8 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -322,6 +322,11 @@ item.itemBrokenSpawner.name=Broken Spawner item.itemBrokenSpawner.tooltip.detailed.line1=Combine with a Powered Spawner item.itemBrokenSpawner.tooltip.detailed.line2=in an Anvil to set spawn type +tile.blockSoulBinder.name=Soul Binder +tile.blockSoulBinder.tooltip.detailed.line1=Used to convert the type of +tile.blockSoulBinder.tooltip.detailed.line2=a broken spawner + + enderio.machine.tooltip.configured=(Configured) //Blocks diff --git a/resources/assets/enderio/textures/blocks/blockSoulFuser.png b/resources/assets/enderio/textures/blocks/blockSoulBinder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulFuser.png rename to resources/assets/enderio/textures/blocks/blockSoulBinder.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulFuserOn.png b/resources/assets/enderio/textures/blocks/blockSoulBinderOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulFuserOn.png rename to resources/assets/enderio/textures/blocks/blockSoulBinderOn.png diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 9bd93629..4bc28dd7 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -93,7 +93,7 @@ import crazypants.enderio.machine.painter.BlockPainter; import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; -import crazypants.enderio.machine.soul.BlockSoulFuser; +import crazypants.enderio.machine.soul.BlockSoulBinder; import crazypants.enderio.machine.spawner.BlockPoweredSpawner; import crazypants.enderio.machine.spawner.ItemBrokenSpawner; import crazypants.enderio.machine.still.BlockVat; @@ -197,7 +197,7 @@ public class EnderIO { public static BlockCrafter blockCrafter; public static BlockPoweredSpawner blockPoweredSpawner; public static ItemBrokenSpawner itemBrokenSpawner; - public static BlockSoulFuser blockSoulFuser; + public static BlockSoulBinder blockSoulFuser; public static BlockKillerJoe blockKillerJoe; @@ -306,7 +306,7 @@ public class EnderIO { blockPoweredSpawner = BlockPoweredSpawner.create(); itemBrokenSpawner = ItemBrokenSpawner.create(); - blockSoulFuser = BlockSoulFuser.create(); + blockSoulFuser = BlockSoulBinder.create(); itemRedstoneConduit = ItemRedstoneConduit.create(); itemPowerConduit = ItemPowerConduit.create(); diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 98d92f6c..2d74f5c4 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -43,7 +43,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_WIRELESS_CHARGER = 90; public static final int GUI_ID_ENCHANTER = 91; public static final int GUI_ID_KILLER_JOE = 92; - public static final int GUI_ID_SOUL_FUSER = 93; + public static final int GUI_ID_SOUL_BINDER = 93; protected final Map guiHandlers = new HashMap(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 437f40c5..ec861db9 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -51,7 +51,7 @@ public enum ModObject { blockVacuumChest, blockWirelessCharger, blockEnchanter, - blockSoulFuser, + blockSoulBinder, blockPoweredSpawner, itemBrokenSpawner, diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index ec3db57a..f36dc0c8 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -57,6 +57,7 @@ public final class Config { public static final Section sectionFluid = new Section("Fluid Settings", "fluid"); public static final Section sectionSpawner = new Section("PoweredSpawner Settings", "spawner"); public static final Section sectionKiller = new Section("Killer Joe Settings", "killerjoe"); + public static final Section sectionSoulBinder = new Section("Soul Binder Settings", "soulBinder"); public static final double DEFAULT_CONDUIT_SCALE = 0.5; @@ -257,10 +258,10 @@ public final class Config { public static String[] soulVesselBlackList = new String[0]; public static boolean soulVesselCapturesBosses = false; - public static double soulFuserLevelOnePowerPerTick = 50; - public static double soulFuserLevelTwoPowerPerTick = 100; - public static double soulFuserLevelThreePowerPerTick = 200; - public static int soulFuserMjForBrokenSpawner = 250000; + public static double soulBinderLevelOnePowerPerTick = 50; + public static double soulBinderLevelTwoPowerPerTick = 100; + public static double soulBinderLevelThreePowerPerTick = 200; + public static int soulBinderMjForBrokenSpawner = 250000; public static void load(FMLPreInitializationEvent event) { @@ -686,11 +687,21 @@ public final class Config { isGasConduitEnabled = config.getString("isGasConduitEnabled", sectionItems.name, isGasConduitEnabled, "Can be set to 'auto', 'true' or 'false'. When set to auto the gas conduit will only be enabled when Mekanism is installed."); - soulVesselBlackList = config.getStringList("soulVesselBlackList", sectionItems.name, soulVesselBlackList, - "Entities listed here will can not be captured in a 'Vessel of Souls'"); + soulVesselBlackList = config.getStringList("soulVesselBlackList", sectionSoulBinder.name, soulVesselBlackList, + "Entities listed here will can not be captured in a Soul Vial"); - soulVesselCapturesBosses = config.getBoolean("soulVesselCapturesBosses", sectionItems.name, soulVesselCapturesBosses, - "When set to false, any mob with a 'boss bar' won't be able to be captured in the 'Vessel of Souls'"); + soulVesselCapturesBosses = config.getBoolean("soulVesselCapturesBosses", sectionSoulBinder.name, soulVesselCapturesBosses, + "When set to false, any mob with a 'boss bar' won't be able to be captured in the Soul Vial"); + + soulBinderLevelOnePowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTick", soulBinderLevelOnePowerPerTick, + "The number of MJ/t consumed by an unupgraded soul binder.").getDouble(soulBinderLevelOnePowerPerTick); + + soulBinderLevelTwoPowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTick", soulBinderLevelTwoPowerPerTick, + "The number of MJ/t consumed by a soul binder with a double layer capacitor upgrade.").getDouble(soulBinderLevelTwoPowerPerTick); + soulBinderLevelThreePowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTick", soulBinderLevelThreePowerPerTick, + "The number of MJ/t consumed by a soul binder with an octadic capacitor upgrade.").getDouble(soulBinderLevelThreePowerPerTick); + soulBinderMjForBrokenSpawner = config.get(sectionSoulBinder.name, "soulBinderMjForBrokenSpawner", soulBinderMjForBrokenSpawner, + "The number of MJ required to change the type of a broken spawner.").getInt(soulBinderMjForBrokenSpawner); } private Config() { diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java similarity index 70% rename from src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java rename to src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java index e8bc48a3..6e4a60a3 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BlockSoulFuser.java +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java @@ -18,30 +18,30 @@ import crazypants.enderio.machine.painter.PainterContainer; import crazypants.enderio.machine.painter.TileEntityPainter; import crazypants.enderio.network.PacketHandler; -public class BlockSoulFuser extends AbstractMachineBlock { +public class BlockSoulBinder extends AbstractMachineBlock { - public static BlockSoulFuser create() { - BlockSoulFuser result = new BlockSoulFuser(); + public static BlockSoulBinder create() { + BlockSoulBinder result = new BlockSoulBinder(); result.init(); return result; } - protected BlockSoulFuser() { - super(ModObject.blockSoulFuser, TileSoulFuser.class); + protected BlockSoulBinder() { + super(ModObject.blockSoulBinder, TileSoulBinder.class); } @Override protected void init() { super.init(); - MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulFuser.unlocalisedName, SoulFuserSpawnerRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); } @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSoulFuser) { - return new ContainerSoulFuser(player.inventory, (AbstractMachineEntity) te); + if(te instanceof TileSoulBinder) { + return new ContainerSoulBinder(player.inventory, (AbstractMachineEntity) te); } return null; } @@ -49,22 +49,22 @@ public class BlockSoulFuser extends AbstractMachineBlock { @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSoulFuser) { - return new GuiSoulFuser(player.inventory, (AbstractMachineEntity) te); + if(te instanceof TileSoulBinder) { + return new GuiSoulBinder(player.inventory, (AbstractMachineEntity) te); } return null; } @Override protected int getGuiId() { - return GuiHandler.GUI_ID_SOUL_FUSER; + return GuiHandler.GUI_ID_SOUL_BINDER; } @Override protected String getMachineFrontIconKey(boolean active) { if(active) { - return "enderio:blockSoulFuserOn"; + return "enderio:blockSoulBinderOn"; } - return "enderio:blockSoulFuser"; + return "enderio:blockSoulBinder"; } } diff --git a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java similarity index 88% rename from src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java rename to src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java index ec7874c1..32dbcf84 100644 --- a/src/main/java/crazypants/enderio/machine/soul/ContainerSoulFuser.java +++ b/src/main/java/crazypants/enderio/machine/soul/ContainerSoulBinder.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import crazypants.enderio.machine.AbstractMachineContainer; import crazypants.enderio.machine.AbstractMachineEntity; -public class ContainerSoulFuser extends AbstractMachineContainer { +public class ContainerSoulBinder extends AbstractMachineContainer { - public ContainerSoulFuser(InventoryPlayer playerInv, AbstractMachineEntity te) { + public ContainerSoulBinder(InventoryPlayer playerInv, AbstractMachineEntity te) { super(playerInv, te); } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java similarity index 87% rename from src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java rename to src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index e2cb97c0..342df3a5 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulFuser.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -10,12 +10,12 @@ import crazypants.enderio.machine.painter.PainterContainer; import crazypants.render.RenderUtil; import crazypants.vecmath.Vector4f; -public class GuiSoulFuser extends GuiMachineBase { +public class GuiSoulBinder extends GuiMachineBase { private AbstractMachineEntity tileEntity; - public GuiSoulFuser(InventoryPlayer par1InventoryPlayer, AbstractMachineEntity te) { - super(te, new ContainerSoulFuser(par1InventoryPlayer, te)); + public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, AbstractMachineEntity te) { + super(te, new ContainerSoulBinder(par1InventoryPlayer, te)); tileEntity = te; } diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java similarity index 91% rename from src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java rename to src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index e6e92281..c5bb424e 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulFuserSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -10,9 +10,9 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; -public class SoulFuserSpawnerRecipe implements IMachineRecipe { +public class SoulBinderSpawnerRecipe implements IMachineRecipe { - public static SoulFuserSpawnerRecipe instance = new SoulFuserSpawnerRecipe(); + public static SoulBinderSpawnerRecipe instance = new SoulBinderSpawnerRecipe(); @Override public String getUid() { @@ -21,7 +21,7 @@ public class SoulFuserSpawnerRecipe implements IMachineRecipe { @Override public float getEnergyRequired(MachineRecipeInput... inputs) { - return Config.soulFuserMjForBrokenSpawner; + return Config.soulBinderMjForBrokenSpawner; } @Override @@ -79,7 +79,7 @@ public class SoulFuserSpawnerRecipe implements IMachineRecipe { @Override public String getMachineName() { - return ModObject.blockSoulFuser.unlocalisedName; + return ModObject.blockSoulBinder.unlocalisedName; } @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java similarity index 87% rename from src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java rename to src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index aa5dd3c5..886c6474 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulFuser.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -11,32 +11,32 @@ import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.PowerHandlerUtil; -public class TileSoulFuser extends AbstractPoweredTaskEntity { +public class TileSoulBinder extends AbstractPoweredTaskEntity { - public static final float POWER_PER_TICK_ONE = (float)Config.soulFuserLevelOnePowerPerTick; + public static final float POWER_PER_TICK_ONE = (float)Config.soulBinderLevelOnePowerPerTick; private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_TWO = (float)Config.soulFuserLevelTwoPowerPerTick; + public static final float POWER_PER_TICK_TWO = (float)Config.soulBinderLevelTwoPowerPerTick; private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 1.25), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_THREE = (float)Config.soulFuserLevelThreePowerPerTick; + public static final float POWER_PER_TICK_THREE = (float)Config.soulBinderLevelThreePowerPerTick; private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 1.25), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); - public TileSoulFuser() { + public TileSoulBinder() { super(new SlotDefinition(2, 2, 1)); } @Override public String getMachineName() { - return ModObject.blockSoulFuser.unlocalisedName; + return ModObject.blockSoulBinder.unlocalisedName; } @Override protected boolean isMachineItemValidForSlot(int slot, ItemStack item) { - return SoulFuserSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); + return SoulBinderSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); } public void setCapacitor(Capacitors capacitorType) { diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 91b9f005..97c30bda 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; @@ -157,7 +158,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock