diff --git a/CHANGELOG.md b/CHANGELOG.md index fac93cd..f913bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [4.0.0] +- Update neo,forge,fabric loader versions + +## [4.0.0] + - Ported to 1.20.4 ## [3.0.2] diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 8ef4ab5..b20fa4e 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -30,6 +30,6 @@ side = "BOTH" [[dependencies.bambooeverything]] modId = "architectury" mandatory = true -versionRange = "[11.0.8,)" +versionRange = "[11.0.10,)" ordering = "AFTER" side = "BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 87ecea8..6045ad5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +4,18 @@ minecraft_version=1.20.4 enabled_platforms=fabric,forge,neoforge archives_base_name=BambooEverything -mod_version=4.0.0 +mod_version=4.1.0 maven_group=dev.wuffs -architectury_version=11.0.8 +architectury_version=11.0.10 -fabric_loader_version=0.15.1 -fabric_api_version=0.91.2+1.20.4 +fabric_loader_version=0.15.3 +fabric_api_version=0.92.1+1.20.4 -forge_version=1.20.4-49.0.3 +forge_version=1.20.4-49.0.14 # Neo -neo_version=20.4.3-beta +neo_version=20.4.80-beta neo_gradle=[7.0.60,) # Publishing diff --git a/neoforge/src/main/java/dev/wuffs/forge/BambooEverythingForge.java b/neoforge/src/main/java/dev/wuffs/forge/BambooEverythingForge.java index 21551cb..bab27bb 100644 --- a/neoforge/src/main/java/dev/wuffs/forge/BambooEverythingForge.java +++ b/neoforge/src/main/java/dev/wuffs/forge/BambooEverythingForge.java @@ -4,6 +4,7 @@ import dev.architectury.utils.EnvExecutor; import dev.wuffs.BambooEverything; import dev.wuffs.BambooEverythingClient; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; @@ -11,11 +12,11 @@ @Mod(BambooEverything.MOD_ID) public class BambooEverythingForge { - public BambooEverythingForge() { + public BambooEverythingForge(IEventBus modEventBus) { // Event.registerModEventBus(BambooEverything.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); BambooEverything.init(); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); + modEventBus.addListener(this::clientSetup); + modEventBus.addListener(this::commonSetup); EnvExecutor.runInEnv(Env.CLIENT, ()-> BambooEverythingClient::init); } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index c98acc1..b91d772 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -15,21 +15,21 @@ All things bamboo [[dependencies.bambooeverything]] modId = "neoforge" -mandatory = true +required = true versionRange = "[1,)" ordering = "NONE" side = "BOTH" [[dependencies.bambooeverything]] modId = "minecraft" -mandatory = true +required = true versionRange = "[1.20.4,)" ordering = "NONE" side = "BOTH" [[dependencies.bambooeverything]] modId = "architectury" -mandatory = true -versionRange = "[11.0.8,)" +required = true +versionRange = "[11.0.10,)" ordering = "AFTER" side = "BOTH" \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index df5413c..6be63f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ pluginManagement { repositories { maven { url "https://maven.wuffs.wtf/releases" } +// maven { url "https://maven.neomc.dev/releases" } // maven { url "https://maven.creeperhost.net/" } maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.architectury.dev/" }