diff --git a/README.md b/README.md index 97f48b66..f9f09f73 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,4 @@ From [CurseForge](https://curseforge.com/minecraft/mc-mods/ultreonlib) or [Modri ## License Notes * The package `io.github.xypercode.craftyconfig` and all it's subpackages are licensed under AGPL v3. - Originates from [Ultracraft](https://github.com/Ultreon/ultracraft). + Originates from [Quantum Voxel](https://github.com/Ultreon/quantum-voxel). diff --git a/common/src/main/java/com/ultreon/mods/lib/mixin/common/ButtonAccessor.java b/common/src/main/java/com/ultreon/mods/lib/mixin/common/ButtonAccessor.java index 6ca77f79..4bafb88e 100644 --- a/common/src/main/java/com/ultreon/mods/lib/mixin/common/ButtonAccessor.java +++ b/common/src/main/java/com/ultreon/mods/lib/mixin/common/ButtonAccessor.java @@ -2,10 +2,12 @@ import net.minecraft.client.gui.components.Button; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(Button.class) public interface ButtonAccessor { + @Mutable @Accessor("onPress") void setOnPress(Button.OnPress onPress); @Accessor("onPress") diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index fc70205d..a9ea840b 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -43,10 +43,10 @@ ], "depends": { "fabricloader": ">=0.14.22", - "minecraft": ">=1.20.2 <1.20.3", + "minecraft": "1.20.4", "fabric-api": "*", - "architectury": ">=10 <11", - "forgeconfigapiport": ">=9 <10" + "architectury": "11.*", + "forgeconfigapiport": "20.4.*" }, "suggests": { "modmenu": "*" diff --git a/forge/src/main/java/com/ultreon/mods/lib/forge/UltreonLibForge.java b/forge/src/main/java/com/ultreon/mods/lib/forge/UltreonLibForge.java index 4df6f324..41788fea 100644 --- a/forge/src/main/java/com/ultreon/mods/lib/forge/UltreonLibForge.java +++ b/forge/src/main/java/com/ultreon/mods/lib/forge/UltreonLibForge.java @@ -31,10 +31,10 @@ public class UltreonLibForge { private final UltreonLib ultreonLib; public UltreonLibForge() { - ultreonLib = UltreonLib.create(); - EventBuses.registerModEventBus(UltreonLib.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); MOD_EVENTBUS = FMLJavaModLoadingContext.get().getModEventBus(); + + ultreonLib = UltreonLib.create(); FMLJavaModLoadingContext javaFmlLoadingCtx = FMLJavaModLoadingContext.get(); ModLoadingContext loadingCtx = ModLoadingContext.get(); IEventBus forgeEventBus = MinecraftForge.EVENT_BUS; diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 3155341b..1cc49050 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -38,3 +38,10 @@ mandatory = true versionRange = "[11,12)" ordering = "NONE" side = "BOTH" + +[[dependencies.ultreonlib]] +modId = "forgeconfigapiport" +mandatory = true +versionRange = "[20.4,20.5)" +ordering = "BEFORE" +side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 788b1ab6..8b344269 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx5G minecraft_version=1.20.4 archives_base_name=ultreonlib -mod_version=1.6.0 +mod_version=1.6.0-beta.1 maven_group=com.ultreon.mods architectury_version=11.1.17 fabric_loader_version=0.14.24 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index fa4fb478..d662936a 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -69,7 +69,6 @@ processResources { shadowJar { exclude "fabric.mod.json" - exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] archiveClassifier = "dev-shadow"