From 6180605442b164793236ee1e7e3863905fa05afb Mon Sep 17 00:00:00 2001 From: Discreater Date: Thu, 29 Apr 2021 02:54:16 +0800 Subject: [PATCH] feat: label universal --- .../jecalculation/client/gui/IWPicker.java | 25 +++++++ .../jecalculation/client/gui/JecGui.java | 64 +++++++++++++++--- .../jecalculation/client/gui/Resource.java | 2 + .../client/gui/drawables/WTextField.java | 6 +- .../client/gui/guis/GuiEditorFluidStack.java | 27 -------- .../client/gui/guis/pickers/PickerSimple.java | 47 +++++++++++++ .../gui/guis/pickers/PickerUniversal.java | 31 +++++++++ .../jecalculation/core/labels/ILabel.java | 46 +++++-------- .../core/labels/labels/LabelItemStack.java | 12 ++-- .../core/labels/labels/LabelOreDict.java | 26 ++----- .../core/labels/labels/LabelSimpleAmount.java | 21 ++++++ .../core/labels/labels/LabelUniversal.java | 53 +++++++++++++++ .../jecalculation/utils/Utilities.java | 2 +- .../assets/jecalculation/lang/en_US.lang | 1 + .../jecalculation/textures/gui/resources.png | Bin 11407 -> 11800 bytes 15 files changed, 268 insertions(+), 95 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java delete mode 100644 src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerSimple.java create mode 100644 src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerUniversal.java create mode 100644 src/main/java/me/towdium/jecalculation/core/labels/labels/LabelUniversal.java diff --git a/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java b/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java new file mode 100644 index 0000000..61cdc5e --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java @@ -0,0 +1,25 @@ +package me.towdium.jecalculation.client.gui; + +import me.towdium.jecalculation.client.gui.drawables.WContainer; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.wrappers.Single; + +import java.util.function.Consumer; + +/** + * Author: towdium + * Date: 17-9-28. + */ +public interface IWPicker extends IWidget { + IWPicker setCallback(Consumer callback); + + class Simple extends WContainer implements IWPicker { + protected Single> callback = new Single<>(null); + + @Override + public IWPicker setCallback(Consumer callback) { + this.callback.value = callback; + return this; + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java index 2ca625a..08123f6 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java @@ -56,7 +56,8 @@ public class JecGui extends GuiContainer { super(acceptsTransfer ? new ContainerTransfer() : new ContainerNonTransfer()); this.parent = parent; this.root = root; - if (inventorySlots instanceof JecContainer) ((JecContainer) inventorySlots).setGui(this); + if (inventorySlots instanceof JecContainer) + ((JecContainer) inventorySlots).setGui(this); } public static boolean mouseIn(int xPos, int yPos, int xSize, int ySize, int xMouse, int yMouse) { @@ -88,10 +89,14 @@ public class JecGui extends GuiContainer { private static void displayGuiUnsafe(boolean updateParent, boolean acceptsTransfer, IWidget root) { Minecraft mc = Minecraft.getMinecraft(); JecGui parent; - if (mc.currentScreen == null) parent = null; - else if (!(mc.currentScreen instanceof JecGui)) parent = getCurrent(); - else if (updateParent) parent = (JecGui) mc.currentScreen; - else parent = ((JecGui) mc.currentScreen).parent; + if (mc.currentScreen == null) + parent = null; + else if (!(mc.currentScreen instanceof JecGui)) + parent = getCurrent(); + else if (updateParent) + parent = (JecGui) mc.currentScreen; + else + parent = ((JecGui) mc.currentScreen).parent; JecGui toShow = new JecGui(parent, acceptsTransfer, root); mc.displayGuiScreen(toShow); } @@ -131,6 +136,21 @@ public class JecGui extends GuiContainer { GlStateManager.enableDepth(); } + /** + * This function handles events within the interface. + * Specifically, handles mouse wheel within interface. + * Different from {@link #handleMouseEvent()}, which is + * used to handle mouse event outside. + */ + @Override + public void handleMouseInput() { + super.handleMouseInput(); + int diff = Mouse.getEventDWheel() / 120; + if (diff != 0) + root.onScroll(this, Mouse.getEventX() * width / mc.displayWidth - guiLeft, + height - Mouse.getEventY() * height / mc.displayHeight - 1 - guiTop, diff); + } + /** * @return if the event is canceled * This function handles click outside the normal region, @@ -170,7 +190,11 @@ public class JecGui extends GuiContainer { } public void drawResource(Resource r, int xPos, int yPos) { - drawTexture(r.getResourceLocation(), xPos, yPos, r.getXPos(), r.getYPos(), r.getXSize(), r.getYSize()); + drawResource(r, xPos, yPos, 0xFFFFFF); + } + + public void drawResource(Resource r, int xPos, int yPos, int color) { + drawTexture(r.getResourceLocation(), xPos, yPos, r.getXPos(), r.getYPos(), r.getXSize(), r.getYSize(), color); } public void drawResourceContinuous(Resource r, @@ -193,7 +217,22 @@ public class JecGui extends GuiContainer { int sourceYPos, int sourceXSize, int sourceYSize) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + drawTexture(l, destXPos, destYPos, sourceXPos, sourceYPos, sourceXSize, sourceYSize, 0xFFFFFF); + } + + public void drawTexture(ResourceLocation l, + int destXPos, + int destYPos, + int sourceXPos, + int sourceYPos, + int sourceXSize, + int sourceYSize, + int color) { + float red = (color >> 16 & 0xFF) / 255.0F; + float green = (color >> 8 & 0xFF) / 255.0F; + float blue = (color & 0xFF) / 255.0F; + float alpha = (~(color >> 24) & 0xFF) / 255.0F; + GlStateManager.color(red, green, blue, alpha); mc.getTextureManager().bindTexture(l); drawTexturedModalRect(destXPos, destYPos, sourceXPos, sourceYPos, sourceXSize, sourceYSize); } @@ -383,7 +422,7 @@ public class JecGui extends GuiContainer { protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { super.mouseClicked(mouseX, mouseY, mouseButton); boolean inGui = root.onClicked(this, mouseX - guiLeft, mouseY - guiTop, mouseButton); - if(!inGui) { + if (!inGui) { this.handleMouseEvent(); } } @@ -445,6 +484,11 @@ public class JecGui extends GuiContainer { super.drawHoveringText(textLines, x, y, fontRendererObj); } - public int getXSize() { return xSize; } - public int getYSize() { return ySize; } + public int getXSize() { + return xSize; + } + + public int getYSize() { + return ySize; + } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/Resource.java b/src/main/java/me/towdium/jecalculation/client/gui/Resource.java index 81fc92a..6b73927 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/Resource.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/Resource.java @@ -58,6 +58,8 @@ public class Resource { public static final Resource ICN_HELP_F = new Resource(84, 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); + public static final Resource LBL_UNIV_F = new Resource(48, 56, 16, 16); protected int xPos, yPos, xSize, ySize; protected ResourceLocation rl; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java index aec97a1..9c9653d 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WTextField.java @@ -41,10 +41,14 @@ public class WTextField implements IWidget { @Override public boolean onKey(JecGui gui, char ch, int code) { boolean ret = textField.textboxKeyTyped(ch, code); - if (ret) lsnrText.accept(textField.getText()); + if (ret && lsnrText != null) lsnrText.accept(textField.getText()); return ret; } + public String getText() { + return textField.getText(); + } + @SuppressWarnings("UnusedReturnValue") public WTextField setLsnrText(Consumer lsnrText) { this.lsnrText = lsnrText; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java deleted file mode 100644 index b987f20..0000000 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiEditorFluidStack.java +++ /dev/null @@ -1,27 +0,0 @@ -package me.towdium.jecalculation.client.gui.guis; - -import me.towdium.jecalculation.client.gui.drawables.WLabel; -import me.towdium.jecalculation.client.gui.drawables.WLabelScroll; -import me.towdium.jecalculation.client.gui.drawables.WSearch; -import me.towdium.jecalculation.client.gui.drawables.WTextField; -import me.towdium.jecalculation.core.labels.ILabel; -import me.towdium.jecalculation.core.labels.labels.LabelFluidStack; -import net.minecraftforge.fluids.FluidRegistry; - -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.stream.Collectors; - -/** - * Author: towdium - * Date: 17-9-28. - */ -@ParametersAreNonnullByDefault -public class GuiEditorFluidStack extends ILabel.RegistryEditor.Editor { - public GuiEditorFluidStack() { - WLabelScroll ls = new WLabelScroll(7, 33, 8, 7, WLabel.enumMode.PICKER, true).setLabels( - FluidRegistry.getRegisteredFluids().entrySet().stream() - .map(e -> new LabelFluidStack(e.getValue(), 1000)).collect(Collectors.toList())); - WTextField tf = new WTextField(25, 7, 90); - add(new WSearch(l -> callback.value.accept(l), tf, ls)); - } -} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerSimple.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerSimple.java new file mode 100644 index 0000000..9ba33b5 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerSimple.java @@ -0,0 +1,47 @@ +package me.towdium.jecalculation.client.gui.guis.pickers; + +import me.towdium.jecalculation.client.gui.IWPicker; +import me.towdium.jecalculation.client.gui.Resource; +import me.towdium.jecalculation.client.gui.drawables.*; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.core.labels.labels.LabelFluidStack; +import me.towdium.jecalculation.core.labels.labels.LabelOreDict; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Author: towdium + * Date: 17-9-28. + */ +public class PickerSimple extends IWPicker.Simple { + /** + * @param labels labels to be displayed for selection + * @param l18nKey localization key for help string, + * entire key should be "gui.l18nKey.help.tooltip" + */ + 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); + add(new WSearch(l -> callback.value.accept(l), tf, ls)); + add(new WIcon(149, 7, 20, 20, Resource.ICN_HELP_N, Resource.ICN_HELP_F, l18nKey + ".help")); + } + + public static class FluidStack extends PickerSimple { + public FluidStack() { + super(FluidRegistry.getRegisteredFluids().entrySet().stream() + .map(e -> new LabelFluidStack(e.getValue(), 1000)).collect(Collectors.toList()), + "picker_fluid_stack"); + } + } + + public static class OreDict extends PickerSimple { + public OreDict() { + super(Arrays.stream(OreDictionary.getOreNames()).map(LabelOreDict::new).collect(Collectors.toList()), + "picker_ore_dict"); + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerUniversal.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerUniversal.java new file mode 100644 index 0000000..b49fcac --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/pickers/PickerUniversal.java @@ -0,0 +1,31 @@ +package me.towdium.jecalculation.client.gui.guis.pickers; + +import me.towdium.jecalculation.client.gui.IWPicker; +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.gui.Resource; +import me.towdium.jecalculation.client.gui.drawables.*; +import me.towdium.jecalculation.core.labels.labels.LabelUniversal; + +import java.util.ArrayList; + +/** + * Author: towdium + * Date: 17-9-29. + */ +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); + create.setLsnrText(s -> create.setColor(s.equals("") ? JecGui.COLOR_TEXT_RED : JecGui.COLOR_TEXT_WHITE)); + add(new WSearch(l -> callback.value.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 WLine(36)); + add(new WButtonIcon(95, 7, 20, 20, Resource.BTN_YES_N, Resource.BTN_YES_F).setListenerLeft(() -> { + if (!create.getText().equals("")) callback.value.accept(new LabelUniversal(create.getText(), 1)); + })); + add(create); + + } +} diff --git a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java index 97e953a..4c89d96 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java @@ -1,26 +1,24 @@ package me.towdium.jecalculation.core.labels; import com.google.common.base.CaseFormat; -import me.towdium.jecalculation.client.gui.IWidget; +import me.towdium.jecalculation.client.gui.IWPicker; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.client.gui.drawables.WContainer; -import me.towdium.jecalculation.client.gui.guis.GuiEditorFluidStack; +import me.towdium.jecalculation.client.gui.guis.pickers.PickerSimple; +import me.towdium.jecalculation.client.gui.guis.pickers.PickerUniversal; import me.towdium.jecalculation.core.labels.labels.LabelFluidStack; import me.towdium.jecalculation.core.labels.labels.LabelItemStack; import me.towdium.jecalculation.core.labels.labels.LabelOreDict; +import me.towdium.jecalculation.core.labels.labels.LabelUniversal; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.ItemStackHelper; import me.towdium.jecalculation.utils.Utilities.Relation; import me.towdium.jecalculation.utils.Utilities.ReversedIterator; import me.towdium.jecalculation.utils.wrappers.Pair; -import me.towdium.jecalculation.utils.wrappers.Single; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import java.util.*; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -223,7 +221,7 @@ public interface ILabel { } } - class RegistryConverterFluid extends RegistryConverter { + class RegistryConverterFluid extends RegistryConverter { public static final RegistryConverterFluid INSTANCE; static { @@ -234,8 +232,8 @@ public interface ILabel { } @Override - public ILabel toLabel(FluidStack ingredient) { - return new LabelFluidStack(new FluidStack(ingredient.getFluid(), 1000), ingredient.amount); + public ILabel toLabel(net.minecraftforge.fluids.FluidStack ingredient) { + return new LabelFluidStack(new net.minecraftforge.fluids.FluidStack(ingredient.getFluid(), 1000), ingredient.amount); } } @@ -245,45 +243,35 @@ public interface ILabel { static { INSTANCE = new RegistryEditor(); - INSTANCE.register(LabelOreDict::getEditor, "common.label.ore_dict", + INSTANCE.register(PickerSimple.OreDict::new, "common.label.ore_dict", new LabelOreDict("ingotIron")); - INSTANCE.register(GuiEditorFluidStack::new, "common.label.fluid_stack", - new LabelFluidStack(new FluidStack(FluidRegistry.WATER, 1000), 1000)); + INSTANCE.register(PickerSimple.FluidStack::new, "common.label.fluid_stack", + new LabelFluidStack(FluidRegistry.WATER, 1000)); + INSTANCE.register(PickerUniversal::new, "common.label.universal", + new LabelUniversal("example", 1)); } + private ArrayList records = new ArrayList<>(); private RegistryEditor() { } - public void register(Supplier editor, String unlocalizedName, ILabel representation) { + public void register(Supplier editor, String unlocalizedName, ILabel representation) { records.add(new Record(editor, unlocalizedName, representation)); } + public List getRecords() { return records; } - public interface IEditor extends IWidget { - IEditor setCallback(Consumer callback); - } - - public static class Editor extends WContainer implements RegistryEditor.IEditor { - protected Single> callback = new Single<>(null); - - @Override - public RegistryEditor.IEditor setCallback(Consumer callback) { - this.callback.value = callback; - return this; - } - } - public static class Record { - public Supplier editor; + public Supplier editor; public String localizeKey; public ILabel representation; - public Record(Supplier editor, String localizeKey, ILabel representation) { + public Record(Supplier editor, String localizeKey, ILabel representation) { this.editor = editor; this.localizeKey = localizeKey; this.representation = representation; diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java index 3905f68..5fdf682 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelItemStack.java @@ -18,7 +18,6 @@ import java.util.List; public class LabelItemStack extends LabelSimpleAmount { public static final String IDENTIFIER = "oreDict"; public static final String KEY_STACK = "stack"; - public static final String KEY_AMOUNT = "amount"; ItemStack itemStack; @@ -28,19 +27,20 @@ public class LabelItemStack extends LabelSimpleAmount { // I will copy it! public LabelItemStack(ItemStack is, int amount) { + super(amount); itemStack = is.copy(); - this.amount = amount; } public LabelItemStack(NBTTagCompound nbt) { + super(nbt); itemStack = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag(KEY_STACK)); - amount = nbt.getInteger(KEY_AMOUNT); } - private LabelItemStack(LabelItemStack eis) { - amount = eis.amount; - itemStack = eis.itemStack; + private LabelItemStack(LabelItemStack lis) { + super(lis); + itemStack = lis.itemStack; } + @Override public List getToolTip(List existing, boolean detailed) { super.getToolTip(existing, detailed); diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java index e62d5d7..da1a3c3 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelOreDict.java @@ -35,18 +35,18 @@ public class LabelOreDict extends LabelSimpleAmount { } public LabelOreDict(String name, int amount) { + super(amount); this.name = name; - this.amount = amount; } - public LabelOreDict(LabelOreDict eod) { - this.name = eod.name; - this.amount = eod.amount; + public LabelOreDict(LabelOreDict lod) { + super(lod); + this.name = lod.name; } public LabelOreDict(NBTTagCompound nbt) { + super(nbt); name = nbt.getString(KEY_NAME); - amount = nbt.getInteger(KEY_AMOUNT); } @Override @@ -95,26 +95,10 @@ public class LabelOreDict extends LabelSimpleAmount { return ret; } - public static RegistryEditor.IEditor getEditor() { - return new Editor(); - } - @Override public List getToolTip(List existing, boolean detailed) { super.getToolTip(existing, detailed); existing.add(FORMAT_BLUE + FORMAT_ITALIC + JustEnoughCalculation.Reference.MODNAME); return existing; } - - public static class Editor extends RegistryEditor.Editor { - public Editor() { - add(new WText(5, 5, JecGui.Font.DEFAULT_NO_SHADOW, "hello")); - } - - @Override - public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { - callback.value.accept(new LabelOreDict("plankWood")); - return super.onClicked(gui, xMouse, yMouse, button); - } - } } diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelSimpleAmount.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelSimpleAmount.java index 67f30e7..93a9202 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelSimpleAmount.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelSimpleAmount.java @@ -2,6 +2,7 @@ package me.towdium.jecalculation.core.labels.labels; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.Utilities; +import net.minecraft.nbt.NBTTagCompound; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; @@ -12,8 +13,22 @@ import java.util.List; */ @ParametersAreNonnullByDefault public abstract class LabelSimpleAmount implements ILabel { + public static final String KEY_AMOUNT = "amount"; + protected int amount; + public LabelSimpleAmount(int amount) { + this.amount = amount; + } + + public LabelSimpleAmount(LabelSimpleAmount lsa) { + this(lsa.amount); + } + + public LabelSimpleAmount(NBTTagCompound nbt) { + amount = nbt.getInteger(KEY_AMOUNT); + } + @Override public ILabel increaseAmount() { amount++; @@ -56,4 +71,10 @@ public abstract class LabelSimpleAmount implements ILabel { return amount == 0 ? "" : Utilities.cutNumber(amount, 5); } + @Override + public NBTTagCompound toNBTTagCompound() { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger(KEY_AMOUNT, amount); + return nbt; + } } diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelUniversal.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelUniversal.java new file mode 100644 index 0000000..c38ece6 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelUniversal.java @@ -0,0 +1,53 @@ +package me.towdium.jecalculation.core.labels.labels; + +import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.gui.Resource; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.Utilities; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.ParametersAreNonnullByDefault; + +/** + * Author: towdium + * Date: 17-9-28. + */ +@ParametersAreNonnullByDefault +public class LabelUniversal extends LabelSimpleAmount { + public static final String KEY_NAME = "name"; + + String name; + + public LabelUniversal(String name, int amount) { + super(amount); + this.name = name; + } + + public LabelUniversal(LabelUniversal lu) { + super(lu); + name = lu.name; + } + + @Override + public String getDisplayName() { + return Utilities.L18n.format("label.universal.name", name); + } + + @Override + public ILabel copy() { + return new LabelUniversal(this); + } + + @Override + public NBTTagCompound toNBTTagCompound() { + NBTTagCompound nbt = super.toNBTTagCompound(); + nbt.setString(KEY_NAME, name); + return nbt; + } + + @Override + public void drawLabel(JecGui gui) { + gui.drawResource(Resource.LBL_UNIV_B, 0, 0); + gui.drawResource(Resource.LBL_UNIV_F, 0, 0, (name.hashCode() * 0x131723) & 0xFFFFFF); + } +} diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index a303eb8..8c61458 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -70,7 +70,7 @@ public class Utilities { public static String getModName(FluidStack stack) { String name = GameData.getItemRegistry().getNameForObject(stack.getFluid()); - JustEnoughCalculation.logger.warn(String.format("fluid name: %s", stack.getFluid())); + JustEnoughCalculation.logger.warn(String.format("fluid name: %s", name)); // TODO check return name; } diff --git a/src/main/resources/assets/jecalculation/lang/en_US.lang b/src/main/resources/assets/jecalculation/lang/en_US.lang index 270fd30..388588a 100644 --- a/src/main/resources/assets/jecalculation/lang/en_US.lang +++ b/src/main/resources/assets/jecalculation/lang/en_US.lang @@ -17,4 +17,5 @@ gui.common.label.fluid_stack=Fluid config.force_client=Force Client label.ore_dict.name=Ore: %s +label.universal.name=Label: %s label.common.tooltip.amount=Amount: %s diff --git a/src/main/resources/assets/jecalculation/textures/gui/resources.png b/src/main/resources/assets/jecalculation/textures/gui/resources.png index 433a69bf3398425367dac843a62ad68148ad583a..6f55f2710561d407a16f7789a5181ccd6df6a8d6 100644 GIT binary patch literal 11800 zcmeIYhdZ0^8#W%T+G@5^t4eJ(gW8nVrgm+iRP0S`wQAQcDvF|Lqeg9^)J)AFM(sUn zmWcU2pYQQIet*P!yhoDbNuH7Cx$pZL=Xsr1+)Eu*N-{<=5C}x6uBM_70ucaT2|y%7 zz{bMsivzGBvei^o0p0xf`qWmI4(uWIP&4%gf$skN??cd->iiejN$jJp{hWA-l!cUl zRo|)c0SLqfQddzj44Cu*S5@p)IGym7|A>h4dsIyM%Qi~HM&{I}_wCB- zyQ1k&dsP$PFzc}OdZ#ITd@cK?M>sY>C(-4tsY;s2Ev9}4HgM#xB2LS zPxR5|8!0BZ@`^ycN^`J4NV~UB^U3_hUWm~N>Lj#5^I~>io~dw+^zC~wC^*o|lFxnx z9@_4;MMPXX$L7fhty93)A5nQpEF^r0dvh&;4eW zTbvO3;lrBOgV{J?iu{@#TgDg9@f4w`^+za=ojUj7rLYYas z7ImXzZW2`DeNAp0J5P%oIOZM`S$p4x8$y#hDg({Q$i#FgTi}e$iG*!NL8D;XA7X}x zZ$jVt&*Puumaf3%q2SZhAXl{6t%Z~Y0W^E&04<^5nm*0kNRIf07b7F%dEbMWyN*|U zp7hZHR#DhR&rgSzxwvHARhL=zbaewB`io3wm*1nl6$xyKJlUE@gybAzASie_kTnKb zTuAer1`0m>jY$#p+cmU;Z#_V^o{ODD=oY>tgs`#4vk!0phE(pURemp&ctXxaVAnxte@-UK8Sjvj4hHm=!`3laucPj~>tN zGTS)y zQlARnv0997B0uk2JC@>d4T;1WNYo{9<_!+e2_*goZ8o#=x0l+PR;yYckEeiT{P;lH z#nMyfJw)qPes>T%&}rkZ^0_f?;D89tjSpM@PW@go$&j4^jn`?k6Fpb=Wm%5eQ>yzp`S|5K)2 z>V>p@^(B-4aXNR{vrt3+q@)MQEDAY&IrT|UvkzI(NSI@Da$(+wm}FO(ex@zBd?@wD ztV;dRa5jo+0lE=KXQu87sj$J#ur|iwV_G|?>HXSz_cHjf4)WYaChywjL3F%@#BAS5 z%3Lo3u~PTLuf}(hy(g*Z6~YGknh2zb@d0%Tvs2ub$KhwE54PLKAQiVkv+Bo_d3k5Q zTKO{-Zrj>HA4otqSDHBgvgMrMuq)bX(WedCBz_5RrP@u_D<*5qXT;mBy+Q~M83 zJw>b9PiYHos2Y|p9#8R=WMH=FnVoQ5<_ zff!{v8;LN*?XD3#9#b_oH}`z{NnxSg2d*+5W_zs-6^M3kH48+$Dz#QC_8qllf`Myg zn$uKPG|bG%y=3x@yd{>;%A#xXi2(X>y87|d8e09zfqChIXwbmS?lukKzkl=rzJCbU ztK`(=u{|Hdt_9uaPoLCG6Cq7cIOgT53!dQb-W@Xg_1V*4ZR_3(H&7AJGwhGY?I!r0 zOp~w}S9ez()}zT}Pi6(rM3G`u1Hqs;ns-IiUEe)+Au`sp18*&{V{^VA_Y|Ip4mdm9 z;QTQ&63L}{PvS&(nv-EO5b+-eGg&`^m)5JOV;*f8#tV~GyCyKXUkVJ%;V6z71bTc| zg2sNZkuDYUT;m^Rhr}7qJWe0-I5H$aiwgTb5iyJ@qaJ}UD0Dj74FB|p4+~3u zUzFxb%=y?y+WC$mytI4CxA3J3#!_Ab3e zu{@JwA?q`uC*NEf5t?AaD7PpBb-J0^Tzu^FFhy0Ee9wi{Z(C-XD5KQGQrN5dXynfB z<&6J_i_L}9Q@K;nPOi+f435!32NAtbEbjGI*yT1gAwlUqhHDCrXBZzum>cKu{rSGn zap~YWku1P^xYGM;Y?g}Rk9r?fBAp#`BcLB%Wl<{X>PlkXSoJX7Y;cO^FdrjZvxG?w zTiH^@C|I;H9{Rjwa@;T&tf-|Wo97l9GD?~6()07!QWo2-m6z!ujr^jUzh-NC7y25A zpa-olE<3o>bqx42r2_lZiwL`fJwBezqXK6c)XFGaGV;q2}oMmrlY`ToMz;ck>I>HOkdH-dWM^On)^!?zbI&kq0 zI{L{gr35Ao{F(uM{u6?LpQozegMtzif0cMM0Q15g7(}jaRY_(J-NZmDqAfz{1MN8r zEd)ipPuWWc&j>N4+V8k4vdEulb*+!b(S05>4aHxQzaHZi!2D95R-xGqz6g1dw9S^U z!+k4N8E0T2%bgD37xW4CT9zw?u?5RNV+&qje^PNQ z*U5KMu`_cgZ3LYuz2bOddN)Vwb{1f|5?eh2H%Alg&_r0R!awNn{ZK!=K9^2zPva0N zkot|h9JdjjvkXu(-Z-J#UohjNL?ow$!czPR;{+}KlTZ$aWpRPTBZ$@*JkLOT9gGK);k zSJ&PF7eg<5rrH{T^$Ynd*HoC}<9xpZivlEq9kGG!k9gSlc?@>n+Lvy&!Szx0@FJW5 z!SMafFoDF)ELs3{Buy4g+sqmSqm1;K={de-HT&;YE|QLjwKS7G{@H!YLzs_t?{Uaw zv$zjtyz#hwJ{}plq53o{nL#D$(Nt;7PUgWCiglt!9|D0aUl5petA%bI2EkiKx+6MD zLXIZ>oNwE;itR_Jl;U4;7vluj=MXD~=uk7X!PW^?T38t0P`#hD^h!p>D*@XN4ryG9 zDiX6`{xBTPq@;h1`!#p}o4lNZm76&7-&VdtGHz|;vxz_^NNglpe0pE^YW1PBY}oV@ z0$zdHigBW6muwv)Cjl%AHNx6--1$lv2#K-)zm*_ngd~z=wwfoq^)a)Fm*+h>ZNcm= z2<5uatKTy}0JxTITbLb;%Hb?%j=RCt8VR7bUswq3r5)c+=%DgsPJokVe}XZV+AmE> zMB9q+mY$d}2W`JGe|3T8hV@CTOg(Vn)}}rqM8!hQrgU;+Vo*EVbX+=*3Wig4WWdcs zmp510tp>8)#G!GNSb>##ZC#Iw6I;fxqmaAv9!x-ld0OA~xnZN0zajgwe2YH6E%C@< zvE8-M*pfndzqmtNTgu^TOKzE!h8`(>Bd*Pn({Q2>airU$YcqV z!Cd-AW^z>}#cwHe9^dksrsq!a*W;n5YtpY)k-+{=+)8)+Eq$ic_YX#Q7)gzW@U+O+ z+aIWgT^0l^$AvA&cNZj+JLtuSzjLj^E8e!EUNj_w=`_<|#`vA-l#Xt(^j7%bw?2!( z0kA0VcZccVPCVQRNYji%=^-=wFWmM()X4FK=7n2QPw9`6FP;jb7x73e) zVii3VYQp}3@NKW-t8g|F(zl;z2YThsW1x@G4xZL6sZm#1_LF_(@8vUVNW0$YS4X9L zdB{;=gq_!!#F~?gDp~DD*RWzvhRMOmYTW=T8$&0Gi7NsCugZp?#s>b#^67Hos|F%{ zF4?p~C(#r9GZD9g9*9@m>GcHQpt9=Su?+X3Y7wmJ-r{Hop;GuxR-@x3r@F>kki0_) z|98e=e(!@#f}WHdL*IY@(ss)C(jlK2t9PefT@5xMv)VwNeH4lk*tmV-Oj~p2ZD+?Q z=quiu2O)%!Y;5^{@;*|Q*v-FxIWsjl=U<8wWuiHmx$jBtz9NExv5z{1H3GL=nwy86 zn_8}q?QKC(OJyMF(!$fg0Zm31B1_SclU34rXFJ~k1LzLveuSo!u&&z2 zew~Yjwwe#g8ObDD7w5h#SYNt*XE4#Q!i}utACKDz z2FX89la-q+h-`$LY&3qY)FK`S)ud`lXxnU$mxruc!Phb$CjlNjeEgm7&NB>T)Hnb1 z)K3s~wyYsOznnen{_Qg-QOuH!xoHuJY}GqtUM5M`nn3|7N|=H-8x6#v#S3|?Rgi0| zSz&x;X@AguTkqan3qMS^mFc^c+s@=SaopBZ9nR1Gz#qdfrK$a|&-=ET5j@Uq)#P2m zI%SNqcg3$|v@fJ-rO-8fuSMy}qC?k?@UoU=Iy5izju2#>2OQx8%2ljWJn{a!ZD-2~ zbqx)*FbvoICuULm7r^Pc&cO?BfTZM@+q2rAo+BN?_j~g2S#}3SAN?3JCOO?r-QbV8 z)@lZAGOHXTI$o0SM}2)y4+qKjuZ>J@e;PfRrMw<*jfqi4POig(SMnskhuwq*FKm=4 znD&181JQ>i@FSfz3XG8(zvAeCd)t{BmrVC`3R8rhV+s)SlwV*L{&T)sc@jyntbrt! zSoJcDfN4z>0)bE&!i7jnOE1rb$E1Q&c;Y>nV}Ti{_TRT+?k&$5_MMYwl_PoktI^lT z=fLa&4RHl)+M!Z;;?>G9uWL>3f3qI;7JGA=irzT3sIw!kn&zsjADx=w(fuwgdi&Fi zbtZu@MdSt|DEaiXaYvwFxHja%&tWh(GXSQINpp^5`&3*U`K($I!pi#ah90ps7F-c0 zOtNSkn?11e;KEqu$&)9CY0#4UpIYtSyy4z&J-*x4)&_z|N{YdcR(~1r71KpY>(TQ^ zZ*;>{s;36K>6l=@9UPsUI{j)s%1-_&$xdExXuonT`kGtniGI?s2xraFBI@;=`r*v5 z<&#?#^4IyRRa>rwpsJl6M{mkQ-Bm3yL66+h92ME^0@qoiZW$rCwgz%Os8Ynt+#K$7 ztz36?X)8OdnHX(vYSHY??Mi(2p#SQ^G;Ge7p5JTQC2RQlUs7sAY`yCrAB=Y9T=-om_-KH?>M^$RixPGv=~=gJHJ7X# zYi3DHnOfn?4pC+cA&qB#KV*g>+QwB@+5oUX?r;%(t*lG{s5eBr3+Z!z5?zk1)Mw62 zGvsd~!)1OHrQN=&5#T4?FF0Ez+qE<;l9L`}5a%YUZfMBP?n$;^%6gJG@cQi6aM+Nu zOL$5HElylM7o;^JkJe>j=%w%j;kB>OUFqSoM;c58Qbo zf1ES?tAzjq>lFS~?<#*%u6x)?E+p)~_vbTFAq-k{w!QJBVO~YrHN79=d94J$}qOVy7&^EHscKmuC^BsBI*~(Yb=8WzX`GH4^HuZ_p6n*GWCJ{fvp7kdduL0-zeu9%9?|l zq)P&%QEnKagY}(6TB1Knd4m-~W&i&D3oL!QkMy8@wq*}02UK2Ga)3G1O;MFP+Y3r#p=3g&2CY$ z6L4$^@oKU3pPD6SN0WbLjOgPHeBMkYvJEO_r7k?Z2H;w}ku^aHtvg|#vmj0X}Rm4bPj^)u#;g5i!o(uR!LfU%g1MUC=v&=t_Ul(% zhB4Ay*J3sU!bYl$K%Cw&`L?WB*iktxK$=sRZ_< z?5Ghygq%(@4p((*W~Nu1IG(f|y{mWSjtB1(K>+tucIhp(;KQnr^ZlzANN|xzfaU(q zm&yL&j0MVACHiqL66gu6#h?)4;tu(J0ksTSl4bgidRM`=e`AjY8eH>is{;b#kOgz$ zmB!y}ug*_ii#~9f?WuQt%cj;DHd_yK+-zy9udPiFme-Ze?-8az1}qZH3ufb8slVIr zSzJ4A=)~h?DTft?3%e6wus9q^;(}DBf38lN%&3xxZ(1-M@^kh@n%`#gylO;VZf@hh zUWIj=!j5{L|&sog)^j zDcBT6$E^bz85seR*tY$Xl3yBv*~20Zzdr;>+SqZpeskR{)mbDCK&T34udG(5AJXQ} zP`--43B3j`2O|0zY8a@cr;!v{2-?j`Xl4uApKMS3E>LJ6du>NUTYdb5s&A2)pnit( z!+>qBXF+&r{^|8V%TBWnU#2Ypebn_{8eIWd!*?#%H-r=Ljm^Ei_3?6p&E}zD`5X90 z>&v&2Z-!nEd{%Fj^A|kbo^UCU%^@u}WZ!st*W0Qk<}bO`BTFatKn$Bv-($3Y#S*ES zK45cw&b1Cuw}qiuu`-dhBHsUz1L)2h_m27RIfyNT9LROiqaOz3oi>gOXFZba_iSa7 z)1yWz$f`O+XY1)AKNS(298@^uY;#I?38%d`^&RJJ+QxSZe>UV>da9%SQ+H6(;Wro& zxXrshn5SxBK!*=T=>}9~s0@CaYVmg;gaff^{;iXta{9TckV%yzF%@fKUNWC=WU*=r zm+$+)rmo(*MrN^cTs}H#MVu$7iH$>~$$DRPu}`x6+-hoZVYuNXp&R*YQkP&4QvSWB^fmtl z)f=xX@9VyAE6MGb7mSe}H~u%lYF-l?#(Suod$>PRpFXk$KPCcw2?S#)0$psHuFuZ; zT!TIO*$`noUO#B`d~hLeT8F1rs>%<~(8FxpBoE^Vz;~G*T67M~{dlye_RO5~VM?{z zi1X0>wU7&1RkgE|`U?g?q<{y2yN2bI0@z{WIf z43JQ)Z|!V=2R@=pzdcYH#Zu6^{@O4kqc*w0QZS|pv|q>@@0AMvwl+8pBfW`Ei6(d@ z;i}!8J`vkiNo-VM7H#G|X%+Z=`OnL>$|_UO;ruJUGY^h%?+E=P435vr`V3qOni%*@ zW}zWPbYytNn=z2R@*X~C%Ky6UQqh~r@U=`H$*0MV-~cJOFCQCl{?sI>B1zG;QKs?P z1b>?TP$7NGIiE_~Wyg=$TBCUs(VMyV7>au|l$`qI3X=s#DG+ViC~qeak=dR!-3h`h zx~c2LM+1dwd|LN1bn_AZrCv1Z=lafYt;xe3p>9Ss9cp>n+b?(YOsL@Rldi@=%fdl} z)T`(1FQT`uc;BVT%zg}6q27bBHD$Jxi^S{E=T|qW4VD>0#+@HH8KkjY4pDS?$Zbb+ zU?uq~zNJ%0STj=^sj77)SrIN-6v>@$7GH6l9lpq>*2dV2y_^WrXCdfwU|Yhmgd7lC zosyAu-f;#IDm5xPfzVk`Wb)gQ7X7Xbb3Jw`ay`J-IByndVS0Sy)THFSb*#8o-OE}j zWpXu7!R0TpLAb;r0sr_E!2 z9JHNj_hso+kq7@X!>iHzt3^{I`5KXv}e(a#Eu^e%-cx7A0i@9dvoAMWVlIoYY@jfreNts%wqs=ji3^D*K7 zqev$DibsJtQVi^b`2P%uiH9uho#NRPID9E!JYqE_O_xfdAZ=e)DdW%d`Ys1Ngx>`D z^?yd=dA-f3;Y)Y`onRzfaw(stfEcFC6qL14uWnO@m%<_^)rl%ku?6Xaik+%%ASWF| zzvg^2i+elHJ!_YUeyD+du`iXwG50?v0)QInf{Q;JY3|436p`uNx@p53yqOw6Ql6Qa z`HwO}>1)CkLXnM^Ud_!d)vincg{?YcRg;fr2UxoXSNhTqto26BPSwNIOAaapfp`v* zE^!cIquOmwnxgAdVPS;iLU6h;puq9tojit*0qrWBl#c6r=vAQ0Z0SoLVdqH!MCdsz ze08U$OIQoFZqEDToYCdv-eR_e7ilaNOHoT%tmJ&a?RV|2Q@(Rb8z$DAtb_!>fi&Hh z)Gus7@!jmrNX+!KI$!23HI$$^@5ggS4@>Mc@aV3tu1}M@TJ}+S!A2(l@3`n=ib?Gw zRtiV%0JvKV^ZIDD|8m=;T?3WYQd>)huJK?Fl=K6-3v&MJ1z?VyYw@QeRBAs4uGnb? z$LP_eg>A?z#ARGcw&S(q$Oxe%n|TthopoBBJVl0lqjPilJURMq!^a?6P6$Qh)ddbS zG4Y)K`B_Am@li8!rP(b_GkZ=n%f9+`KP~F|q>4)2ip9VXP5xF`<@R@S7*^X9sK~Y1H$+bB|l8y547H-3Rn^VD4vYE;6aQJQU%+f9hSCXUm()o$w~sA-*r+ zO4KiGKyTST0mK!!@{b&avJOHvXLUuRJmN8hP&WF1r9JwD?$9;#+EMsX^fLmGxPqc| zrVdgLe)L!fX{l*$&Sc);_SgS9Fr$@?L>U4C&grdB_b>-48*0>q85$+8$}_lyS~C0C z?)C$~Kg*s{bN*O%{1ViyFOnLz^R2-V=GJp8>(#{E4vg(0v#Qk0iaP2M7=*6jF_Hze zunt@Zuvk#AEtsg@70_Qs_~vJXDP@QMQ#+M)vvy;+-9N2cw*~-&;`gIW4L!chSHKT| z#Pb6>Lv;{tPyQ(02^eWij45Acn#D~0-&g9DM|eOF)uzKfp?m()5B(t~ZsQ^Vp<8ZP z!SmX~_z1PXa#7v7e<6E)wjz6Z(AB?9&;jtZvy-Z@Bq;a{r3+vbpajBQFuY>4dJk*i zon&}@XUT;lT)#Yn=i>%kJvMLPhQI>*97}0|Ein}6j&9V5_-@EI@%50($m-jzFLz7GZE_|tosjJO0=~4PdWQca3sfz>X*4X^Kj=Q@M zK+!@k19Ee7pZe{-5)Jd^c+W=CrAEM|^`YZ~h+SGy{s#P|X*_wcu&F;zma3ihv<0at zm~HoOb2RR#;9F}2)i`<|V79ylr6T|sqNmHejHBbGg|ltlrw4jXh!#5{Zo5p^MC(_p zl^bd_A1q(WRY2xG?#&x?w*VXnAs3VuQ>b6=V|)a3rC4Iq4FO-NhISDF zt4Hcc=j(KaPE@}Ezo1<<@jt{Xef^yU6LFt!eJuASs|sQ5YDT*+M6%HV`j2`6ko;o5 z-FjK6kTj2x8AZTVoz3s#bx|<7rV}6L#cWy8P8JHFm6~PeHZPW8w`9kRkdi= zUE#_9(AOLqU|>RNf%T_(dC(@{@3 zuolkt&c348fK0Dy(P>YZBCd$UQo&WrPz7idfr2MLUI;6sc+1VV0bz4;#dW^5DNy#C z8Gcyev&n!ES?FB=ROwfckn*h+~2D@PGyIPcJ7Dlva5yrX^*t*1XqX@le zG7gOc#XKMgW-d3r3jhhr2HnRa1?*DEK&1mr1-3hS=2|hEO$4!9V;GDg-oz|*!?^GPh3h_3V7eRw9qW_u|Z5~clbb!llovbvug>OWIV~oWR z%?;;gB5|aDq~JVC#0SlHB%ng$Y5%5w3yk(-`4Wm&mQ6#f>o*xMwA))ZuJDt5400xZ!hdb$($44|m(T{NIu6HIx%RbMF4Uek7&Ky>7fG`j`<=0>$#Ks9zHxI|s zg?tQ@;*}wNOo|F`<=1Xo&-aIQ0|ADCx7al}AA)*C)XTKUo>O5d z9UZ^((zh!0R_^T@Xjr>`G0Xs(a_U`id9?3nz)k-dhO8(^BbCkSK1J8}9(1L>qBds4 zH(!g(p!og7qZa*h;Y7Zb?w#xM4ATd?nt`B<)N(h{$&>%hgVBKjI&*?0eBvZxo22tt zwwxfC!`>Z_BViLtwxt#&z{+-^77;_iti41^LiUc^ud^#8<9X{xWG6_!DP z_O*Iyg^QyjHg;g?tP*biTNSgy1>R35jP@iezU;}p0)l8`iYS>RE_E{CPya(tw~6mQ)&M$JfI=(O&v*3O3>(F- zm?WX&`JjEyl{=^u@sWTMS{**|&48;Pmy@yASH8E5tDMGD#P#=Dk9CZ{nfVS;pqp5A zGj8nC%qqW}07@D2sG_dyAz`pu7!^=QT=k!=2XLi0S!ruqDeSdqPOc^Vs)QODbnf5l z*|&atI|V!9(Q{aFK|dZJwS8QL)ci7k=f@Azl3Q0IY576^^YAxCkPQv|@LIshmyhiV zoW@dNVH<`+LIVnKaj5y6B%iNAdrjQUJII!yr7llsNIjE;%hR$IOF+ktOO;}nji~Hp z+Vit9`g9?jAHzoSR+zrZ60eNVkGU^TngVF z_k6y;|Kj)hy|(A|Y{OvbIuyfqUwdN3G>!H8esSu{h}tp9yf%Sptrr=>r3=LKxQP?6yqavnch?HhpnO_xtCh z;Dy=0-~}f#;HxVUe)aX3jFK}=YuAgFWl3a>^yAogQf&DWGr?(XZ4G($L65}*T-N9E z9X}*3kI}>lE!wb`kv7y)CCi;!q{~Ifj+&j78>^*bqR=c$+IU2%ItF4Z`u7QhTlHF5M*Cb0k~G}iV|(lD3)p}!%1ARa6#SeX4(>}U z{$e-Z;Lg1wx!f4!Pk&AlMk;wN$pf<)Hh3wVSyAnRt(_sj|2}W%oM_#=umf49xk2mfRov`y)1FmOmJvwASDQuJ%wwZ>@tC zG;zdY`ygka$`JF*Vxjfw$v54@-@ULN7khB8g`W-$&3x`R%fS5^)dOodN9ptsNENnGdk;2~eYjXNj<;a+#8 zvzz97m5dV*gckX74Z$t8B$bmeL|ct7FUu}GjB~#e@0@<)yKGSa4}E_kc6cB1C6je> zZYI_gqRSGRALk&-R+I+6GV`?ejpg4IE?{^#KR(Ek<)CFQibHP z=GeIV`{ugBTh$N@4~hgw+LjB7Fg>5CY}i{Eou;?9>^*!@q??S~qPbc(zo@T2gzY;R z+UIn9euU;uVbz6;V}nc}EFh(RHj1M^V~amqjqe_hn2TUJcW^nicLv9ev?*cu7a);`;(ePf0qP0!ude@W}l&y^4K_QAd;nI5l~wV&_2@jF;v zd<6;jGI~PVe%a&J(6ki)3aVaMGfXn(QI##>wk=;3A!^#6YEK@> zyHcJk^>M*QxjREM4Y-l!I$X>rnU6{@xb%w~pW`w`{@vv~Mm|bRyI+$aP}v{8Dseix z-Zy5=by}HAUf#-P_MO%GYq7j1ubd7u%rRO$C6t09(uxx{FGK=6b~4oJH)3M8WtV1z zgL@T-cpdk2Ig%L!9=Lq3;ldjmsk@yX;hJ@!?GTUHzC}MV51~Bw+j=oK$2u-nETC;Q z$zSV`y1DtzXz`ROw`&8*R`kp2WvT9JE0NIRDOHaDxy>ezZuBARg$1=bbq~Vj_+**q zmMQ(a3U?;@Z!J@-xoPGr+fpv%vsj8^o0|1EsOJjW(dcKd#!i&Y9xmTFE%%?i{Im`d z6Z*94g`*zikj~|M#VU4(xlb@FizemlY`FEvN#n))R(|R7oh|i-Uw>l#Bu1?DGS22N z{n!s<17t&#l{R6x9&7Uv@uAhZY@i}?cH7{jUIFrWZ{dRIP+!pZ=|Xp*i>9WqH2ej& z2}IG$kShfi-Dmeu`j^|-9oY%xQs13_o3#ziy}h|x)AHda^ctM5(>UL* zhx}za7oOxo*n7{TN7h}|Pc#u8C~u{ruj3+#BP=#@Bqn;48%odFLoCI$!0M2P1 zBZb>@q$5R7^8;D9dUh5=Rvp&o0{nSJg1{6CKvT!W+d{k_JDClwvq$ek$5Mm@zalsE zYMj-zuM*>@`3b?jJ#~QVdze>Uok~^Dy`^)HdG6Z6vT5i+%b|fIoiwDE^2HS5l@9Lj z{MOJUI5|JB2K{6{pO&I1u|*mx5qxO=Vc!;>tu<9LcJ2ZtrVzE@qYBAOfDsH@)+Zq; zhywl=sfSqVc^SDn8MoY?SnyF+nXk65%{k5Z|0*iAEV={-A;yE^_6dWYN_LyJPDZGyx+?Vm=E{TA+6 zGIH9Yw-@UHKtj}(S8xsbb<&f_lZMIU464xXNw#M)O#bpvxHwjRqj3Gx22dW_VL5hf z?Vn%(yb`poFqk(|!r7Uet}#(IMir0WD~0jL*%Xz*aO+#YzAZ~i_t<7?{SXj+ zaG*FS*XWwi(_|1!D=fp3x%G5RT#Y;PXRSkf^c!gJxzMutaGGk}AA9{==lw#Vytmde z{RCqkyd%&21bOj$Nwl?%=9LICmHLyEDC{R!R_VnCWhK1`CPUx$KeO>yhV*+Gr7(c; znYCHB;B+kp*s*}-a{n0+yT3{9vdY@8QwXbZBa`efdz4t>&X;fZM5!Nc8MnD))9!sl zkdu4Nz`1op5wr2g0+VTdbM{RC1iihx%Zx7*!cd;6#(9sRzoWzewq=KrzY$qhji>2- zijqX$eZugn@FkOlPDX;hhG=WVV^D-$uamo)ONiU_8)MD;^JNt#8~5eXD{ZUx%yd%w zdtiMow626P7WH(&^b?ahO!z%mt|YG{((P0Fb(V)`USwKxtmB7#X81hY;>JUBe`ZN( z?19~HMm4G2-ViJ=xcdZ$wA#^&u9sh3J!s$Jvw433r(~E-8jk5}xC!B66XC%%PqS$T zNhoiQ`4c%_rC>XnOX+kNbWfd@RaRD(*%V@`6|?>{(4F3i(s!2T%3Zl5d_Ld`;xy(9 zOSTc7>YvSy`sK;*^4){jA$j{W0>joWMCTW89bUD$PnlwjQ>g zmm?Om%PutzG(4HTFz{OfgklO34Avq?`w%6&#)qTzxyuSZ*x1_kG`#@4>TncK6)V1< zQhxwJ7-iLc-^k5!Zk5H+w9qP^VyXc|ST4Wk1iJa6ovs&FLyI@&!JeXI!|PDGHk&B9 z*ca916%y|EI486BtWHk-H94+s)2Cfa8*4~=m4wYPKS3BvogOigKmESzE~NPl;*x=@ z{$Q?Xp>x$Gw$V@-9oN;{N#j(~SV=o}mUg`9=gGfc;B1fk-07)#NP4J~$Y1TJ$d`ER z&TejG_4lh?Zh40c^GRz$ZdJu?cGNE4b$#c>hXdCFh#HMUPkPXM#?IK9u60isvaqn< zmR%0N_aftKZ4-7~hk#;Y6y20aLT8(_4e8z-o1<>2k_-^zc*ifeZf(bDGKZ@U zA;Te6xdJN?U%cf?(P(ikQ|>GaOXn*dPrJZp?vFkg3{B{%eZdj%c~|%5C;c5BUEmFU zi|bLz*ATrdMkXs{1>?9BiM-deOh&3hpXcz-oLo|;)RL$*vhEs38FXfyv29M6J0vBz*8rvYqB|@UYfq^~G?SU?%P3>VE%IC$HOyI5%~{ z%pvb81R}tLCUdLu+57aMxxM&(C#BTG0=Dw=hf*YRUOBR5TAOF`xj&cwk-y&xj6ASO zEyn#;)RH}7+(~osG;Y%O>P$IX%v@`KDg^dq0M&Jbo;{mW=U_=xblrhPe@3UVMNTAR zEpAYTld2bfE-0lQVimtmu`EJbDH^vWhu_AUqXxI*B@$iKIf@N9(3WC14Bbt8tycpv z4j(p#5W4RDtW(!7iW>$J0W$E3PD4Oo~v6o;D7=rT+7n0SIV+33-r)t2fT3gkIy~DwWwLj8H#= z$dms0evyDoFP07rluTD)^-zP_haNA#bvaqcUhz5mTkMfUb>ETg}7HNG|6~OVE zy>#L~JW$?%A{bMV>Rgl&Nu1;ar%=)GNc5>VMW|*RsGPVXzyuBdQ+v_#m}eZAUN|9* zZi6+cDMW*da<}SHZ#*H5pa}$5vqaVMI(pl=Ofk=oNt8)v*!34&xk=!SjShSAq!Qe7 zPZ!Gihh%DICIu45*5mTk@y8=F7Uz}j;D$G2O2f(%Ej-AqS4{Foz{Wwh-LrB_B>{l6d6CKe0GkQP21htE(NIuAy@6 z3Ts>2g4)`I-U#9n*QRW8xWl|EGu`c&$705sVSFdc3!!n}UEaC5IWO0{-iG@Y zF=1%9L6g7ezVF5Hk+`p}Z!cj|x$Bi*&e+X5Yr77|@1=#lcN8x>>)+&0@Bt8_HPSzU4$-kDhj*3w^2WyWorfj3-%Cm&Mn_e_z1@|bltf9B)jB0`k>_RFuCxbs z!Vb?)F&l7I>Ltm$qm3V;$9ru&sBqEP$b8n+{oLa*CB*s{C zd?IN(I_zz&P41_n(xwFT{+9#=5mkExRG*;aqbO_rG3Td@P7V$mzY>`LOZYJX*&mv? z9-~~Y&NgWc&ff|7`}?2XCaC>%vRMA)3y7LuR>t08L=#(F%(CQ#CX~3{R%30$s@F@> z_)&#ql{k8o6L{ynIhvh0!vK~oimVP?@|hp8sON4m;8TdB>u(xySA08Gq?yGNc!ezc ze!i5h91f4Y8W8GCpsPrp#2t6Z>g&y93B2B^xIvEyX>z6VCaoczI{GEmvLn^C{ffwe zb^864C3o!P8%?KdQ**-TR*CEH!l(*lfmQZG_?Um}n_RDurWDF5-#hQtpbH}UO`+n! zi2Am4n5PT}D}IS3s6m4=s(*?v!t@uCr)xM%*bVNy0x}Uk=%$REE*gPkz@ zO!j`3nI^H*o5GBmg`$fXF=(1D_~(0sL*}-@b;)k4*yYM65AXI(wYzn-9Z&3;q3s%@ zh`)i?*Sk<03CuV8TA#rul#JE5(`2J)T}X z7{$~13y?Pr?!rV%OKZQ}nQbqK+(j;jBjkB%;UTSHr&8<@VUKS=fgTZ?)NZy z3ih6z<>|?j=P!QI6={5FY7+GE@!28pY~`Q>XbDg^QzW@&3Es5i^Atz|Y?w5h@sE9q zQc+L-ZTi$CYunzF=k4fN(TN-51nKlLK9vWUgeuCRG5L{LN1? zwHk5o6%6csKJjMzdzCZv@7&0_+IRE0YMu|PRdz1Wh``qK`36c+7a#Fs9(UgV+zZK$ zHu>1eKmV>)#?tO7gINEL4xB3FnZLi7p|!-_PwfqyRd-lpfwg78-PM-n1`lOapUd!f zz4{+F$H?u&!|KO2X9OYKIX3-OS{wk5W!p>^^O|o)i&X1Zq#`3^g@1sRwrd=_zpg*k?x|T$Ec32I{yv?{5!JRz49IBLhUJ zAN7);JOEVD|D?;ETI-N$FPORcFFhQW?zZP?nu*>`rbbPmm@Jj7d5zwQC8V&UFm9Ko2@G2Mtb)iGzilkE(!lM4Gw?oP^wP^&lPlT9Rw^ zrl^Om=r2?#mdEi=&wbnJgqGECK9NWO-}e#4PQU;wx72;SZHa#T#E`d zecfUJ_!75~M%2HP4}qg04rgR7tojqtqdh|>a}^k zXfYr{dAJy+0@3HcWe-DYYFwx4{hghHw`>4p)pA8~()+~=aZ)VBF$s=jBkApzRm1@5yxATC39UpDEK!PZ}(A&DrAJnzsAXxjT>jCq#N@=Ys~3L+Gx_3r!nQ(`XsMCiqMuuic>leSqiN&&sndB( zakSp!M60LpB=oWPLy+!Vhlu!(waWKD{I5Cad@+v~B>c6ryCa(&%P@hJ3$L??UE?}# z!&==M4@X|Rvbw2~j7DOCbZ@2wrk7`GPV;xYSKbHW1|EGJR5Q7iMb+Odwds0}-GW~T z@o&W~P#@exbye`;6Z`Fsy?U)8LkxdwP79N?@LAnW8qJ%eN-L8g<_J zNwFX&pRhNBkr{vgXUo=|^hMdmssD~JO45A+Kl=0O^FmODYb*1b*~B!R1KE8tywe-JFtWAXm^&C}6G*fkBl9@B}0 zU|*e>Qmr$B#_Ph4)7SkizlTsp{|Owf^-nVfG>W4?7`I&E<-ZD5#OaSTV%;6=AnC(va0GuVlvbpv*_) zg=EbSc0i9C^{OBernbK?OEwXX~iq?U)PMbAjPx}A97b&<8QsE z`Q&oQZ2Qs90P+j|tcA$tQocwRXl_l*>#-6Y{!=?D2hFbxH#5N6`%FDnaCFwvGG?W+ z>3l|A9uu!B;6ob9_vPsCw>YBo6;>KU@^I53tGtYhLcs^|BT_wwBAdU6+xI8{J(~gH zhd2jMfl{~)eZ&F{YeVLpy0Q^;zR|$FL!#NRw&38t(Uo~~Vk>yTJWl-G$Ex!VD#Zhf z(MLUcydY52Q=Tf{*YsX1SV5;-*JrzWoqoc|lo#gkmV9{b`a%22sK}>(-Ppv@N>%3z zkrbS|oqks}|5s%v2jo{#|~3GL_SIGAh~vTzH0(2J3~rx0cA1BGgo;&XY&@ zTXF=jq+{!`046oDtTmfMA!>O^+N(Lc6dq%VwKRRkF$*o;Id@C`Y6X%}eZstRtm%hU zWZvcZF`?O9(!J}`q(hn3{Fp>8uEF#m(rHSsma?s6GItwJ*P z!!JEszkd?sJPBM_6?8gcN@(2@B%bvMUGHnwhM0M{z7T z6TH-53*^B4@a$BKc|<7bL$$b|0r@l1VCPXtkmgZo?_dl|E}f0U3(2Gq>z2fkKWbZN zmAbVBqih2%emz%qc5IEL-3r=vB%z5#j(p?R;yZ714rJnKtU=&jNUiEijmE$g;XmMK zSsvJLKNhr3?kgX7VX_13Erjx%JBvVgM9^*+7)Xh|_8U=`dmkh-12U^E^`PQDNiz9T z0FtL7e=jYK0;u!0)@D~z)~bQKval}tOLrpD`zNU1$H2N+}8PoCmm#|2U5=9|I%oO0=fZw?VtJ&CsUeg zScS%^l}Sono9}5J-U`fKb9VCp2z(xRneX=?#95F~s!XegU!}FR^_Rs<&^F2v8wiL_ z?YdPaEr7VPp}86DO?TLSqI#`8Z4NX%bJBaqK`&2QYy-quH4d3&nkC1(#`pRXSkmyQ zG#WwsZclqHs3v#n_Wu6!NG88!wPaEJ2SHQ#y2iBAH6Rd}sN_Naf|!lQs{O*a7^BJjAdSX%yiCRTH+zQY{XkXiF}iq*TPX z!I?Z%bKGyH{=cyVg3M|^Z?(!PnPym(m&U}z;7G?)?w9)P>Gr1q^^a$a{y_fglEuFu zN#&hQ4H$k36A0nLrX%iAtNRQrt5gJpJ6y;f55u92m$<+jQXEKeuz&(17oXv=sDSsI z|JEcEH_w2ZESyoDe6^L^1zHkGh2S-Xn9U1z=7!!-bOA*YIVDmY#tqk&@^MyH`tbZI z5YDOr45V-RiQ%>Ag8Lou3Pz&XW)&l`p&`t^uKhR^c+@c_u;I9lfB}C?icpHP%c%Ln zpB~5oH$(v*B(l?Cezr*kIHTZ_)ry<1nUIPvMKW54#g>YcnrJ7JSAUYDK$>DB12!cu zHd=hCa+4w8KX$@K83hSY}-ekOhJbN0}gfW)Jg8nXMu4QDx!$C3-==+{j71@ z8f`EwHQ>%o@+;C%w8H~-tq4D_x%p`??B7c&B3cnS?$ln7MSeLU@FzBc$rx!M82naS z%X_wDO8(Mej(=``eiAnyNJ_$QThU{6-}&X^xuvAx3gB)$dOv`VYrk0XohIrCQ08Ob zvk8kS_zaJAf#LzYNRz|+oss3)8{7zDdMm)wZWl8eLZEEbZ8$2E-{%?G@Ix5>|NH;h z73lc|5$HmEFw5es`oScjDb#E+_~f8vE9dbU-9 zUB^|x#uUk7>&2&Vr+h$b?J_X|enOJ*z3c|Yq!$D&<#QPuR* z9rg=9jzVHVdy}^?teML92yGohiom24|NXhfUOnF=4ItPi!I7m71xSs%Tg+~3$LVnf z=|GeVG>YMK4VT-v!0oL>+s7{B57xFZ>QF@4>hCU^@C5453E*jkf8JTU=xKJz?qnS! zDyP|+pOB#nVvmCah42)bgY@49{%6xq{Rm8m#bEkKJ>>1h@>pf_(hxdMk}gn7h#JAG zPHsAnaMEKBbC~~>goJ_Z=UMPWPBVfdpCWjr^PCMUtlA-{Mts>Y4VUtpaI7jj^)fj* zbtX;GoOhpt397cXjjIx{5jPoI{8tqAa4vrUG(rs^ELPjWskAX(Ar zp{w0Tr@FkRrEEGf_Q>xv)q)SkFKi*NuJ3~{bZAK`!6$PO>2!x$Nr69V?v**a zJ>3Y-)HysLpx;vk$n3J?XTQ!Dk$B`|@teTMnT zs&kOS7WG8ZZzYWuY4l^n++XC)K=e`s{x-s66RBe!Q}q7mg^c1u!cD;+a1MT;iDa3A z9(RL6O?6W>Q5^T(T6rl9_!9-0+|(=xk6FjU$eifP$I*%$FlVvlIQ$1;mQ)_-ZC{$S z$f>1zL454T>DSkjBNhGluW_80s6mzg0LV1b@|}RkYO3vE0t}N4OCDkW9u+-Wr%bUd zRu9%#@utlApvfJ9BOU5MPhZ_+1takfY^(t3Uq$FY9JdMi_Zxzx{_ms@WX0 ze2om}0K`jHdfqWp*WGmH6+bweRxDi^_{ALmL2?dp2%ESu*G!yFCMvFQYL0EYweRgK zxu9UAUx|+@`3=ya&x=KV6=0JtfbvUU9hcv7_51LOkqd|UfeU{CtWVmh<)`vn6a~#S ztK`yH;IZ;$kvr?${G(bIxonr-_8{Be ztAYFaZSNT7n~ucdTwAhy?v#pT%Cx9W#lDHqP3HuqxeDWSpV-$?Wty>fUocZs8$|Y- z^c~rXVj3n;)Eu`DGXfcGNM zqp7ni(&4CzP5qAf@Y2&mjCmhx{8e$&^I85~L`4k9{ihm_&WtB$W(Loe`7;B4A?`oY z|7piC=r0Qmt?F)7cW~H`xdD1wN8-M^Xj@;WG!8!qhqC6!Gg^8c@Hh7>9(*l*DX2Bb z9bSD{bbc|1so1B0lo9Gicb8EGV*u+8SzdQrq6&h6@#L}3yl;;Pg?t`L<=blBNp5nqc1YB+$|~IKHS4x~d*IUY z*xUEeX%Vy#cz;WOrDD5Ls{N#rKUwMF*hvjng`-o@yBY&-g<4(cO7NLlhuzqBM?nq1 ziU|q1Q!LluR;^5VZG?|i=ny^}vacu_JMerqnD9dy@bzd~rixjTmE?V}%7=($dCp!K zwg2A{|GD;jAq+BwylQt`Y+a6gnM(kKLS~0c9c5p`Oh50o+N2r2cdrn@@2z#bMYaPX zZ+odj*1$qWEzzli(eS0WFS@X0@AE~l>~sWhV?A0IJWz%J)Eq}srSOU8u-yxP)!!{W zE3c>$sSF0n;x3n;@92UKG24e#yAxAWS|uiP^EBbo+^H4w$wFELs~AM!g;<A?XbFR6DstZF+@O5RjvzfXrcF^Fu@D}C`8m7EgJ zK8ZTc9q^SLPtQKk1>!0vKL8wae@38tuI*8k??1jmwC$8vXfV66G-0D+KbFr2djubR zbEgI(sUGWg&og3gB`SS5CqT>fB@Nx`@q_;B<8&+VZtJP-bA6O_A1J4PtUKP4M4BXY dnfsoeZ2kpIUo7A&aC8`?D6cA4C1Voue*o*l@g@KO