优化替换模式 移除部分gradle注释

Author: zhaixianyu

build.gradle

@@ -42,53 +42,6 @@ preprocess {
     mc12105.link(mc12106, file("versions/mapping-1.21.5-1.21.6.txt"))
 }
 
-//ext {
-//    env = System.getenv()
-//
-//    getVersionGit = { List paths ->
-//        if (grgit == null) {
-//            return "nogit"
-//        }
-//
-//        List latestCommits = paths.isEmpty() ? grgit.log(maxCommits: 1) : grgit.log(paths: paths, maxCommits: 1)
-//        return latestCommits.isEmpty() ? "uncommited" : "${latestCommits.get(0).id.substring(0, 7)}"
-//    }
-//
-//    getBuildNumber = {
-//        return ext.env.GITHUB_RUN_NUMBER ? ext.env.GITHUB_RUN_NUMBER : Integer.MAX_VALUE
-//    }
-//
-//    getVersionType = {
-//        switch (ext.env.BUILD_TYPE) {
-//            case "RELEASE":
-//                return "stable"
-//            case "BETA":
-//                return "beta"
-//            default:
-//                return "dev"
-//        }
-//    }
-//
-//    getVersionPatch = { List paths ->
-//        if (grgit == null) {
-//            return 0
-//        }
-//
-//        List latestCommits = paths.isEmpty() ? grgit.log() : grgit.log(paths: paths)
-//        return latestCommits.size()
-//    }
-//
-//    getMavenArtifactVersion = {
-//        return ext.getVersionType() == "stable" ? "${project.mod_version}.${ext.getVersionPatch([])}" : project.version
-//    }
-//
-//    getModVersion = {
-//        return "${project.mod_version}.${getVersionPatch([])}+${getVersionGit([])}-${getVersionType()}"
-//    }
-//}
-//
-//setVersion(project.getModVersion())
-
 tasks.register("cleanPreprocessSources") {
     it.group("${project.mod_id}")
 

common.gradle

@@ -1,6 +1,5 @@
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableMap
-import net.fabricmc.loom.util.Platform
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.tree.ClassNode
@@ -124,7 +123,7 @@ def mod_dependencies = [
         [(mcVersion > 12004 ? "curse.maven:carpet-349239" : "maven.modrinth:carpet"), "carpet", 1],
         ["net.kyrptonaught:kyrptconfig", "kyrptconfig", 1],
         ["net.kyrptonaught:shulkerutils", "shulkerutils", mcVersion > 12004 ? 0 : 1],
-        [getSbYacl(), "yacl", mcVersion >= 12001 ? 1 : 0],
+        [getYacl(), "yacl", mcVersion >= 12001 ? 1 : 0],
         ["maven.modrinth:chest-tracker", "chesttracker", mcVersion < 12105 ? 1 : 4],   //TODO 箱子追踪未更新21.5
         ["maven.modrinth:where-is-it", "whereisit", mcVersion < 12105 ? 1 : 4],
         ["red.jackf.jackfredlib:jackfredlib", "jackfredlib", mcVersion >= 12001 ? 1 : 0],
@@ -135,10 +134,9 @@ def mod_dependencies = [
         ["io.github.cottonmc:LibGui", "LibGui", mcVersion < 12001 ? 1 : 0],
 ]
 
-String getSbYacl() {
+String getYacl() {
 //    return "maven.modrinth:yacl";
     return mcVersion == 12002 ? "maven.modrinth:yacl" : "dev.isxander:yet-another-config-lib";
-//    return"maven.modrinth:yacl";
 }
 
 String getQuiShulkerBox() {
@@ -281,76 +279,6 @@ loom {
     }
 }
 
-//tasks.register("serverPropertiesJar", Jar) {
-//    File propsFile = file("build/tmp/install.properties")
-//
-//    doFirst {
-//        if (propsFile.exists()) {
-//            propsFile.delete()
-//        }
-//
-//        BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(propsFile))
-//        bufferedWriter.writeLine("fabric-loader-version=${project.loader_version}")
-//        bufferedWriter.writeLine("game-version=${project.minecraft_version}")
-//        bufferedWriter.close()
-//    }
-//
-//    archiveFileName.set("server-properties.jar")
-//    destinationDirectory.set(file("build/tmp"))
-//    from(propsFile)
-//}
-
-//tasks.register("runProductionClient", JavaExec) {
-//    dependsOn(tasks.remapJar)
-//    classpath.from(configurations.productionRuntimeClient)
-//    mainClass.set("net.fabricmc.loader.impl.launch.knot.KnotClient")
-//    workingDir(file("run/client"))
-//
-//    doFirst {
-//        classpath.from(loom.minecraftProvider.minecraftClientJar)
-//        args(
-//                "--assetIndex", loom.minecraftProvider.versionInfo.assetIndex().fabricId(loom.minecraftProvider.minecraftVersion()),
-//                "--assetsDir", file("${loom.files.userCache}/assets").absolutePath,
-//                "--gameDir", workingDir.absolutePath,
-//                "--width", "1280",
-//                "--height", "720",
-//        )
-//        jvmArgs("-Dmixin.debug.export=true")
-//        jvmArgs("-Dfabric.addMods=${configurations.productionRuntimeMods.files.join(File.pathSeparator)}${File.pathSeparator}${tasks.remapJar.archiveFile.get().asFile.absolutePath}")
-//
-//
-//        if (Platform.CURRENT.operatingSystem.isMacOS()) {
-//            jvmArgs("-XstartOnFirstThread")
-//        }
-//    }
-//}
-
-//tasks.register("runProductionServer", JavaExec) {
-//    dependsOn(tasks.remapJar)
-//    classpath.from(configurations.productionRuntimeServer, tasks.named("serverPropertiesJar"))
-//    mainClass.set("net.fabricmc.installer.ServerLauncher")
-//    workingDir(file("run/server"))
-//
-//    doFirst {
-//        args("nogui")
-//        jvmArgs("-Dmixin.debug.export=true")
-//        jvmArgs("-Dfabric.addMods=${configurations.productionRuntimeMods.files.join(File.pathSeparator)}${File.pathSeparator}${tasks.remapJar.archiveFile.get().asFile.absolutePath}")
-//    }
-//}
-
-//["serverPropertiesJar",
-// "runClient", "runServer",
-// "runMixinAuditClient", "runMixinAuditServer",
-// "runProductionClient", "runProductionServer",
-// "preprocessCode", "preprocessResources",
-// "preprocessTestCode", "preprocessTestResources"].forEach {
-//    if (tasks.getNames().contains(it)) {
-//        tasks.named(it) {
-//            it.group("${mod_id}")
-//        }
-//    }
-//}
-
 tasks.withType(JavaCompile).configureEach {
     options.encoding("UTF-8")
 }

src/main/java/me/aleksilassila/litematica/printer/printer/PlacementGuide.java

@@ -52,6 +52,16 @@ public PlacementGuide(@NotNull MinecraftClient client) {
 
         return buildAction(world, worldSchematic, pos, ClassHook.DEFAULT);
     }
+    public @Nullable ClassHook getClassHook(BlockState requiredState) {
+        for (ClassHook hook : ClassHook.values()) {
+            for (Class<?> clazz : hook.classes) {
+                if (clazz != null  && clazz.isInstance(requiredState.getBlock())) {
+                    return hook;
+                }
+            }
+        }
+        return ClassHook.DEFAULT;
+    }
 
 //    public static Placement getPlacement(BlockState requiredState, MinecraftClient client) {
 //        Placement placement = _getPlacement(requiredState, client);
@@ -107,10 +117,11 @@ public PlacementGuide(@NotNull MinecraftClient client) {
         return placement;
     }
 
+    public @Nullable Action buildAction(World world, WorldSchematic worldSchematic, BlockPos pos, ClassHook requiredType) {
+        return buildAction(world, world.getBlockState(pos), worldSchematic.getBlockState(pos), pos, requiredType);
+    }
     @SuppressWarnings("EnhancedSwitchMigration")
-    private @Nullable Action buildAction(World world, WorldSchematic worldSchematic, BlockPos pos, ClassHook requiredType) {
-        BlockState requiredState = worldSchematic.getBlockState(pos);
-        BlockState currentState = world.getBlockState(pos);
+    public @Nullable Action buildAction(World world, BlockState currentState, BlockState requiredState, BlockPos pos, ClassHook requiredType) {
 
         if (LitematicaMixinMod.PRINT_WATER_LOGGED_BLOCK.getBooleanValue()
                 && canWaterLogged(requiredState)