diff --git a/CHANGELOG.md b/CHANGELOG.md index da98b4e..e37b243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +To be consistent with the main branch, it may miss some versions + +## 3.8.0 + +- Fixed: disamb select no effect + ## 3.6.3 - Feat: add support of `GT++`, `EnderIO`, `Thaumcraft` diff --git a/gradle.properties b/gradle.properties index 083c661..f061720 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3G # suppress inspection "UnusedProperty" for whole file mc_version=1.7.10 nei_version=2.1.5-GTNH -proj_version=3.6.3 \ No newline at end of file +proj_version=3.8.0 \ No newline at end of file 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 787f823..93cf9c5 100644 --- a/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java +++ b/src/main/java/me/towdium/jecalculation/gui/guis/GuiRecipe.java @@ -315,12 +315,12 @@ public class GuiRecipe extends Gui { class WDisamb extends WOverlay { WLabel temp; - WLabel ref; WLabelScroll content; WTextField search; public WDisamb(IO type, int idx) { - ref = getWidget(type).get(idx); + WLabelScroll list = getWidget(type); + WLabel ref = list.get(idx); int x = ref.xPos; int y = ref.yPos; add(new WPanel(x - 7, y - 46, 111, 71)); @@ -328,9 +328,8 @@ public class GuiRecipe extends Gui { temp.setLabel(ref.getLabel().copy()); content = new WLabelScroll(x + 8, y - 40, 4, 2, false).setLabels(disamb.get(type).get(idx)) .setLsnrLeftClick((i, v) -> { - ref.setLabel( - i.get(v).getLabel().copy().multiply(-1), - false); + list.setLabel( + idx, i.get(v).getLabel().copy().multiply(-1)); GuiRecipe.this.setOverlay(null); refresh(); }); diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java index f588046..7aa4127 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelGroup.java @@ -9,7 +9,6 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java index b874923..10708a8 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java @@ -77,6 +77,11 @@ public class WLabelScroll extends WContainer implements ISearchable { return this; } + public WLabelScroll setLabel(int idx, ILabel label) { + labels.set(idx, label); + return setLabels(labels); + } + public boolean setFilter(String str) { if (accept) throw new RuntimeException("Filtering not allowed when editing");