diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 06d5602..5ca27ba 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -596,27 +596,27 @@ public class MineTweakerImplementationAPI { events.onPlayerLoggedIn(LISTEN_LOGIN); events.onPlayerLoggedOut(LISTEN_LOGOUT); } - - byte[] currentScript = MineTweakerAPI.tweaker.getScriptData(); - if (currentScript != null) { - System.out.println("Already loaded a script before"); - - // alread loaded a script - byte[] stagedScript = MineTweakerAPI.tweaker.getStagedScriptData(); - - if (Arrays.equals(currentScript, stagedScript)) { - System.out.println("No reload needed"); - return; // no reload necessary - } - - if (MineTweakerAPI.game.isLocked()) { - System.out.println("Reload blocked"); - MineTweakerAPI.game.signalLockError(); - return; - } - } else { - System.out.println("First time loading a script, go ahead"); - } +// +// byte[] currentScript = MineTweakerAPI.tweaker.getScriptData(); +// if (currentScript != null) { +// System.out.println("Already loaded a script before"); +// +// // alread loaded a script +// byte[] stagedScript = MineTweakerAPI.tweaker.getStagedScriptData(); +// +// if (Arrays.equals(currentScript, stagedScript)) { +// System.out.println("No reload needed"); +// return; // no reload necessary +// } +// +// if (MineTweakerAPI.game.isLocked()) { +// System.out.println("Reload blocked"); +// MineTweakerAPI.game.signalLockError(); +// return; +// } +// } else { +// System.out.println("First time loading a script, go ahead"); +// } MineTweakerAPI.tweaker.rollback(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java index ce75b3f..fcb29b7 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -80,13 +80,13 @@ public interface IItemStack extends IIngredient { */ @ZenSetter("maxStackSize") public void setMaxStackSize(int size); - + /** * Gets the block hardness */ @ZenGetter("hardness") public float getBlockHardness(); - + /** * Sets the block hardness * @@ -111,6 +111,14 @@ public interface IItemStack extends IIngredient { @ZenGetter("maxDamage") public int getMaxDamage(); + /** + * Sets the max Itemstack damage + * + * @param damage the new max damage + */ + @ZenSetter("maxDamage") + public void setMaxDamage(int damage); + /** * Gets the item tag. (NBT data) The resulting data is immutable and can * only be changed with updateTag. Returns empty data if there is no data. diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java new file mode 100644 index 0000000..13fc0b6 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java @@ -0,0 +1,61 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +package minetweaker.mc1710.actions; + +import minetweaker.IUndoableAction; +import net.minecraft.item.ItemStack; + +/** + * + * @author Jared + */ +public class SetStackmaxDamageAction implements IUndoableAction { + + private final ItemStack stack; + private final int damage; + private final int oldDamage; + + public SetStackmaxDamageAction(ItemStack stack, int damage) { + this.stack = stack; + this.damage= damage; + this.oldDamage= stack.getMaxDamage(); + } + + @Override + public void apply() { + set(stack, damage); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + set(stack, oldDamage); + } + + @Override + public String describe() { + return "Setting max damage of " + stack.getDisplayName() + " to " + damage; + } + + @Override + public String describeUndo() { + return "Reverting max damage of " + stack.getDisplayName() + " to " + oldDamage; + } + + private static void set(ItemStack stack, int damage) { + stack.getItem().setMaxDamage(damage); + } + + @Override + public Object getOverrideKey() { + return null; + } +} 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 575b209..ed61760 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 @@ -30,6 +30,7 @@ import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; import minetweaker.mc1710.actions.SetBlockHardnessAction; import minetweaker.mc1710.actions.SetStackSizeAction; +import minetweaker.mc1710.actions.SetStackmaxDamageAction; import minetweaker.mc1710.actions.SetTranslationAction; import minetweaker.mc1710.block.MCItemBlock; import minetweaker.mc1710.data.NBTConverter; @@ -102,6 +103,12 @@ public class MCItemStack implements IItemStack { public void setDisplayName(String name) { MineTweakerAPI.apply(new SetTranslationAction(getName() + ".name", name)); } + + + @Override + public void setMaxDamage(int damage) { + MineTweakerAPI.apply(new SetStackmaxDamageAction(stack, damage)); + } @Override public int getMaxStackSize() { @@ -388,4 +395,5 @@ public class MCItemStack implements IItemStack { return result.toString(); } + } diff --git a/configuration.gradle b/configuration.gradle index 82b2b38..c721ad1 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -12,7 +12,7 @@ ext.javaToolsJar = ((URLClassLoader) ToolProvider.getSystemToolClassLoader()).ge // ### 1.7.10 settings ### // ####################### -ext.forgeVersion1710 = "1.7.10-10.13.4.1448-1.7.10" +ext.forgeVersion1710 = "1.7.10-10.13.4.1492-1.7.10" ext.projects1710 = [ 'MineTweaker3-MC1710-Main', 'MineTweaker3-MC1710-Mod-IC2',