diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index 3154f33..01bb193 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -23,6 +23,7 @@ import minetweaker.api.recipes.IRecipeManager; import minetweaker.api.oredict.IOreDict; import minetweaker.api.recipes.IFurnaceManager; import minetweaker.api.server.IServer; +import minetweaker.api.vanilla.IVanilla; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenExpansion; @@ -90,6 +91,7 @@ public class MineTweakerAPI { registerGlobalSymbol("game", getJavaStaticFieldSymbol(MineTweakerAPI.class, "game")); registerGlobalSymbol("loadedMods", getJavaStaticFieldSymbol(MineTweakerAPI.class, "loadedMods")); registerGlobalSymbol("format", getJavaStaticFieldSymbol(MineTweakerAPI.class, "format")); + registerGlobalSymbol("vanilla", getJavaStaticFieldSymbol(MineTweakerAPI.class, "vanilla")); } private MineTweakerAPI() {} @@ -156,6 +158,11 @@ public class MineTweakerAPI { */ public static IFormatter format = null; + /** + * Access point to the vanilla functions and data. + */ + public static IVanilla vanilla = null; + /** * Applies this given action. * diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 6770faa..90cf950 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -1,6 +1,5 @@ package minetweaker; -import minetweaker.api.logger.MTLogger; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -23,7 +22,9 @@ import minetweaker.api.formatting.IFormatter; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.item.IItemStack; +import minetweaker.api.item.WeightedItemStack; import minetweaker.api.liquid.ILiquidDefinition; +import minetweaker.api.logger.MTLogger; import minetweaker.api.mods.ILoadedMods; import minetweaker.api.mods.IMod; import minetweaker.api.oredict.IOreDict; @@ -34,6 +35,8 @@ import minetweaker.api.recipes.IRecipeManager; import minetweaker.api.server.ICommandFunction; import minetweaker.api.server.ICommandValidator; import minetweaker.api.server.IServer; +import minetweaker.api.vanilla.IVanilla; +import minetweaker.api.vanilla.LootEntry; import minetweaker.api.world.IBiome; import minetweaker.runtime.IScriptProvider; import minetweaker.util.EventList; @@ -290,6 +293,60 @@ public class MineTweakerImplementationAPI { } })); + minetweakerCommands.put("seeds", new MineTweakerCommand( + "seeds", + new String[] { + "/minetweaker seeds", + " Prints all seeds registered", + " for tall grass" + }, new ICommandFunction() { + @Override + public void execute(String[] arguments, IPlayer player) { + MineTweakerAPI.logCommand("Seeds:"); + for (WeightedItemStack seed : MineTweakerAPI.vanilla.getSeeds().getSeeds()) { + String message = seed.getStack() + " - " + (int) seed.getChance(); + player.sendChat(message); + MineTweakerAPI.logCommand("Seed: " + message); + } + } + })); + + minetweakerCommands.put("loot", new MineTweakerCommand( + "seeds", + new String[] { + "/minetweaker seeds", + " Prints all seeds registered", + " for tall grass" + }, new ICommandFunction() { + @Override + public void execute(String[] arguments, IPlayer player) { + if (arguments.length == 0) { + MineTweakerAPI.logCommand("Loot chest contents:"); + List types = MineTweakerAPI.vanilla.getLoot().getLootTypes(); + Collections.sort(types); + for (String lootType : types) { + MineTweakerAPI.logCommand("Loot type: " + lootType); + + List entries = MineTweakerAPI.vanilla.getLoot().getLoot(lootType); + for (LootEntry entry : entries) { + MineTweakerAPI.logCommand(" " + entry.toString()); + } + } + + player.sendChat("List generated; see minetweaker.log in your minecraft dir"); + } else { + MineTweakerAPI.logCommand("Loot for type: " + arguments[0]); + + List entries = MineTweakerAPI.vanilla.getLoot().getLoot(arguments[0]); + for (LootEntry entry : entries) { + MineTweakerAPI.logCommand(" " + entry.toString()); + } + + player.sendChat("List generated; see minetweaker.log in your minecraft dir"); + } + } + })); + minetweakerCommands.put("wiki", new MineTweakerCommand( "wiki", new String[] { @@ -396,6 +453,7 @@ public class MineTweakerImplementationAPI { * @param game game interface * @param mods mods interface * @param formatter formatter interface + * @param vanilla vanilla interface */ public static void init( IOreDict oreDict, @@ -403,13 +461,15 @@ public class MineTweakerImplementationAPI { IFurnaceManager furnace, IGame game, ILoadedMods mods, - IFormatter formatter) { + IFormatter formatter, + IVanilla vanilla) { MineTweakerAPI.oreDict = oreDict; MineTweakerAPI.recipes = recipes; MineTweakerAPI.furnace = furnace; MineTweakerAPI.game = game; MineTweakerAPI.loadedMods = mods; MineTweakerAPI.format = formatter; + MineTweakerAPI.vanilla = vanilla; } /** @@ -530,6 +590,7 @@ public class MineTweakerImplementationAPI { private static class AddMineTweakerCommandAction implements IUndoableAction { private final MineTweakerCommand command; + private boolean added; public AddMineTweakerCommandAction(MineTweakerCommand command) { this.command = command; @@ -537,7 +598,12 @@ public class MineTweakerImplementationAPI { @Override public void apply() { - minetweakerCommands.put(command.name, command); + if (!minetweakerCommands.containsKey(command.name)) { + minetweakerCommands.put(command.name, command); + added = true; + } else { + added = false; + } } @Override @@ -547,7 +613,9 @@ public class MineTweakerImplementationAPI { @Override public void undo() { - minetweakerCommands.remove(command.name); + if (added) { + minetweakerCommands.remove(command.name); + } } @Override diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java b/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java index 5d9f5e0..1fb8888 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/client/IClient.java @@ -18,4 +18,7 @@ public interface IClient { */ @ZenGetter("player") public IPlayer getPlayer(); + + @ZenGetter("language") + public String getLanguage(); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java index c45cf38..9055119 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java @@ -8,6 +8,7 @@ import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.world.IBiome; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; /** * Game interface. Used to obtain general game information. @@ -55,4 +56,42 @@ public interface IGame { */ @ZenGetter("entities") public List getEntities(); + + /** + * Sets a localization value. + * + * @param key localization key + * @param value localization value + */ + @ZenMethod + public void setLocalization(String key, String value); + + /** + * Sets a localization value. + * + * @param lang language + * @param key localization key + * @param value localization value + */ + @ZenMethod + public void setLocalization(String lang, String key, String value); + + /** + * Gets a localized string. + * + * @param key localization key + * @return localized value + */ + @ZenMethod + public String localize(String key); + + /** + * Gets a localized string. + * + * @param key localization key + * @param lang language + * @return localized value + */ + @ZenMethod + public String localize(String key, String lang); } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ILootRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ILootRegistry.java new file mode 100644 index 0000000..78b74d1 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ILootRegistry.java @@ -0,0 +1,36 @@ +/* + * 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.vanilla; + +import java.util.List; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("vanilla.ILootRegistry") +public interface ILootRegistry { + @ZenMethod + public void addChestLoot(String name, WeightedItemStack item); + + @ZenMethod + public void addChestLoot(String name, WeightedItemStack item, int min, int max); + + @ZenMethod + public void removeChestLoot(String name, IIngredient ingredient); + + @ZenMethod + public List getLoot(String name); + + @ZenGetter("lootTypes") + public List getLootTypes(); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ISeedRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ISeedRegistry.java new file mode 100644 index 0000000..c39396b --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/ISeedRegistry.java @@ -0,0 +1,30 @@ +/* + * 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.vanilla; + +import java.util.List; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenClass("vanilla.ISeedRegistry") +public interface ISeedRegistry { + @ZenMethod + public void addSeed(WeightedItemStack item); + + @ZenMethod + public void removeSeed(IIngredient item); + + @ZenGetter("seeds") + public List getSeeds(); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVanilla.java b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVanilla.java new file mode 100644 index 0000000..b091548 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/IVanilla.java @@ -0,0 +1,23 @@ +/* + * 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.vanilla; + +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; + +/** + * + * @author Stan + */ +@ZenClass("vanilla.IVanilla") +public interface IVanilla { + @ZenGetter("loot") + public ILootRegistry getLoot(); + + @ZenGetter("seeds") + public ISeedRegistry getSeeds(); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/LootEntry.java b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/LootEntry.java new file mode 100644 index 0000000..b78ef07 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/vanilla/LootEntry.java @@ -0,0 +1,60 @@ +/* + * 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.vanilla; + +import minetweaker.api.item.WeightedItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; + +/** + * + * @author Stan + */ +@ZenClass("vanilla.LootEntry") +public class LootEntry { + private final WeightedItemStack item; + private final int minAmount; + private final int maxAmount; + + public LootEntry(WeightedItemStack item, int minAmount, int maxAmount) { + this.item = item; + this.minAmount = minAmount; + this.maxAmount = maxAmount; + } + + @ZenGetter("item") + public WeightedItemStack getItem() { + return item; + } + + @ZenGetter("minAmount") + public int getMinAmount() { + return minAmount; + } + + @ZenGetter("maxAmount") + public int getMaxAmount() { + return maxAmount; + } + + @Override + public String toString() { + StringBuilder message = new StringBuilder(); + message.append(getItem().getStack()); + message.append(" (weight "); + message.append((int) getItem().getChance()); + if (getMinAmount() != 0 || getMaxAmount() != 1) { + message.append(", "); + message.append(getMinAmount()); + message.append("-"); + message.append(getMaxAmount()); + } + message.append(")"); + + return message.toString(); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java index 3aadf5b..2bb003c 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java @@ -27,6 +27,7 @@ import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.logger.FileLogger; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.mc164.client.MCClient; import minetweaker.mc164.formatting.MCFormatter; import minetweaker.mc164.furnace.FuelTweaker; import minetweaker.mc164.furnace.MCFurnaceManager; @@ -38,6 +39,8 @@ import minetweaker.mc164.oredict.MCOreDict; import minetweaker.mc164.recipes.MCRecipeManager; import minetweaker.mc164.server.MCServer; import minetweaker.mc164.util.MineTweakerHacks; +import minetweaker.mc164.util.MineTweakerPlatformUtils; +import minetweaker.mc164.vanilla.MCVanilla; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; @@ -90,7 +93,8 @@ public class MineTweakerMod { new MCFurnaceManager(), MCGame.INSTANCE, new MCLoadedMods(), - new MCFormatter()); + new MCFormatter(), + new MCVanilla()); MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; @@ -177,6 +181,10 @@ public class MineTweakerMod { // starts before loading worlds // perfect place to start MineTweaker! + if (MineTweakerPlatformUtils.isClient()) { + MineTweakerAPI.client = new MCClient(); + } + File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); if (!scriptsDir.exists()) { scriptsDir.mkdir(); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/client/MCClient.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/client/MCClient.java new file mode 100644 index 0000000..873aceb --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/client/MCClient.java @@ -0,0 +1,29 @@ +/* + * 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.client; + +import cpw.mods.fml.client.FMLClientHandler; +import minetweaker.api.client.IClient; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; +import net.minecraft.client.Minecraft; + +/** + * + * @author Stan + */ +public class MCClient implements IClient { + @Override + public IPlayer getPlayer() { + return MineTweakerMC.getIPlayer(Minecraft.getMinecraft().thePlayer); + } + + @Override + public String getLanguage() { + return FMLClientHandler.instance().getCurrentLanguage(); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java index 1f0b567..23381a7 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/game/MCGame.java @@ -7,9 +7,12 @@ package minetweaker.mc164.game; import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlockDefinition; import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; @@ -21,6 +24,7 @@ import minetweaker.mc164.entity.MCEntityDefinition; import minetweaker.mc164.item.MCItemDefinition; import minetweaker.mc164.liquid.MCLiquidDefinition; import minetweaker.mc164.util.MineTweakerHacks; +import minetweaker.mc164.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; @@ -31,6 +35,8 @@ import net.minecraftforge.fluids.FluidRegistry; * @author Stan */ public class MCGame implements IGame { + private static final Map TRANSLATIONS = MineTweakerHacks.getTranslations(); + public static final MCGame INSTANCE = new MCGame(); private MCGame() {} @@ -90,4 +96,89 @@ public class MCGame implements IGame { return result; } + + @Override + public void setLocalization(String key, String value) { + MineTweakerAPI.apply(new SetTranslation(null, key, value)); + } + + @Override + public void setLocalization(String lang, String key, String value) { + MineTweakerAPI.apply(new SetTranslation(lang, key, value)); + } + + @Override + public String localize(String key) { + return LanguageRegistry.instance().getStringLocalization(key); + } + + @Override + public String localize(String key, String lang) { + return LanguageRegistry.instance().getStringLocalization(key, lang); + } + + // ###################### + // ### Action classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author Joshiejack + */ + private static class SetTranslation implements IUndoableAction { + private String original; + private final String lang; + private final String key; + private final String text; + private boolean added; + + public SetTranslation(String lang, String key, String text) { + this.lang = lang; + this.key = key; + this.text = text; + } + + @Override + public void apply() { + if (lang == null || MineTweakerPlatformUtils.isLanguageActive(lang)) { + original = TRANSLATIONS.get(key); + TRANSLATIONS.put(key, text); + added = true; + } else { + added = false; + } + } + + @Override + public boolean canUndo() { + return TRANSLATIONS != null; + } + + @Override + public void undo() { + if (added) { + if (original == null) { + TRANSLATIONS.remove(key); + } else { + TRANSLATIONS.put(key, original); + } + } + } + + @Override + public String describe() { + return "Setting localization for the key: " + key + " to " + text; + } + + @Override + public String describeUndo() { + return "Setting localization for the key: " + key + " to " + original; + } + + @Override + public Object getOverrideKey() { + return null; + } + } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java index e6db71a..1bd3727 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/network/MCPacketHandler.java @@ -18,6 +18,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.mc164.client.MCClient; import minetweaker.runtime.providers.ScriptProviderMemory; public class MCPacketHandler implements IPacketHandler { @@ -36,6 +37,8 @@ public class MCPacketHandler implements IPacketHandler { System.out.println("Received script data: " + packet.data.length + " bytes"); if (MineTweakerAPI.server == null) { + MineTweakerAPI.client = new MCClient(); + MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(packet.data)); MineTweakerImplementationAPI.reload(); } 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 84c80c4..521a0ac 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 @@ -9,11 +9,17 @@ package minetweaker.mc164.util; import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.EntityRegistry; import java.io.File; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import minetweaker.MineTweakerAPI; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -22,7 +28,11 @@ 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.StatCollector; import net.minecraft.util.StringTranslate; +import net.minecraft.util.WeightedRandomItem; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.oredict.OreDictionary; @@ -45,6 +55,8 @@ public class MineTweakerHacks { private static final Field SLOTCRAFTING_PLAYER; private static final Field ENTITYREGISTRY_CLASSREGISTRATIONS; + private static final Field SEEDENTRY_SEED; + private static final Constructor SEEDENTRY_CONSTRUCTOR; static { NBTTAGCOMPOUND_TAGMAP = getField(NBTTagCompound.class, MineTweakerObfuscation.NBTTAGCOMPOUND_TAGMAP); @@ -56,6 +68,26 @@ public class MineTweakerHacks { SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); + + Class forgeSeedEntry = null; + try { + forgeSeedEntry = (Class) Class.forName("net.minecraftforge.common.ForgeHooks$SeedEntry"); + } catch (ClassNotFoundException ex) {} + + SEEDENTRY_SEED = getField(forgeSeedEntry, "seed"); + + Constructor seedEntryConstructor = null; + + try { + seedEntryConstructor = forgeSeedEntry.getConstructor(ItemStack.class, int.class); + seedEntryConstructor.setAccessible(true); + } catch (NoSuchMethodException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } + + SEEDENTRY_CONSTRUCTOR = seedEntryConstructor; } private MineTweakerHacks() {} @@ -80,6 +112,22 @@ public class MineTweakerHacks { } } + + public static List getSeeds() { + return getPrivateStaticObject(ForgeHooks.class, "seedList"); + } + + public static Map getChestLoot() { + return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); + } + + public static Map getTranslations() { + return getPrivateObject( + getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), + "languageList", + "field_74816_c"); + } + public static Map> getOreStacks() { try { return (Map>) OREDICTIONARY_ORESTACKS.get(null); @@ -176,17 +224,63 @@ public class MineTweakerHacks { } } - public static T getPrivateStaticObject(Class cls, String name) { + public static ItemStack getSeedEntrySeed(Object entry) { try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return (T) field.get(null); - } catch (NoSuchFieldException ex) { - - } catch (SecurityException ex) { - + return (ItemStack) SEEDENTRY_SEED.get(entry); } catch (IllegalAccessException ex) { - + MineTweakerAPI.logError("could not get SeedEntry seed"); + return null; + } + } + + public static WeightedRandomItem constructSeedEntry(WeightedItemStack stack) { + try { + return SEEDENTRY_CONSTRUCTOR.newInstance(MineTweakerMC.getItemStack(stack.getStack()), (int) stack.getChance()); + } catch (InstantiationException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalArgumentException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (InvocationTargetException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } + + return null; + } + + public static T getPrivateStaticObject(Class cls, String... names) { + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(null); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } + } + + return null; + } + + public static T getPrivateObject(Object object, String... names) { + Class cls = object.getClass(); + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(object); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } } return null; @@ -196,7 +290,7 @@ public class MineTweakerHacks { // ### Private Methods ### // ####################### - private static Field getField(Class cls, String[] names) { + private static Field getField(Class cls, String... names) { for (String name : names) { try { Field field = cls.getDeclaredField(name); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerPlatformUtils.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerPlatformUtils.java index be92d90..abc83a8 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerPlatformUtils.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/util/MineTweakerPlatformUtils.java @@ -6,6 +6,9 @@ package minetweaker.mc164.util; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.EntityLivingBase; /** @@ -26,4 +29,17 @@ public class MineTweakerPlatformUtils { throw new RuntimeException("entity class not found: " + entityClassName); } } + + public static String getLanguage() { + return FMLCommonHandler.instance().getSide() == Side.SERVER ? null : FMLClientHandler.instance().getCurrentLanguage(); + } + + public static boolean isLanguageActive(String lang) { + String current = getLanguage(); + return current != null && current.equals(lang); + } + + public static boolean isClient() { + return FMLCommonHandler.instance().getSide() == Side.CLIENT; + } } diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCLootRegistry.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCLootRegistry.java new file mode 100644 index 0000000..6c726a8 --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCLootRegistry.java @@ -0,0 +1,203 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.LootEntry; +import minetweaker.mc164.util.MineTweakerHacks; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + +/** + * + * @author Stan + */ +public class MCLootRegistry implements ILootRegistry { + private static final Map LOOT = MineTweakerHacks.getChestLoot(); + + @Override + public void addChestLoot(String type, WeightedItemStack item) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + 1, + 1, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void addChestLoot(String type, WeightedItemStack item, int min, int max) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + min, + max, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void removeChestLoot(String type, IIngredient pattern) { + MineTweakerAPI.apply(new RemoveLootAction(type, pattern)); + } + + @Override + public List getLoot(String type) { + ChestGenHooks recipe = LOOT.get(type); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + List results = new ArrayList(); + for (WeightedRandomChestContent content : contents) { + results.add(new LootEntry(new WeightedItemStack( + MineTweakerMC.getIItemStack(content.theItemId), + content.itemWeight), + content.theMinimumChanceToGenerateItem, + content.theMaximumChanceToGenerateItem)); + } + return results; + } + + @Override + public List getLootTypes() { + Set keys = LOOT.keySet(); + List keyList = new ArrayList(); + keyList.addAll(keys); + return keyList; + } + + // ###################### + // ### Action Classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class AddLootAction implements IUndoableAction { + private final String chest; + private final WeightedRandomChestContent content; + + public AddLootAction(String chest, WeightedRandomChestContent content) { + this.chest = chest; + this.content = content; + } + + @Override + public void apply() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.add(content); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.remove(content); + } + + public String getRecipeInfo() { + return content.theItemId.getDisplayName(); + } + + @Override + public String describe() { + return "Adding chest loot " + content.theItemId.getDisplayName() + " to loot class " + chest; + } + + @Override + public String describeUndo() { + return "Removing chest loot " + content.theItemId.getDisplayName() + " from loot class " + chest; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class RemoveLootAction implements IUndoableAction { + private final String chest; + private final IIngredient pattern; + private final List removed; + + public RemoveLootAction(String chest, IIngredient pattern) { + this.chest = chest; + this.pattern = pattern; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent r : contents) { + if (pattern.matches(MineTweakerMC.getIItemStack(r.theItemId))) { + removed.add(r); + } + } + + for (WeightedRandomChestContent r : removed) { + contents.remove(r); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent entry : removed) { + contents.add(entry); + } + } + + @Override + public String describe() { + return "Removing chest loot " + pattern + " for loot type " + chest; + } + + @Override + public String describeUndo() { + return "Restoring chest loot " + pattern + " for loot type " + chest + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCSeedRegistry.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCSeedRegistry.java new file mode 100644 index 0000000..3b7e513 --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCSeedRegistry.java @@ -0,0 +1,150 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.mc164.util.MineTweakerHacks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; +import net.minecraft.util.WeightedRandomItem; + +/** + * + * @author Stan + */ +public class MCSeedRegistry implements ISeedRegistry { + private static final List SEEDS = MineTweakerHacks.getSeeds(); + + @Override + public void addSeed(WeightedItemStack item) { + MineTweakerAPI.apply(new AddSeedAction(item)); + } + + @Override + public void removeSeed(IIngredient pattern) { + MineTweakerAPI.apply(new RemoveSeedAction(pattern)); + } + + @Override + public List getSeeds() { + List entries = (List) SEEDS; + + List results = new ArrayList(); + for (WeightedRandomItem entry : entries) { + results.add(new WeightedItemStack( + MineTweakerMC.getIItemStack(MineTweakerHacks.getSeedEntrySeed(entry)), + entry.itemWeight + )); + } + return results; + } + + // ###################### + // ### Action classes ### + // ###################### + + private static class AddSeedAction implements IUndoableAction { + private final IItemStack item; + private final WeightedRandomItem entry; + + public AddSeedAction(WeightedItemStack item) { + this.item = item.getStack(); + entry = MineTweakerHacks.constructSeedEntry(item); + } + + @Override + public void apply() { + SEEDS.add(entry); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + SEEDS.remove(entry); + } + + @Override + public String describe() { + return "Adding seed entry " + item; + } + + @Override + public String describeUndo() { + return "Removing seed entry " + item; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class RemoveSeedAction implements IUndoableAction { + private final IIngredient pattern; + private final List removed; + + public RemoveSeedAction(IIngredient ingredient) { + this.pattern = ingredient; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + for (Object entry : SEEDS) { + ItemStack itemStack = MineTweakerHacks.getSeedEntrySeed(entry); + if (pattern.matches(MineTweakerMC.getIItemStack(itemStack))) { + removed.add(entry); + } + } + + for (Object entry : removed) { + SEEDS.remove(entry); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + for (Object entry : removed) { + SEEDS.add(entry); + } + } + + @Override + public String describe() { + return "Removing seeds " + pattern; + } + + @Override + public String describeUndo() { + return "Restoring seeds " + pattern + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCVanilla.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCVanilla.java new file mode 100644 index 0000000..aff6d69 --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/vanilla/MCVanilla.java @@ -0,0 +1,30 @@ +/* + * 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.vanilla; + +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.api.vanilla.IVanilla; + +/** + * + * @author Stan + */ +public class MCVanilla implements IVanilla { + private final MCLootRegistry lootRegistry = new MCLootRegistry(); + private final MCSeedRegistry seedRegistry = new MCSeedRegistry(); + + @Override + public ILootRegistry getLoot() { + return lootRegistry; + } + + @Override + public ISeedRegistry getSeeds() { + return seedRegistry; + } +} diff --git a/MineTweaker3-MC1710-Main/build.gradle b/MineTweaker3-MC1710-Main/build.gradle index b937ea1..4d8ec37 100644 --- a/MineTweaker3-MC1710-Main/build.gradle +++ b/MineTweaker3-MC1710-Main/build.gradle @@ -51,12 +51,6 @@ processResources expand 'version':project.version, 'mcversion':project.minecraft.version } - from(sourceSets.main.java.srcDirs) { - include 'minetweaker/mc1710/MineTweakerMod.java' - - expand 'version':project.version - } - // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 67b4dd3..a397e26 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -22,6 +22,7 @@ import java.io.File; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; +import minetweaker.mc1710.client.MCClient; import minetweaker.mc1710.formatting.MCFormatter; import minetweaker.mc1710.furnace.FuelTweaker; import minetweaker.mc1710.furnace.MCFurnaceManager; @@ -35,6 +36,8 @@ import minetweaker.mc1710.oredict.MCOreDict; import minetweaker.mc1710.recipes.MCRecipeManager; import minetweaker.mc1710.server.MCServer; import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc1710.util.MineTweakerPlatformUtils; +import minetweaker.mc1710.vanilla.MCVanilla; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; @@ -87,7 +90,8 @@ public class MineTweakerMod { new MCFurnaceManager(), MCGame.INSTANCE, new MCLoadedMods(), - new MCFormatter()); + new MCFormatter(), + new MCVanilla()); MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; @@ -149,6 +153,10 @@ public class MineTweakerMod { // starts before loading worlds // perfect place to start MineTweaker! + if (MineTweakerPlatformUtils.isClient()) { + MineTweakerAPI.client = new MCClient(); + } + File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); if (!scriptsDir.exists()) { scriptsDir.mkdir(); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java new file mode 100644 index 0000000..3cb694c --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java @@ -0,0 +1,29 @@ +/* + * 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.client; + +import cpw.mods.fml.client.FMLClientHandler; +import minetweaker.api.client.IClient; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; +import net.minecraft.client.Minecraft; + +/** + * + * @author Stan + */ +public class MCClient implements IClient { + @Override + public IPlayer getPlayer() { + return MineTweakerMC.getIPlayer(Minecraft.getMinecraft().thePlayer); + } + + @Override + public String getLanguage() { + return FMLClientHandler.instance().getCurrentLanguage(); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java index 97a4d63..d91a588 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java @@ -7,10 +7,13 @@ package minetweaker.mc1710.game; import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlockDefinition; import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; @@ -22,6 +25,7 @@ import minetweaker.mc1710.entity.MCEntityDefinition; import minetweaker.mc1710.item.MCItemDefinition; import minetweaker.mc1710.liquid.MCLiquidDefinition; import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc1710.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; @@ -32,6 +36,8 @@ import net.minecraftforge.fluids.FluidRegistry; * @author Stan */ public class MCGame implements IGame { + private static final Map TRANSLATIONS = MineTweakerHacks.getTranslations(); + public static final MCGame INSTANCE = new MCGame(); private MCGame() {} @@ -85,4 +91,89 @@ public class MCGame implements IGame { return result; } + + @Override + public void setLocalization(String key, String value) { + MineTweakerAPI.apply(new SetTranslation(null, key, value)); + } + + @Override + public void setLocalization(String lang, String key, String value) { + MineTweakerAPI.apply(new SetTranslation(lang, key, value)); + } + + @Override + public String localize(String key) { + return LanguageRegistry.instance().getStringLocalization(key); + } + + @Override + public String localize(String key, String lang) { + return LanguageRegistry.instance().getStringLocalization(key, lang); + } + + // ###################### + // ### Action classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author Joshiejack + */ + private static class SetTranslation implements IUndoableAction { + private String original; + private final String lang; + private final String key; + private final String text; + private boolean added; + + public SetTranslation(String lang, String key, String text) { + this.lang = lang; + this.key = key; + this.text = text; + } + + @Override + public void apply() { + if (lang == null || MineTweakerPlatformUtils.isLanguageActive(lang)) { + original = TRANSLATIONS.get(key); + TRANSLATIONS.put(key, text); + added = true; + } else { + added = false; + } + } + + @Override + public boolean canUndo() { + return TRANSLATIONS != null; + } + + @Override + public void undo() { + if (added) { + if (original == null) { + TRANSLATIONS.remove(key); + } else { + TRANSLATIONS.put(key, original); + } + } + } + + @Override + public String describe() { + return "Setting localization for the key: " + key + " to " + text; + } + + @Override + public String describeUndo() { + return "Setting localization for the key: " + key + " to " + original; + } + + @Override + public Object getOverrideKey() { + return null; + } + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java index 494d711..e0505c9 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java @@ -11,6 +11,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.mc1710.client.MCClient; import minetweaker.runtime.providers.ScriptProviderMemory; /** @@ -21,6 +22,8 @@ public class MineTweakerLoadScriptsHandler implements IMessageHandler SEEDENTRY_CONSTRUCTOR; static { NBTTAGLIST_TAGLIST = getField(NBTTagList.class, MineTweakerObfuscation.NBTTAGLIST_TAGLIST); @@ -53,6 +66,26 @@ public class MineTweakerHacks { SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); + + Class forgeSeedEntry = null; + try { + forgeSeedEntry = (Class) Class.forName("net.minecraftforge.common.ForgeHooks$SeedEntry"); + } catch (ClassNotFoundException ex) {} + + SEEDENTRY_SEED = getField(forgeSeedEntry, "seed"); + + Constructor seedEntryConstructor = null; + + try { + seedEntryConstructor = forgeSeedEntry.getConstructor(ItemStack.class, int.class); + seedEntryConstructor.setAccessible(true); + } catch (NoSuchMethodException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } + + SEEDENTRY_CONSTRUCTOR = seedEntryConstructor; } private MineTweakerHacks() {} @@ -80,6 +113,21 @@ public class MineTweakerHacks { } } + public static List getSeeds() { + return getPrivateStaticObject(ForgeHooks.class, "seedList"); + } + + public static Map getChestLoot() { + return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); + } + + public static Map getTranslations() { + return getPrivateObject( + getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), + "languageList", + "field_74816_c"); + } + public static List> getOreIdStacks() { try { return (List>) OREDICTIONARY_IDTOSTACK.get(null); @@ -155,17 +203,63 @@ public class MineTweakerHacks { } } - public static T getPrivateStaticObject(Class cls, String name) { + public static ItemStack getSeedEntrySeed(Object entry) { try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return (T) field.get(null); - } catch (NoSuchFieldException ex) { - - } catch (SecurityException ex) { - + return (ItemStack) SEEDENTRY_SEED.get(entry); } catch (IllegalAccessException ex) { - + MineTweakerAPI.logError("could not get SeedEntry seed"); + return null; + } + } + + public static WeightedRandom.Item constructSeedEntry(WeightedItemStack stack) { + try { + return SEEDENTRY_CONSTRUCTOR.newInstance(MineTweakerMC.getItemStack(stack.getStack()), (int) stack.getChance()); + } catch (InstantiationException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalArgumentException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (InvocationTargetException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } + + return null; + } + + public static T getPrivateStaticObject(Class cls, String... names) { + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(null); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } + } + + return null; + } + + public static T getPrivateObject(Object object, String... names) { + Class cls = object.getClass(); + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(object); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } } return null; @@ -176,7 +270,7 @@ public class MineTweakerHacks { // ### Private Methods ### // ####################### - private static Field getField(Class cls, String[] names) { + private static Field getField(Class cls, String... names) { for (String name : names) { try { Field field = cls.getDeclaredField(name); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java index f3683d2..2ced44a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/util/MineTweakerPlatformUtils.java @@ -6,6 +6,9 @@ package minetweaker.mc1710.util; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.EntityLivingBase; /** @@ -26,4 +29,17 @@ public class MineTweakerPlatformUtils { throw new RuntimeException("entity class not found: " + entityClassName); } } + + public static String getLanguage() { + return FMLCommonHandler.instance().getSide() == Side.SERVER ? null : FMLClientHandler.instance().getCurrentLanguage(); + } + + public static boolean isLanguageActive(String lang) { + String current = getLanguage(); + return current != null && current.equals(lang); + } + + public static boolean isClient() { + return FMLCommonHandler.instance().getSide() == Side.CLIENT; + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java new file mode 100644 index 0000000..5305678 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java @@ -0,0 +1,203 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.LootEntry; +import minetweaker.mc1710.util.MineTweakerHacks; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + +/** + * + * @author Stan + */ +public class MCLootRegistry implements ILootRegistry { + private static final Map LOOT = MineTweakerHacks.getChestLoot(); + + @Override + public void addChestLoot(String type, WeightedItemStack item) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + 1, + 1, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void addChestLoot(String type, WeightedItemStack item, int min, int max) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + min, + max, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void removeChestLoot(String type, IIngredient pattern) { + MineTweakerAPI.apply(new RemoveLootAction(type, pattern)); + } + + @Override + public List getLoot(String type) { + ChestGenHooks recipe = LOOT.get(type); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + List results = new ArrayList(); + for (WeightedRandomChestContent content : contents) { + results.add(new LootEntry(new WeightedItemStack( + MineTweakerMC.getIItemStack(content.theItemId), + content.itemWeight), + content.theMinimumChanceToGenerateItem, + content.theMaximumChanceToGenerateItem)); + } + return results; + } + + @Override + public List getLootTypes() { + Set keys = LOOT.keySet(); + List keyList = new ArrayList(); + keyList.addAll(keys); + return keyList; + } + + // ###################### + // ### Action Classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class AddLootAction implements IUndoableAction { + private final String chest; + private final WeightedRandomChestContent content; + + public AddLootAction(String chest, WeightedRandomChestContent content) { + this.chest = chest; + this.content = content; + } + + @Override + public void apply() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.add(content); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.remove(content); + } + + public String getRecipeInfo() { + return content.theItemId.getDisplayName(); + } + + @Override + public String describe() { + return "Adding chest loot " + content.theItemId.getDisplayName() + " to loot class " + chest; + } + + @Override + public String describeUndo() { + return "Removing chest loot " + content.theItemId.getDisplayName() + " from loot class " + chest; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class RemoveLootAction implements IUndoableAction { + private final String chest; + private final IIngredient pattern; + private final List removed; + + public RemoveLootAction(String chest, IIngredient pattern) { + this.chest = chest; + this.pattern = pattern; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent r : contents) { + if (pattern.matches(MineTweakerMC.getIItemStack(r.theItemId))) { + removed.add(r); + } + } + + for (WeightedRandomChestContent r : removed) { + contents.remove(r); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent entry : removed) { + contents.add(entry); + } + } + + @Override + public String describe() { + return "Removing chest loot " + pattern + " for loot type " + chest; + } + + @Override + public String describeUndo() { + return "Restoring chest loot " + pattern + " for loot type " + chest + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java new file mode 100644 index 0000000..8ef2926 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java @@ -0,0 +1,149 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.mc1710.util.MineTweakerHacks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + +/** + * + * @author Stan + */ +public class MCSeedRegistry implements ISeedRegistry { + private static final List SEEDS = MineTweakerHacks.getSeeds(); + + @Override + public void addSeed(WeightedItemStack item) { + MineTweakerAPI.apply(new AddSeedAction(item)); + } + + @Override + public void removeSeed(IIngredient pattern) { + MineTweakerAPI.apply(new RemoveSeedAction(pattern)); + } + + @Override + public List getSeeds() { + List entries = (List) SEEDS; + + List results = new ArrayList(); + for (WeightedRandom.Item entry : entries) { + results.add(new WeightedItemStack( + MineTweakerMC.getIItemStack(MineTweakerHacks.getSeedEntrySeed(entry)), + entry.itemWeight + )); + } + return results; + } + + // ###################### + // ### Action classes ### + // ###################### + + private static class AddSeedAction implements IUndoableAction { + private final IItemStack item; + private final WeightedRandom.Item entry; + + public AddSeedAction(WeightedItemStack item) { + this.item = item.getStack(); + entry = MineTweakerHacks.constructSeedEntry(item); + } + + @Override + public void apply() { + SEEDS.add(entry); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + SEEDS.remove(entry); + } + + @Override + public String describe() { + return "Adding seed entry " + item; + } + + @Override + public String describeUndo() { + return "Removing seed entry " + item; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class RemoveSeedAction implements IUndoableAction { + private final IIngredient pattern; + private final List removed; + + public RemoveSeedAction(IIngredient ingredient) { + this.pattern = ingredient; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + for (Object entry : SEEDS) { + ItemStack itemStack = MineTweakerHacks.getSeedEntrySeed(entry); + if (pattern.matches(MineTweakerMC.getIItemStack(itemStack))) { + removed.add(entry); + } + } + + for (Object entry : removed) { + SEEDS.remove(entry); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + for (Object entry : removed) { + SEEDS.add(entry); + } + } + + @Override + public String describe() { + return "Removing seeds " + pattern; + } + + @Override + public String describeUndo() { + return "Restoring seeds " + pattern + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java new file mode 100644 index 0000000..6ae1d9a --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/vanilla/MCVanilla.java @@ -0,0 +1,30 @@ +/* + * 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.vanilla; + +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.api.vanilla.IVanilla; + +/** + * + * @author Stan + */ +public class MCVanilla implements IVanilla { + private final MCLootRegistry lootRegistry = new MCLootRegistry(); + private final MCSeedRegistry seedRegistry = new MCSeedRegistry(); + + @Override + public ILootRegistry getLoot() { + return lootRegistry; + } + + @Override + public ISeedRegistry getSeeds() { + return seedRegistry; + } +} diff --git a/MineTweaker3-MC172-Main/build.gradle b/MineTweaker3-MC172-Main/build.gradle index 8b8efe9..eafce52 100644 --- a/MineTweaker3-MC172-Main/build.gradle +++ b/MineTweaker3-MC172-Main/build.gradle @@ -51,12 +51,6 @@ processResources expand 'version':project.version, 'mcversion':project.minecraft.version } - from(sourceSets.main.java.srcDirs) { - include 'minetweaker/mc172/MineTweakerMod.java' - - expand 'version':project.version - } - // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java index cca1ec8..af2cfaa 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -35,6 +35,7 @@ import minetweaker.mc172.oredict.MCOreDict; import minetweaker.mc172.recipes.MCRecipeManager; import minetweaker.mc172.server.MCServer; import minetweaker.mc172.util.MineTweakerHacks; +import minetweaker.mc172.vanilla.MCVanilla; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; @@ -85,7 +86,8 @@ public class MineTweakerMod { new MCFurnaceManager(), MCGame.INSTANCE, new MCLoadedMods(), - new MCFormatter()); + new MCFormatter(), + new MCVanilla()); MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/client/MCClient.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/client/MCClient.java index 46f0d27..ec70efc 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/client/MCClient.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/client/MCClient.java @@ -6,6 +6,7 @@ package minetweaker.mc172.client; +import cpw.mods.fml.client.FMLClientHandler; import minetweaker.api.client.IClient; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; @@ -26,4 +27,9 @@ public class MCClient implements IClient { public IPlayer getPlayer() { return player; } + + @Override + public String getLanguage() { + return FMLClientHandler.instance().getCurrentLanguage(); + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java index f043bf0..989b7a1 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/game/MCGame.java @@ -7,10 +7,13 @@ package minetweaker.mc172.game; import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlockDefinition; import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.game.IGame; @@ -22,6 +25,7 @@ import minetweaker.mc172.entity.MCEntityDefinition; import minetweaker.mc172.item.MCItemDefinition; import minetweaker.mc172.liquid.MCLiquidDefinition; import minetweaker.mc172.util.MineTweakerHacks; +import minetweaker.mc172.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; @@ -32,6 +36,8 @@ import net.minecraftforge.fluids.FluidRegistry; * @author Stan */ public class MCGame implements IGame { + private static final Map TRANSLATIONS = MineTweakerHacks.getTranslations(); + public static final MCGame INSTANCE = new MCGame(); private MCGame() {} @@ -85,4 +91,89 @@ public class MCGame implements IGame { return result; } + + @Override + public void setLocalization(String key, String value) { + MineTweakerAPI.apply(new SetTranslation(null, key, value)); + } + + @Override + public void setLocalization(String lang, String key, String value) { + MineTweakerAPI.apply(new SetTranslation(lang, key, value)); + } + + @Override + public String localize(String key) { + return LanguageRegistry.instance().getStringLocalization(key); + } + + @Override + public String localize(String key, String lang) { + return LanguageRegistry.instance().getStringLocalization(key, lang); + } + + // ###################### + // ### Action classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author Joshiejack + */ + private static class SetTranslation implements IUndoableAction { + private String original; + private final String lang; + private final String key; + private final String text; + private boolean added; + + public SetTranslation(String lang, String key, String text) { + this.lang = lang; + this.key = key; + this.text = text; + } + + @Override + public void apply() { + if (lang == null || MineTweakerPlatformUtils.isLanguageActive(lang)) { + original = TRANSLATIONS.get(key); + TRANSLATIONS.put(key, text); + added = true; + } else { + added = false; + } + } + + @Override + public boolean canUndo() { + return TRANSLATIONS != null; + } + + @Override + public void undo() { + if (added) { + if (original == null) { + TRANSLATIONS.remove(key); + } else { + TRANSLATIONS.put(key, original); + } + } + } + + @Override + public String describe() { + return "Setting localization for the key: " + key + " to " + text; + } + + @Override + public String describeUndo() { + return "Setting localization for the key: " + key + " to " + original; + } + + @Override + public Object getOverrideKey() { + return null; + } + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java index 2a87468..d4ef7c4 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/network/MineTweakerLoadScriptsHandler.java @@ -11,6 +11,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.mc172.client.MCClient; import minetweaker.runtime.providers.ScriptProviderMemory; /** @@ -21,6 +22,8 @@ public class MineTweakerLoadScriptsHandler implements IMessageHandler SEEDENTRY_CONSTRUCTOR; static { NBTTAGLIST_TAGLIST = getField(NBTTagList.class, MineTweakerObfuscation.NBTTAGLIST_TAGLIST); @@ -55,6 +68,26 @@ public class MineTweakerHacks { SLOTCRAFTING_PLAYER = getField(SlotCrafting.class, MineTweakerObfuscation.SLOTCRAFTING_PLAYER); ENTITYREGISTRY_CLASSREGISTRATIONS = getField(EntityRegistry.class, new String[] {"entityClassRegistrations"}); + + Class forgeSeedEntry = null; + try { + forgeSeedEntry = (Class) Class.forName("net.minecraftforge.common.ForgeHooks$SeedEntry"); + } catch (ClassNotFoundException ex) {} + + SEEDENTRY_SEED = getField(forgeSeedEntry, "seed"); + + Constructor seedEntryConstructor = null; + + try { + seedEntryConstructor = forgeSeedEntry.getConstructor(ItemStack.class, int.class); + seedEntryConstructor.setAccessible(true); + } catch (NoSuchMethodException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } catch (SecurityException ex) { + Logger.getLogger(MineTweakerHacks.class.getName()).log(Level.SEVERE, null, ex); + } + + SEEDENTRY_CONSTRUCTOR = seedEntryConstructor; } private MineTweakerHacks() {} @@ -82,6 +115,21 @@ public class MineTweakerHacks { } } + public static List getSeeds() { + return getPrivateStaticObject(ForgeHooks.class, "seedList"); + } + + public static Map getChestLoot() { + return getPrivateStaticObject(ChestGenHooks.class, "chestInfo"); + } + + public static Map getTranslations() { + return getPrivateObject( + getPrivateStaticObject(StatCollector.class, "localizedName", "field_74839_a"), + "languageList", + "field_74816_c"); + } + public static List> getOreIdStacks() { try { return (List>) OREDICTIONARY_IDTOSTACK.get(null); @@ -157,17 +205,63 @@ public class MineTweakerHacks { } } - public static T getPrivateStaticObject(Class cls, String name) { + public static ItemStack getSeedEntrySeed(Object entry) { try { - Field field = cls.getDeclaredField(name); - field.setAccessible(true); - return (T) field.get(null); - } catch (NoSuchFieldException ex) { - - } catch (SecurityException ex) { - + return (ItemStack) SEEDENTRY_SEED.get(entry); } catch (IllegalAccessException ex) { - + MineTweakerAPI.logError("could not get SeedEntry seed"); + return null; + } + } + + public static WeightedRandom.Item constructSeedEntry(WeightedItemStack stack) { + try { + return SEEDENTRY_CONSTRUCTOR.newInstance(MineTweakerMC.getItemStack(stack.getStack()), (int) stack.getChance()); + } catch (InstantiationException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalAccessException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (IllegalArgumentException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } catch (InvocationTargetException ex) { + MineTweakerAPI.logError("could not construct SeedEntry"); + } + + return null; + } + + public static T getPrivateStaticObject(Class cls, String... names) { + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(null); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } + } + + return null; + } + + public static T getPrivateObject(Object object, String... names) { + Class cls = object.getClass(); + for (String name : names) { + try { + Field field = cls.getDeclaredField(name); + field.setAccessible(true); + return (T) field.get(object); + } catch (NoSuchFieldException ex) { + + } catch (SecurityException ex) { + + } catch (IllegalAccessException ex) { + + } } return null; @@ -177,7 +271,7 @@ public class MineTweakerHacks { // ### Private Methods ### // ####################### - private static Field getField(Class cls, String[] names) { + private static Field getField(Class cls, String... names) { for (String name : names) { try { Field field = cls.getDeclaredField(name); diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerPlatformUtils.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerPlatformUtils.java index 7682836..8ca71ae 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerPlatformUtils.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/util/MineTweakerPlatformUtils.java @@ -6,6 +6,9 @@ package minetweaker.mc172.util; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.EntityLivingBase; /** @@ -26,4 +29,17 @@ public class MineTweakerPlatformUtils { throw new RuntimeException("entity class not found: " + entityClassName); } } + + public static String getLanguage() { + return FMLCommonHandler.instance().getSide() == Side.SERVER ? null : FMLClientHandler.instance().getCurrentLanguage(); + } + + public static boolean isLanguageActive(String lang) { + String current = getLanguage(); + return current != null && current.equals(lang); + } + + public static boolean isClient() { + return FMLCommonHandler.instance().getSide() == Side.CLIENT; + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCLootRegistry.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCLootRegistry.java new file mode 100644 index 0000000..a89aa67 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCLootRegistry.java @@ -0,0 +1,203 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.LootEntry; +import minetweaker.mc172.util.MineTweakerHacks; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + +/** + * + * @author Stan + */ +public class MCLootRegistry implements ILootRegistry { + private static final Map LOOT = MineTweakerHacks.getChestLoot(); + + @Override + public void addChestLoot(String type, WeightedItemStack item) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + 1, + 1, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void addChestLoot(String type, WeightedItemStack item, int min, int max) { + WeightedRandomChestContent content = new WeightedRandomChestContent( + MineTweakerMC.getItemStack(item.getStack()), + min, + max, + (int) item.getChance()); + MineTweakerAPI.apply(new AddLootAction(type, content)); + } + + @Override + public void removeChestLoot(String type, IIngredient pattern) { + MineTweakerAPI.apply(new RemoveLootAction(type, pattern)); + } + + @Override + public List getLoot(String type) { + ChestGenHooks recipe = LOOT.get(type); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + List results = new ArrayList(); + for (WeightedRandomChestContent content : contents) { + results.add(new LootEntry(new WeightedItemStack( + MineTweakerMC.getIItemStack(content.theItemId), + content.itemWeight), + content.theMinimumChanceToGenerateItem, + content.theMaximumChanceToGenerateItem)); + } + return results; + } + + @Override + public List getLootTypes() { + Set keys = LOOT.keySet(); + List keyList = new ArrayList(); + keyList.addAll(keys); + return keyList; + } + + // ###################### + // ### Action Classes ### + // ###################### + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class AddLootAction implements IUndoableAction { + private final String chest; + private final WeightedRandomChestContent content; + + public AddLootAction(String chest, WeightedRandomChestContent content) { + this.chest = chest; + this.content = content; + } + + @Override + public void apply() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.add(content); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + contents.remove(content); + } + + public String getRecipeInfo() { + return content.theItemId.getDisplayName(); + } + + @Override + public String describe() { + return "Adding chest loot " + content.theItemId.getDisplayName() + " to loot class " + chest; + } + + @Override + public String describeUndo() { + return "Removing chest loot " + content.theItemId.getDisplayName() + " from loot class " + chest; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + /** + * Ported from ModTweaker. + * + * @author JoshieJack + */ + private static class RemoveLootAction implements IUndoableAction { + private final String chest; + private final IIngredient pattern; + private final List removed; + + public RemoveLootAction(String chest, IIngredient pattern) { + this.chest = chest; + this.pattern = pattern; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent r : contents) { + if (pattern.matches(MineTweakerMC.getIItemStack(r.theItemId))) { + removed.add(r); + } + } + + for (WeightedRandomChestContent r : removed) { + contents.remove(r); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + ChestGenHooks recipe = LOOT.get(chest); + List contents = MineTweakerHacks.getPrivateObject(recipe, "contents"); + + for (WeightedRandomChestContent entry : removed) { + contents.add(entry); + } + } + + @Override + public String describe() { + return "Removing chest loot " + pattern + " for loot type " + chest; + } + + @Override + public String describeUndo() { + return "Restoring chest loot " + pattern + " for loot type " + chest + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCSeedRegistry.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCSeedRegistry.java new file mode 100644 index 0000000..01cbb7b --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCSeedRegistry.java @@ -0,0 +1,149 @@ +/* + * 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.vanilla; + +import java.util.ArrayList; +import java.util.List; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.mc172.util.MineTweakerHacks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + +/** + * + * @author Stan + */ +public class MCSeedRegistry implements ISeedRegistry { + private static final List SEEDS = MineTweakerHacks.getSeeds(); + + @Override + public void addSeed(WeightedItemStack item) { + MineTweakerAPI.apply(new AddSeedAction(item)); + } + + @Override + public void removeSeed(IIngredient pattern) { + MineTweakerAPI.apply(new RemoveSeedAction(pattern)); + } + + @Override + public List getSeeds() { + List entries = (List) SEEDS; + + List results = new ArrayList(); + for (WeightedRandom.Item entry : entries) { + results.add(new WeightedItemStack( + MineTweakerMC.getIItemStack(MineTweakerHacks.getSeedEntrySeed(entry)), + entry.itemWeight + )); + } + return results; + } + + // ###################### + // ### Action classes ### + // ###################### + + private static class AddSeedAction implements IUndoableAction { + private final IItemStack item; + private final WeightedRandom.Item entry; + + public AddSeedAction(WeightedItemStack item) { + this.item = item.getStack(); + entry = MineTweakerHacks.constructSeedEntry(item); + } + + @Override + public void apply() { + SEEDS.add(entry); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + SEEDS.remove(entry); + } + + @Override + public String describe() { + return "Adding seed entry " + item; + } + + @Override + public String describeUndo() { + return "Removing seed entry " + item; + } + + @Override + public Object getOverrideKey() { + return null; + } + } + + private static class RemoveSeedAction implements IUndoableAction { + private final IIngredient pattern; + private final List removed; + + public RemoveSeedAction(IIngredient ingredient) { + this.pattern = ingredient; + removed = new ArrayList(); + } + + @Override + public void apply() { + removed.clear(); + + for (Object entry : SEEDS) { + ItemStack itemStack = MineTweakerHacks.getSeedEntrySeed(entry); + if (pattern.matches(MineTweakerMC.getIItemStack(itemStack))) { + removed.add(entry); + } + } + + for (Object entry : removed) { + SEEDS.remove(entry); + } + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + for (Object entry : removed) { + SEEDS.add(entry); + } + } + + @Override + public String describe() { + return "Removing seeds " + pattern; + } + + @Override + public String describeUndo() { + return "Restoring seeds " + pattern + " (" + removed.size() + " entries)"; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCVanilla.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCVanilla.java new file mode 100644 index 0000000..26e57ca --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/vanilla/MCVanilla.java @@ -0,0 +1,30 @@ +/* + * 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.vanilla; + +import minetweaker.api.vanilla.ILootRegistry; +import minetweaker.api.vanilla.ISeedRegistry; +import minetweaker.api.vanilla.IVanilla; + +/** + * + * @author Stan + */ +public class MCVanilla implements IVanilla { + private final MCLootRegistry lootRegistry = new MCLootRegistry(); + private final MCSeedRegistry seedRegistry = new MCSeedRegistry(); + + @Override + public ILootRegistry getLoot() { + return lootRegistry; + } + + @Override + public ISeedRegistry getSeeds() { + return seedRegistry; + } +} diff --git a/build.gradle b/build.gradle index d1054a4..fdea957 100644 --- a/build.gradle +++ b/build.gradle @@ -64,10 +64,91 @@ task assembleMC164(type: Jar, dependsOn: [\ } } +task assembleDevBase1710(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build', + ':MineTweaker3-MC1710-Main:build']) { + archiveName="MineTweaker3-Dev-1.7.10-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + from project(':MineTweaker3-MC1710-Main').sourceSets.main.output +} + +task assembleDevBase172(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build', + ':MineTweaker3-MC172-Main:build']) { + archiveName="MineTweaker3-Dev-1.7.2-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + from project(':MineTweaker3-MC172-Main').sourceSets.main.output +} + +task assembleDevBase164(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build', + ':MineTweaker3-MC164-Main:build']) { + archiveName="MineTweaker3-Dev-1.6.4-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + from project(':MineTweaker3-MC164-Main').sourceSets.main.output +} + +task assembleDevFull1710(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build'] + + projects1710.collect { ':' + it + ":build" }) { + archiveName="MineTweaker3-Dev-Full-1.7.10-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + + for (p in projects1710) { + from project(p).sourceSets.main.output + } +} + +task assembleDevFull172(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build'] + + projects172.collect { ':' + it + ":build" }) { + archiveName="MineTweaker3-Dev-Full-1.7.2-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + + for (p in projects172) { + from project(p).sourceSets.main.output + } +} + +task assembleDevFull164(type: Jar, dependsOn: [ + ':ZenScript:build', + ':MineTweaker3-API:build'] + + projects164.collect { ':' + it + ":build" }) { + archiveName="MineTweaker3-Dev-Full-1.6.4-${mineTweakerVersion}.jar" + + from project(':ZenScript').sourceSets.main.output + from project(':MineTweaker3-API').sourceSets.main.output + + for (p in projects164) { + from project(p).sourceSets.main.output + } +} + task assembleAll(dependsOn: [ assembleMC164, assembleMC172, - assembleMC1710]) { + assembleMC1710, + assembleDevBase164, + assembleDevBase172, + assembleDevBase1710, + assembleDevFull164, + assembleDevFull172, + assembleDevFull1710]) { } task zendoc164(type: Javadoc) {