Merge pull request #8 from Apricityx/1.21.3

Upgrade to 1.21.3
MCTown · Dec 7, 2024 · 9eb1435 · 9eb1435
2 parents dea4514 + 17f6c6d
commit 9eb1435
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+.github/
+.gradle/
+.idea/
+build/
+run/
+Carpet-MCT-Addition_client.launch
+Carpet-MCT-Addition_server.launch
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 //    modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
-    modImplementation "carpet:fabric-carpet:1.21-${project.carpet_core_version}"
+    modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx6G
 # Fabric Properties
 # check these on https://fabricmc.net/use or https://modmuss50.me/fabric.html
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.5
+minecraft_version=1.21.2
+yarn_mappings=1.21.2+build.1
+loader_version=0.16.9
 # check available versions on maven for the given minecraft version you are using
-carpet_core_version=1.4.147+v240613
+carpet_core_version=1.4.158+v241022
 # Mod Properties
 mod_version=0.1.1
 maven_group=tech.mctown.cma
 archives_base_name=carpet-mct-addition
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
-fabric_version=0.104.0+1.21.1
+fabric_version=0.106.1+1.21.2
diff --git a/java/tech/mctown/cma/CMAEntry.java b/java/tech/mctown/cma/CMAEntry.java
diff --git a/java/tech/mctown/cma/CMAExtension.java b/java/tech/mctown/cma/CMAExtension.java
diff --git a/java/tech/mctown/cma/CMASettings.java b/java/tech/mctown/cma/CMASettings.java
diff --git a/java/tech/mctown/cma/commands/DumpEntityCommand.java b/java/tech/mctown/cma/commands/DumpEntityCommand.java
diff --git a/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java b/java/tech/mctown/cma/mixins/editableSign/SignBlockEntityMixin.java
diff --git a/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java b/java/tech/mctown/cma/mixins/fakePlayerGamemode/PlayerCommandMixin.java
diff --git a/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java b/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java
diff --git a/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java b/java/tech/mctown/cma/mixins/runCommandOnSign/SignBlockEntityMixin.java
diff --git a/src/main/java/tech/mctown/cma/CMALogger.java b/src/main/java/tech/mctown/cma/CMALogger.java
@@ -28,7 +28,7 @@ public static void toGame(String message, MinecraftServer server) {
     }
 
     public static void toGame(String message, PlayerEntity player) {
-        player.sendMessage(Text.of(message));
+        player.sendMessage(Text.of(message),false);
     }
 
     public static void error(String s, Exception e) {

diff --git a/...in/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java b/...in/java/tech/mctown/cma/mixins/flintAndSteelActivatesObserver/FlintAndSteelItemMixin.java
@@ -41,7 +41,7 @@ void activatesObserver(ItemUsageContext context, CallbackInfoReturnable<ActionRe
                 } catch (Exception e) {
                     CMALogger.toConsole("Failed to activate observer");
                 }
-                ci.setReturnValue(ActionResult.success(world.isClient()));
+                ci.setReturnValue(ActionResult.SUCCESS);
             }
         }
     }