Skip to content

Commit

Permalink
fix lang
Browse files Browse the repository at this point in the history 
store result in class
more work on ui
  • Loading branch information
@ghzdude
ghzdude committed Jan 14, 2024
1 parent ce6f51b commit af04a1e
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 55 deletions.
124 changes: 73 additions & 51 deletions src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

import com.cleanroommc.modularui.api.drawable.IKey;

import com.cleanroommc.modularui.drawable.UITexture;

import com.cleanroommc.modularui.screen.Tooltip;
import com.cleanroommc.modularui.widget.Widget;

import com.cleanroommc.modularui.widgets.CycleButtonWidget;

import gregtech.api.mui.GTGuiTextures;
import gregtech.api.mui.GTGuis;
import gregtech.api.unification.OreDictUnifier;
Expand All @@ -14,6 +21,7 @@
import gregtech.common.gui.widget.HighlightedTextField;
import gregtech.common.gui.widget.orefilter.OreFilterTestSlot;

import net.minecraft.client.resources.I18n;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
Expand Down Expand Up @@ -44,7 +52,7 @@ public class OreDictionaryItemFilter extends ItemFilter {
private final SingleItemVariantMap<Boolean> noOreDictMatch = new SingleItemVariantMap<>();

private OreGlob glob = ImpossibleOreGlob.getInstance();
private boolean error;
private OreGlobCompileResult result;
private final OreDictionaryFilterReader filterReader;

public OreDictionaryItemFilter(ItemStack stack) {
Expand All @@ -67,12 +75,11 @@ protected void recompile() {
clearCache();
String expr = this.filterReader.getExpression();
if (!expr.isEmpty()) {
OreGlobCompileResult result = OreGlob.compile(expr, !this.filterReader.isCaseSensitive());
result = OreGlob.compile(expr, !this.filterReader.isCaseSensitive());
this.glob = result.getInstance();
this.error = result.hasError();
} else {
this.glob = ImpossibleOreGlob.getInstance();
this.error = true;
result = null;
}
}

Expand Down Expand Up @@ -197,9 +204,16 @@ public ParentWidget<?> createWidgets(GuiSyncManager syncManager) {
.height(18).widthRel(1f))
.child(new Row().coverChildrenHeight()
.widthRel(1f)
.child(GTGuiTextures.OREDICT_INFO.asWidget().marginRight(4)
.tooltip(tooltip -> tooltip.setAutoUpdate(true))
.tooltipBuilder(tooltip -> tooltip.addLine(glob.toString())))
.child(new Column().height(18)
.coverChildrenWidth().marginRight(2)
.child(GTGuiTextures.OREDICT_INFO.asWidget()
.size(8).top(0)
.addTooltipLine(IKey.lang("cover.ore_dictionary_filter.info")))
.child(new Widget<>()
.size(8).bottom(0)
.onUpdateListener(this::getStatusIcon)
.tooltipBuilder(this::createStatusTooltip)
.tooltip(tooltip -> tooltip.setAutoUpdate(true))))
.child(SlotGroupWidget.builder()
.row("XXXXX")
.key('X', i -> {
Expand All @@ -209,24 +223,66 @@ public ParentWidget<?> createWidgets(GuiSyncManager syncManager) {
return slot;
})
.build().marginRight(4))
.child(new ToggleButton()
.child(new CycleButtonWidget()
.size(18).value(caseSensitive)
// todo fix the textures for hovering
.background(GTGuiTextures.MC_BUTTON_DISABLED)
.selectedBackground(GTGuiTextures.MC_BUTTON)
.textureGetter(i -> GTGuiTextures.BUTTON_CASE_SENSITIVE[i])
.marginRight(4)
.tooltip(tooltip -> tooltip.setAutoUpdate(true))
.addTooltipLine(IKey.lang("cover.ore_dictionary_filter.case_sensitive",
caseSensitive.getBoolValue())))
.child(new ToggleButton()
.child(new CycleButtonWidget()
.size(18).value(matchAll)
.background(GTGuiTextures.MC_BUTTON_DISABLED)
.selectedBackground(GTGuiTextures.MC_BUTTON)
.textureGetter(i -> GTGuiTextures.BUTTON_MATCH_ALL[i])
.tooltip(tooltip -> tooltip.setAutoUpdate(true))
.addTooltipLine(IKey.lang("cover.ore_dictionary_filter.match_all",
matchAll.getBoolValue()))));
}

protected void getStatusIcon(Widget<?> widget) {
UITexture texture;
if (this.result == null) {
texture = GTGuiTextures.OREDICT_WAITING;
} else if (this.result.getReports().length == 0) {
texture = GTGuiTextures.OREDICT_SUCCESS;
} else if (this.result.hasError()) {
texture = GTGuiTextures.OREDICT_ERROR;
} else {
texture = GTGuiTextures.OREDICT_WARN;
}
widget.background(texture);
}

protected void createStatusTooltip(Tooltip tooltip) {
List<String> list = new ArrayList<>();
if (result == null) return;

int error = 0, warn = 0;
for (OreGlobCompileResult.Report report : this.result.getReports()) {
if (report.isError()) error++;
else warn++;
list.add((report.isError() ? TextFormatting.RED : TextFormatting.GOLD) + report.toString());
}
if (error > 0) {
if (warn > 0) {
list.add(0, I18n.format("cover.ore_dictionary_filter.status.err_warn", error, warn));
} else {
list.add(0, I18n.format("cover.ore_dictionary_filter.status.err", error));
}
} else {
if (warn > 0) {
list.add(0, I18n.format("cover.ore_dictionary_filter.status.warn", warn));
} else {
list.add(I18n.format("cover.ore_dictionary_filter.status.no_issues"));
}
list.add("");
list.add(I18n.format("cover.ore_dictionary_filter.status.explain"));
list.add("");
list.addAll(this.result.getInstance().toFormattedString());
}
tooltip.addStringLines(list);
}

protected String highlightRule(StringBuilder h) {
for (int i = 0; i < h.length(); i++) {
switch (h.charAt(i)) {
Expand Down Expand Up @@ -280,7 +336,7 @@ public MatchResult<Integer> matchItemStack(ItemStack itemStack) {
}

public boolean matchesItemStack(@NotNull ItemStack itemStack) {
if (this.error) return false;
if (this.result.hasError()) return false;
Item item = itemStack.getItem();
ItemVariantMap<Set<String>> oreDictEntry = OreDictUnifier.getOreDictionaryEntry(item);

Expand Down Expand Up @@ -332,47 +388,14 @@ public boolean showGlobalTransferLimitSlider() {
return true;
}

@Override
public void writeToNBT(NBTTagCompound tag) {
// tag.setString("OreDictionaryFilter", expression);
// if (this.caseSensitive) tag.setBoolean("caseSensitive", true);
// if (this.matchAll) tag.setBoolean("matchAll", true);
}

@Override
public void readFromNBT(NBTTagCompound tag) {
// this.expression = tag.getString("OreDictionaryFilter");
// this.caseSensitive = tag.getBoolean("caseSensitive");
// this.matchAll = tag.getBoolean("matchAll");
this.filterReader.setExpression(tag.getString("OreDictionaryFilter"));
this.filterReader.setCaseSensitive(tag.getBoolean("caseSensitive"));
this.filterReader.setMatchAll(tag.getBoolean("matchAll"));
recompile();
}

// public static class ForcedInitialSyncImageCycleButtonWidget extends ImageCycleButtonWidget {
//
// private final BooleanConsumer updater;
//
// public ForcedInitialSyncImageCycleButtonWidget(int xPosition, int yPosition, int width, int height,
// TextureArea buttonTexture, BooleanSupplier supplier,
// BooleanConsumer updater) {
// super(xPosition, yPosition, width, height, buttonTexture, supplier, updater);
// this.currentOption = 0;
// this.updater = updater;
// }
//
// @Override
// public void readUpdateInfo(int id, PacketBuffer buffer) {
// if (id == 1) {
// int currentOptionCache = this.currentOption;
// super.readUpdateInfo(id, buffer);
// if (this.currentOption != currentOptionCache) {
// this.updater.apply(currentOption >= 1); // call updater to apply necessary state changes
// }
// } else {
// super.readUpdateInfo(id, buffer);
// }
// }
// }

protected class OreDictionaryFilterReader extends BaseFilterReader {

private static final String EXPRESSION = "expression";
Expand All @@ -381,7 +404,6 @@ protected class OreDictionaryFilterReader extends BaseFilterReader {

public OreDictionaryFilterReader(ItemStack container, int slots) {
super(container, slots);
// setExpression("");
setCaseSensitive(true);
setMatchAll(true);
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/gregtech/common/gui/widget/orefilter/OreFilterTestSlot.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package gregtech.common.gui.widget.orefilter;

import com.cleanroommc.modularui.drawable.UITexture;

import gregtech.api.unification.OreDictUnifier;
import gregtech.api.util.function.BooleanConsumer;
import gregtech.api.util.oreglob.OreGlob;
Expand All @@ -22,9 +24,6 @@
*/
public class OreFilterTestSlot extends ItemSlot {

// private final IWidget match;
// private final IWidget noMatch;

private final ItemOreFilterTestSlot slot;
private Supplier<OreGlob> globSupplier = ImpossibleOreGlob::getInstance;
private boolean expectedResult = true;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/gregtech/lang/en_us.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ cover.filter.blacklist.disabled=Whitelist
cover.filter.blacklist.enabled=Blacklist

cover.ore_dictionary_filter.title=Ore Dictionary Filter
cover.ore_dictionary_filter.info=§bAccepts complex expressions/n§6a & b§r = AND/n§6a | b§r = OR/n§6a ^ b§r = XOR/n§6! abc§r = NOT/n§6( abc )§r for grouping/n§6*§r for wildcard (i.e. 0 or more characters)/n§6?§r for any 1 character/n§6()§r for matching empty entry (including items with no ore dictionary)/n§bExample:/n§6dust*Gold | (plate* & !*Double*)/nWill match all gold dusts of all sizes or all plates, but not double plates
cover.ore_dictionary_filter.info=§bAccepts complex expressions\n§6a & b§r = AND\n§6a | b§r = OR\n§6a ^ b§r = XOR\n§6! abc§r = NOT\n§6( abc )§r for grouping\n§6*§r for wildcard (i.e. 0 or more characters)\n§6?§r for any 1 character\n§6()§r for matching empty entry (including items with no ore dictionary)\n§bExample:\n§6dust*Gold | (plate* & !*Double*)\nWill match all gold dusts of all sizes or all plates, but not double plates
cover.ore_dictionary_filter.match_all=Match All: %s
cover.ore_dictionary_filter.case_sensitive=Case Sensitive: %s
cover.ore_dictionary_filter.test_slot.info=Insert a item to test if it matches the filter expression
Expand Down

0 comments on commit af04a1e

Please sign in to comment.