mirror of
https://github.com/GTNewHorizons/JustEnoughCalculation.git
synced 2026-11-20 03:59:41 +00:00
Add support for calculating multiple items (#14)
* Initial GUI work and basic functionality * New implementation with linkedlist * Use record for groupcraft * Fix small bug with updating calculator and removing items properly * Fix not saving on logout on client * Restore tag workaround * Fix format errors * Revert using * in imports * Spotless again * update bs * update deps --------- Co-authored-by: Caedis <[email protected]>
This commit is contained in:
1 parent
949664b33c
commit
da39c8e14a
8 files changed
+173
-56
No files matched your search
@@ -28,6 +28,7 @@ import me.towdium.jecalculation.data.structure.IRecord;
|
||||
import me.towdium.jecalculation.data.structure.Recipe;
|
||||
import me.towdium.jecalculation.data.structure.Recipes;
|
||||
import me.towdium.jecalculation.data.structure.RecordCraft;
|
||||
import me.towdium.jecalculation.data.structure.RecordGroupCraft;
|
||||
import me.towdium.jecalculation.data.structure.RecordMath;
|
||||
import me.towdium.jecalculation.data.structure.RecordPlayer;
|
||||
import me.towdium.jecalculation.polyfill.MethodsReturnNonnullByDefault;
|
||||
@@ -44,10 +45,12 @@ import me.towdium.jecalculation.utils.wrappers.Pair;
|
||||
public class Controller {
|
||||
|
||||
public static final String KEY_MATH = "math";
|
||||
public static final String KEY_GROUPCRAFT = "groupCraft";
|
||||
public static final String KEY_CRAFT = "craft";
|
||||
public static final String KEY_PLAYER = "player";
|
||||
|
||||
static RecordPlayer rPlayerClient;
|
||||
static RecordGroupCraft rGroupCraftClient;
|
||||
static RecordCraft rCraftClient;
|
||||
static RecordMath rMathClient;
|
||||
|
||||
@@ -181,6 +184,14 @@ public class Controller {
|
||||
return getR(rCraftClient, KEY_CRAFT, RecordCraft::new);
|
||||
}
|
||||
|
||||
public static RecordGroupCraft getRGroupCraft() {
|
||||
return getR(rGroupCraftClient, KEY_GROUPCRAFT, RecordGroupCraft::new);
|
||||
}
|
||||
|
||||
public static void setRGroupCraft(RecordGroupCraft rgc) {
|
||||
setR(rgc, i -> rGroupCraftClient = i, KEY_GROUPCRAFT);
|
||||
}
|
||||
|
||||
public static RecordMath getRMath() {
|
||||
return getR(rMathClient, KEY_MATH, RecordMath::new);
|
||||
}
|
||||
@@ -224,12 +235,14 @@ public class Controller {
|
||||
boolean s = LPlaceholder.state;
|
||||
LPlaceholder.state = true;
|
||||
if (nbt != null) {
|
||||
rGroupCraftClient = new RecordGroupCraft(nbt.getCompoundTag(KEY_GROUPCRAFT));
|
||||
rCraftClient = new RecordCraft(nbt.getCompoundTag(KEY_CRAFT));
|
||||
rMathClient = new RecordMath(nbt.getCompoundTag(KEY_MATH));
|
||||
rPlayerClient = nbt.hasKey(KEY_PLAYER) ? new RecordPlayer(nbt.getCompoundTag(KEY_PLAYER))
|
||||
: new RecordPlayer();
|
||||
} else {
|
||||
rPlayerClient = new RecordPlayer();
|
||||
rGroupCraftClient = new RecordGroupCraft(new NBTTagCompound());
|
||||
rCraftClient = new RecordCraft(new NBTTagCompound());
|
||||
rMathClient = new RecordMath(new NBTTagCompound());
|
||||
}
|
||||
@@ -239,6 +252,7 @@ public class Controller {
|
||||
public static void writeToLocal() {
|
||||
File file = JecaConfig.recordFile;
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
nbt.setTag(KEY_GROUPCRAFT, rGroupCraftClient.serialize());
|
||||
nbt.setTag(KEY_CRAFT, rCraftClient.serialize());
|
||||
nbt.setTag(KEY_PLAYER, rPlayerClient.serialize());
|
||||
nbt.setTag(KEY_MATH, rMathClient.serialize());
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package me.towdium.jecalculation.data.structure;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
|
||||
import me.towdium.jecalculation.data.label.ILabel;
|
||||
|
||||
public class RecordGroupCraft implements IRecord {
|
||||
|
||||
public static final String KEY_ITEMS = "items";
|
||||
|
||||
LinkedList<ILabel> craftList = new LinkedList<>();
|
||||
|
||||
public RecordGroupCraft(NBTTagCompound nbt) {
|
||||
|
||||
}
|
||||
|
||||
public void addLabel(ILabel l) {
|
||||
if (l == ILabel.EMPTY) return;
|
||||
craftList.remove(l);
|
||||
craftList.addFirst(l);
|
||||
}
|
||||
|
||||
public void setAmount(int index, long amount) {
|
||||
if (index < 0 || index >= craftList.size()) return;
|
||||
ILabel l = craftList.get(index);
|
||||
if (l == ILabel.EMPTY) return;
|
||||
l.setAmount(amount);
|
||||
}
|
||||
|
||||
public void removeLabel(int index) {
|
||||
if (index < 0 || index >= craftList.size()) return;
|
||||
craftList.remove(index);
|
||||
}
|
||||
|
||||
public List<ILabel> getCraftList() {
|
||||
return craftList;
|
||||
}
|
||||
|
||||
public ILabel getFirstOrEmpty() {
|
||||
return craftList.isEmpty() ? ILabel.EMPTY : craftList.getFirst();
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound serialize() {
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
NBTTagList items = new NBTTagList();
|
||||
craftList.forEach(l -> items.appendTag(l.SERIALIZER.serialize(l)));
|
||||
nbt.setTag(KEY_ITEMS, items);
|
||||
return nbt;
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,8 @@ package me.towdium.jecalculation.event.handlers;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.InputEvent;
|
||||
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.network.FMLNetworkEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import me.towdium.jecalculation.JustEnoughCalculation;
|
||||
@@ -24,14 +24,9 @@ public class FMLBusEventHandler {
|
||||
JecaGui.onKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* No effect at client only
|
||||
*
|
||||
* @param event event
|
||||
*/
|
||||
@Deprecated
|
||||
@SubscribeEvent
|
||||
public void onLogout(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||
public void onLogout(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
|
||||
JustEnoughCalculation.logger.info("on log out event");
|
||||
Controller.writeToLocal();
|
||||
LPlaceholder.onLogOut();
|
||||
|
||||
@@ -25,6 +25,7 @@ import me.towdium.jecalculation.data.label.ILabel;
|
||||
import me.towdium.jecalculation.data.structure.CostList;
|
||||
import me.towdium.jecalculation.data.structure.CostList.Calculator;
|
||||
import me.towdium.jecalculation.data.structure.RecordCraft;
|
||||
import me.towdium.jecalculation.data.structure.RecordGroupCraft;
|
||||
import me.towdium.jecalculation.gui.JecaGui;
|
||||
import me.towdium.jecalculation.gui.Resource;
|
||||
import me.towdium.jecalculation.gui.widgets.WButton;
|
||||
@@ -56,19 +57,21 @@ public class GuiCraft extends Gui {
|
||||
|
||||
Calculator calculator = null;
|
||||
RecordCraft record;
|
||||
WLabel label = new WLabel(31, 7, 20, 20, true).setLsnrUpdate((i, v) -> refreshLabel(v, false, true));
|
||||
WLabelGroup recent = new WLabelGroup(7, 31, 8, 1, false).setLsnrLeftClick((i, v) -> {
|
||||
RecordGroupCraft groupCraft;
|
||||
WLabel label = new WLabel(31, 7, 20, 20, true).setLsnrUpdate((i, v) -> {
|
||||
v.setAmount(getCurrentAmount());
|
||||
addLabel(v);
|
||||
refreshCrafts();
|
||||
});
|
||||
WLabelGroup recent = new WLabelGroup(7, 51, 8, 1, false).setLsnrLeftClick((i, v) -> {
|
||||
ILabel l = i.get(v)
|
||||
.getLabel();
|
||||
if (l != ILabel.EMPTY) {
|
||||
label.setLabel(
|
||||
i.get(v)
|
||||
.getLabel()
|
||||
.copy(),
|
||||
true);
|
||||
addLabel(l);
|
||||
refreshCrafts();
|
||||
}
|
||||
});
|
||||
WLabelScroll result = new WLabelScroll(7, 87, 8, 4, false).setLsnrLeftClick((i, v) -> {
|
||||
WLabelScroll result = new WLabelScroll(7, 107, 8, 4, false).setLsnrLeftClick((i, v) -> {
|
||||
Object rep = i.get(v)
|
||||
.getLabel()
|
||||
.getRepresentation();
|
||||
@@ -82,25 +85,38 @@ public class GuiCraft extends Gui {
|
||||
})
|
||||
.setFmtAmount(i -> i.getAmountString(true))
|
||||
.setFmtTooltip((i, j) -> i.getToolTip(j, true));
|
||||
WButton steps = new WButtonIcon(64, 62, 20, 20, Resource.BTN_LIST, "craft.step").setListener(i -> setMode(STEPS));
|
||||
WButton catalyst = new WButtonIcon(45, 62, 20, 20, Resource.BTN_CAT, "common.catalyst")
|
||||
WButton steps = new WButtonIcon(64, 82, 20, 20, Resource.BTN_LIST, "craft.step").setListener(i -> setMode(STEPS));
|
||||
WButton catalyst = new WButtonIcon(45, 82, 20, 20, Resource.BTN_CAT, "common.catalyst")
|
||||
.setListener(i -> setMode(CATALYST));
|
||||
WButton output = new WButtonIcon(26, 62, 20, 20, Resource.BTN_OUT, "craft.output")
|
||||
WButton output = new WButtonIcon(26, 82, 20, 20, Resource.BTN_OUT, "craft.output")
|
||||
.setListener(i -> setMode(OUTPUT));
|
||||
WButton input = new WButtonIcon(7, 62, 20, 20, Resource.BTN_IN, "common.input").setListener(i -> setMode(INPUT));
|
||||
WButton invE = new WButtonIcon(149, 62, 20, 20, Resource.BTN_INV_E, "craft.inventory_enabled");
|
||||
WButton invD = new WButtonIcon(149, 62, 20, 20, Resource.BTN_INV_D, "craft.inventory_disabled");
|
||||
WButton input = new WButtonIcon(7, 82, 20, 20, Resource.BTN_IN, "common.input").setListener(i -> setMode(INPUT));
|
||||
WButton invE = new WButtonIcon(149, 82, 20, 20, Resource.BTN_INV_E, "craft.inventory_enabled");
|
||||
WButton invD = new WButtonIcon(149, 82, 20, 20, Resource.BTN_INV_D, "craft.inventory_disabled");
|
||||
WTextField amount = new WTextField(60, 7, 65).setListener(i -> {
|
||||
record.amount = i.getText();
|
||||
Controller.setRCraft(record);
|
||||
groupCraft.setAmount(0, getCurrentAmount());
|
||||
refreshCalculator();
|
||||
});
|
||||
WLabelGroup craftingGroup = new WLabelGroup(7, 31, 8, 1, false).setLsnrLeftClick((i, v) -> {
|
||||
ILabel item = i.get(v)
|
||||
.getLabel();
|
||||
if (item == ILabel.EMPTY) return;
|
||||
addLabel(item);
|
||||
amount.setText(item.getAmountString(false));
|
||||
refreshCrafts();
|
||||
})
|
||||
.setLsnrRightClick((i, v) -> {
|
||||
groupCraft.removeLabel(v + 1);
|
||||
refreshCrafts();
|
||||
})
|
||||
.setFmtAmount(i -> i.getAmountString(true));
|
||||
|
||||
public GuiCraft() {
|
||||
record = Controller.getRCraft();
|
||||
groupCraft = Controller.getRGroupCraft();
|
||||
amount.setText(record.amount);
|
||||
add(new WHelp("craft"));
|
||||
add(new WPanel());
|
||||
add(new WPanel(0, 0, 176, 186));
|
||||
add(
|
||||
new WButtonIcon(7, 7, 20, 20, Resource.BTN_LABEL, "craft.label")
|
||||
.setListener(i -> JecaGui.displayGui(new GuiLabel(l -> {
|
||||
@@ -115,8 +131,18 @@ public class GuiCraft extends Gui {
|
||||
.setListener(i -> JecaGui.displayGui(new GuiSearch())));
|
||||
add(new WText(53, 13, JecaGui.Font.RAW, "x"));
|
||||
add(new WLine(55));
|
||||
add(new WIcon(151, 31, 18, 18, Resource.ICN_RECENT, "craft.history"));
|
||||
add(recent, label, input, output, catalyst, steps, result, amount, record.inventory ? invE : invD);
|
||||
add(new WIcon(151, 51, 18, 18, Resource.ICN_RECENT, "craft.history"));
|
||||
add(
|
||||
craftingGroup,
|
||||
recent,
|
||||
label,
|
||||
input,
|
||||
output,
|
||||
catalyst,
|
||||
steps,
|
||||
result,
|
||||
amount,
|
||||
record.inventory ? invE : invD);
|
||||
invE.setListener(i -> {
|
||||
record.inventory = false;
|
||||
Controller.setRCraft(record);
|
||||
@@ -131,7 +157,7 @@ public class GuiCraft extends Gui {
|
||||
add(invE);
|
||||
refreshCalculator();
|
||||
});
|
||||
refreshRecent();
|
||||
refreshRecent(true);
|
||||
setMode(record.mode);
|
||||
}
|
||||
|
||||
@@ -160,8 +186,8 @@ public class GuiCraft extends Gui {
|
||||
refreshResult();
|
||||
}
|
||||
|
||||
void refreshRecent() {
|
||||
label.setLabel(record.getLatest());
|
||||
void refreshRecent(boolean notify) {
|
||||
label.setLabel(record.getLatest(), notify);
|
||||
recent.setLabel(record.getHistory(), 0);
|
||||
}
|
||||
|
||||
@@ -170,10 +196,7 @@ public class GuiCraft extends Gui {
|
||||
String s = amount.getText();
|
||||
long i = s.isEmpty() ? 1 : Long.parseLong(amount.getText());
|
||||
amount.setColor(JecaGui.COLOR_TEXT_WHITE);
|
||||
List<ILabel> dest = Collections.singletonList(
|
||||
label.getLabel()
|
||||
.copy()
|
||||
.setAmount(i));
|
||||
List<ILabel> dest = groupCraft.getCraftList();
|
||||
CostList list = record.inventory ? new CostList(getInventory(), dest) : new CostList(dest);
|
||||
calculator = list.calculate();
|
||||
} catch (NumberFormatException | ArithmeticException e) {
|
||||
@@ -218,7 +241,7 @@ public class GuiCraft extends Gui {
|
||||
private void refreshLabel(ILabel l, boolean replace, boolean suggest) {
|
||||
boolean dup = record.push(l, replace);
|
||||
Controller.setRCraft(record);
|
||||
refreshRecent();
|
||||
refreshRecent(false);
|
||||
refreshCalculator();
|
||||
if (suggest && findRecipe(l).isEmpty()) {
|
||||
Pair<List<ILabel>, List<ILabel>> guess = ILabel.CONVERTER.guess(Collections.singletonList(l), null);
|
||||
@@ -240,6 +263,26 @@ public class GuiCraft extends Gui {
|
||||
}
|
||||
}
|
||||
|
||||
private void refreshCrafts() {
|
||||
label.setLabel(groupCraft.getFirstOrEmpty(), false);
|
||||
craftingGroup.setLabel(groupCraft.getCraftList(), 1);
|
||||
refreshCalculator();
|
||||
}
|
||||
|
||||
private long getCurrentAmount() {
|
||||
String s = amount.getText();
|
||||
return s.isEmpty() ? 1 : Long.parseLong(amount.getText());
|
||||
}
|
||||
|
||||
private void addLabel(ILabel l) {
|
||||
if (l == ILabel.EMPTY) return;
|
||||
record.push(l, false);
|
||||
Controller.setRCraft(record);
|
||||
groupCraft.addLabel(l);
|
||||
refreshCrafts();
|
||||
refreshRecent(false);
|
||||
}
|
||||
|
||||
private static List<ILabel> findRecipe(ILabel l) {
|
||||
return Controller.recipeIterator()
|
||||
.stream()
|
||||
|
||||
Reference in new issue
Block a user