From b073a209f1741e701641f40191fbf368e9a226b6 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 18 Nov 2014 10:20:06 +0100 Subject: [PATCH 1/3] Fix repair-button not getting translated #1182 --- src/main/java/tconstruct/tools/ToolProxyClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index d892525f..d2f5979b 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -416,7 +416,7 @@ public class ToolProxyClient extends ToolProxyCommon final ToolCore[] tier2Tools = {hammer, lumberaxe, excavator, scythe, cleaver, battleaxe}; // repair - addToolButton(0, 3, 0, new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, "gui.toolforge1", "gui.toolforge2"); + addToolButton(0, 3, 0, new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, StatCollector.translateToLocal("gui.toolforge1"), "gui.toolforge2"); // tier 1 tools for (int i = 0; i < tier1Tools.length; i++) From 9af43cbe9ec5089841d85fb5b1a1afadde1a03cb Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 19 Nov 2014 11:21:51 +0100 Subject: [PATCH 2/3] Fix oredicted obsidian melting to 9 ingots instead of 2 --- src/main/java/tconstruct/smeltery/TinkerSmeltery.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index fca36892..1ea65b55 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -922,7 +922,7 @@ public class TinkerSmeltery Smeltery.addDictionaryMelting("oreNether" + fluidTypeName, ft, 75, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); // Blocks - Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.blockLiquidValue); + Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.ingotLiquidValue*2); if (ft.isToolpart) { @@ -1073,7 +1073,7 @@ public class TinkerSmeltery basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 8), new FluidStack(TinkerSmeltery.moltenAlumiteFluid, TConstruct.blockLiquidValue), null, true, 100); // alumite basinCasting.addCastingRecipe(new ItemStack(TinkerWorld.metalBlock, 1, 9), new FluidStack(TinkerSmeltery.moltenSteelFluid, TConstruct.blockLiquidValue), null, true, 100); // steel } - basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.oreLiquidValue), null, true, 100);// obsidian + basinCasting.addCastingRecipe(new ItemStack(Blocks.obsidian), new FluidStack(TinkerSmeltery.moltenObsidianFluid, TConstruct.ingotLiquidValue*2), null, true, 100);// obsidian basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.clearGlass, 1, 0), new FluidStack(TinkerSmeltery.moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); // glass basinCasting.addCastingRecipe(new ItemStack(TinkerSmeltery.smeltery, 1, 4), new FluidStack(TinkerSmeltery.moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); // seared // stone From 6d677dcc7a8ba0d48b311eb5072d6ff304102634 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 23 Nov 2014 18:30:19 +0100 Subject: [PATCH 3/3] Port the weird possible casting-block-dupe fix over to the drying rack #1190 --- .../java/tconstruct/armor/blocks/DryingRack.java | 15 ++++++++------- .../smeltery/logic/CastingBlockLogic.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index 0a3a4b12..13a78885 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -96,12 +96,9 @@ public class DryingRack extends InventoryBlock } else { - if (logic.isStackInSlot(0)) - { - ItemStack decrStack = logic.decrStackSize(0, 1); - if (decrStack != null) - addItemToInventory(player, world, x, y, z, decrStack); - } + ItemStack decrStack = logic.decrStackSize(0, 1); + if (decrStack != null) + addItemToInventory(player, world, x, y, z, decrStack); } world.markBlockForUpdate(x, y, z); @@ -111,7 +108,11 @@ public class DryingRack extends InventoryBlock public void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack) { - AbilityHelper.spawnItemAtPlayer(player, stack); + if(!player.inventory.addItemStackToInventory(stack)) + { + // drop the rest as an item + AbilityHelper.spawnItemAtPlayer(player, stack); + } } @Override diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 6429a186..d971f348 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -308,7 +308,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid if(isStackInSlot(1)) slot = 1; - // Additional Info: Only 1 item can only be put into the casting block usually, however recipies + // Additional Info: Only 1 item can only be put into the casting block usually, however recipes // can have multiple blocks as output (compressed gravel -> brownstone for example) // we therefore spill the whole contents on extraction