From 729d6a266fc1425dee54e9d65d647fb6b40c2c93 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 8 Oct 2014 22:26:54 +0200 Subject: [PATCH 1/3] Change Death penality to take difficulty into account. Easy/Peaceful = no penality, normal = 5%, hard = 10% --- .../java/tconstruct/tools/TinkerToolEvents.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index b8f7270f..7ce49f51 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -13,6 +13,7 @@ import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.world.EnumDifficulty; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.oredict.*; @@ -436,12 +437,22 @@ public class TinkerToolEvents } + @SubscribeEvent public void damageToolsOnDeath (PlayerDropsEvent event) { if(!PHConstruct.deathPenality) return; - + + EnumDifficulty difficulty = event.entityPlayer.worldObj.difficultySetting; + // easy and peaceful don't punish + if(difficulty == EnumDifficulty.PEACEFUL || difficulty == EnumDifficulty.EASY) + return; + + int punishment = 20; // normal has 5% + if(difficulty == EnumDifficulty.HARD) + punishment = 10; // hard has 10% + for(EntityItem drop : event.drops) { // we're only interested in tools @@ -451,7 +462,7 @@ public class TinkerToolEvents // damage tools by 10% of their total durability! NBTTagCompound tags = drop.getEntityItem().getTagCompound().getCompoundTag("InfiTool"); int dur = tags.getInteger("TotalDurability"); - dur /= 10; + dur /= punishment; AbilityHelper.damageTool(drop.getEntityItem(), dur, event.entityPlayer, true); } From 196a435ba91054fc53afbc2fd8eb77f7d8d04d0e Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 9 Oct 2014 14:22:16 +0200 Subject: [PATCH 2/3] Fix NPE when no tank with fuel is present #1070 --- src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index dbc987e4..697bb928 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -590,6 +590,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci // ensure active lava tank verifyFuelTank(); + if (activeLavaTank == null) + return; // checks are all done before in verifyFuelTank. Don't do this without checks! IFluidHandler tankContainer = (IFluidHandler) worldObj.getTileEntity(activeLavaTank.x, activeLavaTank.y, activeLavaTank.z); @@ -650,6 +652,8 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci activeLavaTank = tank; return; } + + // possibly assign default empty tank here (tanks.get(0)) so we don't have a null activeLavaTank if all are empty } @SideOnly(Side.CLIENT) From 66bfc70b0ff2a2ced3fb6bcc0e3490da1df2eb3b Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 10 Oct 2014 00:44:01 +0200 Subject: [PATCH 3/3] Don't use custom renderer unless needed, since it seems to cause performance problems on some systems --- src/main/java/tconstruct/tools/ToolProxyClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index c31f5db1..c51cdff7 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -55,6 +55,7 @@ public class ToolProxyClient extends ToolProxyCommon //MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer()); ToolCoreRenderer renderer = new ToolCoreRenderer(false); + /* MinecraftForgeClient.registerItemRenderer(TinkerTools.pickaxe, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.shovel, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.hatchet, renderer); @@ -72,7 +73,7 @@ public class ToolProxyClient extends ToolProxyCommon MinecraftForgeClient.registerItemRenderer(TinkerTools.mattock, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.rapier, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.scythe, renderer); - MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, renderer); + MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, renderer);*/ renderer = new ToolCoreRenderer(true); MinecraftForgeClient.registerItemRenderer(TinkerTools.arrow, renderer); MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer);