diff --git a/src/main/java/modtweaker2/ClientEvents.java b/src/main/java/modtweaker2/ClientEvents.java index 42ef7d7..233b51d 100644 --- a/src/main/java/modtweaker2/ClientEvents.java +++ b/src/main/java/modtweaker2/ClientEvents.java @@ -15,7 +15,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ClientEvents { public static int cooldown; public static boolean active; -public static String notice = EnumChatFormatting.DARK_RED + "This item's recipe has been changed by ModTweaker."; + @SubscribeEvent public void onDrawTooltip(ItemTooltipEvent event) { @@ -23,7 +23,6 @@ public static String notice = EnumChatFormatting.DARK_RED + "This item's recipe if (player != null) { IItemStack hand = MineTweakerMC.getIItemStack(event.itemStack); if (hand != null) { - if (active) { String print = hand.toString(); @@ -38,11 +37,6 @@ public static String notice = EnumChatFormatting.DARK_RED + "This item's recipe cooldown--; } - for (ItemStack stack : TweakerPlugin.changed) { - if (stack.isItemEqual(event.itemStack) && event.toolTip.contains(notice)) { - event.toolTip.add(notice); - } - } } } } diff --git a/src/main/java/modtweaker2/ModTweaker2.java b/src/main/java/modtweaker2/ModTweaker2.java index 0f0118b..924a5ec 100644 --- a/src/main/java/modtweaker2/ModTweaker2.java +++ b/src/main/java/modtweaker2/ModTweaker2.java @@ -1,7 +1,5 @@ package modtweaker2; -import java.util.Random; - import minetweaker.MineTweakerImplementationAPI; import minetweaker.MineTweakerImplementationAPI.ReloadEvent; import minetweaker.util.IEventHandler; @@ -25,9 +23,7 @@ import modtweaker2.mods.thaumcraft.Thaumcraft; import modtweaker2.mods.thermalexpansion.ThermalExpansion; import modtweaker2.proxy.CommonProxy; import modtweaker2.utils.TweakerPlugin; -import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.CommandEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,7 +37,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @Mod(modid = ModProps.modid, version = ModProps.version, dependencies = ModProps.dependencies) @@ -97,32 +92,6 @@ public class ModTweaker2 { MinecraftForge.EVENT_BUS.register(this); } - @SubscribeEvent - public void onCommand(CommandEvent event) { - if ((event.command.getCommandName().equals("mt") || event.command.getCommandName().equals("minetweaker")) && event.parameters.length > 0 && "reload".equals(event.parameters[0])) { - event.setCanceled(true); - Random rand = new Random(); - int ran = rand.nextInt(5); - switch (ran) { - case 0: - event.sender.addChatMessage(new ChatComponentText(" Nope! Do NOT use /mt reload, it causes errors when ModTweaker is loaded.")); - break; - case 1: - event.sender.addChatMessage(new ChatComponentText(" No can do!")); - break; - case 2: - event.sender.addChatMessage(new ChatComponentText(" #stopModReloading.")); - break; - case 3: - event.sender.addChatMessage(new ChatComponentText(" Take a look over here. http://www.reddit.com/r/feedthebeast/comments/3acdqc/psa_never_use_mt_reload_or_anything_of_the_like/")); - break; - case 4: - event.sender.addChatMessage(new ChatComponentText(" Stop touching me like that!")); - break; - } - } - } - @EventHandler public void postInit(FMLPostInitializationEvent event) { logger.info("Starting PostInitialization for " + ModProps.modid); diff --git a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java index a2a369e..8022a4d 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java @@ -19,7 +19,6 @@ public abstract class BaseCraftingAddition extends BaseDescriptionAddition { this.output = output; this.recipe = recipe; this.list = list; - TweakerPlugin.changed.add(output); } @Override diff --git a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java index 6234687..4fa3b53 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java @@ -10,7 +10,6 @@ import static modtweaker2.helpers.StackHelper.areEqual; public class BaseCraftingRemoval extends BaseListRemoval { public BaseCraftingRemoval(String name, List list, ItemStack stack) { super(name, list, stack); - TweakerPlugin.changed.add(stack); } @Override diff --git a/src/main/java/modtweaker2/utils/BaseListAddition.java b/src/main/java/modtweaker2/utils/BaseListAddition.java index 5d412a2..9757f84 100644 --- a/src/main/java/modtweaker2/utils/BaseListAddition.java +++ b/src/main/java/modtweaker2/utils/BaseListAddition.java @@ -19,7 +19,6 @@ public abstract class BaseListAddition implements IUndoableAction { public BaseListAddition(List list, Object recipe) { this.list = list; this.recipe = recipe; - TweakerPlugin.changed.add(((ItemStack) recipe)); } @Override diff --git a/src/main/java/modtweaker2/utils/BaseListRemoval.java b/src/main/java/modtweaker2/utils/BaseListRemoval.java index a32f637..27d467f 100644 --- a/src/main/java/modtweaker2/utils/BaseListRemoval.java +++ b/src/main/java/modtweaker2/utils/BaseListRemoval.java @@ -22,7 +22,6 @@ public abstract class BaseListRemoval implements IUndoableAction { this.stack = stack; this.description = description; this.fluid = fluid; - TweakerPlugin.changed.add(stack); } public BaseListRemoval(String description, List list, ItemStack stack) { diff --git a/src/main/java/modtweaker2/utils/BaseMapAddition.java b/src/main/java/modtweaker2/utils/BaseMapAddition.java index c8db7be..df82716 100644 --- a/src/main/java/modtweaker2/utils/BaseMapAddition.java +++ b/src/main/java/modtweaker2/utils/BaseMapAddition.java @@ -21,8 +21,6 @@ public abstract class BaseMapAddition implements IUndoableAction { this.key = key; this.recipe = recipe; this.description = description; - if (recipe instanceof ItemStack) - TweakerPlugin.changed.add(((ItemStack) recipe)); } @Override diff --git a/src/main/java/modtweaker2/utils/BaseMapRemoval.java b/src/main/java/modtweaker2/utils/BaseMapRemoval.java index 8fef801..0db79f7 100644 --- a/src/main/java/modtweaker2/utils/BaseMapRemoval.java +++ b/src/main/java/modtweaker2/utils/BaseMapRemoval.java @@ -26,9 +26,6 @@ public abstract class BaseMapRemoval implements IUndoableAction { this.map = map; this.key = key; this.description = description; - if(map.get(key) instanceof ItemStack){ - TweakerPlugin.changed.add(((ItemStack) map.get(key))); - } } @Override diff --git a/src/main/java/modtweaker2/utils/TweakerPlugin.java b/src/main/java/modtweaker2/utils/TweakerPlugin.java index bb2391a..ce005f2 100644 --- a/src/main/java/modtweaker2/utils/TweakerPlugin.java +++ b/src/main/java/modtweaker2/utils/TweakerPlugin.java @@ -8,7 +8,6 @@ import cpw.mods.fml.common.Loader; public class TweakerPlugin { private static ArrayList isLoaded = new ArrayList(); - public static List changed = new ArrayList(); public static void register(String mod, Class clazz) { if (Loader.isModLoaded(mod)) {