From 05f7beb67f796d98f822e51ae7cd36f8811590f5 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 5 Sep 2014 04:13:58 +0800 Subject: [PATCH] Slice'N and Splice'N --- .../config/SliceAndSpliceRecipes_Core.xml | 20 +++- resources/assets/enderio/lang/en_US.lang | 3 + .../textures/blocks/sliceAndSpliceFront.png | Bin 0 -> 892 bytes .../textures/blocks/sliceAndSpliceFrontOn.png | Bin 0 -> 1384 bytes .../blocks/sliceAndSpliceFrontOn.png.mcmeta | 9 ++ .../enderio/textures/gui/sliceAndSplice.png | Bin 2452 -> 2450 bytes .../textures/items/skullZombieController.png | Bin 0 -> 461 bytes .../textures/items/skullZombieElectrode.png | Bin 0 -> 416 bytes src/main/java/crazypants/enderio/EnderIO.java | 7 +- .../java/crazypants/enderio/ModObject.java | 3 +- .../crazypants/enderio/config/Config.java | 12 +++ .../machine/AbstractMachineEntity.java | 2 + .../enderio/machine/MachineRecipes.java | 9 +- .../slicensplice/BlockSliceAndSplice.java | 74 ++++++++++---- .../slicensplice/GuiSliceAndSplice.java | 4 +- .../slicensplice/TileSliceAndSplice.java | 96 +++++++++++++++--- .../enderio/machine/soul/TileSoulBinder.java | 21 ++-- .../enderio/material/FrankenSkull.java | 24 +++++ .../enderio/material/ItemFrankenSkull.java | 64 ++++++++++++ .../crazypants/enderio/power/Capacitors.java | 2 +- 20 files changed, 288 insertions(+), 62 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png create mode 100644 resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png create mode 100644 resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/skullZombieController.png create mode 100644 resources/assets/enderio/textures/items/skullZombieElectrode.png create mode 100644 src/main/java/crazypants/enderio/material/FrankenSkull.java create mode 100644 src/main/java/crazypants/enderio/material/ItemFrankenSkull.java 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 0000000000000000000000000000000000000000..625366efe018e51f31b2028ebae4b82e31f6a691 GIT binary patch literal 892 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 delta 1342 zcmcJPX;4#F6vxkdFOU#GHVd*?mPD=9YEUUK;z)314vO?K)@jdEGV*!paemdA{yBOl_iMDYoJp;^h-bW<9~kV+%a;r_Ye z2b&!BPMss}PNuB`m$|UqlA5iOM|HKHSVmwgBQUT;T)X{&c>6wCf9Jg)) zG;}2t`+mA~Jiz`s!3Ec)$zAf+`@}XcrYmtf>&3!jemnHCEf`tDXQYcLtF3i^0%2so zLKm0Uf+fWG!f zM|eaIN0CC?{*R;8uNFtsd%bmsLZ-sE5j~B{#+!*a>yqM)Gunmv?<_>~<4stb5a=Y& z7U*=Lp&hgKv1ClV2q|?Nlxr^ULqjExX5EZr>YsTDCUHc=EV+3D+u4t-fR>r6fCI>3 z^3*u)3tglQ+|=-3+`5lUflAU69==_;1!2nP?+;ZJ>YAa|n(I`NEl!;dT^oj9P3$3s zpuojM`-}vPJfnMlakFH1kH)$jc7f^uhWo zCo}ID45`EuP2R~{se)_91W@b%d4b8&@RrniUFm6#dP&v~)y*%PMmuI`muxmHa~d1a zI*icVL&|VVcTM!%bP~iFu8DtAiz?_Mih_27BGOk-M0)Rm?C7)VT4o4RN9+g51)&S* zn9upKy6IE2LvH<}v6PO6YY1+5(4hWP9?H}pXI7$RvUJR%V z{Rt(4`>wjhe}f9JU;`L<_m$F<1Kk^OeN?WxN>Lp20b3Jvj~;7cY zsA#RUuqd%PAf%<6bi8OK#XZx8N10BtKRf_kF=m@WY04RcHzh_9-VG)os4u#Q4UKgi z>W{ z*s*JJ3xXJ_Ncog$R#YU_N!aNf0S|XwPRU-pZSwap+UF(IKbo%wHW9PM<(8Kz_I#y4 zt`r@D@_DPQs6-2GJFe|d=u&ga`QlY7fOvjUgbC pMihVeFO2^O|6g&DjntxyL|;!meiH6vG_U<8!N-%!DRUPj{{>!5F;oBm diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/resources/assets/enderio/textures/items/skullZombieController.png new file mode 100644 index 0000000000000000000000000000000000000000..3ccb86abdeee308976ed4e507cd47c904762e859 GIT binary patch literal 461 zcmV;;0W$uHP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003zNklKav;qmHU&Lupg5u>N53{J==6KBo{JY~I~rj+Yl~{;nyME;wr6geE6p%_Q6}Ej+Cp$d@8> z9QJYcQbNVe@ashFo1h80(;_;-5j6J@mY-)zj)2Crz-y)=Y!A>YDID8L6#9E?B9e*J z@Ny^*)A0fHk?4%{*6sQiscx>vrqPLd+(-J4NF+W1sN&3bz$|Rf00000NkvXXu0mjf DbuPqQ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/skullZombieElectrode.png b/resources/assets/enderio/textures/items/skullZombieElectrode.png new file mode 100644 index 0000000000000000000000000000000000000000..943224e3dd36a11d685449a8ec669033895f80a1 GIT binary patch literal 416 zcmV;R0bl-!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003GNkl zQBM2mP%$H18n}lUd#Jf#GE`zumk0*o)4-tpy+`i1d)271Ctv!&;of^V=fG9|A?-jz z)34wzsN%{iqGliA;;BGhb9{=udZ4;AevzbEIke^_@=^y*%zcyw zSt@by5 { - - 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;