mirror of
https://github.com/GTNewHorizons/JustEnoughCalculation.git
synced 2026-11-14 01:04:06 +00:00
Fix disamb select no effect
Co-authored-by: Towdium <[email protected]>
This commit is contained in:
1 parent
c88415241f
commit
45a1bb1761
5 files changed
+16
-7
No files matched your search
@@ -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`
|
||||
|
||||
+1
-1
@@ -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
|
||||
proj_version=3.8.0
|
||||
@@ -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();
|
||||
});
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in new issue
Block a user