From 33b6ff5467e8153368ac734122ed640b45d93385 Mon Sep 17 00:00:00 2001 From: Discreater Date: Sun, 2 May 2021 00:23:13 +0800 Subject: [PATCH] feat: client only backport finish --- .../jecalculation/data/Controller.java | 9 ++ .../jecalculation/data/label/ILabel.java | 12 +- .../data/label/labels/LOreDict.java | 48 ++++---- .../data/label/labels/LPlaceholder.java | 15 ++- .../data/structure/CostList.java | 3 +- .../jecalculation/data/structure/Recipes.java | 5 + .../me/towdium/jecalculation/gui/JecaGui.java | 25 +++- .../towdium/jecalculation/gui/Resource.java | 11 ++ .../jecalculation/gui/guis/GuiCraft.java | 18 +-- .../jecalculation/gui/guis/GuiRecipe.java | 88 +++++++------- .../jecalculation/gui/guis/GuiSearch.java | 66 ++++++++--- .../jecalculation/gui/widgets/WLabel.java | 111 +++++++++--------- .../jecalculation/gui/widgets/WOverlay.java | 34 ++++++ .../jecalculation/utils/Utilities.java | 2 +- .../assets/jecalculation/lang/en_US.lang | 11 +- .../assets/jecalculation/lang/ru_RU.lang | 11 +- .../assets/jecalculation/lang/zh_CN.lang | 11 +- .../jecalculation/textures/gui/resources.png | Bin 24048 -> 26660 bytes src/main/resources/mcmod.info | 2 +- 19 files changed, 296 insertions(+), 186 deletions(-) create mode 100644 src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java diff --git a/src/main/java/me/towdium/jecalculation/data/Controller.java b/src/main/java/me/towdium/jecalculation/data/Controller.java index d79cfb8..6874bf7 100644 --- a/src/main/java/me/towdium/jecalculation/data/Controller.java +++ b/src/main/java/me/towdium/jecalculation/data/Controller.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import me.towdium.jecalculation.JecaConfig; import me.towdium.jecalculation.JustEnoughCalculation; +import me.towdium.jecalculation.data.label.labels.LPlaceholder; import me.towdium.jecalculation.data.structure.*; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.gui.guis.GuiCraft; @@ -141,6 +142,11 @@ public class Controller { writeToLocal(); } + public static void removeGroup(String group) { + getRecipes().remove(group); + setLast(group); + } + public static Recipe getRecipe(String group, int index) { return getRecipes().getRecipe(group, index); } @@ -216,6 +222,8 @@ public class Controller { JecaConfig.dataDir.mkdirs(); File file = JecaConfig.recordFile; NBTTagCompound nbt = Utilities.Json.read(file); + boolean s = LPlaceholder.state; + LPlaceholder.state = true; if (nbt != null) { rCraftClient = new RecordCraft(nbt.getCompoundTag(KEY_CRAFT)); rMathClient = new RecordMath(nbt.getCompoundTag(KEY_MATH)); @@ -225,6 +233,7 @@ public class Controller { rCraftClient = new RecordCraft(new NBTTagCompound()); rMathClient = new RecordMath(new NBTTagCompound()); } + LPlaceholder.state = s; } public static void writeToLocal() { diff --git a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java index ce47c57..a565245 100644 --- a/src/main/java/me/towdium/jecalculation/data/label/ILabel.java +++ b/src/main/java/me/towdium/jecalculation/data/label/ILabel.java @@ -17,7 +17,9 @@ import me.towdium.jecalculation.polyfill.mc.client.renderer.GlStateManager; import me.towdium.jecalculation.utils.Utilities; import me.towdium.jecalculation.utils.Utilities.ReversedIterator; import me.towdium.jecalculation.utils.wrappers.Pair; +import net.minecraft.enchantment.EnchantmentData; import net.minecraft.init.Items; +import net.minecraft.item.ItemEnchantedBook; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; @@ -245,8 +247,14 @@ public interface ILabel { return new LItemStack((ItemStack) o); else if (o instanceof FluidStack) return new LFluidStack((FluidStack) o); - else - throw new RuntimeException("Unrecognized ingredient type: " + o.getClass()); + else if (o instanceof EnchantmentData) { + ItemStack itemStack = new ItemStack(Items.enchanted_book); + new ItemEnchantedBook().addEnchantment(itemStack, (EnchantmentData) o); + return new LItemStack(itemStack); + } else { + JustEnoughCalculation.logger.warn("Unrecognized ingredient type: " + o.getClass()); + return ILabel.EMPTY; + } } public void register(ConverterFunction handler, Priority priority) { diff --git a/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java index d3a6b2a..c376eae 100644 --- a/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LOreDict.java @@ -57,27 +57,6 @@ public class LOreDict extends ILabel.Impl { name = nbt.getString(KEY_NAME); } - @Override - @Nonnull - public ItemStack getRepresentation() { - NonNullList list = NonNullList.create(); - OreDictionary.getOres(name).forEach(is -> { - if (is.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - is.getItem().getSubItems(is.getItem(), CreativeTabs.tabAllSearch, list); - } else - list.add(is); - }); - if (list.isEmpty()) return ItemStackHelper.EMPTY_ITEM_STACK; - long index = System.currentTimeMillis() / 1500; - return list.get((int) (index % list.size())); - } - - @Override - @SideOnly(Side.CLIENT) - public String getDisplayName() { - return Utilities.I18n.get("label.ore_dict.name", name); - } - public static boolean mergeSame(ILabel a, ILabel b) { if (a instanceof LOreDict && b instanceof LOreDict) { LOreDict lodA = (LOreDict) a; @@ -90,9 +69,9 @@ public class LOreDict extends ILabel.Impl { if (a instanceof LOreDict && b instanceof LItemStack) { LOreDict lod = (LOreDict) a; LItemStack lis = (LItemStack) b; - return OreDictionary.getOres(lod.name).stream() - .map(Converter::from) - .anyMatch(i -> LItemStack.merge(i, lis)); + return lod.getAmount() * lis.getAmount() < 0 + && OreDictionary.getOres(lod.name).stream().map(Converter::from) + .anyMatch(i -> LItemStack.merge(i, lis)); } return false; } @@ -137,6 +116,27 @@ public class LOreDict extends ILabel.Impl { return acceptable.value; } + @Override + @Nonnull + public ItemStack getRepresentation() { + NonNullList list = NonNullList.create(); + OreDictionary.getOres(name).forEach(is -> { + if (is.getItemDamage() == OreDictionary.WILDCARD_VALUE) { + is.getItem().getSubItems(is.getItem(), CreativeTabs.tabAllSearch, list); + } else list.add(is); + }); + if (list.isEmpty()) return ItemStackHelper.EMPTY_ITEM_STACK; + long index = System.currentTimeMillis() / 1500; + return list.get((int) (index % list.size())); + } + + @Override + @SideOnly(Side.CLIENT) + public String getDisplayName() { + return Utilities.I18n.get("label.ore_dict.name", name); + } + + @Override public String getIdentifier() { return IDENTIFIER; diff --git a/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java b/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java index 7e08dc4..1c5c7e8 100644 --- a/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java +++ b/src/main/java/me/towdium/jecalculation/data/label/labels/LPlaceholder.java @@ -22,14 +22,20 @@ import java.util.stream.Collectors; public class LPlaceholder extends ILabel.Impl { public static final String KEY_NAME = "name"; public static final String IDENTIFIER = "placeholder"; + public static boolean state = true; // true for client, false for server static Utilities.Recent recentClient = new Utilities.Recent<>(100); static Utilities.Recent recentServer = new Utilities.Recent<>(100); String name; + static Utilities.Recent getActive() { + return state ? recentClient : recentServer; + } + public LPlaceholder(NBTTagCompound tag) { super(tag); name = tag.getString(KEY_NAME); + getActive().push(new LPlaceholder(name, 1, true), false); } public LPlaceholder(String name, long amount) { @@ -39,7 +45,7 @@ public class LPlaceholder extends ILabel.Impl { public LPlaceholder(String name, long amount, boolean silent) { super(amount, false); this.name = name; - if (!silent) getRecord().push(new LPlaceholder(name, 1, true), false); + if (!silent) getActive().push(new LPlaceholder(name, 1, true), false); } public LPlaceholder(LPlaceholder label) { @@ -49,6 +55,7 @@ public class LPlaceholder extends ILabel.Impl { public static void onLogOut() { recentServer.clear(); + state = true; } @Override @@ -57,11 +64,7 @@ public class LPlaceholder extends ILabel.Impl { } public static List getRecent() { - return getRecord().toList().stream().map(LPlaceholder::copy).collect(Collectors.toList()); - } - - private static Utilities.Recent getRecord() { - return recentClient; + return getActive().toList().stream().map(LPlaceholder::copy).collect(Collectors.toList()); } @Override diff --git a/src/main/java/me/towdium/jecalculation/data/structure/CostList.java b/src/main/java/me/towdium/jecalculation/data/structure/CostList.java index 618ab90..9eafadd 100644 --- a/src/main/java/me/towdium/jecalculation/data/structure/CostList.java +++ b/src/main/java/me/towdium/jecalculation/data/structure/CostList.java @@ -201,7 +201,8 @@ public class CostList { .map(i -> i.two.labels.get(0)) .collect(Collectors.toList()); Collections.reverse(ret); - return ret; + CostList cl = new CostList(ret).multiply(-1); + return new CostList().merge(cl, false, true).labels; } } } diff --git a/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java b/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java index c397e02..a45c7b3 100644 --- a/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java +++ b/src/main/java/me/towdium/jecalculation/data/structure/Recipes.java @@ -68,6 +68,7 @@ public class Recipes { if (index == -1) { if (recipe != null) add(neu, recipe); else if (old != null) renameGroup(old, neu); + else remove(neu); } else { if (recipe == null) remove(neu, index); else if (old == null || old.equals(neu)) set(neu, index, recipe); @@ -98,6 +99,10 @@ public class Recipes { if (l.isEmpty()) records.remove(group); } + public void remove(String group) { + records.remove(group); + } + public Recipe getRecipe(String group, int index) { return getGroup(group).get(index); } diff --git a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java index f41b8ae..2001aa3 100644 --- a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java +++ b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java @@ -60,6 +60,17 @@ public class JecaGui extends GuiContainer { ((JecContainer) inventorySlots).setGui(this); } + public static int getMouseX() { + JecaGui gui = getCurrent(); + return Mouse.getEventX() * gui.width / gui.mc.displayWidth - gui.guiLeft; + } + + public static int getMouseY() { + JecaGui gui = getCurrent(); + return gui.height - Mouse.getEventY() * gui.height / gui.mc.displayHeight - 1 - gui.guiTop; + } + + @Override public void initGui() { this.guiLeft = (this.width - this.xSize) / 2; @@ -284,14 +295,18 @@ public class JecaGui extends GuiContainer { r.getXSize(), r.getYSize(), borderTop, borderBottom, borderLeft, borderRight, zLevel); } - 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(); + private void setColor(int color) { 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); + float alpha = (~(color >> 24) & 0xFF) / 255.0F; + GlStateManager.color(red, green, blue, alpha); + } + + public void drawFluid(Fluid f, int xPos, int yPos, int xSize, int ySize) { + IIcon fluidStillIcon = f.getStillIcon(); + mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + setColor(f.getColor() & 0x00FFFFFF); if (fluidStillIcon != null) drawTexturedModelRectFromIcon(xPos, yPos, fluidStillIcon, xSize, ySize); } diff --git a/src/main/java/me/towdium/jecalculation/gui/Resource.java b/src/main/java/me/towdium/jecalculation/gui/Resource.java index c1ad64f..ad569e3 100644 --- a/src/main/java/me/towdium/jecalculation/gui/Resource.java +++ b/src/main/java/me/towdium/jecalculation/gui/Resource.java @@ -84,6 +84,14 @@ public class Resource { public static final Resource BTN_EDIT_N = getIcon(6, 4); public static final Resource BTN_EDIT_F = getIcon(6, 3); public static final Resource BTN_EDIT_D = getIcon(6, 5); + public static final Resource BTN_PICK_N = getIcon(7, 4); + public static final Resource BTN_PICK_F = getIcon(7, 3); + public static final Resource BTN_DELETE_N_N = getIcon(8, 4); + public static final Resource BTN_DELETE_N_F = getIcon(8, 3); + public static final Resource BTN_DELETE_N_D = getIcon(8, 5); + public static final Resource BTN_DELETE_1_N = getIcon(9, 4); + public static final Resource BTN_DELETE_1_F = getIcon(9, 3); + public static final Resource BTN_DELETE_1_D = getIcon(9, 5); public static final Resource WGT_BUTTON_N = getWidget(0); public static final Resource WGT_BUTTON_F = getWidget(1); @@ -181,6 +189,9 @@ public class Resource { public static final ResourceGroup BTN_CAP_F = new ResourceGroup(BTN_CAP_F_N, BTN_CAP_F_F, BTN_CAP_D); public static final ResourceGroup BTN_NBT_F = new ResourceGroup(BTN_NBT_F_N, BTN_NBT_F_F, BTN_NBT_D); public static final ResourceGroup BTN_EDIT = new ResourceGroup(BTN_EDIT_N, BTN_EDIT_F, BTN_EDIT_D); + public static final ResourceGroup BTN_PICK = new ResourceGroup(BTN_PICK_N, BTN_PICK_F); + public static final ResourceGroup BTN_DELETE_N = new ResourceGroup(BTN_DELETE_N_N, BTN_DELETE_N_F, BTN_DELETE_N_D); + public static final ResourceGroup BTN_DELETE_1 = new ResourceGroup(BTN_DELETE_1_N, BTN_DELETE_1_F, BTN_DELETE_1_D); public static final ResourceGroup WGT_ARR_L = new ResourceGroup(WGT_ARR_L_N, WGT_ARR_L_F, WGT_ARR_L_D); public static final ResourceGroup WGT_ARR_R = new ResourceGroup(WGT_ARR_R_N, WGT_ARR_R_F, WGT_ARR_R_D); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java index 558aba2..e79e524 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiCraft.java @@ -186,7 +186,7 @@ public class GuiCraft extends WContainer implements IGui { enum Mode { INPUT, OUTPUT, CATALYST, STEPS } - class Suggest extends WContainer { + class Suggest extends WOverlay { boolean replace; public Suggest(List labels, boolean replace) { @@ -207,21 +207,5 @@ public class GuiCraft extends WContainer implements IGui { GuiCraft.this.remove(this); refreshLabel(l, replace, false); } - - @Override - public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { - if (!super.onClicked(gui, xMouse, yMouse, button)) GuiCraft.this.remove(this); - return true; - } - - @Override - public boolean onKey(JecaGui gui, char ch, int code) { - if (!super.onKey(gui, ch, code)) { - if (code == Keyboard.KEY_ESCAPE) { - GuiCraft.this.remove(this); - return true; - } else return false; - } else return true; - } } } diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java index ff8aef4..93c2307 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java @@ -29,7 +29,7 @@ public class GuiRecipe extends WContainer implements IGui { Pair dest; HashMap> disambCache = new HashMap<>(); WSwitcher group = new WSwitcher(7, 7, 162, Controller.getGroups()).setListener(i -> refresh()); - WTextField text = new WTextField(49, 31, 119); + WTextField text = new WTextField(49, 32, 119); WLabelGroup catalyst = new WLabelGroup(29, 87, 7, 1, 20, 20, WLabel.Mode.EDITOR).setListener((i, v) -> { disambCache.remove(v + 14); refresh(); @@ -42,46 +42,44 @@ public class GuiRecipe extends WContainer implements IGui { disambCache.remove(v + 21); refresh(); }); - WButton disamb = new WButtonIcon(121, 31, 20, 20, BTN_DISAMB, "recipe.disamb").setListener(i -> { - if (disambCache != null) JecaGui.displayGui(new GuiDisamb(new ArrayList<>(disambCache.values())) - .setCallback(l -> { - JecaGui.displayParent(); - JecaGui.getCurrent().hand = l; - })); + WButton disamb = new WButtonIcon(102, 32, 20, 20, BTN_DISAMB, "recipe.disamb").setListener(i -> { + if (disambCache != null) + JecaGui.displayGui(new GuiDisamb(new ArrayList<>(disambCache.values())).setCallback(l -> { + JecaGui.displayParent(); + JecaGui.getCurrent().hand = l; + })); }); - WButton clear = new WButtonIcon(64, 31, 20, 20, BTN_DEL, "recipe.clear").setListener(i -> reset()); + WButton clear = new WButtonIcon(64, 32, 20, 20, BTN_DEL, "recipe.clear").setListener(i -> reset()); // check duplicate and valid - WButton copy = new WButtonIcon(83, 31, 20, 20, BTN_COPY, "recipe.copy").setListener(i -> { + WButton copy = new WButtonIcon(83, 32, 20, 20, BTN_COPY, "recipe.copy").setListener(i -> { Controller.addRecipe(group.getText(), toRecipe()); JecaGui.displayParent(); }); - WButton label = new WButtonIcon(45, 31, 20, 20, BTN_LABEL, "recipe.label").setListener(i -> - JecaGui.displayGui(new GuiLabel((l) -> { - JecaGui.displayParent(); - JecaGui.getCurrent().hand = l; - }))); - WButton save = new WButtonIcon(26, 31, 20, 20, BTN_SAVE, "recipe.save").setDisabled(true).setListener(i -> { + WButton label = new WButtonIcon(45, 32, 20, 20, BTN_LABEL, "recipe.label") + .setListener(i -> JecaGui.displayGui(new GuiLabel((l) -> { + JecaGui.displayParent(); + JecaGui.getCurrent().hand = l; + }))); + WButton save = new WButtonIcon(26, 32, 20, 20, BTN_SAVE, "recipe.save").setDisabled(true).setListener(i -> { if (dest == null) Controller.addRecipe(group.getText(), toRecipe()); else { String group = this.group.getText(); - if (group.equals(dest.one)) Controller.setRecipe(dest.one, dest.two, toRecipe()); - else Controller.setRecipe(group, dest.one, dest.two, toRecipe()); + if (group.equals(dest.one)) + Controller.setRecipe(dest.one, dest.two, toRecipe()); + else + Controller.setRecipe(group, dest.one, dest.two, toRecipe()); } JecaGui.displayParent(); }); - WButton delete = new WButtonIcon(102, 31, 20, 20, BTN_NO, "recipe.delete").setListener(i -> { - Controller.removeRecipe(dest.one, dest.two); - JecaGui.displayParent(); - }); - WButton yes = new WButtonIcon(7, 31, 20, 20, BTN_YES, "recipe.confirm").setDisabled(true).setListener(i -> { + WButton yes = new WButtonIcon(7, 32, 20, 20, BTN_YES, "recipe.confirm").setDisabled(true).setListener(i -> { group.setText(text.getText()); text.setText(""); setNewGroup(false); refresh(); }); - WButton no = new WButtonIcon(26, 31, 20, 20, BTN_NO, "common.cancel").setListener(i -> setNewGroup(false)); - WButton neu = new WButtonIcon(7, 31, 20, 20, BTN_NEW, "recipe.new").setListener(i -> setNewGroup(true)); + WButton no = new WButtonIcon(26, 32, 20, 20, BTN_NO, "common.cancel").setListener(i -> setNewGroup(false)); + WButton neu = new WButtonIcon(7, 32, 20, 20, BTN_NEW, "recipe.new").setListener(i -> setNewGroup(true)); public GuiRecipe(String group, int index) { this(); @@ -89,7 +87,6 @@ public class GuiRecipe extends WContainer implements IGui { Recipe r = Controller.getRecipe(group, index); fromRecipe(r); this.group.setIndex(Controller.getGroups().indexOf(group)); - delete.setDisabled(false); refresh(); } @@ -100,14 +97,16 @@ public class GuiRecipe extends WContainer implements IGui { add(new WIcon(7, 111, 22, 40, ICN_INPUT, "common.input")); add(new WLine(57)); add(input, catalyst, output, group); - if (group.getTexts().isEmpty()) group.setText(Utilities.I18n.get("gui.common.default")); + if (group.getTexts().isEmpty()) + group.setText(Utilities.I18n.get("gui.common.default")); String last = Controller.getLast(); int index = -1; - if (last != null) index = group.getTexts().indexOf(last); - if (index != -1) group.setIndex(index); + if (last != null) + index = group.getTexts().indexOf(last); + if (index != -1) + group.setIndex(index); setNewGroup(false); copy.setDisabled(true); - delete.setDisabled(true); disamb.setDisabled(true); text.setListener(i -> yes.setDisabled(i.getText().isEmpty())); } @@ -123,10 +122,10 @@ public class GuiRecipe extends WContainer implements IGui { public void setNewGroup(boolean b) { if (b) { - remove(neu, label, clear, copy, save, disamb, delete); + remove(neu, label, clear, copy, save, disamb); add(yes, no, text); } else { - add(neu, label, clear, copy, save, disamb, delete); + add(neu, label, clear, copy, save, disamb); remove(yes, no, text); text.setText(""); yes.setDisabled(true); @@ -137,6 +136,8 @@ public class GuiRecipe extends WContainer implements IGui { input.setLabel(Collections.nCopies(14, ILabel.EMPTY), 0); catalyst.setLabel(Collections.nCopies(7, ILabel.EMPTY), 0); output.setLabel(Collections.nCopies(7, ILabel.EMPTY), 0); + disambCache.clear(); + refresh(); } public void transfer(IRecipeHandler recipe, int recipeIndex) { @@ -147,7 +148,8 @@ public class GuiRecipe extends WContainer implements IGui { // input List inputItemStacks = recipe.getIngredientStacks(recipeIndex).stream() - .map((positionedStack) -> positionedStack.item).collect(Collectors.toList()); + .map((positionedStack) -> positionedStack.item) + .collect(Collectors.toList()); List outputItemStacks = Collections.singletonList(recipe.getResultStack(recipeIndex).item); merge(input, inputItemStacks, recipe); @@ -164,7 +166,8 @@ public class GuiRecipe extends WContainer implements IGui { } private void merge(ArrayList> dst, List gi, IRecipeHandler context) { - List list = gi.stream().map(ILabel.Converter::from).collect(Collectors.toList()); + List list = gi.stream().map(ILabel.Converter::from).filter(i -> i != ILabel.EMPTY) + .collect(Collectors.toList()); if (list.isEmpty()) return; dst.stream().filter(p -> { @@ -188,7 +191,8 @@ public class GuiRecipe extends WContainer implements IGui { for (int i = 0; i < src.size(); i++) { Trio p = src.get(i); ret.add(p.one); - if (p.two.getLabels().size() > 1) disambCache.put(i + offset, p.two.getLabels()); + if (p.two.getLabels().size() > 1) + disambCache.put(i + offset, p.two.getLabels()); } return ret; } @@ -198,12 +202,10 @@ public class GuiRecipe extends WContainer implements IGui { } void fromRecipe(Recipe r) { - input.setLabel(Arrays.stream(r.getLabel(Recipe.IO.INPUT)) - .map(ILabel::copy).collect(Collectors.toList()), 0); - catalyst.setLabel(Arrays.stream(r.getLabel(Recipe.IO.CATALYST)) - .map(ILabel::copy).collect(Collectors.toList()), 0); - output.setLabel(Arrays.stream(r.getLabel(Recipe.IO.OUTPUT)) - .map(ILabel::copy).collect(Collectors.toList()), 0); + input.setLabel(Arrays.stream(r.getLabel(Recipe.IO.INPUT)).map(ILabel::copy).collect(Collectors.toList()), 0); + catalyst.setLabel(Arrays.stream(r.getLabel(Recipe.IO.CATALYST)).map(ILabel::copy).collect(Collectors.toList()), + 0); + output.setLabel(Arrays.stream(r.getLabel(Recipe.IO.OUTPUT)).map(ILabel::copy).collect(Collectors.toList()), 0); } @@ -211,10 +213,10 @@ public class GuiRecipe extends WContainer implements IGui { disamb.setDisabled(disambCache.isEmpty()); try { Recipe r = toRecipe(); - boolean d = dest == null ? Controller.hasDuplicate(r) : - Controller.hasDuplicate(r, dest.one, dest.two); + boolean d = dest == null ? Controller.hasDuplicate(r) : Controller.hasDuplicate(r, dest.one, dest.two); save.setDisabled(d); - if (dest != null) copy.setDisabled(d); + if (dest != null) + copy.setDisabled(d); } catch (IllegalArgumentException e) { save.setDisabled(true); copy.setDisabled(true); diff --git a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java index 84538f0..40539aa 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiSearch.java @@ -5,23 +5,16 @@ import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.data.structure.Recipe; import me.towdium.jecalculation.data.structure.Recipes; import me.towdium.jecalculation.gui.JecaGui; -import me.towdium.jecalculation.gui.Resource; import me.towdium.jecalculation.gui.widgets.*; -import me.towdium.jecalculation.polyfill.google.common.collect.Streams; import me.towdium.jecalculation.utils.Utilities; import me.towdium.jecalculation.utils.wrappers.Trio; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ChatComponentTranslation; import org.lwjgl.input.Keyboard; import javax.annotation.ParametersAreNonnullByDefault; -import java.io.File; import java.util.ArrayList; import java.util.IdentityHashMap; import java.util.List; import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; import static me.towdium.jecalculation.data.Controller.recipeIterator; import static me.towdium.jecalculation.gui.Resource.*; @@ -30,10 +23,8 @@ import static me.towdium.jecalculation.gui.widgets.WLabel.Mode.PICKER; @ParametersAreNonnullByDefault public class GuiSearch extends WContainer implements IGui { IdentityHashMap> recipes; - WLabelScroll labels = new WLabelScroll(7, 51, 8, 6, PICKER, true).setListener((i, v) -> { - Trio recipe = recipes.get(i.get(v)); - JecaGui.displayGui(true, true, new GuiRecipe(recipe.two, recipe.three)); - }); + WLabelScroll labels = new WLabelScroll(7, 51, 8, 6, PICKER, true) + .setListener((i, v) -> add(new Overlay(i.get(v)))); WSwitcher group; WTextField text = new WTextField(7, 25, 119); WButton no = new WButtonIcon(130, 25, 20, 20, BTN_NO, "common.cancel") @@ -46,16 +37,28 @@ public class GuiSearch extends WContainer implements IGui { refreshDisplay(); setRename(false); }); - WButton exportN = new WButtonIcon(130, 25, 20, 20, BTN_EXPORT_N, "search.export_all") + WButton exportN = new WButtonIcon(111, 25, 20, 20, BTN_EXPORT_N, "search.export_all") .setListener(i -> Controller.export()); - WButton export1 = new WButtonIcon(130, 25, 20, 20, BTN_EXPORT_1, "search.export_group") + WButton export1 = new WButtonIcon(111, 25, 20, 20, BTN_EXPORT_1, "search.export_group") .setListener(i -> Controller.export(group.getText())); - WButton inport = new WButtonIcon(112, 25, 20, 20, BTN_IMPORT, "search.import") + WButton deleteN = new WButtonIcon(130, 25, 20, 20, BTN_DELETE_N, "search.delete_all") + .setListener(i -> { + Controller.getGroups().forEach(Controller::removeGroup); + refreshGroups(); + refreshDisplay(); + }); + WButton delete1 = new WButtonIcon(130, 25, 20, 20, BTN_DELETE_1, "search.delete_group") + .setListener(i -> { + Controller.removeGroup(group.getText()); + refreshGroups(); + refreshDisplay(); + }); + WButton inport = new WButtonIcon(92, 25, 20, 20, BTN_IMPORT, "search.import") .setListener(i -> JecaGui.displayGui(new GuiImport())); WButton rename = new WButtonIcon(149, 25, 20, 20, BTN_EDIT, "search.rename") .setListener(i -> setRename(true)); WIcon icon = new WIcon(7, 25, 20, 20, ICN_TEXT, "common.search"); - WSearch search = new WSearch(26, 25, 80, labels); + WSearch search = new WSearch(26, 25, 61, labels); List identifiers; public GuiSearch() { @@ -64,7 +67,7 @@ public class GuiSearch extends WContainer implements IGui { yes.setDisabled(s.isEmpty() || Controller.getGroups().contains(s)); }); add(new WHelp("search"), new WPanel()); - add(labels, icon, search, inport, exportN, rename); + add(labels, icon, search, inport, exportN, deleteN, rename); } @@ -77,7 +80,7 @@ public class GuiSearch extends WContainer implements IGui { identifiers.add(id); }; - Recipes.RecipeIterator it = group.getIndex() == 0 ? recipeIterator() : recipeIterator(group.getText()); + Recipes.RecipeIterator it = group.getIndex() == 0 ? Controller.recipeIterator() : Controller.recipeIterator(group.getText()); it.stream().map(j -> new Trio<>(j, it.getGroup(), it.getIndex())).forEach(add); } @@ -91,11 +94,13 @@ public class GuiSearch extends WContainer implements IGui { } public void refreshDisplay() { - remove(exportN, export1); + remove(exportN, export1, deleteN, delete1); generate(); labels.setLabels(identifiers); add(group.getIndex() == 0 ? exportN : export1); + add(group.getIndex() == 0 ? deleteN : delete1); exportN.setDisabled(identifiers.size() == 0); + deleteN.setDisabled(identifiers.size() == 0); rename.setDisabled(group.getIndex() == 0); } @@ -105,7 +110,8 @@ public class GuiSearch extends WContainer implements IGui { groups.add(Utilities.I18n.get("gui.search.all")); groups.addAll(Controller.getGroups()); int index = group == null ? 0 : group.getIndex(); - if (index >= groups.size()) index = groups.size() - 1; + if (index >= groups.size()) + index = groups.size() - 1; group = new WSwitcher(7, 7, 162, groups).setListener(i -> refreshDisplay()); group.setIndex(index); add(group); @@ -129,4 +135,26 @@ public class GuiSearch extends WContainer implements IGui { yes.setDisabled(true); } } + + class Overlay extends WOverlay { + public Overlay(ILabel l) { + Trio recipe = recipes.get(l); + int x = JecaGui.getMouseX(); + int y = JecaGui.getMouseY(); + x = ((x - 7) / 18) * 18 + 6; + y = ((y - 51) / 18) * 18 + 50; + add(new WPanel(x - 5, y - 5, 72, 30)); + add(new WLabel(x, y, 20, 20, PICKER).setLabel(l)); + add(new WButtonIcon(x + 23, y, 20, 20, BTN_EDIT, "search.edit").setListener(i -> { + JecaGui.displayGui(true, true, new GuiRecipe(recipe.two, recipe.three)); + GuiSearch.this.remove(this); + })); + add(new WButtonIcon(x + 42, y, 20, 20, BTN_NO, "search.delete").setListener(i -> { + Controller.removeRecipe(recipe.two, recipe.three); + GuiSearch.this.remove(this); + refreshGroups(); + refreshDisplay(); + })); + } + } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java index d5eaaae..ee98fcc 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabel.java @@ -20,8 +20,7 @@ import static me.towdium.jecalculation.gui.JecaGui.COLOR_TEXT_RED; import static me.towdium.jecalculation.gui.JecaGui.COLOR_TEXT_WHITE; import static me.towdium.jecalculation.gui.JecaGui.Font.HALF; import static me.towdium.jecalculation.gui.JecaGui.Font.PLAIN; -import static me.towdium.jecalculation.gui.Resource.BTN_NO; -import static me.towdium.jecalculation.gui.Resource.BTN_YES; +import static me.towdium.jecalculation.gui.Resource.*; /** * Author: towdium @@ -96,6 +95,11 @@ public class WLabel implements IWidget { } else return false; } + @Nullable + @Override + public ILabel getLabelUnderMouse(int xMouse, int yMouse) { + return mouseIn(xMouse, yMouse) ? label : null; + } @Override public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { @@ -166,79 +170,70 @@ public class WLabel implements IWidget { } - class WAmount extends WContainer { - long old = label.getAmount(); - WButton bAmount = new WButtonText(xPos + xSize + 60, yPos, 20, 20, "#", "general.to_percent") - .setListener(i -> setPercent(true)); - WTextField wtf = new WTextField(xPos + xSize + 10, yPos + ySize / 2 - WTextField.HEIGHT / 2, 50); - WButton bPercent = new WButtonText(xPos + xSize + 60, yPos, 20, 20, "%", "general.to_percent") - .setListener(i -> setPercent(false)); - WLabel wl = new WLabel(xPos, yPos, xSize, ySize, Mode.SELECTOR).setListener((i, v) -> update()); - WButton bYes = new WButtonIcon(xPos + xSize + 83, yPos, 20, 20, BTN_YES) - .setListener(i -> JecaGui.getCurrent().root.remove(this)); - WButton bNo = new WButtonIcon(xPos + xSize + 102, yPos, 20, 20, BTN_NO).setListener(i -> { + class WAmount extends WOverlay { + WLabel temp = new WLabel(xPos, yPos, xSize, ySize, Mode.PICKER).setListener((i, v) -> update()); + WButton number = new WButtonText(xPos + xSize + 60, yPos, 20, 20, "#", "general.to_percent") + .setListener(i -> { + temp.label.setPercent(true); + update(); + }); + WTextField text = new WTextField(xPos + xSize + 10, yPos + ySize / 2 - WTextField.HEIGHT / 2, 50); + WButton percent = new WButtonText(xPos + xSize + 60, yPos, 20, 20, "%", "general.to_percent") + .setListener(i -> { + temp.label.setPercent(false); + update(); + }); + WButton pick = new WButtonIcon(xPos + xSize + 83, yPos, 20, 20, BTN_PICK, "label.pick").setListener(i -> { + JecaGui.getCurrent().hand = temp.label; setLabel(ILabel.EMPTY); + notifyLsnr(); + JecaGui.getCurrent().root.remove(this); + }); + WButton yes = new WButtonIcon(xPos + xSize + 102, yPos, 20, 20, BTN_YES, "label.confirm").setListener(i -> { + setLabel(temp.label); + notifyLsnr(); + JecaGui.getCurrent().root.remove(this); + }); + WButton no = new WButtonIcon(xPos + xSize + 121, yPos, 20, 20, BTN_NO, "label.delete").setListener(i -> { + setLabel(ILabel.EMPTY); + notifyLsnr(); JecaGui.getCurrent().root.remove(this); }); public WAmount() { - wl.setLabel(label); - add(new WPanel(xPos - 5, yPos - 5, xSize + 133, ySize + 10)); + temp.setLabel(label.copy()); + add(new WPanel(xPos - 5, yPos - 5, xSize + 152, ySize + 10)); add(new WText(xPos + xSize + 3, yPos + 5, PLAIN, "x")); - add(wl, wtf, bYes, bNo); - wtf.setListener(i -> { + add(temp, text, pick, yes, no); + text.setListener(i -> { + boolean acceptable; + long amount; try { - long n = Long.parseLong(wtf.getText()); - label.setAmount(n); - wtf.setColor(COLOR_TEXT_WHITE); - bYes.setDisabled(false); + amount = Long.parseLong(text.getText()); + acceptable = amount > 0; + if (!acceptable) amount = 1; } catch (NumberFormatException e) { - boolean acceptable = wtf.getText().isEmpty(); - wtf.setColor(acceptable ? COLOR_TEXT_WHITE : COLOR_TEXT_RED); - bYes.setDisabled(!acceptable); - label.setAmount(acceptable ? 1 : old); + acceptable = text.getText().isEmpty(); + amount = 1; } - notifyLsnr(); + text.setColor(acceptable ? COLOR_TEXT_WHITE : COLOR_TEXT_RED); + yes.setDisabled(!acceptable); + temp.label = temp.label.setAmount(amount); }); update(); } private void update() { - label = wl.label; - bAmount.setDisabled(!label.acceptPercent()); - if (label.isPercent()) { - remove(bAmount); - add(bPercent); + number.setDisabled(!temp.label.acceptPercent()); + if (temp.label.isPercent()) { + remove(number); + add(percent); } else { - remove(bPercent); - add(bAmount); + remove(percent); + add(number); } - wtf.setText(Long.toString(label.getAmount())); + text.setText(Long.toString(temp.label.getAmount())); } - - private void setPercent(boolean b) { - boolean original = label.isPercent(); - if (label.acceptPercent()) label.setPercent(b); - if (b != original) notifyLsnr(); - update(); - } - - @Override - public boolean onKey(JecaGui gui, char ch, int code) { - if (super.onKey(gui, ch, code)) - return true; - if (code == Keyboard.KEY_ESCAPE) { - gui.root.remove(this); - return true; - } else - return false; - } - } - - @Nullable - @Override - public ILabel getLabelUnderMouse(int xMouse, int yMouse) { - return mouseIn(xMouse, yMouse) ? label : null; } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java new file mode 100644 index 0000000..3dbc7a6 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WOverlay.java @@ -0,0 +1,34 @@ +package me.towdium.jecalculation.gui.widgets; + +import me.towdium.jecalculation.gui.JecaGui; +import org.lwjgl.input.Keyboard; + +import javax.annotation.ParametersAreNonnullByDefault; + +/** + * Author: Towdium + * Date: 16/02/19 + */ +@ParametersAreNonnullByDefault +public class WOverlay extends WContainer { + @Override + public boolean onKey(JecaGui gui, char ch, int code) { + if (super.onKey(gui, ch, code)) return true; + if (code == Keyboard.KEY_ESCAPE) { + gui.root.remove(this); + return true; + } else return false; + } + + @Override + public boolean onClicked(JecaGui gui, int xMouse, int yMouse, int button) { + if (!super.onClicked(gui, xMouse, yMouse, button)) gui.root.remove(this); + return true; + } + + @Override + public boolean onScroll(JecaGui gui, int xMouse, int yMouse, int diff) { + if (!super.onScroll(gui, xMouse, yMouse, diff)) gui.root.remove(this); + return true; + } +} diff --git a/src/main/java/me/towdium/jecalculation/utils/Utilities.java b/src/main/java/me/towdium/jecalculation/utils/Utilities.java index 79b174c..282c9a7 100644 --- a/src/main/java/me/towdium/jecalculation/utils/Utilities.java +++ b/src/main/java/me/towdium/jecalculation/utils/Utilities.java @@ -47,7 +47,7 @@ import static net.minecraft.client.resources.I18n.format; @ParametersAreNonnullByDefault public class Utilities { // FLOAT FORMATTING - public static char[] suffix = new char[]{'K', 'M', 'B', 'G', 'T'}; + public static char[] suffix = new char[]{'K', 'M', 'B', 'G', 'T', 'P'}; public static DecimalFormat[] format = new DecimalFormat[]{new DecimalFormat("#."), new DecimalFormat("#.#"), new DecimalFormat("#.##"), diff --git a/src/main/resources/assets/jecalculation/lang/en_US.lang b/src/main/resources/assets/jecalculation/lang/en_US.lang index 3d71189..54471d5 100644 --- a/src/main/resources/assets/jecalculation/lang/en_US.lang +++ b/src/main/resources/assets/jecalculation/lang/en_US.lang @@ -18,7 +18,6 @@ jecalculation.gui.craft.help=Welcome to the main interface of the mod. The first jecalculation.gui.craft.title=Crafting Calculator jecalculation.gui.craft.label=Add label jecalculation.gui.craft.step=Steps -jecalculation.gui.craft.recipe=Add recipe jecalculation.gui.craft.search=Search recipe jecalculation.gui.craft.suggest=Suggestions jecalculation.gui.math.title=Math Calculator @@ -29,8 +28,6 @@ jecalculation.gui.recipe.save.enabled=Save jecalculation.gui.recipe.save.disabled=Cannot save recipe because\nrecipe is invalid or you\nalready have same recipe jecalculation.gui.recipe.copy.enabled=Save as new recipe jecalculation.gui.recipe.copy.disabled=Cannot save as new recipe\nbecause you are not editing\na recipe or already have\nsame recipe -jecalculation.gui.recipe.delete.enabled=Delete recipe -jecalculation.gui.recipe.delete.disabled=Cannot delete recipe because\nyou are not editing a recipe jecalculation.gui.recipe.clear=Clear grid jecalculation.gui.recipe.label=Add label jecalculation.gui.recipe.confirm.enabled=Confirm @@ -42,6 +39,9 @@ jecalculation.gui.recipe.title=Recipe Editing jecalculation.gui.recipe.help=This interface allows you to create or edit recipes. To create one recipe, you can pick items from the JEI item list, then put it into the slots. When finished, simply click the save button. You can also fast transer recipes from JEI by clicking "+" when openning recipe view.\fTo edit one label, you can simply click it, then a toolbar will pop up to help you, where you can switch between amount and percentage mode, type the amount, or remove the label. In addition, you can use mouse scroll to quickly change the amount. Clicking the "Clear" button will remove all of the labels.\fUsing recipe fast transfer, some labels will automatically setup for you, like oreDict labels. If you do not want this behavoir, simply use "Disambiguous" button to select manually. You can also add labels by ckicking the "Add label" button. By the way, normally you shouldn't put fuzzy labels as output.\fYou can easily manage recipes using groups. Click the "New group" button, type the group name and hit the tick, you are done. The new group name will show in the top bar. If you already have groups set up and you want to use an existing one, you can use the arrows to select between them.\fWhen you are editing an existing recipe, you will have two extra buttons, "Save as" and "Delete". "Save as" allows you to save the current recipe as a new recipe, without changing the existing one. "Delete" simply allows you to delete the recipe. jecalculation.gui.label.title=Label Editing jecalculation.gui.label.help=This interface allows you to create labels. This mod provides 4 types of labels: fluid, oreDict, placeholder and item. To create fluid and oreDict label, you can just search and pick. Item labels represent an item stack, but with fuzzy options for meta, nbt and capalibity.\fAs is indicated by the name, Placeholder labels do not hold any content. It is just a string to connect recipes. You can use it for anything, like structure or event energy. To create one, simply type in the name, then hit the tick. You can also search and pick from existing ones. +jecalculation.gui.label.pick=Pick label +jecalculation.gui.label.confirm=Apply changes +jecalculation.gui.label.delete=Delete label jecalculation.gui.search.all=All jecalculation.gui.search.import=Import recipes jecalculation.gui.search.export_group=Export recipes in current group @@ -53,6 +53,11 @@ jecalculation.gui.search.rename.enabled=Rename group jecalculation.gui.search.rename.disabled=Rename options only available\nwhen one group selected jecalculation.gui.search.confirm.enabled=Confirm jecalculation.gui.search.confirm.disabled=New name cannot be empty\nor the same as existing ones +jecalculation.gui.search.delete=Delete recipe +jecalculation.gui.search.edit=Edit recipe +jecalculation.gui.search.delete_group=\u00A7cDelete\u00A7r all recipes in group +jecalculation.gui.search.delete_all.enabled=\u00A7cDelete all\u00A7r recipes +jecalculation.gui.search.delete_all.disabled=No record to delete jecalculation.gui.import.title=Recipe Import jecalculation.gui.import.help=This interface allows you to import recipes. First place exported data files into "config/JustEnoughCalculation/data/", then you will see them in the list organized as "filename/group" if there is no error (otherwise check the log). Use the buttons to select recipe groups to import and hit the tick, then you are done.\fFor pack makers or server owners, you can rename the data file and place it at "config/JustEnoughCalculation/default.json" to set it as default. When player creates world or joins server, the default recipes will be automatically setup for the user. jecalculation.gui.import.confirm.enabled=Confirm diff --git a/src/main/resources/assets/jecalculation/lang/ru_RU.lang b/src/main/resources/assets/jecalculation/lang/ru_RU.lang index ccd6917..f62a4d5 100644 --- a/src/main/resources/assets/jecalculation/lang/ru_RU.lang +++ b/src/main/resources/assets/jecalculation/lang/ru_RU.lang @@ -18,7 +18,6 @@ jecalculation.gui.craft.help=Добро пожаловать в основной jecalculation.gui.craft.title=Калькулятор создания jecalculation.gui.craft.label=Добавить метку jecalculation.gui.craft.step=Этапы -jecalculation.gui.craft.recipe=Добавить рецепт jecalculation.gui.craft.search=Поиск рецепта jecalculation.gui.craft.suggest=Предложения jecalculation.gui.math.title=Математический калькулятор @@ -30,8 +29,6 @@ jecalculation.gui.recipe.save.disabled=Не удается сохранить р jecalculation.gui.recipe.copy.enabled=Сохранить как новый рецепт # changed jecalculation.gui.recipe.copy.disabled=Не удается сохранить как новый рецепт,\nпотому что вы не редактируете\nрецепт -jecalculation.gui.recipe.delete.enabled=Удалить рецепт -jecalculation.gui.recipe.delete.disabled=Не удается удалить рецепт, потому что\nвы не редактируете рецепт jecalculation.gui.recipe.clear=Очистить сетку jecalculation.gui.recipe.label=Добавить метку jecalculation.gui.recipe.confirm.enabled=Подтвердить @@ -43,6 +40,9 @@ jecalculation.gui.recipe.title=Редактирование рецепта jecalculation.gui.recipe.help=Этот интерфейс позволяет создавать или редактировать рецепты. Чтобы создать один рецепт, вы можете выбрать предметы из списка предметов JEI, а затем поместить их в слоты. Когда закончите, просто нажмите кнопку Сохранить. Вы также можете быстро пересылать рецепты из JEI, нажимая "+" при открытии представления рецептов.\fДля редактирования одной метки вы можете просто щелкнуть его, после чего появится всплывающая панель инструментов, где вы можете переключаться между режимом количества и процента, введите сумму или удалите метку. Кроме того, вы можете использовать прокрутку мыши, чтобы быстро изменить сумму. Нажатие кнопки "Очистить" удалит все метки.\fПри использовании быстрого переноса рецепта некоторые метки будут автоматически настроены для вас, например, метки словаря руды. Если вы не хотите этого поведения, просто используйте кнопку "Однозначный", чтобы выбрать вручную. Вы также можете добавить метки, нажав кнопку "Добавить метку". Кстати, обычно вы не должны помещать нечеткие метки в качестве вывода.\fВы можете легко управлять рецептами, используя группы. Нажмите кнопку "Новая группа", введите имя группы и нажмите галочку, все готово. Имя новой группы будет отображаться в верхней панели. Если у вас уже настроены группы и вы хотите использовать существующую, вы можете использовать стрелки для выбора между ними.\fПри редактировании существующего рецепта у вас будут две дополнительные кнопки: "Сохранить как" и "Удалить". "Сохранить как" позволяет сохранить текущий рецепт как новый рецепт, не меняя существующий. "Удалить" просто позволяет удалить рецепт. jecalculation.gui.label.title=Редактирование метки jecalculation.gui.label.help=Этот интерфейс позволяет создавать метки. Этот мод предоставляет 4 типа меток: жидкость, словарь руды, заполнитель и предмет. Чтобы создать жидкостную и словарь руды метки, вы можете просто искать и выбирать. Метки предметво представляют стак предметов, но с нечеткими опциями для мета, nbt и возможность.\fКак указано именем, метки заполнитель не содержат никакого содержимого. Это просто строка для подключения рецептов. Вы можете использовать его для чего угодно, например, для структуры или энергии события. Чтобы создать его, просто введите имя, а затем нажмите галочку. Вы также можете искать и выбирать из существующих. +#jecalculation.gui.label.pick=Pick label +#jecalculation.gui.label.confirm=Apply changes +#jecalculation.gui.label.delete=Delete label jecalculation.gui.search.all=Все jecalculation.gui.search.import=Импорт рецептов jecalculation.gui.search.export_group=Экспорт рецептов в текущую группу @@ -54,6 +54,11 @@ jecalculation.gui.search.help=Этот интерфейс позволяет и # jecalculation.gui.search.rename.disabled=Rename options only available\nwhen one group selected # jecalculation.gui.search.confirm.enabled=Confirm # jecalculation.gui.search.confirm.disabled=New name cannot be empty\nor the same as existing ones +jecalculation.gui.search.delete=Удалить рецепт +# jecalculation.gui.search.edit=Edit recipe +#jecalculation.gui.search.delete_group=\u00A7cDelete\u00A7r all recipes in group +#jecalculation.gui.search.delete_all.enabled=\u00A7cDelete all\u00A7r recipes +#jecalculation.gui.search.delete_all.disabled=No record to delete jecalculation.gui.import.title=Импорт рецепта jecalculation.gui.import.help=Этот интерфейс позволяет импортировать рецепты. Сначала поместите экспортированные файлы данных в "config/JustEnoughCalculation/data/", затем вы увидите их в списке, организованном как "filename/group" если ошибки нет (в противном случае проверьте журнал). Используйте кнопки для выбора групп рецептов для импорта и нажмите галочку, после чего все готово.\fДля производителей модпакетов или владельцев серверов вы можете переименовать файл данных и поместить его в "config/JustEnoughCalculation/default.json", чтобы установить его как по умолчанию. Когда игрок создает мир или присоединяется к серверу, рецепты по умолчанию будут автоматически установлены для пользователя. jecalculation.gui.import.confirm.enabled=Подтвердить diff --git a/src/main/resources/assets/jecalculation/lang/zh_CN.lang b/src/main/resources/assets/jecalculation/lang/zh_CN.lang index 17b84c7..e3096e9 100644 --- a/src/main/resources/assets/jecalculation/lang/zh_CN.lang +++ b/src/main/resources/assets/jecalculation/lang/zh_CN.lang @@ -18,7 +18,6 @@ jecalculation.gui.craft.help=欢迎来到本模组的主界面!首先,我建 jecalculation.gui.craft.title=合成计算器 jecalculation.gui.craft.label=添加标签 jecalculation.gui.craft.step=步骤 -jecalculation.gui.craft.recipe=添加配方 jecalculation.gui.craft.search=查找配方 jecalculation.gui.craft.suggest=建议选项 jecalculation.gui.math.title=数学计算器 @@ -29,8 +28,6 @@ jecalculation.gui.recipe.save.enabled=保存配方 jecalculation.gui.recipe.save.disabled=因为当前配方无效或者\n已经保存过相同的配方\n所以无法保存当前配方 jecalculation.gui.recipe.copy.enabled=另存为新配方 jecalculation.gui.recipe.copy.disabled=因为你不在编辑已有配方\n或已经保存过相同的配方\n所以无法使用另存为 -jecalculation.gui.recipe.delete.enabled=删除配方 -jecalculation.gui.recipe.delete.disabled=因为你不在编辑已有配方\n所以无法使用删除 jecalculation.gui.recipe.clear=清空所有槽位 jecalculation.gui.recipe.label=添加标签 jecalculation.gui.recipe.confirm.enabled=确认 @@ -42,6 +39,9 @@ jecalculation.gui.recipe.title=编辑配方 jecalculation.gui.recipe.help=你可以使用本界面编辑或者创建配方。你可以手动从JEI物品列表抓取物品,然后放入槽位中。除此之外,你也可以使用JEI查询,然后点击“+”来快速转移配方。完成编辑后,点击“保存配方”就可以将该配方添加至你个人的配方库中。\n当你点击一个标签,一个工具栏会弹出来帮助你编辑。你可以使用这个工具栏来输入数量,切换百分比设定,或是删除标签。除此之外,你也可以直接使用鼠标滚轮来编辑标签的数量。\f在你从JEI快速转移配方的时候,系统会帮你自动配置好一些标签,诸如矿辞或是流体之类。如果你不想系统自动匹配,你可以使用消歧义选项来手动选取你需要的标签类型。与此同时,你也可以通过“添加标签”按钮手动选取并添加标签。值得一提的是,虽然本模组不会阻止你在输出列表中使用模糊标签,但是这通常是不必要的。\f你可以使用编组来轻松地管理你的配方。要添加一个新组,你只需要点击“新建编组”,键入名称,再点击确认即可。如果你想要使用已有的编组,可以使用两侧的箭头按钮进行切换。\n在你编辑已有的合成表时,会有两个额外的按钮。使用“另存为”,你可以将当前的合成表保存为新的合成表,而不改动原有合成表。使用“删除”将从合成表库中删除当前合成表。 jecalculation.gui.label.title=编辑标签 jecalculation.gui.label.help=你可以使用该界面创建标签。本模组目前有四类标签:流体栈,矿物词典,占位符和物品栈。要创建流体或矿辞标签,你只需要搜索并抓取即可。物品栈标签可以表示游戏中的物品栈,但是可以对Metadata,NBT和Capability使用额外的模糊选项。\n占位符并不表示任何实际内容,但可以用来链接配方,代表多方块结构,能量,或者任何你能想到的东西。只需要键入名字,就可以创建占位符标签。另外地,你也可以在已有的占位符中直接搜索并抓取。 +jecalculation.gui.label.pick=抓取标签 +jecalculation.gui.label.confirm=应用修改 +jecalculation.gui.label.delete=删除标签 jecalculation.gui.search.all=全部组 jecalculation.gui.search.import=导入配方 jecalculation.gui.search.export_group=导出当前组内的配方 @@ -53,6 +53,11 @@ jecalculation.gui.search.rename.enabled=重命名分组 jecalculation.gui.search.rename.disabled=重命名选项只在选中分组时有效 jecalculation.gui.search.confirm.enabled=确认 jecalculation.gui.search.confirm.disabled=分组名不能为空\n且不能与已有组名重复 +jecalculation.gui.search.delete=删除配方 +jecalculation.gui.search.edit=编辑配方 +jecalculation.gui.search.delete_group=\u00A7c删除\u00A7r分组内所有配方 +jecalculation.gui.search.delete_all.enabled=\u00A7c删除所有\u00A7r配方 +jecalculation.gui.search.delete_all.disabled=没有配方可以删除 jecalculation.gui.import.title=导入配方 jecalculation.gui.import.help=你可以使用该界面导入配方。首先,请将需要导入的文件放置于"config/ JustEnoughCalculation/data/"。在检测到合适的文件时,编组将会以“文件名/组名”的格式显示在列表中。最后选取需要导入的编组,点击确定就完成了。\n对于整合包作者,你可以将符合格式的文件放置于"config/JustEnoughCalculation/ default.json"。在玩家新建世界或者加入服务器时,其中的内容会做为默认值自动载入。 jecalculation.gui.import.confirm.enabled=确认 diff --git a/src/main/resources/assets/jecalculation/textures/gui/resources.png b/src/main/resources/assets/jecalculation/textures/gui/resources.png index 6d49449b5e28ff7673c958ec9743fbcb53b10f30..4ee24caef747384be558d3d9e09ef6bbc067e5e5 100644 GIT binary patch literal 26660 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 D_1Aea literal 24048 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