Merge branch 'feature-1.19.2' into nyan-work/dev

Author: Hendrix-Shen

build.gradle

@@ -1,9 +1,8 @@
 plugins {
     id("maven-publish")
     id("fabric-loom").version("1.3-SNAPSHOT").apply(false)
-    // https://github.com/Juuxel/LoomQuiltflower
-    id("io.github.juuxel.loom-quiltflower").version("1.10.0").apply(false)
-    id("net.kyori.blossom").version("1.3.1").apply(false)
+    // https://github.com/Juuxel/loom-vineflower
+    id("io.github.juuxel.loom-vineflower").version("1.11.0").apply(false)
     id("org.ajoberstar.grgit").version("5.2.0")
     id("com.replaymod.preprocess").version("SNAPSHOT")
 }
@@ -18,6 +17,7 @@ preprocess {
     def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
     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")
 
     mc1144.link(mc1152, null)
     mc1152.link(mc1165, file("versions/mapping-1.15.2-1.16.5.txt"))
@@ -27,6 +27,7 @@ preprocess {
     mc1192.link(mc1193, file("versions/mapping-1.19.2-1.19.3.txt"))
     mc1193.link(mc1194, null)
     mc1194.link(mc1201, null)
+    mc1201.link(mc1202, null)
 }
 
 ext {

common.gradle

@@ -1,7 +1,13 @@
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.ClassWriter
+import org.objectweb.asm.tree.ClassNode
+import org.objectweb.asm.tree.LdcInsnNode
+
 apply(plugin: "maven-publish")
 apply(plugin: "fabric-loom")
-apply(plugin: "io.github.juuxel.loom-quiltflower")
-apply(plugin: "net.kyori.blossom")
+apply(plugin: "io.github.juuxel.loom-vineflower")
 apply(plugin: "com.replaymod.preprocess")
 
 int mcVersion = 1
@@ -200,12 +206,6 @@ processResources {
     }
 }
 
-blossom {
-    replaceToken("@MOD_IDENTIFIER@"            , project.mod_id)
-    replaceToken("@MOD_NAME@"                  , project.mod_name)
-    replaceToken("@MINECRAFT_VERSION_IDENTIFY@", project.minecraft_version.replace(".", "_"))
-}
-
 java {
     sourceCompatibility(JavaVersion.VERSION_1_8)
     targetCompatibility(JavaVersion.VERSION_1_8)
@@ -232,3 +232,64 @@ publishing {
         }
     }
 }
+
+ImmutableMap<Object, Object> replaceTokenMap = ImmutableMap.builder()
+        .put("@MOD_IDENTIFIER@"            , project.mod_id)
+        .put("@MOD_NAME@"                  , project.mod_name)
+        .put("@MINECRAFT_VERSION_IDENTIFY@", project.minecraft_version.replace(".", "_"))
+        .build()
+ImmutableList<Object> replaceTokenFile = ImmutableList.builder()
+        .add("OhMyMinecraftClientReference")
+        .build()
+
+tasks.classes {
+    doLast {
+        File dir = file("build/classes/java")
+
+        dir.eachFileRecurse {
+            String path = it.path.replace(dir.path, "")
+
+            if (path.endsWith(".class") && replaceTokenFile.stream().anyMatch { path.contains(it as String) }) {
+                ClassReader cr = new ClassReader(it.newInputStream().bytes)
+                ClassNode cn = new ClassNode()
+                cr.accept(cn, ClassReader.SKIP_FRAMES | ClassReader.SKIP_DEBUG)
+
+                // ReplaceToken in fields
+                cn.fields.each {
+                    if (it.desc == "Ljava/lang/String;" && it.value instanceof String) {
+                        String value = it.value as String
+
+                        replaceTokenMap.each {
+                            value = value.replace(it.key as String, it.value as String)
+                        }
+
+                        it.value = value
+                    }
+                }
+
+                // ReplaceToken in methods
+                cn.methods.each {
+                    it.instructions.each {
+                        if (it instanceof LdcInsnNode) {
+                            LdcInsnNode ldc = it as LdcInsnNode
+
+                            if (ldc.cst instanceof String) {
+                                String value = ldc.cst as String
+
+                                replaceTokenMap.each {
+                                    value = value.replace(it.key as String, it.value as String)
+                                }
+
+                                ldc.cst = value
+                            }
+                        }
+                    }
+                }
+
+                ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES)
+                cn.accept(cw)
+                new FileOutputStream(it).write(cw.toByteArray())
+            }
+        }
+    }
+}

gradle.properties

@@ -15,9 +15,9 @@ mod_sources=https://github.com/plusls/oh-my-minecraft-client
 mod_version=0.5
 
 # Required Libraries
-# MagicLib - 0.7.345
-magiclib_dependency=0.7.345
-magiclib_version=0.7.345
+# MagicLib - 0.7.376+bce84f9-beta
+magiclib_dependency=0.7.376+bce84f9-beta
+magiclib_version=0.7.376+bce84f9-beta
 
 # Annotation processor
 lombok_version=1.18.28

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

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

settings.gradle

@@ -128,7 +128,9 @@ public static void init() {
     }
 
     public static void postRespawn(@NotNull ClientboundRespawnPacket packet) {
-        //#if MC > 11502
+        //#if MC > 12001
+        //$$ ResourceKey<Level> newDimension = packet.commonPlayerSpawnInfo().dimension();
+        //#elseif MC > 11502
         ResourceKey<Level> newDimension = packet.getDimension();
         //#else
         //$$ DimensionType newDimension = packet.getDimension();

src/main/java/com/plusls/ommc/feature/highlithtWaypoint/HighlightWaypointUtil.java

@@ -1,6 +1,6 @@
 # Development Environment
 minecraft_version=1.20.1
-minecraft_dependency=1.20.x
+minecraft_dependency=>1.20 <=1.20.1
 
 # Compatible Libraries
 sodium_version=mc1.20-0.4.10

versions/1.20.1/gradle.properties

@@ -0,0 +1,6 @@
+# Development Environment
+minecraft_version=23w33a
+minecraft_dependency=1.20.2-alpha.23.33.a
+
+# Compatible Libraries
+sodium_version=0