雨屏梦见cb补丁😔

Author: wdog5

.gitignore

@@ -45,3 +45,4 @@ build
 **/runs/
 
 **/out/
+/projects/cb-base/

build.gradle

@@ -1,3 +1,6 @@
+import io.codechicken.diffpatch.cli.PatchOperation
+
+import java.nio.file.Paths
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 import net.neoforged.neodev.CheckSplitSources
@@ -51,4 +54,107 @@ sourceSets {
             srcDirs = []
         }
     }
+}
+
+tasks.register('copyCB', Copy) {
+    group = 'neotenet'
+
+    from('projects/bukkit/src/main/java') {
+        exclude 'com/**'
+    }
+    from('projects/craftbukkit/src/main/java') {
+        exclude 'com/**'
+    }
+
+    into 'projects/neotenet/src/main/java'
+
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+def rootDir = rootProject.projectDir
+
+tasks.register('prepareCleanCB', Copy) {
+    group = 'neotenet'
+
+    from('projects/bukkit/src/main/java') {
+        exclude 'com/mojang/**'
+    }
+    from('projects/craftbukkit/src/main/java') {
+        exclude 'com/mojang/**'
+    }
+    into 'projects/cb-base/src/main/java'
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
+import io.codechicken.diffpatch.cli.DiffOperation
+import io.codechicken.diffpatch.util.Input.MultiInput
+import io.codechicken.diffpatch.util.Output.MultiOutput
+
+tasks.register('genCBPatchesJar') {
+    group = 'neotenet'
+    dependsOn 'prepareCleanCB'
+
+    inputs.dir('projects/cb-base/src/main/java/org/bukkit')
+    inputs.dir('projects/neotenet/src/main/java/org/bukkit')
+    outputs.file('projects/neotenet/cb-patches.jar')
+
+    doLast {
+        def baseDir = new File(rootDir, 'projects/cb-base/src/main/java/org/bukkit').toPath()
+        def modifiedDir = new File(rootDir, 'projects/neotenet/src/main/java/org/bukkit').toPath()
+        def patchesJar = new File(rootDir, 'projects/neotenet/cb-patches.jar').toPath()
+
+        java.nio.file.Files.deleteIfExists(patchesJar)
+
+        def builder = DiffOperation.builder()
+                .logTo(logger::lifecycle)
+                .baseInput(MultiInput.folder(baseDir))
+                .changedInput(MultiInput.folder(modifiedDir))
+                .patchesOutput(MultiOutput.detectedArchive(patchesJar))
+                .autoHeader(true)
+                .level(io.codechicken.diffpatch.util.LogLevel.WARN)
+                .summary(false)
+                .aPrefix('a/')
+                .bPrefix('b/')
+                .lineEnding('\n')
+
+        def result = builder.build().operate()
+        int exit = result.exit
+        if (exit != 0 && exit != 1) {
+            throw new RuntimeException("Diffpatch Failed，Code: " + exit)
+        }
+        logger.lifecycle('Patched Successful: cb-patches.jar')
+    }
+}
+
+tasks.register('applyCBPatches') {
+    group = 'neotenet'
+    dependsOn 'copyCB'
+
+    inputs.file('projects/neotenet/cb-patches.jar')
+    outputs.dir('projects/neotenet/src/main/java/org/bukkit')
+
+    doLast {
+        def patchesJar = new File(rootDir, 'projects/neotenet/cb-patches.jar')
+        if (!patchesJar.exists()) {
+            logger.lifecycle('cb-patches.jar None Exist，Skip')
+            return
+        }
+        def baseDir = new File(rootDir, 'projects/cb-base/src/main/java/org/bukkit').toPath()
+        def targetDir = new File(rootDir, 'projects/neotenet/src/main/java/org/bukkit').toPath()
+
+        def builder = PatchOperation.builder()
+                .logTo(logger::lifecycle)
+                .baseInput(MultiInput.folder(baseDir))
+                .patchesInput(MultiInput.detectedArchive(patchesJar.toPath()))
+                .patchedOutput(MultiOutput.folder(targetDir))
+                .level(io.codechicken.diffpatch.util.LogLevel.WARN)
+                .summary(false)
+                .lineEnding('\n')
+
+        def result = builder.build().operate()
+        if (result.exit != 0 && result.exit != 1) {
+            throw new RuntimeException("Failed，Code: " + result.exit)
+        }
+        logger.lifecycle('Applied Successful')
+    }
 }

projects/neotenet/cb-patches.jar

@@ -10,6 +10,7 @@
 import org.bukkit.craftbukkit.registry.CraftOldEnumRegistryItem;
 import org.jetbrains.annotations.NotNull;
 
+// ABSTRACT
 public class CraftArt extends CraftOldEnumRegistryItem<Art, PaintingVariant> implements Art {
 
     private static int count = 0;

projects/neotenet/src/main/java/org/bukkit/craftbukkit/CraftArt.java

@@ -5,4 +5,4 @@ public interface AdvancementHolderInjection {
     default org.bukkit.advancement.Advancement toBukkit() {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}

projects/neotenet/src/main/java/org/teneted/neotenet/injection/advancements/AdvancementHolderInjection.java

@@ -7,4 +7,4 @@ public interface CommandSourceInjection {
     default org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper) {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}

projects/neotenet/src/main/java/org/teneted/neotenet/injection/commands/CommandSourceInjection.java

@@ -5,4 +5,4 @@ public interface CommandSourceStackInjection {
     default org.bukkit.command.CommandSender getBukkitSender() {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}

projects/neotenet/src/main/java/org/teneted/neotenet/injection/commands/CommandSourceStackInjection.java

@@ -16,4 +16,4 @@ default void performPrefixedCommand(CommandSourceStack sender, String command, S
     default void performCommand(ParseResults<CommandSourceStack> command, String commandString, String label) {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}

projects/neotenet/src/main/java/org/teneted/neotenet/injection/commands/CommandsInjection.java

@@ -9,4 +9,4 @@ public interface EntityArgumentInjection {
     default EntitySelector parse(StringReader reader, boolean allowSelectors, boolean overridePermissions) throws CommandSyntaxException {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}

projects/neotenet/src/main/java/org/teneted/neotenet/injection/commands/arguments/EntityArgumentInjection.java

@@ -8,4 +8,4 @@ public interface EntitySelectorParserInjection {
     default EntitySelector parse(boolean overridePermissions) throws CommandSyntaxException {
         throw new IllegalArgumentException("Not implemented");
     }
-}
+}