From 9b51082c4b695222efb262e58bd6bba09dc3e847 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sat, 28 Jun 2014 19:25:11 +0200 Subject: [PATCH] - Implemented item renaming - Did a little bit of work on asset handling --- .../main/java/minetweaker/MineTweakerAPI.java | 16 +++++ .../java/minetweaker/api/item/IItemStack.java | 4 ++ .../api/resource/IResourceFile.java | 20 ++++++ .../api/resource/IResourceManager.java | 22 +++++++ .../mc164/actions/SetTranslationAction.java | 61 ++++++++++++++++++ .../minetweaker/mc164/item/MCItemStack.java | 6 ++ .../mc164/util/MineTweakerHacks.java | 11 ++++ .../mc164/util/MineTweakerObfuscation.java | 1 + .../mc1710/actions/SetTranslationAction.java | 61 ++++++++++++++++++ .../minetweaker/mc1710/item/MCItemStack.java | 6 ++ .../mc1710/util/MineTweakerHacks.java | 11 ++++ .../mc1710/util/MineTweakerObfuscation.java | 1 + .../mc172/actions/SetTranslationAction.java | 62 +++++++++++++++++++ .../minetweaker/mc172/item/MCItemStack.java | 6 ++ .../mc172/util/MineTweakerHacks.java | 11 ++++ .../mc172/util/MineTweakerObfuscation.java | 1 + 16 files changed, 300 insertions(+) create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceFile.java create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceManager.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/actions/SetTranslationAction.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/actions/SetTranslationAction.java diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index f2c0fec..f7f55f0 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -19,6 +19,7 @@ import minetweaker.runtime.Tweaker; import minetweaker.api.recipes.IRecipeManager; import minetweaker.api.oredict.IOreDict; import minetweaker.api.recipes.IFurnaceManager; +import minetweaker.api.resource.IResourceManager; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenExpansion; @@ -36,6 +37,8 @@ import stanhebben.zenscript.type.natives.JavaMethod; * - Set the ore dictionary * - Set the recipe manager * - Set the furnace manager + * - Set event manager + * - Set resource manager * * - Register additional global symbols to the GlobalRegistry (recipes, * minetweaker, oreDict, logger, as well as the official set of functions) @@ -101,6 +104,19 @@ public class MineTweakerAPI { */ public static ILoadedMods loadedMods = null; + /** + * Access point to the global resource manager. Note that each script group also + * has its own local resource manager. + */ + public static IResourceManager resources = null; + + /** + * Register a class registry class. Such class must have (at least) a public + * static method called "getClasses" with accepts a List of classes and which + * stores its classes into that list. + * + * @param registryClass + */ public static void registerClassRegistry(Class registryClass) { try { Method method = registryClass.getMethod("getClasses", List.class); 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 a7f0c26..b18dfa4 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java @@ -13,6 +13,7 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; import stanhebben.zenscript.annotations.ZenOperator; +import stanhebben.zenscript.annotations.ZenSetter; /** * @@ -29,6 +30,9 @@ public interface IItemStack extends IIngredient { @ZenGetter("displayName") public String getDisplayName(); + @ZenSetter("displayName") + public void setDisplayName(String name); + @ZenGetter("damage") public int getDamage(); diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceFile.java b/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceFile.java new file mode 100644 index 0000000..fa89730 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceFile.java @@ -0,0 +1,20 @@ +/* + * 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.api.resource; + +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; + +/** + * + * @author Stan + */ +@ZenClass("minetweaker.resource.IResourceFile") +public interface IResourceFile { + @ZenGetter("name") + public String getName(); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceManager.java new file mode 100644 index 0000000..86cfd12 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/resource/IResourceManager.java @@ -0,0 +1,22 @@ +/* + * 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.api.resource; + +/** + * + * @author Stan + */ +public interface IResourceManager { + /** + * Retrieves a resource file. Returns null if the resource dosen't exist. + * + * @param module + * @param name + * @return + */ + public IResourceFile getResource(String module, String name); +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/actions/SetTranslationAction.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/actions/SetTranslationAction.java new file mode 100644 index 0000000..26cbe61 --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/actions/SetTranslationAction.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.mc164.actions; + +import java.io.ByteArrayInputStream; +import java.nio.charset.Charset; +import minetweaker.IUndoableAction; +import minetweaker.mc164.util.MineTweakerHacks; +import net.minecraft.util.StringTranslate; + +/** + * + * @author Stan + */ +public class SetTranslationAction implements IUndoableAction { + private static final StringTranslate INSTANCE = MineTweakerHacks.getStringTranslateInstance(); + private static final Charset UTF8 = Charset.forName("utf-8"); + + private final String key; + private final String newValue; + private final String oldValue; + + public SetTranslationAction(String key, String value) { + this.key = key; + newValue = value; + oldValue = INSTANCE.translateKey(key); + } + + @Override + public void apply() { + set(key, newValue); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + set(key, oldValue); + } + + @Override + public String describe() { + return "Translating " + key + " to " + newValue; + } + + @Override + public String describeUndo() { + return "Reverting " + key + " to " + oldValue; + } + + private static void set(String key, String value) { + StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8))); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java index d03168f..54e9ada 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemStack.java @@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; import minetweaker.api.item.IngredientItem; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.mc164.actions.SetTranslationAction; import minetweaker.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -71,6 +72,11 @@ public class MCItemStack implements IItemStack { public String getDisplayName() { return stack.getDisplayName(); } + + @Override + public void setDisplayName(String name) { + MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + } @Override public int getDamage() { diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java index 3326ca5..a2b643d 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerHacks.java @@ -18,6 +18,7 @@ import net.minecraft.inventory.SlotCrafting;import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.StringTranslate; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -115,6 +116,16 @@ public class MineTweakerHacks { } } + public static StringTranslate getStringTranslateInstance() { + try { + Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); + return (StringTranslate) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logger.logError("could not get string translator"); + return null; + } + } + // ####################### // ### Private Methods ### // ####################### diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerObfuscation.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerObfuscation.java index 443130f..ea2b767 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerObfuscation.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerObfuscation.java @@ -18,4 +18,5 @@ public class MineTweakerObfuscation { public static final String[] MINECRAFTSERVER_ANVILFILE = {"anvilFile", "field_71308_o"}; public static final String[] INVENTORYCRAFTING_EVENTHANDLER = {"eventHandler", "field_70465_c"}; public static final String[] SLOTCRAFTING_PLAYER = {"thePlayer", "field_75238_b"}; + public static final String[] STRINGTRANSLATE_INSTANCE = {"instance", "field_74817_a"}; } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java new file mode 100644 index 0000000..94580c9 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.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 java.io.ByteArrayInputStream; +import java.nio.charset.Charset; +import minetweaker.IUndoableAction; +import minetweaker.mc1710.util.MineTweakerHacks; +import net.minecraft.util.StringTranslate; + +/** + * + * @author Stan + */ +public class SetTranslationAction implements IUndoableAction { + private static final StringTranslate INSTANCE = MineTweakerHacks.getStringTranslateInstance(); + private static final Charset UTF8 = Charset.forName("utf-8"); + + private final String key; + private final String newValue; + private final String oldValue; + + public SetTranslationAction(String key, String value) { + this.key = key; + newValue = value; + oldValue = INSTANCE.translateKey(key); + } + + @Override + public void apply() { + set(key, newValue); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + set(key, oldValue); + } + + @Override + public String describe() { + return "Translating " + key + " to " + newValue; + } + + @Override + public String describeUndo() { + return "Reverting " + key + " to " + oldValue; + } + + private static void set(String key, String value) { + StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8))); + } +} 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 c6c8dc7..9f8b988 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 @@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; import minetweaker.api.item.IngredientItem; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.mc1710.actions.SetTranslationAction; import minetweaker.util.ArrayUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -72,6 +73,11 @@ public class MCItemStack implements IItemStack { public String getDisplayName() { return stack.getDisplayName(); } + + @Override + public void setDisplayName(String name) { + MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + } @Override public int getDamage() { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java index 047076d..26d6339 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java @@ -18,6 +18,7 @@ import net.minecraft.inventory.SlotCrafting;import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.StringTranslate; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -127,6 +128,16 @@ public class MineTweakerHacks { } } + public static StringTranslate getStringTranslateInstance() { + try { + Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); + return (StringTranslate) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logger.logError("could not get string translator"); + return null; + } + } + // ####################### // ### Private Methods ### // ####################### diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java index abfe495..9c67978 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerObfuscation.java @@ -20,4 +20,5 @@ public class MineTweakerObfuscation { public static final String[] MINECRAFTSERVER_ANVILFILE = {"anvilFile", "field_71308_o"}; public static final String[] INVENTORYCRAFTING_EVENTHANDLER = {"eventHandler", "field_70465_c"}; public static final String[] SLOTCRAFTING_PLAYER = {"thePlayer", "field_75238_b"}; + public static final String[] STRINGTRANSLATE_INSTANCE = {"instance", "field_74817_a"}; } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/actions/SetTranslationAction.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/actions/SetTranslationAction.java new file mode 100644 index 0000000..1c391e6 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/actions/SetTranslationAction.java @@ -0,0 +1,62 @@ +/* + * 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.mc172.actions; + +import java.io.ByteArrayInputStream; +import java.nio.charset.Charset; +import minetweaker.IUndoableAction; +import minetweaker.mc172.util.MineTweakerHacks; +import net.minecraft.client.Minecraft; +import net.minecraft.util.StringTranslate; + +/** + * + * @author Stan + */ +public class SetTranslationAction implements IUndoableAction { + private static final StringTranslate INSTANCE = MineTweakerHacks.getStringTranslateInstance(); + private static final Charset UTF8 = Charset.forName("utf-8"); + + private final String key; + private final String newValue; + private final String oldValue; + + public SetTranslationAction(String key, String value) { + this.key = key; + newValue = value; + oldValue = INSTANCE.translateKey(key); + } + + @Override + public void apply() { + set(key, newValue); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + set(key, oldValue); + } + + @Override + public String describe() { + return "Translating " + key + " to " + newValue; + } + + @Override + public String describeUndo() { + return "Reverting " + key + " to " + oldValue; + } + + private static void set(String key, String value) { + StringTranslate.inject(new ByteArrayInputStream((key + "=" + value).getBytes(UTF8))); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java index dea2b97..4c392bc 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemStack.java @@ -19,6 +19,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; import minetweaker.api.item.IngredientItem; import minetweaker.api.liquid.ILiquidStack; +import minetweaker.mc172.actions.SetTranslationAction; import minetweaker.util.ArrayUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -72,6 +73,11 @@ public class MCItemStack implements IItemStack { public String getDisplayName() { return stack.getDisplayName(); } + + @Override + public void setDisplayName(String name) { + MineTweakerAPI.tweaker.apply(new SetTranslationAction(getName() + ".name", name)); + } @Override public int getDamage() { diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java index dbf680f..04d725f 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerHacks.java @@ -18,6 +18,7 @@ import net.minecraft.inventory.SlotCrafting;import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; +import net.minecraft.util.StringTranslate; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -127,6 +128,16 @@ public class MineTweakerHacks { } } + public static StringTranslate getStringTranslateInstance() { + try { + Field field = getField(StringTranslate.class, MineTweakerObfuscation.STRINGTRANSLATE_INSTANCE); + return (StringTranslate) field.get(null); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logger.logError("could not get string translator"); + return null; + } + } + // ####################### // ### Private Methods ### // ####################### diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerObfuscation.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerObfuscation.java index 61dc5ac..7fe041f 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerObfuscation.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerObfuscation.java @@ -20,4 +20,5 @@ public class MineTweakerObfuscation { public static final String[] MINECRAFTSERVER_ANVILFILE = {"anvilFile", "field_71308_o"}; public static final String[] INVENTORYCRAFTING_EVENTHANDLER = {"eventHandler", "field_70465_c"}; public static final String[] SLOTCRAFTING_PLAYER = {"thePlayer", "field_75238_b"}; + public static final String[] STRINGTRANSLATE_INSTANCE = {"instance", "field_74817_a"}; }