Update to 1.20.3 (Fabric Only)

Waiting for Forge and NeoForge.
LemonCaramel · Dec 5, 2023 · 38deb7e · 38deb7e
1 parent 954efe8
commit 38deb7e
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 }
 
 architectury {
-    common("fabric", "forge", "neoforge")
+    common("fabric"/*, "forge", "neoforge"*/)
 }
 
 loom {

diff --git a/common/src/main/java/moe/caramel/chat/mixin/MixinEditBox.java b/common/src/main/java/moe/caramel/chat/mixin/MixinEditBox.java
@@ -184,7 +184,7 @@ private void onValueChange(final String text, final CallbackInfo ci) {
     }
 
     @Inject(
-        method = "deleteChars",
+        method = "deleteCharsToPos",
         at = @At(
             value = "INVOKE", shift = At.Shift.BEFORE,
             target = "Lnet/minecraft/client/gui/components/EditBox;moveCursorTo(IZ)V"

diff --git a/common/src/main/java/moe/caramel/chat/mixin/MixinSelectWorldScreen.java b/common/src/main/java/moe/caramel/chat/mixin/MixinSelectWorldScreen.java
@@ -19,7 +19,7 @@ public final class MixinSelectWorldScreen {
         method = "init",
         at = @At(
             value = "INVOKE", shift = At.Shift.AFTER,
-            target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;<init>(Lnet/minecraft/client/gui/screens/worldselection/SelectWorldScreen;Lnet/minecraft/client/Minecraft;IIIIILjava/lang/String;Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;)V"
+            target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;<init>(Lnet/minecraft/client/gui/screens/worldselection/SelectWorldScreen;Lnet/minecraft/client/Minecraft;IIIILjava/lang/String;Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;)V"
         ), cancellable = true
     )
     private void initWorldSelectionList(final CallbackInfo ci) {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -24,8 +24,8 @@
   "accessWidener": "caramelchat.accesswidener",
   "mixins": [ "caramelchat.mixins.json" ],
   "depends": {
-    "fabricloader": ">=0.14.0",
-    "minecraft": ">=1.20.2"
+    "fabricloader": ">=0.15.0",
+    "minecraft": ">=1.20.3"
   },
   "breaks": {
     "lunar": "*",

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -6,7 +6,7 @@
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
 modLoader="javafml" #mandatory
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[47,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[49,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
 # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
 license="GNU LGPL 3.0"
@@ -48,11 +48,11 @@ Provides an enhanced IME input experience in Minecraft.
 [[dependencies.caramelchat]]
    modId = "forge"
    mandatory = true
-   versionRange = "[48,)"
+   versionRange = "[49,)"
    side = "CLIENT"
 
 [[dependencies.caramelchat]]
    modId="minecraft"
    mandatory=true
-   versionRange = "[1.20.2,)"
+   versionRange = "[1.20.3,)"
    side = "CLIENT"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "caramelChat Resources",
-        "pack_format": 18
+        "pack_format": 22
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ archives_base_name=caramelChat
 mod_version=1.1.1
 maven_group=moe.caramel
 
-minecraft_version=1.20.2
-fabric_loader_version=0.14.22
-forge_version=1.20.2-48.0.0
-neoforge_version=20.2.86
+minecraft_version=1.20.3
+fabric_loader_version=0.15.0
+# TODO Forge 1.20.3 # forge_version=1.20.2-48.0.0
+# TODO NeoForge 1.20.3 # neoforge_version=20.2.86
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -50,13 +50,13 @@ config = "caramelchat.mixins.json"
 [[dependencies.caramelchat]]
 modId="neoforge"
 mandatory=true
-versionRange="[20.2,)"
+versionRange="[20.3,)"
 ordering="NONE"
 side="BOTH"
 
 [[dependencies.caramelchat]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.20.2,)"
+versionRange="[1.20.3,)"
 ordering="NONE"
 side="CLIENT"
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "caramelChat Resources",
-        "pack_format": 18
+        "pack_format": 22
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -9,5 +9,5 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
-include("neoforge")
+//include("forge")
+//include("neoforge")
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ dependencies { @@
     }
     architectury {
-        common("fabric", "forge", "neoforge")
+        common("fabric"/*, "forge", "neoforge"*/)
     }
     loom {
@@ Expand Down @@