build: bump to 1.21

70CentsApple · Jun 15, 2024 · 63d6aff · 63d6aff
1 parent 14eef0c
commit 63d6aff
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,12 +17,14 @@ preprocess {
     def mc119 = createNode('1.19.4', 1_19_04, 'yarn')
     def mc12004 = createNode('1.20.4', 1_20_04, 'yarn')
     def mc12006 = createNode('1.20.6', 1_20_06, 'yarn')
+    def mc121 = createNode('1.21', 1_21_00, 'yarn')
 
     mc116.link(mc117, null)
     mc117.link(mc118, null)
     mc118.link(mc119, null)
     mc119.link(mc12004, null)
     mc12004.link(mc12006, null)
+    mc12006.link(mc121, null)
 }
 
 tasks.register('buildAndGather') {
@@ -31,8 +33,7 @@ tasks.register('buildAndGather') {
     }
     doFirst {
         println 'Gathering builds'
-        def buildLibs = {
-            p -> p.buildDir.toPath().resolve('libs')
+        def buildLibs = { p -> p.buildDir.toPath().resolve('libs')
         }
         delete fileTree(buildLibs(rootProject)) {
             include '*'

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-loader_version=0.15.10
+loader_version=0.15.11
 # Mod Properties
 mod_id=chattools
 mod_version=2.2.0

diff --git a/settings.json b/settings.json
@@ -5,6 +5,7 @@
     "1.18.2",
     "1.19.4",
     "1.20.4",
-    "1.20.6"
+    "1.20.6",
+    "1.21"
   ]
 }
diff --git a/src/main/java/net/apple70cents/chattools/config/ConfigScreenGenerator.java b/src/main/java/net/apple70cents/chattools/config/ConfigScreenGenerator.java
@@ -46,8 +46,13 @@ public static ConfigBuilder getConfigBuilder() {
             GUI_VERSION = ((Number) configGuiMap.get("version")).intValue();
         }
 
+        //#if MC>=12100
+        Identifier backgroundTexture = Identifier.of("minecraft:textures/block/oak_planks.png");
+        //#else
+        //$$ Identifier backgroundTexture = new Identifier("minecraft:textures/block/oak_planks.png");
+        //#endif
         ConfigBuilder builder = ConfigBuilder.create().setTitle(trans("gui.title"))
-                                             .setDefaultBackgroundTexture(new Identifier("minecraft:textures/block/oak_planks.png"))
+                                             .setDefaultBackgroundTexture(backgroundTexture)
                                              .setTransparentBackground(true).setSavingRunnable(ChatTools.CONFIG::save);
         ConfigEntryBuilder eb = builder.entryBuilder();
         for (Object categoryInfo : (List) configGuiMap.get("content")) {

diff --git a/src/main/java/net/apple70cents/chattools/features/notifier/BasicNotifier.java b/src/main/java/net/apple70cents/chattools/features/notifier/BasicNotifier.java
@@ -61,8 +61,10 @@ public static Text work(Text text) {
             String identifier = (String) ChatTools.CONFIG.get("notifier.Sound.Type");
             int volume = ((Number) ChatTools.CONFIG.get("notifier.Sound.Volume")).intValue();
             int pitch = ((Number) ChatTools.CONFIG.get("notifier.Sound.Pitch")).intValue();
-            //#if MC>=12005
-            player.playSound(SoundEvent.of(new Identifier(identifier)), volume * 0.01F, pitch * 0.1F);
+            //#if MC>=12100
+            player.playSound(SoundEvent.of(Identifier.of(identifier)), volume * 0.01F, pitch * 0.1F);
+            //#elseif MC>=12005
+            //$$ player.playSound(SoundEvent.of(new Identifier(identifier)), volume * 0.01F, pitch * 0.1F);
             //#else
             //$$ player.playSound(
             //$$    //#if MC>=11900

diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties
@@ -0,0 +1,9 @@
+# Fabric Properties
+minecraft_version=1.21
+yarn_mappings=1.21+build.2
+# Fabric Mod Metadata
+minecraft_dependency=1.21.x
+# Dependencies
+fabric_api_version=0.100.1+1.21
+cloth_config_version=15.0.127
+mod_menu_version=11.0.0-beta.2
diff --git a/versions/mainProject b/versions/mainProject
@@ -1 +1 @@
-1.20.6
+1.21