From bff0e043ea37fcd50deeeb39054e91f9daa84d3a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 8 Sep 2014 01:22:45 +0800 Subject: [PATCH] Added Ender Crystal and new new recipe for Staff of Travel --- resources/assets/enderio/lang/en_US.lang | 1 + .../enderio/textures/items/enderCrystal.png | Bin 0 -> 345 bytes .../textures/items/itemTravelStaff.png | Bin 689 -> 629 bytes .../crazypants/enderio/config/Config.java | 3 + .../crazypants/enderio/item/ItemRecipes.java | 2 + .../enderio/item/ItemSoulVessel.java | 2 +- .../soul/AbstractSoulBinderRecipe.java | 130 ++++++++++++++++++ .../enderio/machine/soul/BlockSoulBinder.java | 1 + .../soul/SoulBinderEnderCystalRecipe.java | 31 +++++ .../soul/SoulBinderReanimationRecipe.java | 102 +------------- .../enderio/material/ItemMaterial.java | 7 +- .../crazypants/enderio/material/Material.java | 13 +- .../enderio/teleport/TeleportRecipes.java | 9 +- 13 files changed, 191 insertions(+), 110 deletions(-) create mode 100644 resources/assets/enderio/textures/items/enderCrystal.png create mode 100644 src/main/java/crazypants/enderio/machine/soul/AbstractSoulBinderRecipe.java create mode 100644 src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 7b4d6734..04a1fada 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -114,6 +114,7 @@ enderio.machineChassi.name=Machine Chassis enderio.basicGear.name=Basic Gear enderio.pulsatingCrystal.name=Pulsating Crystal enderio.vibrantCrystal.name=Vibrant Crystal +enderio.enderCrystal.name=Ender Crystal enderio.darkGrindingBall.name=Dark Steel Ball enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output diff --git a/resources/assets/enderio/textures/items/enderCrystal.png b/resources/assets/enderio/textures/items/enderCrystal.png new file mode 100644 index 0000000000000000000000000000000000000000..8007d153a45f2ae9125cc2ac6977dae559346a06 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}NmW z7sn6_|EuRcxepl#us(1Kwc%PR8n_`Z!S%weU5YybqmS;8fBye}U%K(44vtX&UkM8B zd-8?eE^l7`QzPOck8Y$>;Hww&kGONRT{<}9R!_u2zVgIFwu+xE4}gE zF^Akq4dQ9Zf_h>pQgT-}E@Ra)V*1APlp|omuHwDFtT-}GIZQ5+@SJ}BmFU$<7M3&{ z1BKbAv#x|&r5HZQ>HXf&cIL3!!P!?oS03}+v9I%%fhhNi1>(6O9#^lwPc4_+|JSg` ng8gIY&uP&wSAV+ia#@daQl;0P9H(la2N^tF{an^LB{Ts5B&LQ> literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemTravelStaff.png b/resources/assets/enderio/textures/items/itemTravelStaff.png index dcff83aaf21e79793ebc7dc720c91f52c0c1ebfc..fca985bb9645e384718041f4811074d8afa31fce 100644 GIT binary patch delta 554 zcmV+_0@eMo1@#1wB#|)~3c>&Y4#EKyC`y2lQz3saF!XYv0005;Nkl z6t90T4)K2R3ZH&_fE{XCm@YBWFn8I~;*q-zB(nj&{5;3I+avV0E%@66UhKh+6zDVr zTUtD{Gu0nxIKMf??CU;UYU&Nl?D_no56f@C?8)g4^jS%qzOA9nW06mqZPEW!#6sz>5Wh!wo3T_ny!B% z6~}Qf>@GC30heC6-2)5#Jssgwx+|fQeW%^uVP(bfcYst6*ViF5Hz27zc!|SKAIPZAr0V+5Cx8tP;VAJKX sG~=A52gnU8H_lmlfE6pMqgML^Ll6=oq8+_)-~a#s07*qoM6N<$g3qQ4_y7O^ delta 612 zcmV-q0-OEy1hEB>Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8JP^FlWO00JOM zL_t(oN9~bKYZFlzg+mu^#6X~G{ixPSV@wN;7McWFHI{}*HBBx~hU8xDinVyAaf+xUc>IT?mS}aOLLlPMHyL<7Ot=Sz(#t{>}zFn@Fkx&6sr>6v6k_YiwAGZ++WM{=<5Q{xI?1i zC7O2;%_g)k8}+B=b2#m#_I!j@R=CR~X?1`z>LE^4Q^?mPqH`|vr{*Iz>z-2g@bt%R z3Is{iQk+x+j8(_E_{q*_$w|D}sWlMPN6ck7w~ykxgUk~mqJO%GsUBYQnDVbMg%7PL z3r^%xC;ph%nil$!2e|q<#A&t=uPNLh#Vs=Aes*x_qaEd%#N{`w3{7;AIOl57$IQbM z>Sgw28_^{RrIw&VoEZY-zc^49B?|8yOh4Sl(5Y@~8t5PHXL@-jqm>x5-yGz>dy%Vd zl(K{@>d(K}%754er?$OcA2FA{BSFHsy(EeUoW0jhO0*Eky0z^$=ws&bcK}VE{XGmE?P4(L!8g)F zyU(W?OG0*i#2gIcK{>uIkJq~{{n{2uyEo~d=3*HCFF}B17{-4pueY(Wal-@D-T2>) y8y-NvwvL7w8#FwCVOV!#gN6ra(xiUaY`+1}tzuX0W8hc-0000 entityClass; + + + protected AbstractSoulBinderRecipe(int energyRequired, String uid, Class entityClass) { + this.energyRequired = energyRequired; + this.uid = uid; + this.entityClass = entityClass; + } + + @Override + public String getUid() { + return uid; + } + + @Override + public int getEnergyRequired(MachineRecipeInput... inputs) { + return getEnergyRequired(); + } + + @Override + public boolean isRecipe(MachineRecipeInput... inputs) { + int validCount = 0; + for(MachineRecipeInput input : inputs) { + if(isValidInput(input)) { + validCount++; + } else { + return false; + } + } + return validCount == 2; + } + + @Override + public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { + String mobType = null; + for(MachineRecipeInput input : inputs) { + if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { + mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); + } + } + if(!getSupportedSouls().contains(mobType)) { + return new ResultStack[0]; + } + ItemStack resultStack = getOutputStack(mobType); + ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); + return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(resultStack)}; + } + + + @Override + public float getExperianceForOutput(ItemStack output) { + return 0; + } + + @Override + public boolean isValidInput(MachineRecipeInput input) { + if(input == null || input.item == null) { + return false; + } + int slot = input.slotNumber; + ItemStack item = input.item; + if(slot == 0) { + return getSupportedSouls().contains(EnderIO.itemSoulVessel.getMobTypeFromStack(item)); + } + if(slot == 1) { + return item.isItemEqual(getInputStack()); + } + return false; + } + + @Override + public String getMachineName() { + return ModObject.blockSoulBinder.unlocalisedName; + } + + @Override + public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { + List result = new ArrayList(inputs.length); + for(MachineRecipeInput input : inputs) { + if(input != null && input.item != null) { + ItemStack resStack = input.item.copy(); + resStack.stackSize = 1; + MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); + result.add(mri); + } + } + return result; + } + + protected ItemStack getOutputStack(String mobType) { + return getOutputStack(); + } + + @Override + public List getSupportedSouls() { + return Collections.singletonList((String)EntityList.classToStringMapping.get(entityClass)); + } + + @Override + public int getEnergyRequired() { + return energyRequired; + } + + public void setEnergyRequired(int energyRequired) { + this.energyRequired = energyRequired; + } + + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java index 9a6e3ce3..2256a485 100644 --- a/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/BlockSoulBinder.java @@ -50,6 +50,7 @@ public class BlockSoulBinder extends AbstractMachineBlock { super.init(); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderSpawnerRecipe.instance); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderReanimationRecipe.instance); + MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSoulBinder.unlocalisedName, SoulBinderEnderCystalRecipe.instance); } @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java new file mode 100644 index 00000000..02e3d5e1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderEnderCystalRecipe.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine.soul; + +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.item.ItemStack; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.material.FrankenSkull; +import crazypants.enderio.material.Material; + +public class SoulBinderEnderCystalRecipe extends AbstractSoulBinderRecipe { + + public static SoulBinderEnderCystalRecipe instance = new SoulBinderEnderCystalRecipe(); + + private SoulBinderEnderCystalRecipe() { + super(Config.soulBinderEnderCystalRF, "SoulBinderEnderCystalRecipe", EntityEnderman.class); + } + + @Override + public ItemStack getInputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + } + + @Override + public ItemStack getOutputStack() { + return new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); + } + + + +} diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java index bdcc8967..c9494ac1 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderReanimationRecipe.java @@ -14,96 +14,16 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.material.FrankenSkull; -public class SoulBinderReanimationRecipe implements IMachineRecipe, ISoulBinderRecipe { +public class SoulBinderReanimationRecipe extends AbstractSoulBinderRecipe { public static SoulBinderReanimationRecipe instance = new SoulBinderReanimationRecipe(); - - @Override - public String getUid() { - return "SoulBinderReanimationRecipe"; + + private SoulBinderReanimationRecipe() { + super(Config.soulBinderReanimationRF, "SoulBinderReanimationRecipe", EntityZombie.class); } @Override - public int getEnergyRequired(MachineRecipeInput... inputs) { - return Config.soulBinderReanimationRF; - } - - @Override - public boolean isRecipe(MachineRecipeInput... inputs) { - int validCount = 0; - for(MachineRecipeInput input : inputs) { - if(isValidInput(input)) { - validCount++; - } else { - return false; - } - } - return validCount == 2; - } - - @Override - public ResultStack[] getCompletedResult(float randomChance, MachineRecipeInput... inputs) { - String mobType = null; - for(MachineRecipeInput input : inputs) { - if(input != null && EnderIO.itemSoulVessel.containsSoul(input.item)) { - mobType = EnderIO.itemSoulVessel.getMobTypeFromStack(input.item); - } - } - if(!isZombie(mobType)) { - return new ResultStack[0]; - } - ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); - ItemStack soulVessel = new ItemStack(EnderIO.itemSoulVessel); - return new ResultStack[] {new ResultStack(soulVessel), new ResultStack(frankenZombie)}; - } - - @Override - public float getExperianceForOutput(ItemStack output) { - return 0; - } - - @Override - public boolean isValidInput(MachineRecipeInput input) { - if(input == null || input.item == null) { - return false; - } - int slot = input.slotNumber; - ItemStack item = input.item; - if(slot == 0) { - return isZombie(EnderIO.itemSoulVessel.getMobTypeFromStack(item)); - } - if(slot == 1) { - return item.getItem() == EnderIO.itemFrankenSkull && item.getItemDamage() == FrankenSkull.ZOMBIE_CONTROLLER.ordinal(); - } - return false; - } - - @Override - public String getMachineName() { - return ModObject.blockSoulBinder.unlocalisedName; - } - - @Override - public List getQuantitiesConsumed(MachineRecipeInput[] inputs) { - List result = new ArrayList(inputs.length); - for(MachineRecipeInput input : inputs) { - if(input != null && input.item != null) { - ItemStack resStack = input.item.copy(); - resStack.stackSize = 1; - MachineRecipeInput mri = new MachineRecipeInput(input.slotNumber, resStack); - result.add(mri); - } - } - return result; - } - - boolean isZombie(String mobType) { - //return mobType != null && mobType.equals("Zombie"); - return mobType != null && mobType.equals(EntityList.classToStringMapping.get(EntityZombie.class)); - } - - @Override - public ItemStack getInputStack() { + public ItemStack getInputStack() { return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); } @@ -111,15 +31,5 @@ public class SoulBinderReanimationRecipe implements IMachineRecipe, ISoulBinderR public ItemStack getOutputStack() { return new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); } - - @Override - public List getSupportedSouls() { - return Collections.singletonList((String)EntityList.classToStringMapping.get(EntityZombie.class)); - } - - @Override - public int getEnergyRequired() { - return Config.soulBinderReanimationRF; - } - + } diff --git a/src/main/java/crazypants/enderio/material/ItemMaterial.java b/src/main/java/crazypants/enderio/material/ItemMaterial.java index ed77206a..8dc0a6b6 100644 --- a/src/main/java/crazypants/enderio/material/ItemMaterial.java +++ b/src/main/java/crazypants/enderio/material/ItemMaterial.java @@ -68,11 +68,8 @@ public class ItemMaterial extends Item { if(par1ItemStack == null) { return false; } - int damage = par1ItemStack.getItemDamage(); - if(damage == Material.VIBRANT_CYSTAL.ordinal() || damage == Material.PULSATING_CYSTAL.ordinal()) { - return true; - } - return false; + int damage = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length); + return Material.values()[damage].hasEffect; } } diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 6f94e9c1..0ae1c2af 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -7,16 +7,23 @@ public enum Material { BINDER_COMPOSITE("binderComposite"), PHASED_IRON_NUGGET("phasedIronNugget"), VIBRANT_NUGGET("vibrantNugget"), - PULSATING_CYSTAL("pulsatingCrystal"), - VIBRANT_CYSTAL("vibrantCrystal"), - DRAK_GRINDING_BALL("darkGrindingBall"); + PULSATING_CYSTAL("pulsatingCrystal", true), + VIBRANT_CYSTAL("vibrantCrystal", true), + DRAK_GRINDING_BALL("darkGrindingBall"), + ENDER_CRYSTAL("enderCrystal", true); public final String unlocalisedName; public final String iconKey; + public final boolean hasEffect; private Material(String unlocalisedName) { + this(unlocalisedName, false); + } + + private Material(String unlocalisedName, boolean hasEffect) { this.unlocalisedName = "enderio." + unlocalisedName; this.iconKey = "enderio:" + unlocalisedName; + this.hasEffect = hasEffect; } } diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index f44be4a3..c54838bc 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -29,12 +29,11 @@ public class TeleportRecipes { //travel staff ItemStack travelStaff = new ItemStack(EnderIO.itemTravelStaff); EnderIO.itemTravelStaff.setEnergy(travelStaff, 0); - ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); - ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); + ItemStack endCry = new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); + ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); IRecipe rec = GameRegistry - .addShapedRecipe(travelStaff, " g", " s ", "c ", 's', electricalSteel, 'c', enderCapacitor, 'g', vibCry); - rec = GameRegistry - .addShapedRecipe(travelStaff, "g ", " s ", " c", 's', electricalSteel, 'c', enderCapacitor, 'g', vibCry); + .addShapedRecipe(travelStaff, " e", " s ", "s ", 's', darkSteel, 'c', enderCapacitor, 'e', endCry); + } }