firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[BUG] Fix Config watcher using too many threads and not detecting changes on Linux systems

Browse Source
This commit is contained in:
HypherionSA
2025-03-13 15:01:19 +02:00
parent 1a48fb6d33
commit 23720f6629
65 changed files with 186 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
1.18.2/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

7
1.18.2/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.18.2/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -21,7 +21,7 @@ fabric_api=0.76.0+1.18.2
forge_version=40.2.0 forge_version=40.2.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.19.2/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

7
1.19.2/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.19.2/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -21,7 +21,7 @@ fabric_api=0.76.0+1.19.2
forge_version=43.4.0 forge_version=43.4.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.19.3/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

7
1.19.3/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.19.3/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -21,7 +21,7 @@ fabric_api=0.87.2+1.19.4
forge_version=45.3.0 forge_version=45.3.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.20.2/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

7
1.20.2/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.20.2/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -21,7 +21,7 @@ fabric_api=0.91.6+1.20.2
forge_version=48.1.0 forge_version=48.1.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.20.4/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

3
1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -29,9 +29,8 @@ public class ConfigScreenHandlerMixin {
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) { if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
AbstractConfig config = watcher.getLeft();
if (config.getModId().equals(selectedMod.getModId())) { if (config.getModId().equals(selectedMod.getModId())) {
cir.setReturnValue( cir.setReturnValue(
Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen)) Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))

7
1.20.4/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.20.4/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -24,7 +24,7 @@ forge_version=49.0.49
neoforge_version=234 neoforge_version=234
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.20/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.20/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

1
1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -32,7 +32,6 @@ public class ConfigScreenHandlerMixin {
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;

5
1.20/changelog.md
View File

@@ -1,8 +1,13 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
- Fixed crash when trying to open config screens on NeoForge - Fixed crash when trying to open config screens on NeoForge
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.20/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -21,7 +21,7 @@ fabric_api=0.83.0+1.20
forge_version=46.0.14 forge_version=46.0.14
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.21.2/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

5
1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
View File

@@ -54,12 +54,11 @@ public class NeoForgeClientHelper implements ClientPlatform {
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
CraterEventBus.INSTANCE.postEvent(event); CraterEventBus.INSTANCE.postEvent(event);
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
} else { } else {
//ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
1.21.2/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.21.2/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -24,7 +24,7 @@ forge_version=50.0.6
neoforge_version=16-beta neoforge_version=16-beta
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

10
1.21/Common/src/main/java/com/hypherionmc/craterlib/core/config/ConfigController.java
View File

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
/** /**
* @author HypherionSA * @author HypherionSA
@@ -19,7 +20,9 @@ public final class ConfigController implements Serializable {
* Cache of registered configs * Cache of registered configs
*/ */
@Getter @Getter
private static final HashMap<String, Pair<AbstractConfig, FileWatcher>> watchedConfigs = new HashMap<>(); private static final HashMap<String, AbstractConfig> watchedConfigs = new HashMap<>();
private static FileWatcher watcher = new FileWatcher(e -> CraterConstants.LOG.error("Config Watcher Error", e));
/** /**
* INTERNAL METHOD - Register and watch the config * INTERNAL METHOD - Register and watch the config
@@ -42,9 +45,8 @@ public final class ConfigController implements Serializable {
if (watchedConfigs.containsKey(config.getConfigPath().toString())) { if (watchedConfigs.containsKey(config.getConfigPath().toString())) {
CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName()); CraterConstants.LOG.error("Failed to register {}. Config already registered", config.getConfigPath().getName());
} else { } else {
FileWatcher configWatcher = new FileWatcher();
try { try {
configWatcher.setWatch(config.getConfigPath(), () -> { watcher.addWatch(config.getConfigPath(), () -> {
if (!config.isWasSaveCalled()) { if (!config.isWasSaveCalled()) {
CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName()); CraterConstants.LOG.info("Sending Reload Event for: {}", config.getConfigPath().getName());
config.configReloaded(); config.configReloaded();
@@ -53,7 +55,7 @@ public final class ConfigController implements Serializable {
} catch (Exception e) { } catch (Exception e) {
CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage()); CraterConstants.LOG.error("Failed to register {} for auto reloading. {}", config.getConfigPath().getName(), e.getMessage());
} }
watchedConfigs.put(config.getConfigPath().toString(), Pair.of(config, configWatcher)); watchedConfigs.put(config.getConfigPath().toString(), config);
CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName()); CraterConstants.LOG.info("Registered {} successfully!", config.getConfigPath().getName());
} }
} }

7
1.21/Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,8 +1,6 @@
package com.hypherionmc.craterlib; package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder; import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.AbstractConfig;
import com.hypherionmc.craterlib.core.config.ConfigController; import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.annotations.ClothScreen; import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen; import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
@@ -27,12 +25,11 @@ public class CraterLibModMenuIntegration implements ModMenuApi {
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>(); Map<String, ConfigScreenFactory<?>> configScreens = new HashMap<>();
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)); configScreens.put(config.getModId(), screen -> ClothConfigScreenBuilder.buildConfigScreen(config, screen));
} else { } else {
configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen( configScreens.put(config.getModId(), screen -> BridgedMinecraft.getInstance().buildWarningScreen(

5
1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
View File

@@ -54,12 +54,11 @@ public class NeoForgeClientHelper implements ClientPlatform {
LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
CraterEventBus.INSTANCE.postEvent(event); CraterEventBus.INSTANCE.postEvent(event);
ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { ConfigController.getWatchedConfigs().forEach((conf, config) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
} else { } else {
//ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
1.21/changelog.md
View File

@@ -1,7 +1,12 @@
**Bug Fixes**: **Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
**New Features**: **New Features**:
- Added Nojang API to allow mods to access GameRules (SDLink) - Added Nojang API to allow mods to access GameRules (SDLink)
**Dev Changes**:
- Bumped MoonConfig - `1.0.10` -> `1.0.11`

4
1.21/gradle.properties
View File

@@ -2,7 +2,7 @@
version_major=2 version_major=2
version_minor=1 version_minor=1
version_patch=4 version_patch=4
version_build=0 version_build=1
#Mod #Mod
mod_author=HypherionSA mod_author=HypherionSA
@@ -24,7 +24,7 @@ forge_version=50.0.6
neoforge_version=167 neoforge_version=167
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
lombok=1.18.32 lombok=1.18.32
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

2
commit.sha
View File

@@ -1 +1 @@
3680e085db3b4b74a2885c79ad909e7170e71403 b800a4ea78e2eae9b5d66af9d8c33f186b09eb26

7
patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -18,7 +18,7 @@
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -19,24 +22,30 @@ @@ -19,23 +22,29 @@
/** /**
* @author HypherionSA * @author HypherionSA
*/ */
@@ -33,13 +33,12 @@
- @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) - @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
+ @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false) + @Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,69 +1,0 @@ @@ -1,68 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

2
patches/1.18.2/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+forge_version=40.2.0 +forge_version=40.2.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +26,22 @@ @@ -29,23 +26,22 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -14,17 +14,16 @@
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
@@ -28,15 +31,21 @@ @@ -28,14 +31,20 @@
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,69 +1,0 @@ @@ -1,68 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

2
patches/1.19.2/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+forge_version=43.4.0 +forge_version=43.4.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +26,22 @@ @@ -29,23 +26,22 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -14,17 +14,16 @@
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
@@ -28,17 +31,22 @@ @@ -28,16 +31,21 @@
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,69 +1,0 @@ @@ -1,68 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

2
patches/1.19.3/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+forge_version=45.3.0 +forge_version=45.3.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +26,22 @@ @@ -29,23 +26,22 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -14,17 +14,16 @@
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
@@ -28,17 +31,22 @@ @@ -28,16 +31,21 @@
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,69 +1,0 @@ @@ -1,68 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

2
patches/1.20.2/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+forge_version=48.1.0 +forge_version=48.1.0
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +26,22 @@ @@ -29,23 +26,22 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -14,17 +14,16 @@
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
@@ -28,17 +31,22 @@ @@ -28,16 +31,21 @@
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -24,7 +24,7 @@
import java.util.Objects; import java.util.Objects;
@@ -48,22 +37,5 @@ @@ -48,21 +37,5 @@
public Connection getClientConnection() { public Connection getClientConnection() {
Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!"); Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
return Minecraft.getInstance().getConnection().getConnection(); return Minecraft.getInstance().getConnection().getConnection();
@@ -34,12 +34,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

5
patches/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -1,6 +1,6 @@
--- /dev/null --- /dev/null
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java +++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
@@ -1,0 +1,44 @@ @@ -1,0 +1,43 @@
+package com.hypherionmc.craterlib.mixin; +package com.hypherionmc.craterlib.mixin;
+ +
+import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; +import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -32,9 +32,8 @@
+ */ + */
+ @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) + @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
+ private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { + private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, config) -> {
+ if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) { + if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
+ AbstractConfig config = watcher.getLeft();
+ if (config.getModId().equals(selectedMod.getModId())) { + if (config.getModId().equals(selectedMod.getModId())) {
+ cir.setReturnValue( + cir.setReturnValue(
+ Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen)) + Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))

2
patches/1.20.4/gradle.properties.patch
View File

@@ -23,7 +23,7 @@
+neoforge_version=234 +neoforge_version=234
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +29,23 @@ @@ -29,23 +29,23 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -14,17 +14,16 @@
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
@@ -28,17 +31,22 @@ @@ -28,16 +31,21 @@
*/ */
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
+ ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { + ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
AbstractConfig config = watcher.getLeft();
if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
return; return;
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ /dev/null +++ /dev/null
@@ -1,69 +1,0 @@ @@ -1,68 +1,0 @@
-package com.hypherionmc.craterlib.client; -package com.hypherionmc.craterlib.client;
- -
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent; -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
@@ -57,12 +57,11 @@
- LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options)); - LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
- CraterEventBus.INSTANCE.postEvent(event); - CraterEventBus.INSTANCE.postEvent(event);
- -
- ConfigController.getWatchedConfigs().forEach((conf, watcher) -> { - ConfigController.getWatchedConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

4
patches/1.20/changelog.md.patch
View File

@@ -1,9 +1,9 @@
--- a/changelog.md --- a/changelog.md
+++ b/changelog.md +++ b/changelog.md
@@ -1,6 +1,7 @@ @@ -2,6 +2,7 @@
**Bug Fixes**:
- Fixed LuckPerms breaking commands on Paper - Fixed LuckPerms breaking commands on Paper
- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fixed crash when trying to open config screens on NeoForge +- Fixed crash when trying to open config screens on NeoForge
**New Features**: **New Features**:

2
patches/1.20/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+forge_version=46.0.14 +forge_version=46.0.14
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,23 +26,22 @@ @@ -29,23 +26,22 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0

7
patches/1.21.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -1,6 +1,6 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java --- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
+++ /dev/null +++ /dev/null
@@ -1,44 +1,0 @@ @@ -1,43 +1,0 @@
-package com.hypherionmc.craterlib.mixin; -package com.hypherionmc.craterlib.mixin;
- -
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; -import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -31,12 +31,11 @@
- */ - */
- @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) - @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
- private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { - private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

7
patches/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch
View File

@@ -1,6 +1,6 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java --- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
+++ /dev/null +++ /dev/null
@@ -1,44 +1,0 @@ @@ -1,43 +1,0 @@
-package com.hypherionmc.craterlib.mixin; -package com.hypherionmc.craterlib.mixin;
- -
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen; -import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
@@ -31,12 +31,11 @@
- */ - */
- @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false) - @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
- private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) { - private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
- ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> { - ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
- AbstractConfig config = watcher.getLeft();
- if (config.getClass().isAnnotationPresent(NoConfigScreen.class)) - if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
- return; - return;
- -
- if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) { - if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
- ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen)))); - ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
- } else { - } else {
- //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen)))); - //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));

2
patches/1.21/gradle.properties.patch
View File

@@ -22,7 +22,7 @@
+neoforge_version=167 +neoforge_version=167
# Dependencies # Dependencies
moon_config=1.0.10 moon_config=1.0.11
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
adventure=4.17.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0