From 5d86a1e2ad8f4d66c518e92d2308577c764de26c Mon Sep 17 00:00:00 2001 From: Discreater Date: Sat, 1 May 2021 01:00:16 +0800 Subject: [PATCH] chore: update --- .../jecalculation/data/label/ILabel.java | 12 +- .../data/label/labels/LPlaceholder.java | 108 ++++++++++++++++++ .../towdium/jecalculation/event/Handlers.java | 19 ++- .../event/handlers/EBEventHandler.java | 25 ++++ ...ntHandler.java => FMLBusEventHandler.java} | 24 ++-- .../towdium/jecalculation/gui/IWPicker.java | 2 +- .../towdium/jecalculation/gui/Resource.java | 2 + .../gui/guis/GuiDisambiguation.java | 2 +- ...rUniversal.java => PickerPlaceholder.java} | 25 ++-- .../gui/guis/pickers/PickerSimple.java | 4 +- .../jecalculation/network/ClientHandler.java | 10 +- .../towdium/jecalculation/polyfill/Event.java | 2 + .../jecalculation/polyfill/Loader.java | 1 + .../jecalculation/utils/Utilities.java | 4 + .../assets/jecalculation/lang/en_US.lang | 6 +- .../jecalculation/textures/gui/resources.png | Bin 12325 -> 12433 bytes 16 files changed, 191 insertions(+), 55 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java create mode 100644 src/main/java/me/towdium/jecalculation/event/handlers/EBEventHandler.java rename src/main/java/me/towdium/jecalculation/event/handlers/{InputEventHandler.java => FMLBusEventHandler.java} (58%) rename src/main/java/me/towdium/jecalculation/gui/guis/pickers/{PickerUniversal.java => PickerPlaceholder.java} (67%) diff --git a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java index b5af599..7140303 100644 --- a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java @@ -2,16 +2,12 @@ package me.towdium.jecalculation.data.label; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.data.label.labels.*; import me.towdium.jecalculation.gui.IWPicker; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.guis.pickers.PickerSimple; -import me.towdium.jecalculation.gui.guis.pickers.PickerUniversal; -import me.towdium.jecalculation.data.label.labels.LFluidStack; -import me.towdium.jecalculation.data.label.labels.LItemStack; -import me.towdium.jecalculation.data.label.labels.LOreDict; -import me.towdium.jecalculation.data.label.labels.LString; +import me.towdium.jecalculation.gui.guis.pickers.PickerPlaceholder; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; -import me.towdium.jecalculation.utils.ItemStackHelper; import me.towdium.jecalculation.utils.Utilities; import me.towdium.jecalculation.utils.Utilities.Relation; import me.towdium.jecalculation.utils.Utilities.ReversedIterator; @@ -60,7 +56,7 @@ public interface ILabel { CONVERTER.register(LOreDict::guess); EDITOR.register(PickerSimple.FluidStack::new, "fluid_stack", new LFluidStack(1000, FluidRegistry.WATER)); EDITOR.register(PickerSimple.OreDict::new, "ore_dict", new LOreDict("ingotIron")); - EDITOR.register(PickerUniversal::new, "string", new LString("example", 1)); + EDITOR.register(PickerPlaceholder::new, "placeholder", new LPlaceholder("example", 1, true)); MERGER.register("itemStack", "itemStack", LItemStack::merge); MERGER.register("oreDict", "oreDict", LOreDict::mergeOreDict); } @@ -69,7 +65,7 @@ public interface ILabel { DESERIALIZER.register(LFluidStack.IDENTIFIER, LFluidStack::new); DESERIALIZER.register(LItemStack.IDENTIFIER, LItemStack::new); DESERIALIZER.register(LOreDict.IDENTIFIER, LOreDict::new); - DESERIALIZER.register(LString.IDENTIFIER, LString::new); + DESERIALIZER.register(LPlaceholder.IDENTIFIER, LPlaceholder::new); DESERIALIZER.register(LEmpty.IDENTIFIER, i -> EMPTY); } diff --git a/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java new file mode 100644 index 0000000..fba735d --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java @@ -0,0 +1,108 @@ +package me.towdium.jecalculation.data.label.labels; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.data.label.ILabel; +import me.towdium.jecalculation.gui.JecaGui; +import me.towdium.jecalculation.gui.Resource; +import me.towdium.jecalculation.utils.Utilities; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Author: towdium + * Date: 17-9-28. + */ +@ParametersAreNonnullByDefault +public class LPlaceholder extends ILabel.Impl { + public static final String KEY_NAME = "name"; + public static final String IDENTIFIER = "string"; + static Utilities.Recent recentClient = new Utilities.Recent<>(100); + static Utilities.Recent recentServer = new Utilities.Recent<>(100); + + String name; + + public LPlaceholder(NBTTagCompound tag) { + this(tag.getString(KEY_NAME), tag.getInteger(KEY_AMOUNT)); + } + + public LPlaceholder(String name, int amount) { + this(name, amount, false); + } + + public LPlaceholder(String name, int amount, boolean silent) { + super(amount); + this.name = name; + if (!silent) getRecord().push(new LPlaceholder(name, 1, true)); + } + + public LPlaceholder(LPlaceholder label) { + super(label); + name = label.name; + } + + public static void onLogOut() { + recentServer.clear(); + } + + @Override + public String getIdentifier() { + return "string"; + } + + public static List getRecent() { + return getRecord().toList().stream().map(LPlaceholder::copy).collect(Collectors.toList()); + } + + private static Utilities.Recent getRecord() { + return JustEnoughCalculation.side == JustEnoughCalculation.enumSide.CLIENT + ? recentClient : recentServer; + } + + @Override + public NBTTagCompound toNBTTagCompound() { + NBTTagCompound nbt = super.toNBTTagCompound(); + nbt.setString(KEY_NAME, name); + return nbt; + } + + @Override + @SideOnly(Side.CLIENT) + public void drawLabel(JecaGui gui) { + gui.drawResource(Resource.LBL_UNIV_B, 0, 0); + gui.drawResource(Resource.LBL_UNIV_F, 0, 0, (name.hashCode() * 0x131723) & 0xFFFFFF); + } + + @Override + public int hashCode() { + return name.hashCode() ^ amount; + } + + @Override + @SideOnly(Side.CLIENT) + public String getDisplayName() { + return Utilities.I18n.format("label.placeholder.name", name); + } + + @Override + public boolean matches(Object l) { + return l instanceof LPlaceholder && name.equals(((LPlaceholder) l).name); + } + + @Override + public ILabel copy() { + return new LPlaceholder(this); + } + + @Override + @SideOnly(Side.CLIENT) + public List getToolTip(List existing, boolean detailed) { + super.getToolTip(existing, detailed); + existing.add(FORMAT_BLUE + FORMAT_ITALIC + JustEnoughCalculation.Reference.MODNAME); + return existing; + } +} diff --git a/src/main/java/me/towdium/jecalculation/event/Handlers.java b/src/main/java/me/towdium/jecalculation/event/Handlers.java index 6b4f17c..aa8e0c5 100644 --- a/src/main/java/me/towdium/jecalculation/event/Handlers.java +++ b/src/main/java/me/towdium/jecalculation/event/Handlers.java @@ -1,15 +1,26 @@ package me.towdium.jecalculation.event; -import me.towdium.jecalculation.event.handlers.InputEventHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import me.towdium.jecalculation.event.handlers.EBEventHandler; +import me.towdium.jecalculation.event.handlers.FMLBusEventHandler; +import net.minecraftforge.common.MinecraftForge; import java.util.ArrayList; public class Handlers { - public static final ArrayList handlers; + public static final ArrayList fmlHandlers; + public static final ArrayList ebHandlers; static { - handlers = new ArrayList<>(); + fmlHandlers = new ArrayList<>(); + fmlHandlers.add(new FMLBusEventHandler()); - handlers.add(new InputEventHandler()); + ebHandlers = new ArrayList<>(); + ebHandlers.add(new EBEventHandler()); + } + + public static void register() { + Handlers.fmlHandlers.forEach(FMLCommonHandler.instance().bus()::register); + Handlers.ebHandlers.forEach(MinecraftForge.EVENT_BUS::register); } } diff --git a/src/main/java/me/towdium/jecalculation/event/handlers/EBEventHandler.java b/src/main/java/me/towdium/jecalculation/event/handlers/EBEventHandler.java new file mode 100644 index 0000000..6e4da1a --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/event/handlers/EBEventHandler.java @@ -0,0 +1,25 @@ +package me.towdium.jecalculation.event.handlers; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.gui.JecaGui; +import net.minecraftforge.client.event.GuiScreenEvent; + +/** + * register to MinecraftForge.EVENT_BUS + */ +public class EBEventHandler { + @SideOnly(Side.CLIENT) + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void onMouseClick(GuiScreenEvent.ActionPerformedEvent.Pre event) { + JustEnoughCalculation.logger.info("on gui screen event action performed event pre"); + if (event.gui instanceof JecaGui) { + JustEnoughCalculation.logger.info("on mouse click in gui screen event"); + JecaGui gui = (JecaGui) event.gui; + event.setCanceled(gui.handleMouseEvent()); + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/event/handlers/InputEventHandler.java b/src/main/java/me/towdium/jecalculation/event/handlers/FMLBusEventHandler.java similarity index 58% rename from src/main/java/me/towdium/jecalculation/event/handlers/InputEventHandler.java rename to src/main/java/me/towdium/jecalculation/event/handlers/FMLBusEventHandler.java index 4d299ce..728a6de 100644 --- a/src/main/java/me/towdium/jecalculation/event/handlers/InputEventHandler.java +++ b/src/main/java/me/towdium/jecalculation/event/handlers/FMLBusEventHandler.java @@ -1,6 +1,5 @@ package me.towdium.jecalculation.event.handlers; -import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; @@ -8,36 +7,27 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.data.Controller; +import me.towdium.jecalculation.data.label.labels.LPlaceholder; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.guis.GuiCalculator; import me.towdium.jecalculation.network.ClientHandler; import net.minecraft.client.Minecraft; import net.minecraft.util.ChatComponentTranslation; -import net.minecraftforge.client.event.GuiScreenEvent; /** * Author: towdium * Date: 8/13/17. */ @SuppressWarnings("unused") -public class InputEventHandler { +public class FMLBusEventHandler { @SideOnly(Side.CLIENT) @SubscribeEvent(receiveCanceled = true) public void onKey(InputEvent.KeyInputEvent event) { if (ClientHandler.keyOpenGui.isPressed()) { - if (JustEnoughCalculation.side == JustEnoughCalculation.enumSide.CLIENT) JecaGui.displayGui(new GuiCalculator()); - else Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentTranslation("chat.server_mode")); - } - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onMouseClick(GuiScreenEvent.ActionPerformedEvent.Pre event) { - JustEnoughCalculation.logger.info("on gui screen event action performed event pre"); - if (event.gui instanceof JecaGui) { - JustEnoughCalculation.logger.info("on mouse click in gui screen event"); - JecaGui gui = (JecaGui) event.gui; - event.setCanceled(gui.handleMouseEvent()); + if (JustEnoughCalculation.side == JustEnoughCalculation.enumSide.CLIENT) + JecaGui.displayGui(new GuiCalculator()); + else + Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentTranslation("chat.server_mode")); } } @@ -45,7 +35,7 @@ public class InputEventHandler { public void onLogout(PlayerEvent.PlayerLoggedOutEvent event) { JustEnoughCalculation.logger.info("on log out event"); Controller.writeToLocal();; + LPlaceholder.onLogOut(); } - } diff --git a/src/main/java/me/towdium/jecalculation/gui/IWPicker.java b/src/main/java/me/towdium/jecalculation/gui/IWPicker.java index 96021c8..edf1952 100644 --- a/src/main/java/me/towdium/jecalculation/gui/IWPicker.java +++ b/src/main/java/me/towdium/jecalculation/gui/IWPicker.java @@ -18,7 +18,7 @@ import java.util.function.Consumer; public interface IWPicker extends IWidget { IWPicker setCallback(Consumer callback); - class Simple extends WContainer implements IWPicker { + class Impl extends WContainer implements IWPicker { protected Consumer callback; @Override diff --git a/src/main/java/me/towdium/jecalculation/gui/Resource.java b/src/main/java/me/towdium/jecalculation/gui/Resource.java index 7cde447..69be70d 100644 --- a/src/main/java/me/towdium/jecalculation/gui/Resource.java +++ b/src/main/java/me/towdium/jecalculation/gui/Resource.java @@ -71,6 +71,8 @@ public class Resource { public static final Resource ICN_STACK_F = new Resource(98, 28, 14, 14); public static final Resource ICN_TEXT_N = new Resource(112, 42, 14, 14); public static final Resource ICN_TEXT_F = new Resource(112, 28, 14, 14); + public static final Resource ICN_MULTI_N = new Resource(126, 42, 14, 14); + public static final Resource ICN_MULTI_F = new Resource(126, 28, 14, 14); public static final Resource LBL_ORE_DICT = new Resource(0, 56, 16, 16); public static final Resource LBL_FLUID = new Resource(16, 56, 16, 16); public static final Resource LBL_UNIV_B = new Resource(32, 56, 16, 16); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiDisambiguation.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiDisambiguation.java index eab11d6..3470378 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiDisambiguation.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiDisambiguation.java @@ -16,7 +16,7 @@ import java.util.List; */ @ParametersAreNonnullByDefault @SideOnly(Side.CLIENT) -public class GuiDisambiguation extends IWPicker.Simple { +public class GuiDisambiguation extends IWPicker.Impl { protected WLabelScroll lsUp; protected WLabelScroll lsDown; protected WSwitcher switcher; diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerUniversal.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java similarity index 67% rename from src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerUniversal.java rename to src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java index f0c4b66..3024a1c 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerUniversal.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerPlaceholder.java @@ -2,14 +2,13 @@ package me.towdium.jecalculation.gui.guis.pickers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.data.label.labels.LPlaceholder; import me.towdium.jecalculation.gui.IWPicker; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.Resource; import me.towdium.jecalculation.gui.drawables.*; -import me.towdium.jecalculation.data.label.labels.LString; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.ArrayList; /** * Author: towdium @@ -17,22 +16,22 @@ import java.util.ArrayList; */ @ParametersAreNonnullByDefault @SideOnly(Side.CLIENT) -public class PickerUniversal extends IWPicker.Simple { - public PickerUniversal() { - WLabelScroll scroll = new WLabelScroll(7, 69, 8, 5, WLabel.enumMode.PICKER, true).setLabels(new ArrayList<>()); - WTextField search = new WTextField(25, 45, 90); - WTextField create = new WTextField(25, 7, 70); +public class PickerPlaceholder extends IWPicker.Impl { + public PickerPlaceholder() { + WLabelScroll scroll = new WLabelScroll(7, 69, 8, 5, WLabel.enumMode.PICKER, true) + .setLabels(LPlaceholder.getRecent()); + WTextField search = new WTextField(26, 45, 90); + WTextField create = new WTextField(26, 7, 69); create.setLsnrText(s -> create.setColor(s.equals("") ? JecaGui.COLOR_TEXT_RED : JecaGui.COLOR_TEXT_WHITE)); add(new WSearch(l -> callback.accept(l), search, scroll)); - add(new WIcon(149, 45, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "picker_universal.help_search")); - add(new WIcon(149, 7, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "picker_universal.help_create")); - add(new WIcon(7, 45, 20, 20, Resource.ICN_TEXT_N, Resource.ICN_TEXT_F, "picker_universal.text_search")); - add(new WIcon(7, 7, 20, 20, Resource.ICN_TEXT_N, Resource.ICN_TEXT_F, "picker_universal.text_create")); + add(new WIcon(149, 45, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "picker_placeholder.help_search")); + add(new WIcon(149, 7, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, "picker_placeholder.help_create")); + add(new WIcon(7, 45, 20, 20, Resource.ICN_TEXT_N, Resource.ICN_TEXT_F, "picker_placeholder.text_search")); + add(new WIcon(7, 7, 20, 20, Resource.ICN_TEXT_N, Resource.ICN_TEXT_F, "picker_placeholder.text_create")); add(new WLine(36)); add(new WButtonIcon(95, 7, 20, 20, Resource.BTN_YES_N, Resource.BTN_YES_F).setListenerLeft(() -> { - if (!create.getText().equals("")) callback.accept(new LString(create.getText(), 1)); + if (!create.getText().equals("")) callback.accept(new LPlaceholder(create.getText(), 1)); })); add(create); - } } diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java index cfecd27..f1c0843 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/pickers/PickerSimple.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; */ @ParametersAreNonnullByDefault @SideOnly(Side.CLIENT) -public class PickerSimple extends IWPicker.Simple { +public class PickerSimple extends IWPicker.Impl { /** * @param labels label to be displayed for selection * @param l18nKey localization key for help string, @@ -30,7 +30,7 @@ public class PickerSimple extends IWPicker.Simple { */ public PickerSimple(List labels, String l18nKey) { WLabelScroll ls = new WLabelScroll(7, 33, 8, 7, WLabel.enumMode.PICKER, true).setLabels(labels); - WTextField tf = new WTextField(25, 7, 90); + WTextField tf = new WTextField(26, 7, 90); add(new WSearch(l -> callback.accept(l), tf, ls)); add(new WIcon(149, 7, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, l18nKey + ".help")); add(new WIcon(7, 7, 20, 20, Resource.ICN_TEXT_N, Resource.ICN_TEXT_F, l18nKey + ".text")); diff --git a/src/main/java/me/towdium/jecalculation/network/ClientHandler.java b/src/main/java/me/towdium/jecalculation/network/ClientHandler.java index bd072c1..0a93473 100644 --- a/src/main/java/me/towdium/jecalculation/network/ClientHandler.java +++ b/src/main/java/me/towdium/jecalculation/network/ClientHandler.java @@ -1,11 +1,10 @@ package me.towdium.jecalculation.network; import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import me.towdium.jecalculation.data.Controller; -import me.towdium.jecalculation.event.Handlers; import me.towdium.jecalculation.command.JecaCommand; +import me.towdium.jecalculation.data.Controller; import me.towdium.jecalculation.data.label.ILabel; +import me.towdium.jecalculation.event.Handlers; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; @@ -13,11 +12,10 @@ import net.minecraftforge.client.ClientCommandHandler; import org.lwjgl.input.Keyboard; public class ClientHandler { - public static final KeyBinding keyOpenGui = - new KeyBinding("key.open_gui", Keyboard.KEY_NONE, "key.category"); + public static final KeyBinding keyOpenGui = new KeyBinding("key.open_gui", Keyboard.KEY_NONE, "key.category"); public void initPre() { - Handlers.handlers.forEach(FMLCommonHandler.instance().bus()::register); + Handlers.register(); } public void initPost() { diff --git a/src/main/java/me/towdium/jecalculation/polyfill/Event.java b/src/main/java/me/towdium/jecalculation/polyfill/Event.java index a827cd5..e1e8af6 100644 --- a/src/main/java/me/towdium/jecalculation/polyfill/Event.java +++ b/src/main/java/me/towdium/jecalculation/polyfill/Event.java @@ -9,6 +9,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) +@Deprecated public @interface Event { /** @@ -16,6 +17,7 @@ public @interface Event { */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) + @Deprecated @interface EventBusSubscriber { Side[] value() default {Side.CLIENT, Side.SERVER}; diff --git a/src/main/java/me/towdium/jecalculation/polyfill/Loader.java b/src/main/java/me/towdium/jecalculation/polyfill/Loader.java index 59ae6aa..ba21b0e 100644 --- a/src/main/java/me/towdium/jecalculation/polyfill/Loader.java +++ b/src/main/java/me/towdium/jecalculation/polyfill/Loader.java @@ -15,6 +15,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +@Deprecated public class Loader { public static void subscribeToEventBus() { diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index a0babff..ac1dd3d 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -271,5 +271,9 @@ public class Utilities { //noinspection unchecked return (List) data.clone(); } + + public void clear() { + data.clear(); + } } } diff --git a/src/main/resources/assets/jecalculation/lang/en_US.lang b/src/main/resources/assets/jecalculation/lang/en_US.lang index 3f15412..c75bfcc 100644 --- a/src/main/resources/assets/jecalculation/lang/en_US.lang +++ b/src/main/resources/assets/jecalculation/lang/en_US.lang @@ -20,9 +20,9 @@ jecharacters.gui.search.output=Output jecharacters.gui.search.catalyst=Catalyst jecharacters.gui.common.label.ore_dict=OreDict jecharacters.gui.common.label.fluid_stack=Fluid -jecharacters.gui.common.label.string=String +jecharacters.gui.common.label.placeholder=Placeholder jecharacters.config.force_client=Force Client jecharacters.label.ore_dict.name=Ore: %s -jecharacters.label.string.name=Label: %s +jecharacters.label.placeholder.name=Placeholder: %s jecharacters.label.common.tooltip.amount=Amount: %s -jecharacters.common.default=Default +jecharacters.common.default=Default \ No newline at end of file diff --git a/src/main/resources/assets/jecalculation/textures/gui/resources.png b/src/main/resources/assets/jecalculation/textures/gui/resources.png index fe29761fccbafe5071611c9aa513bc7d82397bcc..c8551fd91aea599866a615c80011f4c2c90c366b 100644 GIT binary patch literal 12433 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