From 542ebbe83b9832018dd003c6e8c2805982c4f170 Mon Sep 17 00:00:00 2001 From: Discreater Date: Thu, 29 Apr 2021 02:16:37 +0800 Subject: [PATCH] feat: label fluid stack --- .../jecalculation/client/gui/JecGui.java | 5 + .../jecalculation/client/gui/Resource.java | 1 + .../client/gui/drawables/DLabel.java | 16 +-- .../client/gui/guis/GuiLabel.java | 2 +- .../jecalculation/core/labels/ILabel.java | 83 ++++++++------ .../core/labels/labels/LabelFluidStack.java | 107 ++++++++++++++++++ .../core/labels/labels/LabelItemStack.java | 6 +- .../core/labels/labels/LabelOreDict.java | 37 +++--- .../core/labels/labels/LabelSimpleAmount.java | 13 ++- .../jecalculation/utils/Utilities.java | 42 ++----- .../assets/jecalculation/lang/en_US.lang | 4 +- .../jecalculation/textures/gui/resources.png | Bin 11171 -> 11407 bytes 12 files changed, 225 insertions(+), 91 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java 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 db36914..002d4d6 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java @@ -193,6 +193,11 @@ public class JecGui extends GuiContainer { public void drawFluid(Fluid f, int xPos, int yPos, int xSize, int ySize) { IIcon fluidStillIcon = f.getStillIcon(); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + int color = f.getColor(); + float red = (color >> 16 & 0xFF) / 255.0F; + float green = (color >> 8 & 0xFF) / 255.0F; + float blue = (color & 0xFF) / 255.0F; + GlStateManager.color(red, green, blue, 1.0F); if (fluidStillIcon != null) drawTexturedModelRectFromIcon(xPos, yPos, fluidStillIcon, xSize, 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 fdc74ce..81fc92a 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/Resource.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/Resource.java @@ -57,6 +57,7 @@ public class Resource { public static final Resource ICN_HELP_N = new Resource(84, 42, 14, 14); 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); protected int xPos, yPos, xSize, ySize; protected ResourceLocation rl; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java index b433580..4612be8 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/DLabel.java @@ -48,14 +48,16 @@ public class DLabel implements IDrawable { gui.drawResourceContinuous(Resource.WGT_SLOT, xPos, yPos, xSize, ySize, 3, 3, 3, 3); label.drawEntry(gui, xPos + xSize / 2, yPos + ySize / 2, true); if (mode == enumMode.RESULT || mode == enumMode.EDITOR) - gui.drawText(xPos + xSize / 2 + 7.5f, - yPos + ySize / 2 + 7 - (int) (font.size * gui.getFontRenderer().FONT_HEIGHT), font, - label.getAmountString()); - if (label != ILabel.EMPTY && mouseIn(xMouse, yMouse)) { + gui.drawText(xPos + xSize / 2 + 7.5f, yPos + ySize / 2 + 7 - + (int) (font.size * gui.getFontRenderer().FONT_HEIGHT), font, label.getAmountString()); + if (mouseIn(xMouse, yMouse)) { gui.drawRectangle(xPos + 1, yPos + 1, xSize - 2, ySize - 2, 0x80FFFFFF); - ArrayList buf = new ArrayList<>(); - buf.add(label.getDisplayName()); - gui.drawTooltip(xMouse, yMouse, label.getToolTip(buf)); + if (label != ILabel.EMPTY) { + ArrayList buf = new ArrayList<>(); + buf.add(label.getDisplayName()); + gui.drawTooltip(xMouse, yMouse, + label.getToolTip(buf, mode == enumMode.EDITOR || mode == enumMode.RESULT)); + } } } diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java index 695bfdc..794e412 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiLabel.java @@ -37,7 +37,7 @@ public class GuiLabel extends DContainer { Single index = new Single<>(0); ILabel.EDITOR.getRecords().forEach(r -> { int i = index.value; - add(new DPage(0, r, false).setListener(() -> refresh(i))); + add(new DPage(i, r, false).setListener(() -> refresh(i))); index.value += 1; }); add(new DPanel()); 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 147e7e4..1bfd546 100644 --- a/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/core/labels/ILabel.java @@ -3,6 +3,8 @@ package me.towdium.jecalculation.core.labels; import com.google.common.base.CaseFormat; import me.towdium.jecalculation.client.gui.IDrawable; import me.towdium.jecalculation.client.gui.JecGui; +import me.towdium.jecalculation.client.gui.drawables.DContainer; +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.polyfill.mc.client.renderer.GlStateManager; @@ -12,6 +14,7 @@ import me.towdium.jecalculation.utils.Utilities.ReversedIterator; import me.towdium.jecalculation.utils.wrappers.Pair; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import java.util.*; @@ -24,7 +27,7 @@ import java.util.stream.Collectors; * Date: 8/11/17. */ public interface ILabel { - RegistryEntryMerger MERGER = RegistryEntryMerger.INSTANCE; + RegistryMerger MERGER = RegistryMerger.INSTANCE; RegistryDeserializer DESERIALIZER = RegistryDeserializer.INSTANCE; RegistryConverterItem CONVERTER_ITEM = RegistryConverterItem.INSTANCE; RegistryConverterFluid CONVERTER_FLUID = RegistryConverterFluid.INSTANCE; @@ -32,6 +35,7 @@ public interface ILabel { ILabel EMPTY = new LabelItemStack(ItemStackHelper.EMPTY_ITEM_STACK, 0); String FORMAT_BLUE = "\u00A79"; + String FORMAT_GREY = "\u00A78"; String FORMAT_ITALIC = "\u00A7o"; ILabel increaseAmount(); @@ -46,16 +50,18 @@ public interface ILabel { String getDisplayName(); - default List getToolTip(List existing) { - return existing; + static String getIdentifier(ILabel c) { + return getIdentifier(c.getClass()); } - default String getIdentifier() { - String s = this.getClass().getSimpleName(); + static String getIdentifier(Class c) { + String s = c.getSimpleName(); if (s.startsWith("Label")) s = s.substring(5); return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, s); } + List getToolTip(List existing, boolean detailed); + ILabel copy(); NBTTagCompound toNBTTagCompound(); @@ -78,18 +84,18 @@ public interface ILabel { * to operate the {@link ILabel}. * For registering, see {@link RegistryDeserializer}. */ - class RegistryEntryMerger { - public static final RegistryEntryMerger INSTANCE; + class RegistryMerger { + public static final RegistryMerger INSTANCE; static { - INSTANCE = new RegistryEntryMerger(); + INSTANCE = new RegistryMerger(); // registerGuess functions here } private Relation functions = new Relation<>(); - private RegistryEntryMerger() { + private RegistryMerger() { } public void register(String a, String b, MergerFunction func) { @@ -97,12 +103,12 @@ public interface ILabel { } public Pair merge(ILabel a, ILabel b, boolean add) { - return functions.get(a.getIdentifier(), b.getIdentifier()) - .orElse((x, y, f) -> new Pair<>(x, y)).merge(a, b, add); + return functions.get(ILabel.getIdentifier(a), ILabel.getIdentifier(b)) + .orElse((x, y, f) -> new Pair<>(x, y)).merge(a, b, add); } public boolean test(ILabel a, ILabel b) { - Optional f = functions.get(a.getIdentifier(), b.getIdentifier()); + Optional f = functions.get(ILabel.getIdentifier(a), ILabel.getIdentifier(b)); if (!f.isPresent()) return false; else { Pair p = f.get().merge(a, b, true); @@ -125,7 +131,7 @@ public interface ILabel { /** * This class is used to registerGuess an {@link ILabel} type. * Here you can find the identifier and deserializer of one type. - * For {@link ILabel} operations, see {@link RegistryEntryMerger} + * For {@link ILabel} operations, see {@link RegistryMerger} */ class RegistryDeserializer { public static final String KEY_IDENTIFIER = "identifier"; @@ -135,7 +141,9 @@ public interface ILabel { static { INSTANCE = new RegistryDeserializer(); - INSTANCE.register("itemStack", LabelOreDict::new); + INSTANCE.register(ILabel.getIdentifier(LabelOreDict.class), LabelOreDict::new); + INSTANCE.register(ILabel.getIdentifier(LabelItemStack.class), LabelItemStack::new); + INSTANCE.register(ILabel.getIdentifier(LabelFluidStack.class), LabelFluidStack::new); } private HashMap> idToData = new HashMap<>(); @@ -168,9 +176,8 @@ public interface ILabel { } } - class RegistryConverter { - List, List>> handlersGuess = new ArrayList<>(); - List> handlersRaw = new ArrayList<>(); + abstract class RegistryConverter { + List, List>> handlers = new ArrayList<>(); private RegistryConverter() { } @@ -179,26 +186,19 @@ public interface ILabel { * @param ingredient the ingredient, possibly itemStack or FluidStack * @return the identical representation */ - public ILabel toLabel(T ingredient) { - return handlersRaw.stream().map(h -> h.apply(ingredient)) - .filter(Objects::nonNull).findFirst().orElse(ILabel.EMPTY); - } + public abstract ILabel toLabel(T ingredient); /** * @param ingredients the list of ingredient, possibly itemStack or FluidStack * @return list of guessed representation, sorted by possibility */ public List toLabel(List ingredients) { - return new ReversedIterator<>(handlersGuess).stream().flatMap(h -> h.apply(ingredients).stream()) - .collect(Collectors.toList()); + return new ReversedIterator<>(handlers).stream().flatMap(h -> h.apply(ingredients).stream()) + .collect(Collectors.toList()); } - void registerGuess(Function, List> handler) { - handlersGuess.add(handler); - } - - void registerRaw(Function handler) { - handlersRaw.add(handler); + void register(Function, List> handler) { + handlers.add(handler); } } @@ -208,14 +208,15 @@ public interface ILabel { static { INSTANCE = new RegistryConverterItem(); - INSTANCE.registerRaw(RegistryConverterItem::convertRawItemStack); + INSTANCE.register(LabelOreDict::guess); } private RegistryConverterItem() { } - public static ILabel convertRawItemStack(ItemStack is) { - return new LabelItemStack(is); + @Override + public ILabel toLabel(ItemStack ingredient) { + return new LabelItemStack(ingredient); } } @@ -228,6 +229,11 @@ public interface ILabel { private RegistryConverterFluid() { } + + @Override + public ILabel toLabel(FluidStack ingredient) { + return new LabelFluidStack(new FluidStack(ingredient.getFluid(), 1000), ingredient.amount); + } } class RegistryEditor { @@ -237,8 +243,11 @@ public interface ILabel { INSTANCE = new RegistryEditor(); INSTANCE.register(LabelOreDict.getEditor(), "common.label.ore_dict", new LabelOreDict("ingotIron")); + INSTANCE.register(LabelFluidStack.getEditor(), "common.label.fluid_stack", + new LabelFluidStack(new FluidStack(FluidRegistry.WATER, 1000), 1000)); } + private ArrayList records = new ArrayList<>(); private RegistryEditor() { @@ -256,6 +265,16 @@ public interface ILabel { IEditor setCallback(Consumer callback); } + public static class Editor extends DContainer implements RegistryEditor.IEditor { + protected Consumer callback; + + @Override + public RegistryEditor.IEditor setCallback(Consumer callback) { + this.callback = callback; + return this; + } + } + public static class Record { public IEditor editor; public String localizeKey; diff --git a/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java new file mode 100644 index 0000000..bde3743 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/core/labels/labels/LabelFluidStack.java @@ -0,0 +1,107 @@ +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.client.gui.drawables.DText; +import me.towdium.jecalculation.core.labels.ILabel; +import me.towdium.jecalculation.utils.Utilities; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; + +/** + * Author: towdium + * Date: 17-9-27. + */ +@ParametersAreNonnullByDefault +public class LabelFluidStack implements ILabel { + public static final String KEY_FLUID = "name"; + public static final String KEY_AMOUNT = "amount"; + + FluidStack fluid; + int amount; + + public LabelFluidStack(FluidStack fluid, int amount) { + this.fluid = fluid; + this.amount = amount; + } + + public LabelFluidStack(NBTTagCompound nbt) { + fluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag(KEY_FLUID)); + amount = nbt.getInteger(KEY_AMOUNT); + } + + public static RegistryEditor.Editor getEditor() { + return new Editor(); + } + + @Override + public ILabel increaseAmount() { + return ILabel.EMPTY; + } + + @Override + public ILabel increaseAmountLarge() { + return ILabel.EMPTY; + } + + @Override + public ILabel decreaseAmount() { + return ILabel.EMPTY; + } + + @Override + public ILabel decreaseAmountLarge() { + return ILabel.EMPTY; + } + + @Override + public String getAmountString() { + return amount >= 1000 ? Utilities.cutNumber(amount / 1000f, 4) + "B" : Integer.toString(amount) + "mB"; + } + + @Override + public String getDisplayName() { + return fluid.getLocalizedName(); + } + + @Override + public ILabel copy() { + return new LabelFluidStack(fluid, amount); + } + + @Override + public NBTTagCompound toNBTTagCompound() { + NBTTagCompound ret = new NBTTagCompound(); + ret.setTag(KEY_AMOUNT, fluid.writeToNBT(new NBTTagCompound())); + ret.setInteger(KEY_AMOUNT, amount); + return ret; + } + + @Override + public List getToolTip(List existing, boolean detailed) { + existing.add(FORMAT_BLUE + FORMAT_ITALIC + Utilities.getModName(fluid)); + return existing; + } + + @Override + public void drawEntry(JecGui gui) { + gui.drawResource(Resource.LBL_FLUID, 0, 0); + gui.drawFluid(fluid.getFluid(), 2, 2, 12, 12); + } + + public static class Editor extends RegistryEditor.Editor { + public Editor() { + add(new DText(5, 5, JecGui.Font.DEFAULT_NO_SHADOW, "fluid")); + } + + @Override + public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { + callback.accept(new LabelFluidStack(new FluidStack(FluidRegistry.WATER, 1000), 1000)); + return super.onClicked(gui, xMouse, yMouse, button); + } + } +} 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 e7a1743..e9c94ff 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 @@ -7,12 +7,14 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; /** * Author: towdium * Date: 8/11/17. */ +@ParametersAreNonnullByDefault public class LabelItemStack extends LabelSimpleAmount { public static final String IDENTIFIER = "oreDict"; public static final String KEY_STACK = "stack"; @@ -39,9 +41,9 @@ public class LabelItemStack extends LabelSimpleAmount { amount = eis.amount; itemStack = eis.itemStack; } - @Override - public List getToolTip(List existing) { + public List getToolTip(List existing, boolean detailed) { + super.getToolTip(existing, detailed); existing.add(FORMAT_BLUE + FORMAT_ITALIC + Utilities.getModName(itemStack)); return existing; } 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 4e99db0..4f4a84c 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 @@ -15,8 +15,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.HashSet; import java.util.List; import java.util.function.Consumer; +import java.util.stream.Collectors; /** * Author: towdium @@ -54,14 +56,14 @@ public class LabelOreDict extends LabelSimpleAmount { return Utilities.L18n.format("label.ore_dict.name", name); } - @Override - public List getToolTip(List existing) { - existing.add(FORMAT_BLUE + FORMAT_ITALIC + JustEnoughCalculation.Reference.MODNAME); - return existing; - } - - public static RegistryEditor.IEditor getEditor() { - return new Editor(); + public static List guess(List iss) { + HashSet ids = new HashSet<>(); + for (int i : OreDictionary.getOreIDs(iss.get(0))) ids.add(i); + iss.forEach(is -> { + for (int i : OreDictionary.getOreIDs(is)) + if (!ids.contains(i)) ids.remove(i); + }); + return ids.stream().map(i -> new LabelOreDict(OreDictionary.getOreName(i))).collect(Collectors.toList()); } @Override @@ -95,19 +97,22 @@ public class LabelOreDict extends LabelSimpleAmount { return ret; } - public static class Editor extends DContainer implements RegistryEditor.IEditor { - Consumer callback; + 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 DText(5, 5, JecGui.Font.DEFAULT_NO_SHADOW, "hello")); } - @Override - public RegistryEditor.IEditor setCallback(Consumer callback) { - this.callback = callback; - return this; - } - @Override public boolean onClicked(JecGui gui, int xMouse, int yMouse, int button) { callback.accept(new LabelOreDict("plankWood")); 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 4cafc5c..67f30e7 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 @@ -3,10 +3,14 @@ package me.towdium.jecalculation.core.labels.labels; import me.towdium.jecalculation.core.labels.ILabel; import me.towdium.jecalculation.utils.Utilities; +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; + /** * Author: towdium * Date: 17-9-11. */ +@ParametersAreNonnullByDefault public abstract class LabelSimpleAmount implements ILabel { protected int amount; @@ -40,9 +44,16 @@ public abstract class LabelSimpleAmount implements ILabel { } } + @Override + public List getToolTip(List existing, boolean detailed) { + if (detailed) existing.add(FORMAT_GREY + + Utilities.L18n.format("label.common.tooltip.amount", Integer.toString(amount))); + return existing; + } + @Override public String getAmountString() { - return amount == 0 ? "" : Utilities.cutLong(amount, 5); + return amount == 0 ? "" : Utilities.cutNumber(amount, 5); } } diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index a5b832b..a303eb8 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -35,55 +35,35 @@ public class Utilities { } // FLOAT FORMATTING - public static String cutFloat(float f, int size) { + public static String cutNumber(float f, int size) { BiFunction form = (fl, len) -> { - // here 2 means floating point and unit character - // represents for maximum acceptable decimal digits - int scale = len - 2 - String.valueOf(fl.intValue()).length(); - // maximum decimal limits to 2 - int cut = Math.min(scale, 2); - return String.format("%." + (Math.max(cut, 0)) + 'f', fl); + String ret = Float.toString(fl); + if (ret.endsWith(".0")) ret = ret.substring(0, ret.length() - 2); + if (ret.length() > len) ret = ret.substring(0, len); + return ret; }; int scale = (int) Math.log10(f) / 3; switch (scale) { case 0: return form.apply(f, size); case 1: - return form.apply(f / 1000.0f, size) + 'K'; + return form.apply(f / 1000.0f, size - 1) + 'K'; case 2: - return form.apply(f / 1000000.0f, size) + 'M'; + return form.apply(f / 1000000.0f, size - 1) + 'M'; case 3: - return form.apply(f / 1000000000.0f, size) + 'B'; + return form.apply(f / 1000000000.0f, size - 1) + 'B'; case 4: - return form.apply(f / 1000000000000.0f, size) + 'G'; + return form.apply(f / 1000000000000.0f, size - 1) + 'G'; default: - return form.apply(f / 1000000000000000.0f, size) + 'T'; + return form.apply(f / 1000000000000000.0f, size - 1) + 'T'; } } - public static String cutLong(long i, int size) { - if (i < 1000) { - return String.valueOf(i); - } else { - return cutFloat(i, size); - } - } - - // CIRCULATE STRUCTURE - public static int circulate(int current, int total, boolean forward) { - if (forward) { - if (current == total - 1) return 0; - else return current + 1; - } else { - if (current == 0) return total - 1; - else return current - 1; - } - } // MOD NAME public static String getModName(ItemStack stack) { String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); - JustEnoughCalculation.logger.warn(String.format("item name: %s", name)); + JustEnoughCalculation.logger.warn(String.format("item name: %s", name)); // "minecraft:stone" or "jecalculation:item.item_calculator" // 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 4491d2b..270fd30 100644 --- a/src/main/resources/assets/jecalculation/lang/en_US.lang +++ b/src/main/resources/assets/jecalculation/lang/en_US.lang @@ -4,7 +4,7 @@ item.item_calculator_math.name=Math Calculator command.common.not_found=Invalid option: %s command.common.unexpected_arg=Unexpected arg: %s command.help.list=Here is the list of all commands available: -command.state.desc=This mod is working on state: %s +command.state.desc=The mod is working on state: %s command.state.s_server=server command.state.s_client=client only command.state.s_both=client with server @@ -12,7 +12,9 @@ command.state.s_undefined=error state gui.gui_calculator.new_recipe.name=New recipe gui.common.label.ore_dict=OreDict +gui.common.label.fluid_stack=Fluid config.force_client=Force Client label.ore_dict.name=Ore: %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 8428511e3eeaf8fc2874702e2f49948d40ccaf8a..433a69bf3398425367dac843a62ad68148ad583a 100644 GIT binary patch literal 11407 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 literal 11171 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