Updated to Minecraft 1.21

moritz-htk · Jun 17, 2024 · f5a613a · f5a613a
1 parent 95b2a8e
commit f5a613a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 46 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,2 +1,2 @@
 **Changes:**
-- Internal improvements
+- Updated to Minecraft 1.21
diff --git a/common/build.gradle b/common/build.gradle
@@ -13,13 +13,4 @@ repositories {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modApi "me.shedaniel.cloth:cloth-config:${cloth_config_version}"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
 }
diff --git a/common/src/main/resources/mixin.music_delay_reducer.json b/common/src/main/resources/mixin.music_delay_reducer.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.moritz_htk.music_delay_reducer.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "MDRMusicSoundMixin"
   ],

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,5 +1,3 @@
-import java.text.SimpleDateFormat
-
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "me.shedaniel.unified-publishing" version "0.1.12"
@@ -69,15 +67,6 @@ components.java {
     }
 }
 
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-}
-
 unifiedPublishing {
     project {
         displayName = "[Fabric ${project.minecraft_version}] Music Delay Reducer ${project.version}"

diff --git a/fabric/src/main/java/net/moritz_htk/music_delay_reducer/fabric/MusicDelayReducerFabric.java b/fabric/src/main/java/net/moritz_htk/music_delay_reducer/fabric/MusicDelayReducerFabric.java
@@ -8,4 +8,4 @@ public class MusicDelayReducerFabric implements ModInitializer {
     public void onInitialize() {
         MusicDelayReducer.init();
     }
-}
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -31,11 +31,11 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.6",
-    "cloth-config2": ">=14.0.126"
+    "minecraft": ">=1.21",
+    "cloth-config2": ">=15.0.127"
   },
   "recommends": {
-    "modmenu": ">=10.0.0-beta.1"
+    "modmenu": ">=11.0.0-rc.4"
   },
   "custom": {
     "modmenu": {

diff --git a/gradle.properties b/gradle.properties
@@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Environment Properties
-minecraft_version=1.20.6
+minecraft_version=1.21
 enabled_platforms=fabric,neoforge
 fabric_loader_version=0.15.11
-fabric_api_version=0.99.4+1.20.6
-neoforge_version=20.6.98-beta
+fabric_api_version=0.100.1+1.21
+neoforge_version=21.0.14-beta
 
 # Mod Properties
 archives_base_name=music_delay_reducer
-mod_version=1.0.3+1.20.6
+mod_version=1.0.3+1.21
 maven_group=net.moritz_htk.music_delay_reducer
 
 # Dependencies
-cloth_config_version=14.0.126
-mod_menu_version=10.0.0-beta.1
+cloth_config_version=15.0.127
+mod_menu_version=11.0.0-rc.4
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -1,5 +1,3 @@
-import java.text.SimpleDateFormat
-
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "me.shedaniel.unified-publishing" version "0.1.12"
@@ -67,15 +65,6 @@ components.java {
     }
 }
 
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-}
-
 unifiedPublishing {
     project {
         displayName = "[NeoForge ${project.minecraft_version}] Music Delay Reducer ${project.version}"

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -19,20 +19,20 @@ issueTrackerURL="https://github.com/moritz-htk/Music-Delay-Reducer/issues"
 [[dependencies.music_delay_reducer]]
     modId="neoforge"
     type="required"
-    versionRange="[20.6,)"
+    versionRange="[21.0,)"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.music_delay_reducer]]
     modId="minecraft"
     type="required"
-    versionRange="[1.20.6,)"
+    versionRange="[1.21,)"
     ordering="NONE"
     side="BOTH"
 
 [[dependencies.music_delay_reducer]]
     modId="cloth_config"
     type="required"
-    versionRange="[14.0.126,)"
+    versionRange="[15.0.127,)"
     ordering="AFTER"
     side="BOTH"