aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornea <nea@nea.moe>2023-09-09 20:20:10 +0200
committernea <nea@nea.moe>2023-09-09 20:20:10 +0200
commit266786033ba65fa697116e5e6a59dedfc2a20730 (patch)
tree7ea3cc06a04b5df406a7239dad3390471f587f08
parent5b8361e41aaa5171f10059e15ffc4326de9780ea (diff)
downloadNotEnoughUpdates-266786033ba65fa697116e5e6a59dedfc2a20730.tar.gz
NotEnoughUpdates-266786033ba65fa697116e5e6a59dedfc2a20730.tar.bz2
NotEnoughUpdates-266786033ba65fa697116e5e6a59dedfc2a20730.zip
Fix IQ test and oneconfig
-rw-r--r--gradle/libs.versions.toml2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/oneconfig/IOneConfigCompat.java2
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/IQTest.kt2
-rw-r--r--src/oneconfig/java/io/github/moulberry/notenoughupdates/compat/oneconfig/OneConfigCompat.java5
5 files changed, 7 insertions, 6 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fcb8509e..d34734f5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-moulconfig = "1.2.1"
+moulconfig = "1.2.2"
[libraries]
moulconfig = { module = "org.notenoughupdates.moulconfig:MoulConfig", version.ref = "moulconfig" }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 6105ddb8..f81331ea 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -274,7 +274,7 @@ public class NotEnoughUpdates {
if (config.mining.powderGrindingTrackerResetMode == 2)
OverlayManager.powderGrindingOverlay.load();
- IOneConfigCompat.getInstance().ifPresent(it -> it.initConfig(config, this::saveConfig));
+ IOneConfigCompat.getInstance().ifPresent(it -> it.initConfig(config));
MinecraftForge.EVENT_BUS.register(new NEUEventListener(this));
MinecraftForge.EVENT_BUS.register(new RecipeGenerator(this));
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/oneconfig/IOneConfigCompat.java b/src/main/java/io/github/moulberry/notenoughupdates/oneconfig/IOneConfigCompat.java
index ea97de29..4101a715 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/oneconfig/IOneConfigCompat.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/oneconfig/IOneConfigCompat.java
@@ -47,6 +47,6 @@ public abstract class IOneConfigCompat {
return Optional.ofNullable((IOneConfigCompat) INSTANCE);
}
- public abstract void initConfig(Config moulConfig, Runnable saveCallback);
+ public abstract void initConfig(Config moulConfig);
}
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/IQTest.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/IQTest.kt
index 8817dac1..b15649a9 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/IQTest.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/miscfeatures/IQTest.kt
@@ -52,7 +52,7 @@ object IQTest {
} else {
wrongAnswer()
}
- SettingsCommand.lastEditor?.updateSearchResults()
+ SettingsCommand.lastEditor?.updateSearchResults(true)
}
private fun wrongAnswer() {
diff --git a/src/oneconfig/java/io/github/moulberry/notenoughupdates/compat/oneconfig/OneConfigCompat.java b/src/oneconfig/java/io/github/moulberry/notenoughupdates/compat/oneconfig/OneConfigCompat.java
index 9023ce65..069c3d6a 100644
--- a/src/oneconfig/java/io/github/moulberry/notenoughupdates/compat/oneconfig/OneConfigCompat.java
+++ b/src/oneconfig/java/io/github/moulberry/notenoughupdates/compat/oneconfig/OneConfigCompat.java
@@ -21,6 +21,7 @@ package io.github.moulberry.notenoughupdates.compat.oneconfig;
import cc.polyfrost.oneconfig.config.data.Mod;
import cc.polyfrost.oneconfig.config.data.ModType;
+import io.github.moulberry.moulconfig.Config;
import io.github.moulberry.notenoughupdates.oneconfig.IOneConfigCompat;
public class OneConfigCompat extends IOneConfigCompat {
@@ -30,7 +31,7 @@ public class OneConfigCompat extends IOneConfigCompat {
OneMoulConfig omc;
@Override
- public void initConfig(Config moulConfig, Runnable saveCallback) {
- omc = new OneMoulConfig(mod, moulConfig, saveCallback);
+ public void initConfig(Config moulConfig) {
+ omc = new OneMoulConfig(mod, moulConfig);
}
}