mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2025-06-28 08:16:41 +00:00
initial
This commit is contained in:
93
fork-server/build.gradle.kts.patch
Normal file
93
fork-server/build.gradle.kts.patch
Normal file
@ -0,0 +1,93 @@
|
||||
--- a/paper-server/build.gradle.kts
|
||||
+++ b/paper-server/build.gradle.kts
|
||||
@@ -21,25 +_,38 @@
|
||||
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
|
||||
// gitFilePatches = true
|
||||
|
||||
+ val fork = forks.register("fork") {
|
||||
+ upstream.patchDir {
|
||||
+ name = "paperServer"
|
||||
+ upstreamPath = "paper-server"
|
||||
+ excludes = setOf("src/vanilla", "patches", "build.gradle.kts")
|
||||
+ patchesDir = rootDirectory.dir("fork-server/paper-patches")
|
||||
+ outputDir = rootDirectory.dir("paper-server")
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ activeFork = fork
|
||||
+
|
||||
paper {
|
||||
- reobfMappingsPatch = layout.projectDirectory.file("../build-data/reobf-mappings-patch.tiny")
|
||||
- reobfPackagesToFix.addAll(
|
||||
- "co.aikar.timings",
|
||||
- "com.destroystokyo.paper",
|
||||
- "com.mojang",
|
||||
- "io.papermc.paper",
|
||||
- "ca.spottedleaf",
|
||||
- "net.kyori.adventure.bossbar",
|
||||
- "net.minecraft",
|
||||
- "org.bukkit.craftbukkit",
|
||||
- "org.spigotmc",
|
||||
- )
|
||||
+ paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
|
||||
}
|
||||
|
||||
spigot {
|
||||
buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
|
||||
packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
|
||||
}
|
||||
+
|
||||
+ reobfPackagesToFix.addAll(
|
||||
+ "co.aikar.timings",
|
||||
+ "com.destroystokyo.paper",
|
||||
+ "com.mojang",
|
||||
+ "io.papermc.paper",
|
||||
+ "ca.spottedleaf",
|
||||
+ "net.kyori.adventure.bossbar",
|
||||
+ "net.minecraft",
|
||||
+ "org.bukkit.craftbukkit",
|
||||
+ "org.spigotmc",
|
||||
+ )
|
||||
}
|
||||
|
||||
tasks.generateDevelopmentBundle {
|
||||
@@ -104,7 +_,20 @@
|
||||
}
|
||||
}
|
||||
|
||||
-val log4jPlugins = sourceSets.create("log4jPlugins")
|
||||
+sourceSets {
|
||||
+ main {
|
||||
+ java { srcDir("../paper-server/src/main/java") }
|
||||
+ resources { srcDir("../paper-server/src/main/resources") }
|
||||
+ }
|
||||
+ test {
|
||||
+ java { srcDir("../paper-server/src/test/java") }
|
||||
+ resources { srcDir("../paper-server/src/test/resources") }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+val log4jPlugins = sourceSets.create("log4jPlugins") {
|
||||
+ java { srcDir("../paper-server/src/log4jPlugins/java") }
|
||||
+}
|
||||
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
||||
extendsFrom(configurations.compileClasspath.get())
|
||||
}
|
||||
@@ -123,7 +_,7 @@
|
||||
// Paper end - configure mockito agent that is needed in newer java versions
|
||||
|
||||
dependencies {
|
||||
- implementation(project(":paper-api"))
|
||||
+ implementation(project(":fork-api"))
|
||||
implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
|
||||
// Paper start
|
||||
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
|
||||
@@ -261,7 +_,7 @@
|
||||
name: String,
|
||||
block: JavaExec.() -> Unit
|
||||
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
||||
- group = "paper"
|
||||
+ group = "runs"
|
||||
mainClass.set("org.bukkit.craftbukkit.Main")
|
||||
standardInput = System.`in`
|
||||
workingDir = rootProject.layout.projectDirectory
|
@ -0,0 +1,8 @@
|
||||
--- a/src/main/java/test/FakeCraftServer.java
|
||||
+++ b/src/main/java/test/FakeCraftServer.java
|
||||
@@ -1,4 +_,5 @@
|
||||
package test;
|
||||
|
||||
public class FakeCraftServer {
|
||||
+ // Forked
|
||||
}
|
2
fork-server/src/main/java/ForkServerFile.java
Normal file
2
fork-server/src/main/java/ForkServerFile.java
Normal file
@ -0,0 +1,2 @@
|
||||
public class ForkServerFile {
|
||||
}
|
@ -0,0 +1,18 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
||||
Date: Wed, 11 Dec 2024 19:23:25 -0700
|
||||
Subject: [PATCH] 'feature patch'
|
||||
|
||||
|
||||
diff --git a/net/minecraft/DefaultUncaughtExceptionHandler.java b/net/minecraft/DefaultUncaughtExceptionHandler.java
|
||||
index 6341da454460aa6c00075f82163b97286f760eee..a8bc94121a0209faa8dd293ff3c0862dac280cdb 100644
|
||||
--- a/net/minecraft/DefaultUncaughtExceptionHandler.java
|
||||
+++ b/net/minecraft/DefaultUncaughtExceptionHandler.java
|
||||
@@ -12,6 +12,7 @@ public class DefaultUncaughtExceptionHandler implements UncaughtExceptionHandler
|
||||
|
||||
@Override
|
||||
public void uncaughtException(Thread thread, Throwable exception) {
|
||||
+ System.out.println("im a feature");
|
||||
this.logger.error("Caught previously unhandled exception :", exception);
|
||||
}
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
--- a/com/google/common/annotations/Beta.java
|
||||
+++ b/com/google/common/annotations/Beta.java
|
||||
@@ -44,3 +_,4 @@
|
||||
@Documented
|
||||
@GwtCompatible
|
||||
public @interface Beta {}
|
||||
+// comment
|
@ -0,0 +1,10 @@
|
||||
--- a/net/minecraft/BlockUtil.java
|
||||
+++ b/net/minecraft/BlockUtil.java
|
||||
@@ -16,6 +_,7 @@
|
||||
public static BlockUtil.FoundRectangle getLargestRectangleAround(
|
||||
BlockPos centerPos, Direction.Axis axis1, int max1, Direction.Axis axis2, int max2, Predicate<BlockPos> posPredicate
|
||||
) {
|
||||
+ System.out.println("hello");
|
||||
BlockPos.MutableBlockPos mutableBlockPos = centerPos.mutable();
|
||||
Direction direction = Direction.get(Direction.AxisDirection.NEGATIVE, axis1);
|
||||
Direction opposite = direction.getOpposite();
|
Reference in New Issue
Block a user