From 1b2554170ae3dd2c625a9e721933a2f77048a0d6 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sat, 30 Aug 2014 17:03:52 +0200 Subject: [PATCH] Added tooltip support. Also adds formatted text to make formatted tooltips. --- .../main/java/minetweaker/MineTweakerAPI.java | 8 ++ .../MineTweakerImplementationAPI.java | 6 +- .../api/formatting/IFormattedText.java | 24 ++++ .../api/formatting/IFormatter.java | 80 +++++++++++ .../api/item/IngredientTransform.java | 7 + .../api/tooltip/IngredientTooltips.java | 98 ++++++++++++++ .../minetweaker/api/util/IngredientMap.java | 96 +++++++++++++ .../java/minetweaker/expand/ExpandString.java | 7 + .../minetweaker/mc164/ForgeEventHandler.java | 20 +++ .../minetweaker/mc164/MineTweakerMod.java | 4 +- .../formatting/FormattedMarkupString.java | 44 ++++++ .../mc164/formatting/FormattedString.java | 41 ++++++ .../mc164/formatting/FormattedStringJoin.java | 67 +++++++++ .../mc164/formatting/IMCFormattedString.java | 19 +++ .../mc164/formatting/MCFormatter.java | 128 ++++++++++++++++++ .../mc164/item/MCItemDefinition.java | 26 ++++ .../mods/ic2/expand/IngredientExpansion.java | 3 +- .../minetweaker/mc1710/ForgeEventHandler.java | 21 ++- .../minetweaker/mc1710/MineTweakerMod.java | 15 +- .../formatting/FormattedMarkupString.java | 44 ++++++ .../mc1710/formatting/FormattedString.java | 41 ++++++ .../formatting/FormattedStringJoin.java | 67 +++++++++ .../mc1710/formatting/IMCFormattedString.java | 19 +++ .../mc1710/formatting/MCFormatter.java | 128 ++++++++++++++++++ .../mc1710/item/MCItemDefinition.java | 26 ++++ .../minetweaker/mc172/ForgeEventHandler.java | 21 ++- .../minetweaker/mc172/MineTweakerMod.java | 4 +- .../formatting/FormattedMarkupString.java | 44 ++++++ .../mc172/formatting/FormattedString.java | 41 ++++++ .../mc172/formatting/FormattedStringJoin.java | 67 +++++++++ .../mc172/formatting/IMCFormattedString.java | 19 +++ .../mc172/formatting/MCFormatter.java | 128 ++++++++++++++++++ .../mc172/item/MCItemDefinition.java | 26 ++++ 33 files changed, 1377 insertions(+), 12 deletions(-) create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormattedText.java create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormatter.java create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java create mode 100644 MineTweaker3-API/src/main/java/minetweaker/api/util/IngredientMap.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedMarkupString.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedString.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedStringJoin.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/IMCFormattedString.java create mode 100644 MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/MCFormatter.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedMarkupString.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedString.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedStringJoin.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/IMCFormattedString.java create mode 100644 MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/MCFormatter.java diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java index 02e8634..3154f33 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java @@ -13,6 +13,7 @@ import minetweaker.annotations.BracketHandler; import minetweaker.annotations.ModOnly; import minetweaker.api.client.IClient; import minetweaker.api.event.IEventManager; +import minetweaker.api.formatting.IFormatter; import minetweaker.api.game.IGame; import minetweaker.api.mods.ILoadedMods; import minetweaker.runtime.ITweaker; @@ -88,6 +89,7 @@ public class MineTweakerAPI { registerGlobalSymbol("client", getJavaStaticFieldSymbol(MineTweakerAPI.class, "client")); registerGlobalSymbol("game", getJavaStaticFieldSymbol(MineTweakerAPI.class, "game")); registerGlobalSymbol("loadedMods", getJavaStaticFieldSymbol(MineTweakerAPI.class, "loadedMods")); + registerGlobalSymbol("format", getJavaStaticFieldSymbol(MineTweakerAPI.class, "format")); } private MineTweakerAPI() {} @@ -96,6 +98,7 @@ public class MineTweakerAPI { * The Tweaker is where you apply undoable actions. Any kind of action that * reloads with the scripts should always be submitted to the tweaker. */ + @Deprecated public static final ITweaker tweaker = new MTTweaker(); /** @@ -148,6 +151,11 @@ public class MineTweakerAPI { */ public static ILoadedMods loadedMods = null; + /** + * Access point to the text formatter. + */ + public static IFormatter format = 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 b933b8f..6770faa 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -19,6 +19,7 @@ import minetweaker.api.event.MTEventManager; import minetweaker.api.event.PlayerInteractEvent; import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; +import minetweaker.api.formatting.IFormatter; import minetweaker.api.game.IGame; import minetweaker.api.item.IItemDefinition; import minetweaker.api.item.IItemStack; @@ -394,18 +395,21 @@ public class MineTweakerImplementationAPI { * @param furnace furnace manager interface * @param game game interface * @param mods mods interface + * @param formatter formatter interface */ public static void init( IOreDict oreDict, IRecipeManager recipes, IFurnaceManager furnace, IGame game, - ILoadedMods mods) { + ILoadedMods mods, + IFormatter formatter) { MineTweakerAPI.oreDict = oreDict; MineTweakerAPI.recipes = recipes; MineTweakerAPI.furnace = furnace; MineTweakerAPI.game = game; MineTweakerAPI.loadedMods = mods; + MineTweakerAPI.format = formatter; } /** diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormattedText.java b/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormattedText.java new file mode 100644 index 0000000..e96c466 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormattedText.java @@ -0,0 +1,24 @@ +/* + * 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.formatting; + +import stanhebben.zenscript.annotations.OperatorType; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenOperator; + +/** + * + * @author Stan + */ +@ZenClass("minetweaker.formatting.IFormattedText") +public interface IFormattedText { + @ZenOperator(OperatorType.ADD) + public IFormattedText add(IFormattedText other); + + @ZenOperator(OperatorType.CAT) + public IFormattedText cat(IFormattedText other); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormatter.java b/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormatter.java new file mode 100644 index 0000000..15d5d70 --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/formatting/IFormatter.java @@ -0,0 +1,80 @@ +/* + * 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.formatting; + +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +public interface IFormatter { + public IFormattedText string(String text); + + @ZenMethod + public IFormattedText black(IFormattedText text); + + @ZenMethod + public IFormattedText darkBlue(IFormattedText text); + + @ZenMethod + public IFormattedText darkGreen(IFormattedText text); + + @ZenMethod + public IFormattedText darkAqua(IFormattedText text); + + @ZenMethod + public IFormattedText darkRed(IFormattedText text); + + @ZenMethod + public IFormattedText darkPurple(IFormattedText text); + + @ZenMethod + public IFormattedText gold(IFormattedText text); + + @ZenMethod + public IFormattedText gray(IFormattedText text); + + @ZenMethod + public IFormattedText darkGray(IFormattedText text); + + @ZenMethod + public IFormattedText blue(IFormattedText text); + + @ZenMethod + public IFormattedText green(IFormattedText text); + + @ZenMethod + public IFormattedText aqua(IFormattedText text); + + @ZenMethod + public IFormattedText red(IFormattedText text); + + @ZenMethod + public IFormattedText lightPurple(IFormattedText text); + + @ZenMethod + public IFormattedText yellow(IFormattedText text); + + @ZenMethod + public IFormattedText white(IFormattedText text); + + @ZenMethod + public IFormattedText obfuscated(IFormattedText text); + + @ZenMethod + public IFormattedText bold(IFormattedText text); + + @ZenMethod + public IFormattedText strikethrough(IFormattedText text); + + @ZenMethod + public IFormattedText underline(IFormattedText text); + + @ZenMethod + public IFormattedText italic(IFormattedText text); +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java index 9a39053..dd60cbe 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java @@ -135,6 +135,13 @@ public class IngredientTransform { }); } + /** + * Gives an item back to the player. Also clears the inventory slot at that position. + * + * @param ingredient + * @param givenItem + * @return + */ @ZenMethod public static IIngredient giveBack(IIngredient ingredient, @Optional final IItemStack givenItem) { return ingredient.transform(new IItemTransformer() { diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java b/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java new file mode 100644 index 0000000..1708a7c --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/tooltip/IngredientTooltips.java @@ -0,0 +1,98 @@ +/* + * 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.tooltip; + +import java.util.List; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; +import minetweaker.api.util.IngredientMap; +import minetweaker.api.util.IngredientMap.IngredientMapEntry; +import stanhebben.zenscript.annotations.ZenExpansion; +import stanhebben.zenscript.annotations.ZenMethod; + +/** + * + * @author Stan + */ +@ZenExpansion("minetweaker.item.IIngredient") +public class IngredientTooltips { + private static final IngredientMap TOOLTIPS = new IngredientMap(); + private static final IngredientMap SHIFT_TOOLTIPS = new IngredientMap(); + + @ZenMethod + public static void addTooltip(IIngredient ingredient, IFormattedText tooltip) { + MineTweakerAPI.apply(new AddTooltipAction(ingredient, tooltip, false)); + } + + @ZenMethod + public static void addShiftTooltip(IIngredient ingredient, IFormattedText tooltip) { + MineTweakerAPI.apply(new AddTooltipAction(ingredient, tooltip, true)); + } + + public static List getTooltips(IItemStack item) { + return TOOLTIPS.getEntries(item); + } + + public static List getShiftTooltips(IItemStack item) { + return SHIFT_TOOLTIPS.getEntries(item); + } + + // ###################### + // ### Action classes ### + // ###################### + + private static class AddTooltipAction implements IUndoableAction { + private final IIngredient ingredient; + private final IFormattedText tooltip; + private final boolean shift; + + private IngredientMapEntry entry; + + public AddTooltipAction(IIngredient ingredient, IFormattedText tooltip, boolean shift) { + this.ingredient = ingredient; + this.tooltip = tooltip; + this.shift = shift; + } + + @Override + public void apply() { + entry = (shift ? SHIFT_TOOLTIPS : TOOLTIPS).register(ingredient, tooltip); + } + + @Override + public boolean canUndo() { + return true; + } + + @Override + public void undo() { + if (shift) { + SHIFT_TOOLTIPS.unregister(entry); + } else { + TOOLTIPS.unregister(entry); + } + } + + @Override + public String describe() { + return "Adding tooltip for " + ingredient + ": " + tooltip; + } + + @Override + public String describeUndo() { + return "Removing tooltip for " + ingredient + ": " + tooltip; + } + + @Override + public Object getOverrideKey() { + return null; + } + } +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/util/IngredientMap.java b/MineTweaker3-API/src/main/java/minetweaker/api/util/IngredientMap.java new file mode 100644 index 0000000..070eddd --- /dev/null +++ b/MineTweaker3-API/src/main/java/minetweaker/api/util/IngredientMap.java @@ -0,0 +1,96 @@ +/* + * 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.util; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemDefinition; +import minetweaker.api.item.IItemStack; + +/** + * + * @author Stan + */ +public class IngredientMap { + private final HashMap>> entries; + + public IngredientMap() { + entries = new HashMap>>(); + } + + public IngredientMapEntry register(IIngredient ingredient, T entry) { + Set items = new HashSet(); + for (IItemStack item : ingredient.getItems()) { + items.add(item.getDefinition()); + } + + IngredientMapEntry actualEntry = new IngredientMapEntry(ingredient, entry); + + for (IItemDefinition item : items) { + if (!entries.containsKey(item)) { + entries.put(item, new ArrayList>()); + } + + entries.get(item).add(actualEntry); + } + + return actualEntry; + } + + public void unregister(IngredientMapEntry entry) { + Set items = new HashSet(); + for (IItemStack item : entry.ingredient.getItems()) { + items.add(item.getDefinition()); + } + + for (IItemDefinition item : items) { + if (entries.containsKey(item)) { + entries.get(item).remove(entry); + } + } + } + + public T getFirstEntry(IItemStack item) { + for (IngredientMapEntry entry : entries.get(item.getDefinition())) { + if (entry.ingredient.matches(item)) { + return entry.entry; + } + } + + return null; + } + + public List getEntries(IItemStack item) { + List> entries = this.entries.get(item.getDefinition()); + if (entries != null) { + ArrayList results = new ArrayList(); + for (IngredientMapEntry entry : entries) { + if (entry.ingredient.matches(item)) { + results.add(entry.entry); + } + } + return results; + } else { + return Collections.EMPTY_LIST; + } + } + + public static class IngredientMapEntry { + private final IIngredient ingredient; + private final T entry; + + public IngredientMapEntry(IIngredient ingredient, T entry) { + this.ingredient = ingredient; + this.entry = entry; + } + } +} diff --git a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java index e3ecd44..e1fad89 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java +++ b/MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java @@ -8,10 +8,12 @@ package minetweaker.expand; import java.util.ArrayList; import java.util.List; +import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.DataString; import minetweaker.api.data.IData; +import minetweaker.api.formatting.IFormattedText; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenCaster; import stanhebben.zenscript.annotations.ZenExpansion; @@ -33,6 +35,11 @@ public class ExpandString { return MineTweakerImplementationAPI.platform.getMessage(value); } + @ZenCaster + public static IFormattedText asFormattedText(String value) { + return MineTweakerAPI.format.string(value); + } + @ZenMethod public static List split(String value, String separator, @Optional int maximum) { List result = new ArrayList(); diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java index be9ad7f..b6ef35c 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/ForgeEventHandler.java @@ -7,9 +7,15 @@ package minetweaker.mc164; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.tooltip.IngredientTooltips; +import minetweaker.mc164.formatting.IMCFormattedString; import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.lwjgl.input.Keyboard; /** * @@ -26,4 +32,18 @@ public class ForgeEventHandler { MineTweakerImplementationAPI.events.publishPlayerInteract(event); } + + @ForgeSubscribe + public void onItemTooltip(ItemTooltipEvent ev) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); + for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + } + } } 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 8efc26e..e3d9ec9 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java @@ -26,6 +26,7 @@ import minetweaker.api.event.PlayerLoggedInEvent; import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.logger.FileLogger; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.mc164.formatting.MCFormatter; import minetweaker.mc164.furnace.FuelTweaker; import minetweaker.mc164.furnace.MCFurnaceManager; import minetweaker.mc164.game.MCGame; @@ -83,7 +84,8 @@ public class MineTweakerMod { recipes = new MCRecipeManager(), new MCFurnaceManager(), MCGame.INSTANCE, - new MCLoadedMods()); + new MCLoadedMods(), + new MCFormatter()); MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedMarkupString.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedMarkupString.java new file mode 100644 index 0000000..c3bdcca --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedMarkupString.java @@ -0,0 +1,44 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedMarkupString implements IMCFormattedString { + private final EnumChatFormatting markup; + private final IMCFormattedString contents; + + public FormattedMarkupString(EnumChatFormatting markup, IMCFormattedString contents) { + this.markup = markup; + this.contents = contents; + } + + @Override + public String getTooltipString() { + return markup + contents.getTooltipString(markup.toString()); + } + + @Override + public String getTooltipString(String context) { + return markup + contents.getTooltipString(context + markup); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedString.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedString.java new file mode 100644 index 0000000..067a49c --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedString.java @@ -0,0 +1,41 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public class FormattedString implements IMCFormattedString { + private final String value; + + public FormattedString(String value) { + this.value = value; + } + + @Override + public String getTooltipString() { + return value; + } + + @Override + public String getTooltipString(String context) { + return value; + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedStringJoin.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedStringJoin.java new file mode 100644 index 0000000..2449cc5 --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/FormattedStringJoin.java @@ -0,0 +1,67 @@ +/* + * 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.formatting; + +import java.util.Arrays; +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedStringJoin implements IMCFormattedString { + private final IMCFormattedString[] values; + + public FormattedStringJoin(IMCFormattedString first, IMCFormattedString second) { + values = new IMCFormattedString[] { first, second }; + } + + public FormattedStringJoin(IMCFormattedString[] values) { + this.values = values; + } + + @Override + public String getTooltipString() { + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + result.append(value.getTooltipString()); + } + return result.toString(); + } + + @Override + public String getTooltipString(String context) { + boolean first = true; + + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + if (first) { + first = false; + } else { + result.append(context); + } + + result.append(value.getTooltipString()); + result.append(EnumChatFormatting.RESET); + } + + return result.toString(); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + IMCFormattedString[] newValues = Arrays.copyOf(values, values.length + 1); + newValues[values.length] = (IMCFormattedString) other; + return new FormattedStringJoin(newValues); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/IMCFormattedString.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/IMCFormattedString.java new file mode 100644 index 0000000..3c2d84a --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/IMCFormattedString.java @@ -0,0 +1,19 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public interface IMCFormattedString extends IFormattedText { + public String getTooltipString(); + + public String getTooltipString(String context); +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/MCFormatter.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/MCFormatter.java new file mode 100644 index 0000000..18d350e --- /dev/null +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/formatting/MCFormatter.java @@ -0,0 +1,128 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.formatting.IFormatter; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class MCFormatter implements IFormatter { + + @Override + public IFormattedText string(String text) { + return new FormattedString(text); + } + + @Override + public IFormattedText black(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLACK, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkBlue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGreen(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkAqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkRed(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText gold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText gray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText blue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText green(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText aqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText red(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText lightPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.LIGHT_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText yellow(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.YELLOW, (IMCFormattedString) text); + } + + @Override + public IFormattedText white(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.WHITE, (IMCFormattedString) text); + } + + @Override + public IFormattedText obfuscated(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.OBFUSCATED, (IMCFormattedString) text); + } + + @Override + public IFormattedText bold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText strikethrough(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.STRIKETHROUGH, (IMCFormattedString) text); + } + + @Override + public IFormattedText underline(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.UNDERLINE, (IMCFormattedString) text); + } + + @Override + public IFormattedText italic(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.ITALIC, (IMCFormattedString) text); + } +} diff --git a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemDefinition.java b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemDefinition.java index cfeff85..881d595 100644 --- a/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemDefinition.java +++ b/MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/item/MCItemDefinition.java @@ -37,4 +37,30 @@ public class MCItemDefinition implements IItemDefinition { public IItemStack makeStack(int meta) { return MineTweakerMC.getIItemStackWildcardSize(new ItemStack(item, 1, meta)); } + + // ############################# + // ### Object implementation ### + // ############################# + + @Override + public int hashCode() { + int hash = 7; + hash = 37 * hash + (this.item != null ? this.item.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final MCItemDefinition other = (MCItemDefinition) obj; + if (this.item != other.item && (this.item == null || !this.item.equals(other.item))) { + return false; + } + return true; + } } diff --git a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java index 99647ce..864766a 100644 --- a/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java +++ b/MineTweaker3-MC164-Mod-IC2/src/main/java/minetweaker/mods/ic2/expand/IngredientExpansion.java @@ -11,6 +11,7 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemTransformer; +import minetweaker.api.player.IPlayer; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenMethod; @@ -45,7 +46,7 @@ public class IngredientExpansion { public static IIngredient transformIC2Discharge(IIngredient ingredient, final int amount) { return ingredient.transform(new IItemTransformer() { @Override - public IItemStack transform(IItemStack item) { + public IItemStack transform(IItemStack item, IPlayer byPlayer) { return ItemExpansion.ic2Discharge(item, amount, 0).withAmount(item.getAmount() + 1); } }); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index 12d6309..a0047b2 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -7,10 +7,15 @@ package minetweaker.mc1710; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.tooltip.IngredientTooltips; +import minetweaker.mc1710.formatting.IMCFormattedString; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.lwjgl.input.Keyboard; /** * @@ -27,4 +32,18 @@ public class ForgeEventHandler { MineTweakerImplementationAPI.events.publishPlayerInteract(event); } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent ev) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); + for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + } + } } 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 27a9e24..00ee698 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -21,6 +21,7 @@ import java.io.File; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; +import minetweaker.mc1710.formatting.MCFormatter; import minetweaker.mc1710.furnace.FuelTweaker; import minetweaker.mc1710.furnace.MCFurnaceManager; import minetweaker.mc1710.game.MCGame; @@ -76,13 +77,15 @@ public class MineTweakerMod { private final IScriptProvider scriptsGlobal; public MineTweakerMod() { - MineTweakerAPI.oreDict = new MCOreDict(); - MineTweakerAPI.recipes = recipes = new MCRecipeManager(); - MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); - MineTweakerAPI.game = MCGame.INSTANCE; - MineTweakerAPI.furnace = new MCFurnaceManager(); - MineTweakerAPI.loadedMods = new MCLoadedMods(); + MineTweakerImplementationAPI.init( + new MCOreDict(), + recipes = new MCRecipeManager(), + new MCFurnaceManager(), + MCGame.INSTANCE, + new MCLoadedMods(), + new MCFormatter()); + MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; File globalDir = new File("scripts"); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java new file mode 100644 index 0000000..d5de784 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java @@ -0,0 +1,44 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedMarkupString implements IMCFormattedString { + private final EnumChatFormatting markup; + private final IMCFormattedString contents; + + public FormattedMarkupString(EnumChatFormatting markup, IMCFormattedString contents) { + this.markup = markup; + this.contents = contents; + } + + @Override + public String getTooltipString() { + return markup + contents.getTooltipString(markup.toString()); + } + + @Override + public String getTooltipString(String context) { + return markup + contents.getTooltipString(context + markup); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java new file mode 100644 index 0000000..160106f --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java @@ -0,0 +1,41 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public class FormattedString implements IMCFormattedString { + private final String value; + + public FormattedString(String value) { + this.value = value; + } + + @Override + public String getTooltipString() { + return value; + } + + @Override + public String getTooltipString(String context) { + return value; + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java new file mode 100644 index 0000000..f788ceb --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java @@ -0,0 +1,67 @@ +/* + * 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.formatting; + +import java.util.Arrays; +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedStringJoin implements IMCFormattedString { + private final IMCFormattedString[] values; + + public FormattedStringJoin(IMCFormattedString first, IMCFormattedString second) { + values = new IMCFormattedString[] { first, second }; + } + + public FormattedStringJoin(IMCFormattedString[] values) { + this.values = values; + } + + @Override + public String getTooltipString() { + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + result.append(value.getTooltipString()); + } + return result.toString(); + } + + @Override + public String getTooltipString(String context) { + boolean first = true; + + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + if (first) { + first = false; + } else { + result.append(context); + } + + result.append(value.getTooltipString()); + result.append(EnumChatFormatting.RESET); + } + + return result.toString(); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + IMCFormattedString[] newValues = Arrays.copyOf(values, values.length + 1); + newValues[values.length] = (IMCFormattedString) other; + return new FormattedStringJoin(newValues); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java new file mode 100644 index 0000000..aed14a6 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java @@ -0,0 +1,19 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public interface IMCFormattedString extends IFormattedText { + public String getTooltipString(); + + public String getTooltipString(String context); +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java new file mode 100644 index 0000000..35e89f1 --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java @@ -0,0 +1,128 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.formatting.IFormatter; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class MCFormatter implements IFormatter { + + @Override + public IFormattedText string(String text) { + return new FormattedString(text); + } + + @Override + public IFormattedText black(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLACK, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkBlue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGreen(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkAqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkRed(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText gold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText gray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText blue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText green(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText aqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText red(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText lightPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.LIGHT_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText yellow(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.YELLOW, (IMCFormattedString) text); + } + + @Override + public IFormattedText white(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.WHITE, (IMCFormattedString) text); + } + + @Override + public IFormattedText obfuscated(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.OBFUSCATED, (IMCFormattedString) text); + } + + @Override + public IFormattedText bold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText strikethrough(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.STRIKETHROUGH, (IMCFormattedString) text); + } + + @Override + public IFormattedText underline(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.UNDERLINE, (IMCFormattedString) text); + } + + @Override + public IFormattedText italic(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.ITALIC, (IMCFormattedString) text); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java index 82a8349..90e038c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java @@ -39,4 +39,30 @@ public class MCItemDefinition implements IItemDefinition { public IItemStack makeStack(int meta) { return MineTweakerMC.getIItemStackWildcardSize(new ItemStack(item, 1, meta)); } + + // ############################# + // ### Object implementation ### + // ############################# + + @Override + public int hashCode() { + int hash = 7; + hash = 37 * hash + (this.item != null ? this.item.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final MCItemDefinition other = (MCItemDefinition) obj; + if (this.item != other.item && (this.item == null || !this.item.equals(other.item))) { + return false; + } + return true; + } } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/ForgeEventHandler.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/ForgeEventHandler.java index 7a300e8..1f716be 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/ForgeEventHandler.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/ForgeEventHandler.java @@ -7,10 +7,15 @@ package minetweaker.mc172; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.tooltip.IngredientTooltips; +import minetweaker.mc172.formatting.IMCFormattedString; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import org.lwjgl.input.Keyboard; /** * @@ -27,4 +32,18 @@ public class ForgeEventHandler { MineTweakerImplementationAPI.events.publishPlayerInteract(event); } + + @SubscribeEvent + public void onItemTooltip(ItemTooltipEvent ev) { + IItemStack itemStack = MineTweakerMC.getIItemStack(ev.itemStack); + for (IFormattedText tooltip : IngredientTooltips.getTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + for (IFormattedText tooltip : IngredientTooltips.getShiftTooltips(itemStack)) { + ev.toolTip.add(((IMCFormattedString) tooltip).getTooltipString()); + } + } + } } 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 220b7df..562cbd9 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java @@ -21,6 +21,7 @@ import java.io.File; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; +import minetweaker.mc172.formatting.MCFormatter; import minetweaker.mc172.furnace.FuelTweaker; import minetweaker.mc172.furnace.MCFurnaceManager; import minetweaker.mc172.game.MCGame; @@ -79,7 +80,8 @@ public class MineTweakerMod { recipes = new MCRecipeManager(), new MCFurnaceManager(), MCGame.INSTANCE, - new MCLoadedMods()); + new MCLoadedMods(), + new MCFormatter()); MineTweakerImplementationAPI.logger.addLogger(new FileLogger(new File("minetweaker.log"))); MineTweakerImplementationAPI.platform = MCPlatformFunctions.INSTANCE; diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedMarkupString.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedMarkupString.java new file mode 100644 index 0000000..5f265e4 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedMarkupString.java @@ -0,0 +1,44 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedMarkupString implements IMCFormattedString { + private final EnumChatFormatting markup; + private final IMCFormattedString contents; + + public FormattedMarkupString(EnumChatFormatting markup, IMCFormattedString contents) { + this.markup = markup; + this.contents = contents; + } + + @Override + public String getTooltipString() { + return markup + contents.getTooltipString(markup.toString()); + } + + @Override + public String getTooltipString(String context) { + return markup + contents.getTooltipString(context + markup); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedString.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedString.java new file mode 100644 index 0000000..3d3c58f --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedString.java @@ -0,0 +1,41 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public class FormattedString implements IMCFormattedString { + private final String value; + + public FormattedString(String value) { + this.value = value; + } + + @Override + public String getTooltipString() { + return value; + } + + @Override + public String getTooltipString(String context) { + return value; + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + return new FormattedStringJoin(this, (IMCFormattedString) other); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedStringJoin.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedStringJoin.java new file mode 100644 index 0000000..b433270 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/FormattedStringJoin.java @@ -0,0 +1,67 @@ +/* + * 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.formatting; + +import java.util.Arrays; +import minetweaker.api.formatting.IFormattedText; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class FormattedStringJoin implements IMCFormattedString { + private final IMCFormattedString[] values; + + public FormattedStringJoin(IMCFormattedString first, IMCFormattedString second) { + values = new IMCFormattedString[] { first, second }; + } + + public FormattedStringJoin(IMCFormattedString[] values) { + this.values = values; + } + + @Override + public String getTooltipString() { + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + result.append(value.getTooltipString()); + } + return result.toString(); + } + + @Override + public String getTooltipString(String context) { + boolean first = true; + + StringBuilder result = new StringBuilder(); + for (IMCFormattedString value : values) { + if (first) { + first = false; + } else { + result.append(context); + } + + result.append(value.getTooltipString()); + result.append(EnumChatFormatting.RESET); + } + + return result.toString(); + } + + @Override + public IFormattedText add(IFormattedText other) { + return cat(other); + } + + @Override + public IFormattedText cat(IFormattedText other) { + IMCFormattedString[] newValues = Arrays.copyOf(values, values.length + 1); + newValues[values.length] = (IMCFormattedString) other; + return new FormattedStringJoin(newValues); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/IMCFormattedString.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/IMCFormattedString.java new file mode 100644 index 0000000..4da2589 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/IMCFormattedString.java @@ -0,0 +1,19 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; + +/** + * + * @author Stan + */ +public interface IMCFormattedString extends IFormattedText { + public String getTooltipString(); + + public String getTooltipString(String context); +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/MCFormatter.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/MCFormatter.java new file mode 100644 index 0000000..7533e83 --- /dev/null +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/formatting/MCFormatter.java @@ -0,0 +1,128 @@ +/* + * 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.formatting; + +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.formatting.IFormatter; +import net.minecraft.util.EnumChatFormatting; + +/** + * + * @author Stan + */ +public class MCFormatter implements IFormatter { + + @Override + public IFormattedText string(String text) { + return new FormattedString(text); + } + + @Override + public IFormattedText black(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLACK, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkBlue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGreen(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkAqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkRed(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText gold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText gray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText darkGray(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.DARK_GRAY, (IMCFormattedString) text); + } + + @Override + public IFormattedText blue(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BLUE, (IMCFormattedString) text); + } + + @Override + public IFormattedText green(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.GREEN, (IMCFormattedString) text); + } + + @Override + public IFormattedText aqua(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.AQUA, (IMCFormattedString) text); + } + + @Override + public IFormattedText red(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.RED, (IMCFormattedString) text); + } + + @Override + public IFormattedText lightPurple(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.LIGHT_PURPLE, (IMCFormattedString) text); + } + + @Override + public IFormattedText yellow(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.YELLOW, (IMCFormattedString) text); + } + + @Override + public IFormattedText white(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.WHITE, (IMCFormattedString) text); + } + + @Override + public IFormattedText obfuscated(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.OBFUSCATED, (IMCFormattedString) text); + } + + @Override + public IFormattedText bold(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.BOLD, (IMCFormattedString) text); + } + + @Override + public IFormattedText strikethrough(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.STRIKETHROUGH, (IMCFormattedString) text); + } + + @Override + public IFormattedText underline(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.UNDERLINE, (IMCFormattedString) text); + } + + @Override + public IFormattedText italic(IFormattedText text) { + return new FormattedMarkupString(EnumChatFormatting.ITALIC, (IMCFormattedString) text); + } +} diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemDefinition.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemDefinition.java index 782f33b..cafc644 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemDefinition.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/item/MCItemDefinition.java @@ -39,4 +39,30 @@ public class MCItemDefinition implements IItemDefinition { public IItemStack makeStack(int meta) { return MineTweakerMC.getIItemStackWildcardSize(new ItemStack(item, 1, meta)); } + + // ############################# + // ### Object implementation ### + // ############################# + + @Override + public int hashCode() { + int hash = 7; + hash = 37 * hash + (this.item != null ? this.item.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final MCItemDefinition other = (MCItemDefinition) obj; + if (this.item != other.item && (this.item == null || !this.item.equals(other.item))) { + return false; + } + return true; + } }