From 16e579d54f0c90f843c312627afafed793854e47 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 13 Jun 2024 16:53:28 -0300 Subject: [PATCH] port to 1.21 --- build.gradle | 4 ++-- .../extremesoundmuffler/SoundMufflerCommon.java | 2 +- .../leobeliik/extremesoundmuffler/utils/Anchor.java | 2 +- .../extremesoundmuffler/utils/DataManager.java | 2 +- fabric/src/main/resources/fabric.mod.json | 4 ++-- forge/src/main/resources/META-INF/mods.toml | 8 ++++---- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 6 +++++- .../leobeliik/extremesoundmuffler/NeoForgeConfig.java | 5 +++-- .../extremesoundmuffler/SoundMufflerNeoForge.java | 5 +++-- .../src/main/resources/META-INF/neoforge.mods.toml | 8 ++++---- settings.gradle | 2 +- 13 files changed, 33 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 3f4cd8c..6c67ef2 100644 --- a/build.gradle +++ b/build.gradle @@ -60,8 +60,8 @@ subprojects { "version": modversion, "group": project.group, //Else we target the task's group. "minecraft_version": minecraft_version, - "forge_version": forge_version, - "forge_version_range": forge_version, + //"forge_version": forge_version, + //"forge_version_range": forge_version, "minecraft_version_range": minecraft_version, "fabric_version": fabric_version, "fabric_loader_version": fabric_loader_version, diff --git a/common/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerCommon.java b/common/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerCommon.java index 09f93d2..c48aab5 100644 --- a/common/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerCommon.java +++ b/common/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerCommon.java @@ -16,7 +16,7 @@ public static void renderGui() { public static ResourceLocation getTextureRL() { String texture = CommonConfig.get().useDarkTheme().get() ? "textures/gui/sm_gui_dark.png" : "textures/gui/sm_gui.png"; - return new ResourceLocation(Constants.MOD_ID, texture); + return ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, texture); } public static void openMainScreen() { diff --git a/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/Anchor.java b/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/Anchor.java index 56cf61a..76497b1 100644 --- a/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/Anchor.java +++ b/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/Anchor.java @@ -65,7 +65,7 @@ private void setName(String name) { public SortedMap getMuffledSounds() { SortedMap temp = new TreeMap<>(); - this.muffledSounds.forEach((R, D) -> temp.put(new ResourceLocation(R), D)); + this.muffledSounds.forEach((R, D) -> temp.put(ResourceLocation.parse(R), D)); return temp; } diff --git a/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/DataManager.java b/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/DataManager.java index 4da398b..36e4957 100644 --- a/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/DataManager.java +++ b/common/src/main/java/com/leobeliik/extremesoundmuffler/utils/DataManager.java @@ -23,7 +23,7 @@ public class DataManager implements ISoundLists { private static final Gson gson = new GsonBuilder().setPrettyPrinting().create(); public static void loadData() { - Optional.ofNullable(loadMuffledMap()).ifPresent(mm -> mm.forEach((R, D) -> muffledSounds.put(new ResourceLocation(R), D))); + Optional.ofNullable(loadMuffledMap()).ifPresent(mm -> mm.forEach((R, D) -> muffledSounds.put(ResourceLocation.parse(R), D))); if (!CommonConfig.get().disableAnchors().get()) { anchorList.clear(); diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ef2a7cc..fd702d1 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -27,8 +27,8 @@ "modmenu:clientsideOnly": true }, "depends": { - "fabricloader": ">=0.12", - "fabric": ">=0.45", + "fabricloader": ">=0.15", + "fabric": ">=0.100", "minecraft": "~${minecraft_version}", "java": ">=21" } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 55209f6..8d48eaf 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,11 +1,11 @@ modLoader = "javafml" #mandatory -loaderVersion = "50.0.19" #mandatory This is typically bumped every Minecraft version by Forge. See https://files.minecraftforge.net/ for a list of versions. +loaderVersion = "51.0.0" #mandatory This is typically bumped every Minecraft version by Forge. See https://files.minecraftforge.net/ for a list of versions. license = "GNU LESSER GENERAL PUBLIC LICENSE" # Review your options at https://choosealicense.com/. licenseURL= "https://github.com/LeoBeliik/ExtremeSoundMuffler/blob/master/LICENSE.txt" issueTrackerURL="https://github.com/LeoBeliik/ExtremeSoundMuffler/issues" [[mods]] #mandatory modId = "extremesoundmuffler" #mandatory -version = "3.45.1" #mandatory +version = "3.46" #mandatory displayName="Extreme Sound Muffler" displayURL="https://www.curseforge.com/minecraft/mc-mods/extreme-sound-muffler" logoFile= "esm_logo.png" #optional @@ -18,12 +18,12 @@ This mod also works Clientside only. [[dependencies.extremesoundmuffler]] #optional modId = "forge" #mandatory mandatory = true #mandatory -versionRange = "[50.0.19,)" #mandatory +versionRange = "[51.0.0,)" #mandatory ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' [[dependencies.extremesoundmuffler]] modId = "minecraft" mandatory = true -versionRange = "[1.20.6]" +versionRange = "[1.21]" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e5f616d..7ec5190 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,21 @@ # Project -modversion = 3.45.1 +modversion = 3.46 group=com.leobeliik.extremesoundmuffler # Common -minecraft_version=1.20.6 +minecraft_version=1.21 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=50.0.19 +forge_version=51.0.0 # NeoForge -neoforge_version=20.6.62-beta +neoforge_version=21.0.0-beta # Fabric -fabric_version=0.98.0+1.20.6 +fabric_version=0.100.1+1.21 fabric_loader_version=0.15.11 fiber_version=0.23.0-+ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 74dffda..b8b7efa 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.107' + id 'net.neoforged.gradle.userdev' version '7.0.140' id 'java-library' } base { @@ -60,6 +60,10 @@ tasks.withType(ProcessResources).matching(notNeoTask).configureEach { from project(":common").sourceSets.main.resources } +tasks.named("test").configure { + enabled = false +} + publishing { publications { mavenJava(MavenPublication) { diff --git a/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/NeoForgeConfig.java b/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/NeoForgeConfig.java index 2a014fb..23d4813 100644 --- a/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/NeoForgeConfig.java +++ b/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/NeoForgeConfig.java @@ -2,6 +2,7 @@ import com.leobeliik.extremesoundmuffler.interfaces.ISoundLists; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.config.ModConfig; @@ -30,9 +31,9 @@ class NeoForgeConfig { private static ModConfigSpec.IntValue creativeInvButtonHorizontal; private static ModConfigSpec.IntValue creativeInvButtonVertical; - static void init() { + static void init(ModContainer container) { buildConfig(); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, NeoForgeConfig.CLIENT_CONFIG); + container.registerConfig(ModConfig.Type.CLIENT, NeoForgeConfig.CLIENT_CONFIG); CommonConfig.set(new CommonConfig.ConfigAccess( forbiddenSounds, lawfulAllList, diff --git a/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerNeoForge.java b/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerNeoForge.java index 62a8dfe..abf53af 100644 --- a/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerNeoForge.java +++ b/neoforge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerNeoForge.java @@ -9,6 +9,7 @@ import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; @@ -22,12 +23,12 @@ @Mod(Constants.MOD_ID) public class SoundMufflerNeoForge { - public SoundMufflerNeoForge(IEventBus modEventBus) { + public SoundMufflerNeoForge(IEventBus modEventBus, ModContainer container) { NeoForge.EVENT_BUS.register(this); //prevent server complain when this mod is clientside only /*ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> "", (a, b) -> true));*/ - NeoForgeConfig.init(); + NeoForgeConfig.init(container); } @EventBusSubscriber(modid = Constants.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 0a4f05d..8514e40 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,11 +1,11 @@ modLoader = "javafml" #mandatory -loaderVersion = "20.6.62" #mandatory +loaderVersion = "21.0.0" #mandatory license = "GNU LESSER GENERAL PUBLIC LICENSE" # Review your options at https://choosealicense.com/. licenseURL = "https://github.com/LeoBeliik/ExtremeSoundMuffler/blob/master/LICENSE.txt" issueTrackerURL = "https://github.com/LeoBeliik/ExtremeSoundMuffler/issues" [[mods]] #mandatory modId = "extremesoundmuffler" #mandatory -version = "3.45.1" #mandatory +version = "3.46" #mandatory displayName = "Extreme Sound Muffler" logoFile = "esm_logo.png" #optional authors = "LeoBeliik" @@ -19,12 +19,12 @@ config = "extremesoundmuffler.mixins.json" [[dependencies.extremesoundmuffler]] #optional modId = "neoforge" #mandatory type = "required" #mandatory -versionRange = "[20.6.60,)" #mandatory +versionRange = "[21.0.0-beta,)" #mandatory ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' [[dependencies.extremesoundmuffler]] modId = "minecraft" type = "required" -versionRange = "[1.20.6]" +versionRange = "[1.21]" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 55e7a11..77f772b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,5 +28,5 @@ plugins { rootProject.name = 'ExtremeSoundMuffler' include("common") include("fabric") -include("forge") +//include("forge") include("neoforge") \ No newline at end of file