From f11531fc5c9d705679aa40232ce9085777edfa15 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 18 Jul 2016 22:37:25 -0700 Subject: [PATCH] Fix toCommandString output Update MCItemStack's toString function to output the stack size in addition to the ID and NBT data --- .../java/minetweaker/api/recipes/BrewingRecipe.java | 2 +- .../java/minetweaker/api/recipes/FurnaceRecipe.java | 2 +- .../java/minetweaker/mc1710/item/MCItemStack.java | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/BrewingRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/BrewingRecipe.java index a262eca..c396fbf 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/BrewingRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/BrewingRecipe.java @@ -20,6 +20,6 @@ public class BrewingRecipe implements IBrewingRecipe { @Override public String toCommandString() { - return String.format("brewing.add(%s, %s, %s", output, input, ingredient); + return String.format("brewing.add(%s, %s, %s)", output, input, ingredient); } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/FurnaceRecipe.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/FurnaceRecipe.java index 51a3e56..6caa651 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/FurnaceRecipe.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/FurnaceRecipe.java @@ -18,7 +18,7 @@ public class FurnaceRecipe implements IFurnaceRecipe { @Override public String toCommandString() { - return String.format("furnace.addRecipe(%s, %s, %s", output, input, xp); + return String.format("furnace.addRecipe(%s, %s, %s)", output, input, xp); } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index 56dcb11..8a9cf64 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -103,7 +103,7 @@ public class MCItemStack implements IItemStack { public void setDisplayName(String name) { MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } - + @Override public void setMaxDamage(int damage) { @@ -224,7 +224,7 @@ public class MCItemStack implements IItemStack { @Override public IItemStack removeTag(String tag) { ItemStack result = new ItemStack(stack.getItem(), stack.stackSize, stack.getItemDamage()); - + if (tag == null) { result.stackTagCompound = null; } else { @@ -404,10 +404,11 @@ public class MCItemStack implements IItemStack { result.append(")"); } + if (stack.stackSize > 1) { + result.append(" * "); + result.append(stack.stackSize); + } + return result.toString(); } - - - - }