diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index e52d5517..bf1d7afd 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -2,7 +2,7 @@ - + @@ -12,10 +12,24 @@ - + - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 81ff83ad..4ff483ab 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -410,6 +410,9 @@ item.itemSoulVessel.tooltip.detailed.line1=Right-Click on a mob to item.itemSoulVessel.tooltip.detailed.line2=capture its soul item.itemSoulVessel.tooltip.detailed.line3=Click again to release it +skullZombieElectrode.name=Zombie Electrode +skullZombieController.name=Zombie Controller + //Dark Steel item.darkSteel_helmet.name=Dark Helm item.darkSteel_chestplate.name=Dark Plate diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png new file mode 100644 index 00000000..625366ef Binary files /dev/null and b/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png differ diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png new file mode 100644 index 00000000..f13d3168 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta new file mode 100644 index 00000000..0242996a --- /dev/null +++ b/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta @@ -0,0 +1,9 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1 + ] + } +} diff --git a/resources/assets/enderio/textures/gui/sliceAndSplice.png b/resources/assets/enderio/textures/gui/sliceAndSplice.png index bc904bff..29408390 100644 Binary files a/resources/assets/enderio/textures/gui/sliceAndSplice.png and b/resources/assets/enderio/textures/gui/sliceAndSplice.png differ diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/resources/assets/enderio/textures/items/skullZombieController.png new file mode 100644 index 00000000..3ccb86ab Binary files /dev/null and b/resources/assets/enderio/textures/items/skullZombieController.png differ diff --git a/resources/assets/enderio/textures/items/skullZombieElectrode.png b/resources/assets/enderio/textures/items/skullZombieElectrode.png new file mode 100644 index 00000000..943224e3 Binary files /dev/null and b/resources/assets/enderio/textures/items/skullZombieElectrode.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8c12cf0b..71230605 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -109,6 +109,7 @@ import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.BlockIngotStorage; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; +import crazypants.enderio.material.ItemFrankenSkull; import crazypants.enderio.material.ItemFusedQuartzFrame; import crazypants.enderio.material.ItemMachinePart; import crazypants.enderio.material.ItemMaterial; @@ -237,6 +238,7 @@ public class EnderIO { public static ItemMagnet itemMagnet; public static ItemSoulVessel itemSoulVessel; + public static ItemFrankenSkull itemFrankenSkull; public static ItemDarkSteelArmor itemDarkSteelHelmet; public static ItemDarkSteelArmor itemDarkSteelChestplate; @@ -310,6 +312,9 @@ public class EnderIO { itemConduitFacade = ItemConduitFacade.create(); itemBrokenSpawner = ItemBrokenSpawner.create(); + + blockEndermanSkull = BlockEndermanSkull.create(); + itemFrankenSkull = ItemFrankenSkull.create(); itemRedstoneConduit = ItemRedstoneConduit.create(); itemPowerConduit = ItemPowerConduit.create(); @@ -389,8 +394,6 @@ public class EnderIO { itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create(); itemDarkSteelAxe = ItemDarkSteelAxe.create(); - blockEndermanSkull = BlockEndermanSkull.create(); - MaterialRecipes.registerOresInDictionary(); int entityID = EntityRegistry.findGlobalUniqueEntityId(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 2ab79b9f..3194e08d 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -87,7 +87,8 @@ public enum ModObject { itemMagnet, itemGliderWing, blockEndermanSkull, - itemSoulVessel; + itemSoulVessel, + itemFrankenSkull; public final String unlocalisedName; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index f2ff6311..ad208956 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -271,6 +271,10 @@ public final class Config { public static int powerConduitTierTwoRF = 5120; public static int powerConduitTierThreeRF = 20480; + public static int sliceAndSpliceLevelOnePowerPerTickRF = 80; + public static int sliceAndSpliceLevelTwoPowerPerTickRF = 160; + public static int sliceAndSpliceLevelThreePowerPerTickRF = 320; + public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); @@ -724,6 +728,14 @@ public final class Config { "The number of RF/t consumed by a soul binder with an octadic capacitor upgrade.").getInt(soulBinderLevelThreePowerPerTickRF); soulBinderBrokenSpawnerRF = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerRF", soulBinderBrokenSpawnerRF, "The number of RF required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerRF); + + sliceAndSpliceLevelOnePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelOnePowerPerTickRF", sliceAndSpliceLevelOnePowerPerTickRF, + "The number of RF/t consumed by an unupgraded Slice'N'Splice").getInt(sliceAndSpliceLevelOnePowerPerTickRF); + sliceAndSpliceLevelTwoPowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelTwoPowerPerTickRF", sliceAndSpliceLevelTwoPowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with a double layer capacitor upgrade.").getInt(sliceAndSpliceLevelTwoPowerPerTickRF); + sliceAndSpliceLevelThreePowerPerTickRF = config.get(sectionPower.name, "sliceAndSpliceLevelThreePowerPerTickRF", sliceAndSpliceLevelThreePowerPerTickRF, + "The number of RF/t consumed by a Slice'N'Splice with an octadic capacitor upgrade.").getInt(sliceAndSpliceLevelThreePowerPerTickRF); + } private Config() { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 42cb1939..a403b59f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -280,6 +280,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public void setCapacitor(Capacitors capacitorType) { this.capacitorType = capacitorType; forceClientUpdate = true; + //Force a check that the new value is in bounds + setEnergyStored(getEnergyStored()); } public int getPowerUsePerTick() { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index cd8222ed..8675f3b1 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -53,11 +53,11 @@ public class MachineRecipes { //ZombieGen ItemStack zg = new ItemStack(EnderIO.blockZombieGenerator, 1, 0); - GameRegistry.addShapedRecipe(zg, "eee", "qzq", "qcq", 'e', electricSteel, 'q', fusedQuartz, 'z', new ItemStack(Items.skull, 1, 2),'c', capacitor); + GameRegistry.addShapedRecipe(zg, "eee", "qzq", "qqq", 'e', electricSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 0),'c', capacitor); //KillerJoe ItemStack kj = new ItemStack(EnderIO.blockKillerJoe, 1, 0); - GameRegistry.addShapedRecipe(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', new ItemStack(Items.skull, 1, 2)); + GameRegistry.addShapedRecipe(kj, "sss", "qzq", "qqq", 's', darkSteel, 'q', fusedQuartz, 'z', new ItemStack(EnderIO.itemFrankenSkull, 1, 1)); ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger); GameRegistry.addShapedRecipe(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', capacitor3, 'v', vibCry); @@ -239,5 +239,10 @@ public class MachineRecipes { GameRegistry.addRecipe(new ShapedOreRecipe(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Items.comparator, 'g', Blocks.glass_pane, 's', "itemSilicon", 'e', electricalSteel)); + + //Slice'N'Splice + ItemStack sns = new ItemStack(EnderIO.blockSliceAndSplice); + GameRegistry.addRecipe(new ShapedOreRecipe(sns, "isi", "ams","ici", 'i', Items.iron_ingot, 'm', machineChassi, 's', "itemSkull", 'a', Items.iron_axe, 's', Items.shears, 'c', capacitor)); + } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java index 1a58423e..984980a4 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java @@ -1,34 +1,41 @@ package crazypants.enderio.machine.slicensplice; +import java.util.Random; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.MachineRecipeRegistry; +import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; import crazypants.enderio.machine.soul.BlockSoulBinder; import crazypants.enderio.machine.soul.ContainerSoulBinder; import crazypants.enderio.machine.soul.GuiSoulBinder; import crazypants.enderio.machine.soul.SoulBinderSpawnerRecipe; import crazypants.enderio.machine.soul.TileSoulBinder; +import crazypants.vecmath.Vector3f; public class BlockSliceAndSplice extends AbstractMachineBlock { - - public static int renderId; - - public static BlockSliceAndSplice create() { + + public static BlockSliceAndSplice create() { BlockSliceAndSplice result = new BlockSliceAndSplice(); result.init(); return result; } - + protected BlockSliceAndSplice() { super(ModObject.blockSliceAndSplice, TileSliceAndSplice.class); } - + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); @@ -54,22 +61,45 @@ public class BlockSliceAndSplice extends AbstractMachineBlock= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { @@ -119,12 +183,12 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { List recipes = MachineRecipeRegistry.instance.getRecipesForInput(getMachineName(), MachineRecipeInput.create(slot, itemstack)); if(numSlotsFilled == 0 && !recipes.isEmpty()) { return true; - } + } return isValidInputForAlloyRecipe(slot, itemstack, numSlotsFilled, recipes); } private boolean isValidInputForAlloyRecipe(int slot, ItemStack itemstack, int numSlotsFilled, List recipes) { - + ItemStack[] resultInv = new ItemStack[slotDefinition.getNumInputSlots()]; for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { if(i >= 0 && i < inventory.length && i != axeIndex && i != shearsIndex) { @@ -135,17 +199,17 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { } } } - + for (IMachineRecipe recipe : recipes) { - if(recipe instanceof ManyToOneMachineRecipe) { + if(recipe instanceof ManyToOneMachineRecipe) { if(((ManyToOneMachineRecipe) recipe).isValidRecipeComponents(resultInv)) { return true; } - } + } } return false; } - + private boolean isItemAlreadyInASlot(ItemStack itemstack) { ItemStack currentStackType = null; for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot() && currentStackType == null; i++) { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index a208c446..765c2eb2 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -16,16 +16,16 @@ import crazypants.enderio.power.PowerHandlerUtil; public class TileSoulBinder extends AbstractPoweredTaskEntity { public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 2), - Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); + private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2, + Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE); public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 2), - Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); + private static final BasicCapacitor CAP_TWO = new BasicCapacitor(POWER_PER_TICK_TWO * 2, + Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO); public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 2), - Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); + private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2, + Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); private ICapacitor capacitor; @@ -44,8 +44,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity { return SoulBinderSpawnerRecipe.instance.isValidInput(new MachineRecipeInput(slot, item)); } - public void setCapacitor(Capacitors capacitorType) { - this.capacitorType = capacitorType; + public void setCapacitor(Capacitors capacitorType) { switch (capacitorType) { case BASIC_CAPACITOR: capacitor = CAP_ONE; @@ -60,13 +59,9 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity { capacitor = CAP_ONE; break; } - //Force a check that the new value is in bounds - setEnergyStored(getEnergyStored()); - forceClientUpdate = true; + super.setCapacitor(capacitorType); } - - @Override public ICapacitor getCapacitor() { return capacitor; diff --git a/src/main/java/crazypants/enderio/material/FrankenSkull.java b/src/main/java/crazypants/enderio/material/FrankenSkull.java new file mode 100644 index 00000000..2b5b41c4 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/FrankenSkull.java @@ -0,0 +1,24 @@ +package crazypants.enderio.material; + +public enum FrankenSkull { + + ZOMBIE_ELECTRODE("skullZombieElectrode"), + ZOMBIE_CONTROLLER("skullZombieController"); + + public final String unlocalisedName; + public final String iconKey; + + private FrankenSkull(String unlocalisedName) { + this.unlocalisedName = unlocalisedName; + this.iconKey = "enderio:" + unlocalisedName; + } + + public String getUnlocalisedName() { + return unlocalisedName; + } + + public String getIconKey() { + return iconKey; + } + +} diff --git a/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java new file mode 100644 index 00000000..b439e353 --- /dev/null +++ b/src/main/java/crazypants/enderio/material/ItemFrankenSkull.java @@ -0,0 +1,64 @@ +package crazypants.enderio.material; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemFrankenSkull extends Item { + + private final IIcon[] icons; + + public static ItemFrankenSkull create() { + ItemFrankenSkull alloy = new ItemFrankenSkull(); + alloy.init(); + return alloy; + } + + private ItemFrankenSkull() { + setHasSubtypes(true); + setMaxDamage(0); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemFrankenSkull.unlocalisedName); + icons = new IIcon[FrankenSkull.values().length]; + } + + private void init() { + GameRegistry.registerItem(this, ModObject.itemFrankenSkull.unlocalisedName); + } + + @Override + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, icons.length - 1); + return icons[damage]; + } + + @Override + public void registerIcons(IIconRegister IIconRegister) { + for (int i = 0; i < icons.length; i++) { + icons[i] = IIconRegister.registerIcon(FrankenSkull.values()[i].iconKey); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, FrankenSkull.values().length - 1); + return FrankenSkull.values()[i].unlocalisedName; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < FrankenSkull.values().length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + +} diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index 257cfa62..ec6cde38 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -14,7 +14,7 @@ public enum Capacitors { "activatedCapacitor"), ENDER_CAPACITOR( - new BasicCapacitor(400, 1000000, 100), + new BasicCapacitor(400, 500000, 100), "enderCapacitor"); public final ICapacitor capacitor;