From 581f72170cfd34cd8e28c48952c5a3d26bc15b96 Mon Sep 17 00:00:00 2001 From: jaredlll08 Date: Fri, 4 Sep 2015 16:20:50 +0200 Subject: [PATCH] Clsoe #194 --- .../java/minetweaker/mc1710/MineTweakerMod.java | 7 ++++++- .../mc1710/brackets/ItemBracketHandler.java | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) 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 9060444..a90f92c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -21,10 +21,12 @@ import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.relauncher.Side; import java.io.File; +import java.util.Set; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; +import minetweaker.mc1710.brackets.ItemBracketHandler; import minetweaker.mc1710.client.MCClient; import minetweaker.mc1710.formatting.MCFormatter; import minetweaker.mc1710.furnace.FuelTweaker; @@ -47,6 +49,7 @@ import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; +import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; @@ -152,7 +155,9 @@ public class MineTweakerMod { public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { // starts before loading worlds // perfect place to start MineTweaker! - + for (String itemName : (Set) Item.itemRegistry.getKeys()) { + ItemBracketHandler.itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); + } if (MineTweakerPlatformUtils.isClient()) { MineTweakerAPI.client = new MCClient(); } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java index 8924329..53cf923 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java @@ -36,14 +36,14 @@ import stanhebben.zenscript.util.ZenPosition; */ @BracketHandler(priority = 100) public class ItemBracketHandler implements IBracketHandler { - private static final Map itemNames; + public static final Map itemNames = new HashMap(); - static { - itemNames = new HashMap(); - for (String itemName : (Set) Item.itemRegistry.getKeys()) { - itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); - } - } +// static { +// itemNames = new HashMap(); +// for (String itemName : (Set) Item.itemRegistry.getKeys()) { +// itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); +// } +// } public static IItemStack getItem(String name, int meta) { // Item item = (Item) Item.itemRegistry.getObject(name);