From afb5b376ce7cfb14d7c8401af17d06cfff4774e7 Mon Sep 17 00:00:00 2001 From: Ethan Shaughnessy Date: Mon, 6 Oct 2014 23:40:56 -0600 Subject: [PATCH 01/11] Added hardcore mode additional hearts Textures need to be fixed. --- .../assets/tinker/textures/gui/newhearts.png | Bin 4654 -> 4061 bytes .../tconstruct/armor/ArmorProxyClient.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/resources/assets/tinker/textures/gui/newhearts.png b/resources/assets/tinker/textures/gui/newhearts.png index be6b93ae8627da8c5cf8af4d63b0e2e0e73a7684..aa6b187d0171b2e43435ec7aee9780537ac7be02 100644 GIT binary patch literal 4061 zcmeHKX;f3^7X3oPBp@J&Az&FQlopvWh><}N0cB7?Km-gR&`89{6sAA|0y4H$5h_Bc zEznlLARzh>L!d}snW|t(2{MPtFa{6_A@3%<^AFVXoyCmEiElE7>u>GwLM<$Op^TBWO?@#1v@)CdwctnCr>&!I5;{w zIy*bNy1IIMdlLu*B9SPcSP#kp=mB65>>5XSrYZQ`Q1s1J#1`xcyrUFUq;%{k(*h{EZiL6zLZcvGRyf2A?Ole1gx>`^;FI%##UA`naH347bNN|@1@n8iH ziUI^bCJWwsWblY(Z1>GMB9Ht+HLXiEqZgI=5|!1jmN%&O<%s&t@%^{QwF)M*?@S!H zGof2Jp;t8V+1Hc$cP9;sCyh$kXe#?~8T-inDVxd}r`|_kfdV$NB^8H>gGg|pqZxyfTq zt+RN%CD#1>{CkdIeSKXZ5J39>ef@-04!g^afMiT1b}8cht03;~2dTtu{CL`bxz zxuLP4S?*Nf8R+?solYF{j0>3mdfxkWj7q!P$yEZo^>wynR%VXomr|i8HC0D{b^g_7 zmjpcMc3PmccF*Kdm|h2i#CIgXd$+SRpTEBru91-EjcXCXpiX7dM@l%Mr;(`)Qqk3U9I z-URC3o*?LnUqjoW(^oGD(t9 zdZCQGp(tRXIPDE=i?4J&9@e&?URtK^@let+q_Yy$1AZ8(Ns5r;;?Z@ zM8nUGnm@ewJ$?8tJw`^D z1;`Pg~zEXrtVHSsriz|Xm(KX`h=XU@?f-OSB!i2tQ zU3v9t5A-FB1V>m4)7*d|wzu*y`7DQ8tk%#nb%mpWN??f zM}iQsA8I{gY`tVZ_^>_b>J=(gYy9YSKr9RTy*v=T` zsiiJnm3mIs+SXbWgd zT){&oIpW0SEpClcAVWBOu_`n~H9zxIVtML3irK)Q$FqK~W7beyI*H|X+@%q|bbVFI z%EHrMo~zVXL9Fhlz4L7BT@A=Ed2*6;2=oPaig?UFFX?T+bjqaJyCRRK^ zqc^M_lEDXbY@cGsK;3S?SzS#upjq}#Jxf=z2&2)P`MKg~7L#6AcZJgZ4zbiMj&_kr zk(eRW9LIKiaM07Q$R2dch%(PnQi^hCVu{IcIII5K2BdnUwj zuF@nviC;StB1P%WJz5;Eo1l6eYi8h9NzD$(P+(Sda@VHs7iuBUw<2R!e*E_X%aiFl zcb3WV2NP6pdK}Kn8d8L7CZm+jD~ZDF9=K)g@#0op3-DOm!q| z=fI_lvgCf)&$UQkncjy4Ok5W%sZIjKqN2be5k@X~q27|H1hADRl1s}U?Z63ABABWU zL~x_S4m_qTg14T@i(tAs9D)P(lLLNQF%P9q;tsk6FW&|$=CQ{ljATU=^E$hii$xUS zrbms1bT)C$n+ZGwOEK4$?#H3)2_^9;cschywn+k=7KvNBDU$2i&|SKYNG@HA7ZEoC zGQLYj-D0PQ?CAR_GSPn3^gty6r8K*v$=5qURV2+TeGz^4z3{ScwUUmsR#Cdkex@P8 za$nKU_mQAhz_8Lag=!#eoJ87W|3RDFo*hkCb~~g)jYOoMof8L`JWFz^BB1pZ!Q;Y^ zfMY%dtS=x$Y57oCi)--iQLc^%_VI&3>E>Wf3m zdcf=670d-8TbI*kFMql>LG`n_%Gz;1wjYJ6z)0@t9^angA2+g-!lSe2^XA2x%%Nf1 zx1YV6*R$5=v%JJ;gFt(}xfjQJ&|uZn^Ij{iO7E9+*sm!E`@NLQTY+*iNN$ z^otKE-JxgkdnL+ff;KuMV`AI(TN`ISW&oy)Nr&mpf$TR>C8Q`^#K+>)4trny9rgi2 zK9*!+qj9@yur>Q=F;~TP=pIf|l%3x%BE6Bk57K0P4yS-j=^3Ft##XU0W6Y3v#k| KJpt|8)PDh^GdbM= literal 4654 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 diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 2461b505..c9288d71 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -308,6 +308,8 @@ public class ArmorProxyClient extends ArmorProxyCommon potion = mc.thePlayer.getActivePotionEffect(Potion.poison); if (potion != null) potionOffset = 9; + if (mc.theWorld.getWorldInfo().isHardcoreModeEnabled()) + potionOffset += 27; // Extra hearts this.mc.getTextureManager().bindTexture(hearts); From 49d804daa200f3b35bd2bde17cbbd93e0f91afc4 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 20:11:22 +0200 Subject: [PATCH 02/11] Try to fix the weird fuel-consumption behaviour of the Smeltery. It should only consume fuel if it needs any now. And also it shoudl not randomly lose lava anymore. --- .../tconstruct/smeltery/gui/SmelteryGui.java | 2 +- .../smeltery/logic/SmelteryLogic.java | 205 ++++++++---------- 2 files changed, 87 insertions(+), 120 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 2f7671e9..57f8c827 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -45,7 +45,7 @@ public class SmelteryGui extends ActiveContainerGui super.initGui(); if (logic != null) - logic.updateFuelGague(); + logic.updateFuelDisplay(); } @Override diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index c660b9a1..af268d97 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -292,6 +292,13 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci * if (worldObj.isRemote) return; */ + + if(validStructure) + if (tick % 4 == 0) { + checkHasItems(); + heatItems(); + } + if (tick % 20 == 0) { if (!validStructure) @@ -311,10 +318,6 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } - - if(validStructure) - if (tick % 4 == 0) - heatItems(); } void detectEntities () @@ -438,6 +441,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } + private void checkHasItems() + { + inUse = false; + for (int i = 0; i < maxBlockCapacity; i++) + if(this.isStackInSlot(i) && meltingTemps[i] > 200) + { + inUse = true; + break; + } + } + private void heatItems () { if (useTime > 0) @@ -542,7 +556,6 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci private void updateTemperatures () { - inUse = true; for (int i = 0; i < maxBlockCapacity; i++) { meltingTemps[i] = Smeltery.getLiquifyTemperature(inventory[i]) * 10; // temperatures are *10 for more progress control @@ -551,138 +564,92 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci public void updateFuelDisplay () { - if (activeLavaTank == null) - return; - - if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) - { + // ensure our active tank is valid + verifyFuelTank(); + if (activeLavaTank == null) { fuelAmount = 0; fuelGague = 0; return; } - TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); - if (tankContainer == null) - { - fuelAmount = 0; - fuelGague = 0; - return; - } - - if (tankContainer instanceof IFluidHandler) - { - FluidStack liquid = ((IFluidHandler) tankContainer).drain(ForgeDirection.DOWN, 4000, false); - if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) - { - FluidTankInfo[] info = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN); - if (info.length > 0) - { - int capacity = info[0].capacity; - fuelAmount = liquid.amount; - fuelGague = liquid.amount * 52 / capacity; - } - } - else - { - fuelAmount = 0; - fuelGague = 0; - } - } + // checks are all done before in verifyFuelTank. Don't do this without checks! + IFluidHandler tankContainer = (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + FluidTankInfo[] info = tankContainer.getTankInfo(ForgeDirection.DOWN); + int capacity = info[0].capacity; + fuelAmount = info[0].fluid.amount; + fuelGague = (int)((float)fuelAmount * 52f / (float)capacity); } + // actually is updateFuel. public void updateFuelGague () { - if(activeLavaTank == null && lavaTanks.size() > 0) - activeLavaTank = lavaTanks.get(0); - if (activeLavaTank == null || useTime > 0) + // no need to update + if(useTime > 0 || !inUse) return; - if (!worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + // ensure active lava tank + verifyFuelTank(); + + // checks are all done before in verifyFuelTank. Don't do this without checks! + IFluidHandler tankContainer = (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + + // get liquid from the tank + FluidStack liquid = tankContainer.drain(ForgeDirection.DOWN, 15, false); + if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) // doublecheck that everything is ok { - fuelAmount = 0; - fuelGague = 0; - return; + // drain actual liquid, non simulated + liquid = tankContainer.drain(ForgeDirection.DOWN, 15, true); + useTime += Smeltery.getFuelDuration(liquid.getFluid()); + internalTemp = Smeltery.getFuelPower(liquid.getFluid()); + + // update fuel display + updateFuelDisplay(); // this also ensures that the next fuel tank is displayed if this drain made the current one empty + } + } + + protected void verifyFuelTank() + { + // is our current tank still good? + if(activeLavaTank != null && worldObj.blockExists(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z)) + { + TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); + if (tankContainer instanceof IFluidHandler) + { + FluidStack liquid = ((IFluidHandler) tankContainer).drain(ForgeDirection.DOWN, 15, false); + // current tank still has liquid and it's a fuel. everythin ok. + if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) + return; + } } - TileEntity tankContainer = worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); - if (tankContainer == null) + + // our tank got derped or is empty. time to look for a new one! + activeLavaTank = null; + for(CoordTuple tank : lavaTanks) { - fuelAmount = 0; - fuelGague = 0; + // does the tank still exist? + if (!worldObj.blockExists(tank.x, tank.y, tank.z)) + continue; + + // yes, it does, but is it a tank? + TileEntity tankContainer = worldObj.getTileEntity(tank.x, tank.y, tank.z); + if (! (tankContainer instanceof IFluidHandler)) + continue; + + // yes it is, but does it contain a liquid? + FluidTankInfo[] info = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN); + if(info.length <= 0 || info[0].fluid == null || info[0].fluid.amount <= 0) + continue; + + // is it also a smeltery fuel? + if(!Smeltery.isSmelteryFuel(info[0].fluid.getFluid())) + continue; + + // we found a tank! :) + activeLavaTank = tank; return; } - if (tankContainer instanceof IFluidHandler) - { - needsUpdate = true; - FluidStack liquid = ((IFluidHandler) tankContainer).drain(ForgeDirection.DOWN, 15, false); - if (liquid != null && Smeltery.isSmelteryFuel(liquid.getFluid())) - { - liquid = ((IFluidHandler) tankContainer).drain(ForgeDirection.DOWN, 15, true); - useTime += Smeltery.getFuelDuration(liquid.getFluid()); - internalTemp = Smeltery.getFuelPower(liquid.getFluid()); - - FluidTankInfo[] info = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN); - liquid = info[0].fluid; - int capacity = info[0].capacity; - if (liquid != null) - { - fuelAmount = liquid.amount; - fuelGague = liquid.amount * 52 / capacity; - } - else - { - fuelAmount = 0; - fuelGague = 0; - } - } - else - { - boolean foundTank = false; - int iter = 0; - while (!foundTank && iter < lavaTanks.size()) - { - CoordTuple possibleTank = lavaTanks.get(iter); - TileEntity newTankContainer = worldObj.getTileEntity(possibleTank.x, possibleTank.y, possibleTank.z); - if (newTankContainer instanceof IFluidHandler) - { - // TConstruct.logger.info("Tank: "+possibleTank.toString()); - FluidStack newliquid = ((IFluidHandler) newTankContainer).drain(ForgeDirection.UNKNOWN, 150, false); - if (newliquid != null && Smeltery.isSmelteryFuel(newliquid.getFluid()) && newliquid.amount > 0) - { - // TConstruct.logger.info("Tank: "+possibleTank.toString()); - foundTank = true; - activeLavaTank = possibleTank; - iter = lavaTanks.size(); - - /* - * IFluidTank newTank = ((IFluidHandler) - * newTankContainer).getTank(ForgeDirection.UNKNOWN, - * liquid); liquid = newTank.getFluid(); int - * capacity = newTank.getCapacity(); - */ - FluidTankInfo[] info = ((IFluidHandler) tankContainer).getTankInfo(ForgeDirection.DOWN); - liquid = info[0].fluid; - int capacity = info[0].capacity; - if (liquid != null) - { - fuelAmount = liquid.amount; - fuelGague = liquid.amount * 52 / capacity; - } - else - { - fuelAmount = 0; - fuelGague = 0; - } - } - } - iter++; - if (iter >= lavaTanks.size()) - foundTank = true; - } - // TConstruct.logger.info("Searching for tank, size: "+lavaTanks.size()); - } - } } @SideOnly(Side.CLIENT) From 9cb2e27fe3d499c565d948a9216b5962c3eec908 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 20:15:18 +0200 Subject: [PATCH 03/11] Lava lasts a tad longer. Turns out smelteries are consuming 1.5x as much lava as the old smelteries! It's only 1.25 as much now. To be exact: 15 mb are used every 4 seconds --- src/main/java/tconstruct/smeltery/TinkerSmeltery.java | 4 ++-- src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index dad82c49..e6a74568 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1077,11 +1077,11 @@ public class TinkerSmeltery protected static void addRecipesForSmeltery () { // Smeltery fuels - Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 10); + Smeltery.addSmelteryFuel(FluidRegistry.LAVA, 1300, 12); // lava lasts 4 seconds per 15 mb // register pyrotheum if it's present Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); if (pyrotheum != null) - Smeltery.addSmelteryFuel(pyrotheum, 5000, 9); + Smeltery.addSmelteryFuel(pyrotheum, 5000, 9); // pyrotheum lasts 3 seconds per 15 mb // BLOOD FOR THE BLOOD GOD if (TinkerWorld.meatBlock != null) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index af268d97..dbc987e4 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -304,10 +304,10 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci if (!validStructure) checkValidPlacement(); - if (useTime > 0 && inUse) + if (useTime > 0) useTime -= 3; - if (validStructure && useTime <= 0) + if (validStructure && useTime <= 0 && inUse) { updateFuelGague(); } @@ -600,7 +600,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { // drain actual liquid, non simulated liquid = tankContainer.drain(ForgeDirection.DOWN, 15, true); - useTime += Smeltery.getFuelDuration(liquid.getFluid()); + useTime += (int)((float)Smeltery.getFuelDuration(liquid.getFluid())*15f/(float)liquid.amount); internalTemp = Smeltery.getFuelPower(liquid.getFluid()); // update fuel display From 5feb11f1a801fa087c389654ff485df967c28685 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 21:07:48 +0200 Subject: [PATCH 04/11] Try syncing internal itemstack damage with the damage from the tool --- .../java/tconstruct/library/tools/ToolCore.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 03dbd84b..996d1106 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -788,8 +788,11 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo { int energy = tags.getInteger("Energy"); int max = getMaxEnergyStored(stack); - if(energy > 0) - return ((max - energy)*100)/max; + if(energy > 0) { + int damage = ((max - energy) * 100) / max; + super.setDamage(stack, damage); + return damage; + } } int dur = tags.getCompoundTag("InfiTool").getInteger("Damage"); int max = tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); @@ -799,8 +802,11 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo // rounding. if(damage == 0 && dur > 0) - return 1; + damage = 1; + + // synchronize values with stack.. + super.setDamage(stack, damage); return damage; } @@ -813,6 +819,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IMo @Override public void setDamage(ItemStack stack, int damage) { AbilityHelper.damageTool(stack, damage - stack.getItemDamage(), null, false); + getDamage(stack); // called to synchronize with itemstack value } /* Prevent tools from dying */ From 2c2b9ba2815d071ea13a694f4ed78e614f04b80b Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 21:15:05 +0200 Subject: [PATCH 05/11] Fix Paper creating blueslime parts if the paper config option is turned off. #1066 --- src/main/java/tconstruct/tools/TinkerTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 490c8480..6e8be2f7 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -826,7 +826,7 @@ public class TinkerTools if (PHConstruct.enableTPaper) pb.registerFullMaterial(new ItemStack(materials, 1, 0), 2, "Paper", new ItemStack(Items.paper, 2), new ItemStack(toolRod, 1, 9), 9); else - pb.registerMaterialSet("BlueSlime", new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); + pb.registerMaterialSet("Paper", new ItemStack(Items.paper, 2), new ItemStack(TinkerTools.toolRod, 1, 9), 9); pb.registerMaterialSet("Cobalt", new ItemStack(toolShard, 1, 10), new ItemStack(toolRod, 1, 10), 10); pb.registerMaterialSet("Ardite", new ItemStack(toolShard, 1, 11), new ItemStack(toolRod, 1, 11), 11); pb.registerMaterialSet("Manyullyn", new ItemStack(toolShard, 1, 12), new ItemStack(toolRod, 1, 12), 12); From ed630aa03841750550c2a73e6ad58cb3d23492b1 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 22:10:30 +0200 Subject: [PATCH 06/11] Do not add materials that don't have actual parts to the NEI ToolMaterial stuff. Only happens in special cases, like the String material from IguanaTweaks, that has no craftable toolparts. Should finally fix https://github.com/SlimeKnights/IguanaTweaksTConstruct/issues/17 --- .../plugins/nei/RecipeHandlerToolMaterials.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 51b6f0be..39166a32 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -176,7 +176,9 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase } } } - this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, matID)); + + if(toolParts.size() > 0) + this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, matID)); } } else @@ -193,13 +195,17 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase int materialID = ((IToolPart) ingred.getItem()).getMaterialID(ingred); if (materialID >= 0) { - this.arecipes.add(new CachedToolMaterialsRecipe(getSingleList(ingred), materialID)); + List toolParts = getSingleList(ingred); + if(toolParts.size() > 0) + this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID)); } } else if (PatternBuilder.instance.getPartID(ingred) < Short.MAX_VALUE) { int materialID = PatternBuilder.instance.getPartID(ingred); - this.arecipes.add(new CachedToolMaterialsRecipe(getSingleList(ingred), materialID)); + List toolParts = getSingleList(ingred); + if(toolParts.size() > 0) + this.arecipes.add(new CachedToolMaterialsRecipe(toolParts, materialID)); } else { From 3b3f409a2ce44eaf3bc0be1ca21eecb68e8f5ab7 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 22:15:32 +0200 Subject: [PATCH 07/11] Toolforges are not pattern chests. --- src/main/java/tconstruct/tools/model/TableRender.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index d35c592c..c8b38fb7 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.*; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import tconstruct.tools.TinkerTools; public class TableRender implements ISimpleBlockRenderingHandler { @@ -16,7 +17,7 @@ public class TableRender implements ISimpleBlockRenderingHandler if (modelID == model) { // until we get the new model.. finally... - if(metadata >= 5 && metadata <= 9) { + if(block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { // pattern chest renderer.setRenderBounds(0,0,0,1,0.875,1); renderStandardInvBlock(renderer, block, metadata); @@ -43,7 +44,7 @@ public class TableRender implements ISimpleBlockRenderingHandler { int metadata = world.getBlockMetadata(x,y,z); // until we get the new model.. finally... - if(metadata >= 5 && metadata <= 9) { + if(block == TinkerTools.toolStationWood && metadata >= 5 && metadata <= 9) { // pattern chest renderer.setRenderBounds(0,0,0,1,0.875,1); renderer.renderStandardBlock(block, x,y,z); From 85a9bb2ce950ce9640c80cfaab2ae75a65d95565 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 22:21:41 +0200 Subject: [PATCH 08/11] More juicy default color for alumite --- src/main/java/tconstruct/tools/TinkerTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 6e8be2f7..f22a9c7a 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -735,7 +735,7 @@ public class TinkerTools TConstructRegistry.addToolMaterial(MaterialID.Manyullyn, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, DARK_PURPLE.toString(), 0x7338A5); TConstructRegistry.addToolMaterial(MaterialID.Copper, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, RED.toString(), 0xCC6410); TConstructRegistry.addToolMaterial(MaterialID.Bronze, "Bronze", 2, 550, 800, 2, 1.3F, 1, 0f, GOLD.toString(), 0xCA9956); - TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString(), 0xffddff); + TConstructRegistry.addToolMaterial(MaterialID.Alumite, "Alumite", 4, 700, 800, 3, 1.3F, 2, 0f, LIGHT_PURPLE.toString(), 0xffa7e9); TConstructRegistry.addToolMaterial(MaterialID.Steel, "Steel", 4, 750, 1000, 4, 1.3F, 2, 0f, GRAY.toString(), 0xA0A0A0); TConstructRegistry.addToolMaterial(MaterialID.BlueSlime, "BlueSlime", 0, 1200, 150, 0, 2.0F, 0, 0f, AQUA.toString(), 0x66AEB0); TConstructRegistry.addToolMaterial(MaterialID.PigIron, "PigIron", 3, 250, 600, 2, 1.3F, 1, 0f, RED.toString(), 0xF0A8A4); From d39db6dc49cbe7ca5f6eb875bbd68bbf66e7c168 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 7 Oct 2014 22:43:06 +0200 Subject: [PATCH 09/11] Dying costs 10% max durability of tools --- .../tconstruct/tools/TinkerToolEvents.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index ecb5d4e7..b6d31099 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.eventhandler.*; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import java.util.List; import net.minecraft.entity.*; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -13,6 +14,7 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.oredict.*; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import tconstruct.TConstruct; @@ -432,4 +434,23 @@ public class TinkerToolEvents TinkerTools.modAttack.addStackToMatchList(evt.Ore, 24); } } + + + @SubscribeEvent + public void damageToolsOnDeath (PlayerDropsEvent event) + { + for(EntityItem drop : event.drops) + { + // we're only interested in tools + if(!(drop.getEntityItem().getItem() instanceof ToolCore) || !drop.getEntityItem().hasTagCompound()) + continue; + + // damage tools by 10% of their total durability! + NBTTagCompound tags = drop.getEntityItem().getTagCompound().getCompoundTag("InfiTool"); + int dur = tags.getInteger("TotalDurability"); + dur /= 10; + + AbilityHelper.damageTool(drop.getEntityItem(), dur, event.entityPlayer, true); + } + } } From 8c8599c68b3245b993b04a0531a04042aa18ff58 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Wed, 8 Oct 2014 17:13:09 +1100 Subject: [PATCH 10/11] Fixed #1069 --- src/main/java/tconstruct/world/items/StrangeFood.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index 03ae6ed4..8e9127b9 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -13,6 +13,7 @@ public class StrangeFood extends SpecialFood public StrangeFood() { super(new int[] { 2, 2, 4 }, new float[] { 1f, 1f, 0.6f }, new String[] { "edibleslime", "edibleblood", "bacon" }, new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" }); + this.setHasSubtypes(true); } @Override From 72c180fab4c94cd73fe59fb0a032669756f81a5d Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 8 Oct 2014 20:12:22 +0200 Subject: [PATCH 11/11] Add a config option to disable the death penality durability loss --- src/main/java/tconstruct/tools/TinkerToolEvents.java | 3 +++ src/main/java/tconstruct/util/config/PHConstruct.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index b6d31099..b8f7270f 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -439,6 +439,9 @@ public class TinkerToolEvents @SubscribeEvent public void damageToolsOnDeath (PlayerDropsEvent event) { + if(!PHConstruct.deathPenality) + return; + for(EntityItem drop : event.drops) { // we're only interested in tools diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 826fe100..315d72b9 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -43,6 +43,7 @@ public class PHConstruct keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); keepLevels = config.get("Difficulty Changes", "Keep levels on death", true).getBoolean(true); beginnerBook = config.get("Difficulty Changes", "Spawn beginner book", true).getBoolean(true); + deathPenality = config.get("Difficulty Changes", "Tools lose 10% durability on death", true).getBoolean(true); enableTWood = config.get("Difficulty Changes", "Enable mod wooden tools", true).getBoolean(true); enableTStone = config.get("Difficulty Changes", "Enable mod stone tools", true).getBoolean(true); @@ -285,6 +286,7 @@ public class PHConstruct // Difficulty modifiers public static boolean keepHunger; public static boolean keepLevels; + public static boolean deathPenality; public static boolean alphaRegen; public static boolean alphaHunger;