Support Minecraft 1.20.4

Signed-off-by: Hendrix-Shen <[email protected]>

.github/workflows/CI.yml

@@ -127,6 +127,7 @@ jobs:
             1.19.4
             1.20.1
             1.20.2
+            1.20.4
           version-resolver: any
           java: |
             8
@@ -250,6 +251,7 @@ jobs:
             1.19.4
             1.20.1
             1.20.2
+            1.20.4
           version-resolver: any
           java: |
             8

README.md

@@ -47,7 +47,8 @@ And use `preprocess` to be compatible with all versions.
 - Minecraft 1.19.3 (Ending support soon)
 - Minecraft 1.19.4
 - Minecraft 1.20.1 (Ending support soon)
-- Minecraft 1.20.2
+- Minecraft 1.20.2 (Ending support soon)
+- Minecraft 1.20.4
 
 ### Mappings
 

README_ZH_CN.md

@@ -47,7 +47,8 @@
 - Minecraft 1.19.3 (即将终止支持)
 - Minecraft 1.19.4
 - Minecraft 1.20.1 (即将终止支持)
-- Minecraft 1.20.2
+- Minecraft 1.20.2 (即将终止支持)
+- Minecraft 1.20.4
 
 ### 混淆映射表
 

build.gradle

@@ -16,6 +16,7 @@ preprocess {
     def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
     def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
     def mc1202 = createNode("1.20.2", 1_20_02, "mojang")
+    def mc1204 = createNode("1.20.4", 1_20_04, "mojang")
 
     mc1144.link(mc1152, null)
     mc1152.link(mc1165, null)
@@ -26,6 +27,7 @@ preprocess {
     mc1193.link(mc1194, null)
     mc1194.link(mc1201, null)
     mc1201.link(mc1202, null)
+    mc1202.link(mc1204, null)
 }
 
 ext {

common.gradle

@@ -67,9 +67,8 @@ configurations {
 
 // Module, Property prefix, Resolve condition, Transitive dependencies.
 def compileOnlyDependencies = [
-        ["curse.maven:litematica-308892"        , "litematica"        , mcVersion < 12002, false],
-        ["com.github.Nyan-Work:litematica"      , "litematica"        , mcVersion > 12001, false],
-        ["curse.maven:not-enough-crashes-353890", "not_enough_crashes", true             , false],
+        ["curse.maven:litematica-308892"        , "litematica"        , true, false],
+        ["curse.maven:not-enough-crashes-353890", "not_enough_crashes", true, false],
 ]
 
 dependencies {

gradle.properties

@@ -16,12 +16,12 @@ mod_version=3.6
 
 # Development Environment
 fabric_installer_version=0.11.2
-fabric_loader_version=0.14.22
+fabric_loader_version=0.15.2
 
 # Annotation processor
 lombok_version=1.18.30
 
 # Required Libraries
-# MagicLib - 0.7.387
-magiclib_dependency=0.7.387
-magiclib_version=0.7.387
+# MagicLib - 0.7.398
+magiclib_dependency=0.7.398
+magiclib_version=0.7.398

settings.gradle

@@ -37,6 +37,7 @@ def versions = Arrays.asList(
         "1.19.4",
         "1.20.1",
         "1.20.2",
+        "1.20.4",
 )
 
 for (String version : versions) {

src/main/java/top/hendrixshen/tweakmyclient/compat/CompatMixinPlugin.java

@@ -7,7 +7,6 @@
 package top.hendrixshen.tweakmyclient.compat;
 
 import com.google.common.collect.Lists;
-import net.fabricmc.tinyremapper.IMappingProvider.Member;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
@@ -16,6 +15,7 @@
 import org.spongepowered.asm.mixin.transformer.meta.MixinMerged;
 import org.spongepowered.asm.util.Annotations;
 import top.hendrixshen.tweakmyclient.TweakMyClientMixinPlugin;
+import top.hendrixshen.tweakmyclient.util.Member;
 import top.hendrixshen.tweakmyclient.util.RemapUtil;
 import top.hendrixshen.tweakmyclient.util.mixin.MixinType;
 import top.hendrixshen.tweakmyclient.util.mixin.annotation.MagicAttack;

src/main/java/top/hendrixshen/tweakmyclient/util/Member.java

@@ -0,0 +1,13 @@
+package top.hendrixshen.tweakmyclient.util;
+
+public class Member {
+    public String owner;
+    public String name;
+    public String desc;
+
+    public Member(String owner, String name, String desc) {
+        this.owner = owner;
+        this.name = name;
+        this.desc = desc;
+    }
+}

src/main/java/top/hendrixshen/tweakmyclient/util/RemapUtil.java

@@ -2,7 +2,6 @@
 
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.MappingResolver;
-import net.fabricmc.tinyremapper.IMappingProvider.Member;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 

versions/1.20.2/gradle.properties

@@ -4,10 +4,10 @@ minecraft_version=1.20.2
 minecraft_dependency=1.20.2
 
 # Compatible Libraries
-# Litematica - 0.15.3-nyan.6
-# https://jitpack.io/#Nyan-Work/litematica/0.15.3-nyan.6
-# litematica-0.15.3-nyan.6.jar
-litematica_version=0.15.3-nyan.6
+# Litematica - 0.16.0
+# https://www.curseforge.com/minecraft/mc-mods/litematica/files/4789765
+# litematica-fabric-1.20.2-0.16.0.jar
+litematica_version=4789765
 # Not Enough Crashes - 4.4.6
 # https://www.curseforge.com/minecraft/mc-mods/not-enough-crashes/files/4762979
 # notenoughcrashes-4.4.6+1.20.2-fabric.jar

versions/1.20.4/gradle.properties

@@ -0,0 +1,14 @@
+# Independent branch configuration
+# Development Environment
+minecraft_version=1.20.4
+minecraft_dependency=1.20.4
+
+# Compatible Libraries
+# Litematica - 0.17.0
+# https://www.curseforge.com/minecraft/mc-mods/litematica/files/4946471
+# litematica-fabric-1.20.4-0.17.0.jar
+litematica_version=4946471
+# Not Enough Crashes - 4.4.6
+# https://www.curseforge.com/minecraft/mc-mods/not-enough-crashes/files/4762979
+# notenoughcrashes-4.4.6+1.20.2-fabric.jar
+not_enough_crashes_version=4762979