From 90f768ed215db621c0bd3c89d86377d33ec122bb Mon Sep 17 00:00:00 2001 From: Discreater Date: Thu, 29 Apr 2021 22:48:22 +0800 Subject: [PATCH] feat: start records --- .../jecalculation/client/gui/IWPicker.java | 2 +- .../jecalculation/client/gui/JecGui.java | 2 +- .../client/gui/drawables/WLabel.java | 2 +- .../client/gui/drawables/WLabelGroup.java | 2 +- .../client/gui/drawables/WLabelScroll.java | 2 +- .../client/gui/drawables/WPage.java | 2 +- .../client/gui/drawables/WSearch.java | 2 +- .../client/gui/drawables/WSwitcher.java | 8 +- .../client/gui/guis/GuiDisambiguation.java | 2 +- .../client/gui/guis/GuiLabel.java | 2 +- .../client/gui/guis/GuiRecipe.java | 2 +- .../client/gui/guis/pickers/PickerSimple.java | 6 +- .../gui/guis/pickers/PickerUniversal.java | 2 +- .../me/towdium/jecalculation/core/Record.java | 66 -------- .../jecalculation/{core => data}/Recipe.java | 4 +- .../me/towdium/jecalculation/data/Record.java | 153 ++++++++++++++++++ .../{core => data}/label/ILabel.java | 11 +- .../label/labels/LabelFluidStack.java | 13 +- .../label/labels/LabelItemStack.java | 10 +- .../label/labels/LabelOreDict.java | 6 +- .../label/labels/LabelSimpleAmount.java | 8 +- .../label/labels/LabelUniversal.java | 10 +- .../towdium/jecalculation/nei/NEIPlugin.java | 2 +- .../jecalculation/utils/Utilities.java | 87 ++++++++-- 24 files changed, 286 insertions(+), 120 deletions(-) delete mode 100644 src/main/java/me/towdium/jecalculation/core/Record.java rename src/main/java/me/towdium/jecalculation/{core => data}/Recipe.java (96%) create mode 100644 src/main/java/me/towdium/jecalculation/data/Record.java rename src/main/java/me/towdium/jecalculation/{core => data}/label/ILabel.java (97%) rename src/main/java/me/towdium/jecalculation/{core => data}/label/labels/LabelFluidStack.java (86%) rename src/main/java/me/towdium/jecalculation/{core => data}/label/labels/LabelItemStack.java (86%) rename src/main/java/me/towdium/jecalculation/{core => data}/label/labels/LabelOreDict.java (95%) rename src/main/java/me/towdium/jecalculation/{core => data}/label/labels/LabelSimpleAmount.java (88%) rename src/main/java/me/towdium/jecalculation/{core => data}/label/labels/LabelUniversal.java (83%) diff --git a/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java b/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java index 4e3b022..47890a1 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/IWPicker.java @@ -3,7 +3,7 @@ package me.towdium.jecalculation.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.drawables.WContainer; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.wrappers.Single; import javax.annotation.ParametersAreNonnullByDefault; 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 5b3e0c6..1934896 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/JecGui.java @@ -4,7 +4,7 @@ import cpw.mods.fml.client.config.GuiUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.JustEnoughCalculation; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.nei.NEIPlugin; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.IllegalPositionException; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java index 5f66313..5770ba8 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabel.java @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.IllegalPositionException; import me.towdium.jecalculation.utils.Utilities; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java index 597d48d..5e46b2f 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelGroup.java @@ -3,7 +3,7 @@ package me.towdium.jecalculation.client.gui.drawables; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.IWidget; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.wrappers.Single; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java index 48246d4..83b79dc 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WLabelScroll.java @@ -3,7 +3,7 @@ package me.towdium.jecalculation.client.gui.drawables; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java index 0cad40d..82fe5a2 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WPage.java @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java index 4ea57b7..e1d445a 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSearch.java @@ -3,7 +3,7 @@ package me.towdium.jecalculation.client.gui.drawables; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import javax.annotation.ParametersAreNonnullByDefault; import java.util.Arrays; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java index 6227ebf..71dc71a 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/drawables/WSwitcher.java @@ -47,7 +47,7 @@ public class WSwitcher implements IWidget { Resource.WGT_ARR_R_D).setListenerLeft(() -> move(false)); wRect = new WRectangle(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.COLOR_GUI_GREY); wText = new WText(xPos + SIZE, yPos, xSize - 2 * SIZE, SIZE, JecGui.Font.DEFAULT_SHADOW, - () -> keys.get(index.index())); + () -> keys.get(index.current())); index = new Circulator(keys.size()); if (keys.size() == 1) { left.setDisabled(true); @@ -56,10 +56,10 @@ public class WSwitcher implements IWidget { } protected void move(boolean forward) { - if (forward) index.next(); - else index.prev(); + if (forward) index.move(1); + else index.move(-1); - if (listener != null) listener.accept(index.index()); + if (listener != null) listener.accept(index.current()); } @Override diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java index c184739..de10692 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiDisambiguation.java @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; 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.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import net.minecraft.item.ItemStack; import javax.annotation.ParametersAreNonnullByDefault; 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 5b9aa2d..7f53a2c 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 @@ -10,7 +10,7 @@ import me.towdium.jecalculation.client.gui.IWidget; import me.towdium.jecalculation.client.gui.drawables.WContainer; import me.towdium.jecalculation.client.gui.drawables.WPage; import me.towdium.jecalculation.client.gui.drawables.WPanel; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.wrappers.Single; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java index 7583812..76bcd6e 100644 --- a/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/client/gui/guis/GuiRecipe.java @@ -4,7 +4,7 @@ import codechicken.nei.recipe.IRecipeHandler; 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.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import net.minecraft.item.ItemStack; import java.util.*; 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 index 8578b17..c33a286 100644 --- 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 @@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly; 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.label.ILabel; -import me.towdium.jecalculation.core.label.labels.LabelFluidStack; -import me.towdium.jecalculation.core.label.labels.LabelOreDict; +import me.towdium.jecalculation.data.label.ILabel; +import me.towdium.jecalculation.data.label.labels.LabelFluidStack; +import me.towdium.jecalculation.data.label.labels.LabelOreDict; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; 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 index 04547ff..f5f091f 100644 --- 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 @@ -6,7 +6,7 @@ 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.label.labels.LabelUniversal; +import me.towdium.jecalculation.data.label.labels.LabelUniversal; import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; diff --git a/src/main/java/me/towdium/jecalculation/core/Record.java b/src/main/java/me/towdium/jecalculation/core/Record.java deleted file mode 100644 index 424a4f7..0000000 --- a/src/main/java/me/towdium/jecalculation/core/Record.java +++ /dev/null @@ -1,66 +0,0 @@ -package me.towdium.jecalculation.core; - -import me.towdium.jecalculation.polyfill.Polyfill; -import me.towdium.jecalculation.utils.wrappers.Pair; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.function.BiConsumer; -import java.util.stream.StreamSupport; - -/** - * Author: towdium - * Date: 17-10-6. - */ -public class Record { - public static final String KEY_NAME = "name"; - public static final String KEY_CONTENT = "content"; - - ArrayList>> record = new ArrayList<>(); - HashMap index = new HashMap<>(); - - public Record(NBTTagList nbt) { - StreamSupport.stream(Polyfill.spliterator(nbt), false).filter(g -> g instanceof NBTTagCompound).forEach(g -> { - NBTTagCompound group = (NBTTagCompound) g; - String name = group.getString(KEY_NAME); - NBTTagList recipes = group.getTagList(KEY_CONTENT, 10); - StreamSupport.stream(Polyfill.spliterator(recipes), false).filter(r -> r instanceof NBTTagCompound) - .map(r -> (NBTTagCompound) r).forEach(r -> add(name, new Recipe(r))); - }); - } - - public void add(String group, Recipe recipe) { - Integer i = index.get(group); - if (i == null) { - record.add(new Pair<>(group, new ArrayList<>())); - i = record.size() - 1; - } - record.get(i).two.add(recipe); - } - - public void set(String group, int index, Recipe recipe) { - Integer i = this.index.get(group); - if (i == null) throw new RuntimeException("Group not found: " + group + "."); - record.get(i).two.set(index, recipe); - } - - public void foreach(BiConsumer> consumer) { - record.forEach(p -> consumer.accept(p.one, p.two)); - } - - public NBTTagList serialize() { - NBTTagList ret = new NBTTagList(); - foreach((n, rs) -> { - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setString(KEY_NAME, n); - NBTTagList l = new NBTTagList(); - rs.forEach(r -> l.appendTag(r.serialize())); - nbt.setTag(KEY_CONTENT, l); - ret.appendTag(nbt); - }); - return ret; - } -} diff --git a/src/main/java/me/towdium/jecalculation/core/Recipe.java b/src/main/java/me/towdium/jecalculation/data/Recipe.java similarity index 96% rename from src/main/java/me/towdium/jecalculation/core/Recipe.java rename to src/main/java/me/towdium/jecalculation/data/Recipe.java index ee7e9dd..e422e05 100644 --- a/src/main/java/me/towdium/jecalculation/core/Recipe.java +++ b/src/main/java/me/towdium/jecalculation/data/Recipe.java @@ -1,6 +1,6 @@ -package me.towdium.jecalculation.core; +package me.towdium.jecalculation.data; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.polyfill.Polyfill; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/me/towdium/jecalculation/data/Record.java b/src/main/java/me/towdium/jecalculation/data/Record.java new file mode 100644 index 0000000..ea0f131 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/data/Record.java @@ -0,0 +1,153 @@ +package me.towdium.jecalculation.data; + +import me.towdium.jecalculation.data.label.ILabel; +import me.towdium.jecalculation.polyfill.Polyfill; +import me.towdium.jecalculation.utils.Utilities; +import me.towdium.jecalculation.utils.wrappers.Pair; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +/** + * Author: towdium + * Date: 17-10-6. + */ +public abstract class Record { + + public static class RecordSP { + public static final String KEY_RECIPE = "recipe"; + public static final String KEY_RECENT = "recent"; + + public RecordRecipe recipes; + public RecordRecent recents; + + public RecordSP() { + recipes = new RecordRecipe(); + recents = new RecordRecent(); + } + + public RecordSP(NBTTagCompound nbt) { + recipes = new RecordRecipe(nbt.getTagList(KEY_RECIPE, 10)); + recents = new RecordRecent(nbt.getTagList(KEY_RECENT, 10)); + } + + public NBTTagCompound seialize() { + NBTTagCompound ret = new NBTTagCompound(); + ret.setTag(KEY_RECIPE, recipes.serialize()); + ret.setTag(KEY_RECENT, recents.setialize()); + return ret; + } + } + + public static class RecordMP { + HashMap records; + + public RecordSP get(UUID id) { + return records.get(id); + } + } + + public static class RecordRecipe { + public static final String KEY_NAME = "name"; + public static final String KEY_CONTENT = "content"; + + ArrayList>> record = new ArrayList<>(); + HashMap index = new HashMap<>(); + + public RecordRecipe() { + } + + + public RecordRecipe(NBTTagList nbt) { + StreamSupport.stream(Polyfill.spliterator(nbt), false).filter(g -> g instanceof NBTTagCompound) + .forEach(g -> { + NBTTagCompound group = (NBTTagCompound) g; + String name = group.getString(KEY_NAME); + NBTTagList recipes = group.getTagList(KEY_CONTENT, 10); + StreamSupport.stream(Polyfill.spliterator(recipes), false) + .filter(r -> r instanceof NBTTagCompound).map(r -> (NBTTagCompound) r) + .forEach(r -> add(name, new Recipe(r))); + }); + } + + public void add(String group, Recipe recipe) { + Integer i = index.get(group); + if (i == null) { + record.add(new Pair<>(group, new ArrayList<>())); + i = record.size() - 1; + } + record.get(i).two.add(recipe); + } + + public void set(String group, int index, Recipe recipe) { + Integer i = this.index.get(group); + if (i == null) + throw new RuntimeException("Group not found: " + group + "."); + record.get(i).two.set(index, recipe); + } + + public void remove(String group, int index) { + Integer i = this.index.get(group); + if (i == null) + throw new RuntimeException("Group not found: " + group + "."); + record.get(i).two.remove(index); + } + + public void foreach(BiConsumer> consumer) { + record.forEach(p -> consumer.accept(p.one, p.two)); + } + + public NBTTagList serialize() { + NBTTagList ret = new NBTTagList(); + foreach((n, rs) -> { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setString(KEY_NAME, n); + NBTTagList l = new NBTTagList(); + rs.forEach(r -> l.appendTag(r.serialize())); + nbt.setTag(KEY_CONTENT, l); + ret.appendTag(nbt); + }); + return ret; + } + } + + public static class RecordRecent { + Utilities.Recent record = new Utilities.Recent<>(9); + + public RecordRecent(NBTTagList nbt) { + List ls = StreamSupport.stream(Polyfill.spliterator(nbt), false).filter(n -> n instanceof NBTTagCompound) + .map(n -> ILabel.DESERIALIZER.deserialize((NBTTagCompound) n)) + .collect(Collectors.toList()); + new Utilities.ReversedIterator<>(ls).forEachRemaining(l -> record.push(l)); + } + + public RecordRecent() { + } + + public void push(ILabel label) { + record.push(label); + } + + public ILabel getLatest() { + return record.toList().get(0); + } + + public List getRecords() { + List labels = record.toList(); + return labels.subList(1, labels.size()); + } + + public NBTTagList setialize() { + NBTTagList ret = new NBTTagList(); + record.toList().forEach(l -> ret.appendTag(ILabel.DESERIALIZER.serialize(l))); + return ret; + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/core/label/ILabel.java b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java similarity index 97% rename from src/main/java/me/towdium/jecalculation/core/label/ILabel.java rename to src/main/java/me/towdium/jecalculation/data/label/ILabel.java index 7738da4..a4033c5 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java @@ -1,4 +1,4 @@ -package me.towdium.jecalculation.core.label; +package me.towdium.jecalculation.data.label; import com.google.common.base.CaseFormat; import cpw.mods.fml.relauncher.Side; @@ -7,10 +7,10 @@ import me.towdium.jecalculation.client.gui.IWPicker; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.guis.pickers.PickerSimple; import me.towdium.jecalculation.client.gui.guis.pickers.PickerUniversal; -import me.towdium.jecalculation.core.label.labels.LabelFluidStack; -import me.towdium.jecalculation.core.label.labels.LabelItemStack; -import me.towdium.jecalculation.core.label.labels.LabelOreDict; -import me.towdium.jecalculation.core.label.labels.LabelUniversal; +import me.towdium.jecalculation.data.label.labels.LabelFluidStack; +import me.towdium.jecalculation.data.label.labels.LabelItemStack; +import me.towdium.jecalculation.data.label.labels.LabelOreDict; +import me.towdium.jecalculation.data.label.labels.LabelUniversal; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.ItemStackHelper; import me.towdium.jecalculation.utils.Utilities.Relation; @@ -52,6 +52,7 @@ public interface ILabel { String getAmountString(); + @SideOnly(Side.CLIENT) String getDisplayName(); static String getIdentifier(ILabel c) { diff --git a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelFluidStack.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelFluidStack.java similarity index 86% rename from src/main/java/me/towdium/jecalculation/core/label/labels/LabelFluidStack.java rename to src/main/java/me/towdium/jecalculation/data/label/labels/LabelFluidStack.java index 36839a1..beaff9d 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelFluidStack.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelFluidStack.java @@ -1,10 +1,10 @@ -package me.towdium.jecalculation.core.label.labels; +package me.towdium.jecalculation.data.label.labels; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; @@ -65,6 +65,7 @@ public class LabelFluidStack implements ILabel { } @Override + @SideOnly(Side.CLIENT) public String getDisplayName() { return fluid.getLocalizedName(); } @@ -83,6 +84,7 @@ public class LabelFluidStack implements ILabel { } @Override + @SideOnly(Side.CLIENT) public List getToolTip(List existing, boolean detailed) { existing.add(FORMAT_BLUE + FORMAT_ITALIC + Utilities.getModName(fluid)); return existing; @@ -94,4 +96,11 @@ public class LabelFluidStack implements ILabel { gui.drawResource(Resource.LBL_FLUID, 0, 0); gui.drawFluid(fluid.getFluid(), 2, 2, 12, 12); } + + @Override + public boolean equals(Object obj) { + return obj instanceof LabelFluidStack + && fluid.equals(((LabelFluidStack) obj).fluid) + && amount == ((LabelFluidStack) obj).amount; + } } diff --git a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelItemStack.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelItemStack.java similarity index 86% rename from src/main/java/me/towdium/jecalculation/core/label/labels/LabelItemStack.java rename to src/main/java/me/towdium/jecalculation/data/label/labels/LabelItemStack.java index a72e77f..c534116 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelItemStack.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelItemStack.java @@ -1,9 +1,9 @@ -package me.towdium.jecalculation.core.label.labels; +package me.towdium.jecalculation.data.label.labels; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.JecGui; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -43,6 +43,7 @@ public class LabelItemStack extends LabelSimpleAmount { } @Override + @SideOnly(Side.CLIENT) public List getToolTip(List existing, boolean detailed) { super.getToolTip(existing, detailed); existing.add(FORMAT_BLUE + FORMAT_ITALIC + Utilities.getModName(itemStack)); @@ -50,6 +51,7 @@ public class LabelItemStack extends LabelSimpleAmount { } @Override + @SideOnly(Side.CLIENT) public String getDisplayName() { return itemStack.getItem() == null ? "" : itemStack.getDisplayName(); } @@ -75,7 +77,9 @@ public class LabelItemStack extends LabelSimpleAmount { @Override public boolean equals(Object obj) { - return obj instanceof LabelItemStack && itemStack.equals(((LabelItemStack) obj).itemStack); + return obj instanceof LabelItemStack + && itemStack.equals(((LabelItemStack) obj).itemStack) + && amount == ((LabelItemStack) obj).amount; } public ItemStack getItemStack() { diff --git a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelOreDict.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelOreDict.java similarity index 95% rename from src/main/java/me/towdium/jecalculation/core/label/labels/LabelOreDict.java rename to src/main/java/me/towdium/jecalculation/data/label/labels/LabelOreDict.java index 5181948..51ed156 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelOreDict.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelOreDict.java @@ -1,11 +1,11 @@ -package me.towdium.jecalculation.core.label.labels; +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.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.polyfill.mc.util.NonNullList; import me.towdium.jecalculation.utils.Utilities; @@ -51,6 +51,7 @@ public class LabelOreDict extends LabelSimpleAmount { } @Override + @SideOnly(Side.CLIENT) public String getDisplayName() { return Utilities.L18n.format("label.ore_dict.name", name); } @@ -98,6 +99,7 @@ public class LabelOreDict extends LabelSimpleAmount { } @Override + @SideOnly(Side.CLIENT) public List getToolTip(List existing, boolean detailed) { super.getToolTip(existing, detailed); existing.add(FORMAT_BLUE + FORMAT_ITALIC + JustEnoughCalculation.Reference.MODNAME); diff --git a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelSimpleAmount.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelSimpleAmount.java similarity index 88% rename from src/main/java/me/towdium/jecalculation/core/label/labels/LabelSimpleAmount.java rename to src/main/java/me/towdium/jecalculation/data/label/labels/LabelSimpleAmount.java index 4dcb017..08582b5 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelSimpleAmount.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelSimpleAmount.java @@ -1,6 +1,8 @@ -package me.towdium.jecalculation.core.label.labels; +package me.towdium.jecalculation.data.label.labels; -import me.towdium.jecalculation.core.label.ILabel; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import net.minecraft.nbt.NBTTagCompound; @@ -60,6 +62,7 @@ public abstract class LabelSimpleAmount implements ILabel { } @Override + @SideOnly(Side.CLIENT) public List getToolTip(List existing, boolean detailed) { if (detailed) existing.add(FORMAT_GREY + Utilities.L18n.format("label.common.tooltip.amount", Integer.toString(amount))); @@ -67,6 +70,7 @@ public abstract class LabelSimpleAmount implements ILabel { } @Override + @SideOnly(Side.CLIENT) public String getAmountString() { return amount == 0 ? "" : Utilities.cutNumber(amount, 5); } diff --git a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelUniversal.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelUniversal.java similarity index 83% rename from src/main/java/me/towdium/jecalculation/core/label/labels/LabelUniversal.java rename to src/main/java/me/towdium/jecalculation/data/label/labels/LabelUniversal.java index aee28e4..749192e 100644 --- a/src/main/java/me/towdium/jecalculation/core/label/labels/LabelUniversal.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LabelUniversal.java @@ -1,10 +1,10 @@ -package me.towdium.jecalculation.core.label.labels; +package me.towdium.jecalculation.data.label.labels; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.client.gui.JecGui; import me.towdium.jecalculation.client.gui.Resource; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.utils.Utilities; import net.minecraft.nbt.NBTTagCompound; @@ -31,6 +31,7 @@ public class LabelUniversal extends LabelSimpleAmount { } @Override + @SideOnly(Side.CLIENT) public String getDisplayName() { return Utilities.L18n.format("label.universal.name", name); } @@ -53,4 +54,9 @@ public class LabelUniversal extends LabelSimpleAmount { gui.drawResource(Resource.LBL_UNIV_B, 0, 0); gui.drawResource(Resource.LBL_UNIV_F, 0, 0, (name.hashCode() * 0x131723) & 0xFFFFFF); } + + @Override + public boolean equals(Object obj) { + return obj instanceof LabelUniversal && name.equals(((LabelUniversal) obj).name); + } } diff --git a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java index cd0d715..1d9c3c3 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java @@ -1,7 +1,7 @@ package me.towdium.jecalculation.nei; import codechicken.nei.guihook.GuiContainerManager; -import me.towdium.jecalculation.core.label.ILabel; +import me.towdium.jecalculation.data.label.ILabel; import net.minecraft.item.ItemStack; public class NEIPlugin { diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index f126d2f..336b792 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -3,7 +3,8 @@ package me.towdium.jecalculation.utils; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; -import me.towdium.jecalculation.JustEnoughCalculation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.utils.wrappers.Pair; import me.towdium.jecalculation.utils.wrappers.Single; import net.minecraft.client.resources.I18n; @@ -11,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.StringEscapeUtils; +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.*; import java.util.function.BiFunction; import java.util.stream.Stream; @@ -20,7 +23,8 @@ import java.util.stream.StreamSupport; * Author: Towdium * Date: 2016/6/25. */ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "UnusedReturnValue"}) +@ParametersAreNonnullByDefault public class Utilities { final static int[] scaleTable = {9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, Integer.MAX_VALUE}; static Map dictionary = new HashMap<>(); @@ -38,8 +42,10 @@ public class Utilities { public static String cutNumber(float f, int size) { BiFunction form = (fl, len) -> { 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); + 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; @@ -61,18 +67,22 @@ public class Utilities { // MOD NAME + @Nullable public static String getModName(ItemStack stack) { String name = GameData.getItemRegistry().getNameForObject(stack.getItem()); - JustEnoughCalculation.logger.warn(String.format("item name: %s", name)); // "minecraft:stone" or "jecalculation:item.item_calculator" - // TODO check - return name; + name = name.substring(0, name.indexOf(":")); + if (name.equals("minecraft")) + return "Minecraft"; + else + return dictionary.get(name); } public static String getModName(FluidStack stack) { - String name = GameData.getItemRegistry().getNameForObject(stack.getFluid()); - JustEnoughCalculation.logger.warn(String.format("fluid name: %s", name)); - // TODO check - return name; + String name = stack.getFluid().getName(); + if (name.equals("lava") || name.equals("water")) + return "Minecraft"; + else + return dictionary.get(stack.getFluid().getStillIcon().getIconName().split(":")[0]); } public static boolean contains(String s1, String s2) { @@ -112,17 +122,37 @@ public class Utilities { } public int next() { - current = current + 1 == total ? 0 : current + 1; - return current; + return current + 1 == total ? 0 : current + 1; } + public int prev() { - current = current == 0 ? total - 1 : current - 1; + return current == 0 ? total - 1 : current - 1; + } + + public Circulator move(int steps) { + current += steps; + if (current < 0) + current += (-current) / total * total + total; + else + current = current % total; + return this; + } + + public int current() { return current; } - public int index() { - return current; + public Circulator set(int index) { + if (index >= 0 && index < total) + current = index; + else + throw new RuntimeException(String.format("Expected: [0, %d), given: %d.", total, index)); + return this; + } + + public Circulator copy() { + return new Circulator(total).set(current); } } @@ -134,7 +164,8 @@ public class Utilities { } public ReversedIterator(ListIterator i) { - while (i.hasNext()) i.next(); + while (i.hasNext()) + i.next(); this.i = i; } @@ -172,6 +203,7 @@ public class Utilities { } } + @SideOnly(Side.CLIENT) public static class L18n { public static Pair search(String translateKey, Object... parameters) { Pair ret = new Pair<>(null, null); @@ -186,4 +218,25 @@ public class Utilities { return search(translateKey, parameters).one; } } + + public static class Recent { + LinkedList data = new LinkedList<>(); + int limit; + + public Recent(int limit) { + this.limit = limit; + } + + public void push(T obj) { + data.removeIf(t -> t.equals(obj)); + data.push(obj); + if (data.size() > limit) + data.pop(); + } + + public List toList() { + //noinspection unchecked + return (List) data.clone(); + } + } }