diff --git a/.gitignore b/.gitignore index 592239a..158a13f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ Scissors-Server Scissors-API !gradle/wrapper/gradle-wrapper.jar + +aswm-api/src +aswm-core/src \ No newline at end of file diff --git a/README.md b/README.md index 67945cc..c2bea31 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,23 @@ # Scissors [![Build Status](https://ci.plex.us.org/job/Scissors/job/slime%252F1.20.1/badge/icon)](https://ci.plex.us.org/job/Scissors/job/slime%252F1.20.1/) Scissors is a fork of Paper that aims to fix exploits possible in Creative Mode. Many of these exploits are ones that -Paper's own team has either refused to fix or would have. +Paper's own team has either refused to fix or would have. All SWM patches/SWM API belongs to [AdvancedSlimePaper and InfernalSuite](https://github.com/InfernalSuite/AdvancedSlimePaper) +Note: This will not compile on Windows by default. To make it compile, you need to delete the `aswm-core/src` +and `aswm-api/src` files. Then open up Command Prompt as an administrator and run the following for the api project: +```mklink /D C:\full\path\to\project\aswm-api\src C:\full\path\to\project\submodules\AdvancedSlimePaper\api\src```. Now, +run the same thing again for the core +project: ```mklink /D C:\full\path\to\project\aswm-core\src C:\full\path\to\project\submodules\AdvancedSlimePaper\core\src``` +Make sure you replace the placeholder `C:\full\path\to\project` with the actual full path to the root project on your +local machine. You do not need to do this if you are compiling on macOS or Linux. + ## Links ### [Scissors Download](https://ci.plex.us.org/job/Scissors) ### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.1) -### [Scissors Announcements](https://totalfreedom.me/forum/board/139) -### [Scissors General Discussion](https://totalfreedom.me/forum/board/140) +### [Scissors Announcements](https://totalfreedom.tf/forums/scissors-announcements.55) +### [Scissors General Discussion](https://totalfreedom.tf/forums/scissors-discussion.56/) ## Tasks ``` diff --git a/patches/server/0002-Build-changes.patch b/patches/server/0002-Build-changes.patch index 8c7eefb..c57ec4b 100644 --- a/patches/server/0002-Build-changes.patch +++ b/patches/server/0002-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 2143180a92ec6d0c0eba5559dd5497291348fdfa..91c9a0239b8a4d821dd83ea32d971a0a63e5929a 100644 +index ad034c140f18518abc18244ca1f2fb853ca5897e..9a40d3d6bc3862814926e52cf61f46ee440d63fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,12 @@ val alsoShade: Configuration by configurations.creating @@ -55,7 +55,7 @@ index 2143180a92ec6d0c0eba5559dd5497291348fdfa..91c9a0239b8a4d821dd83ea32d971a0a standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 4b002e8b75d117b726b0de274a76d3596fce015b..a46d3f40642bbf249c2d24e689f474d07175ca09 100644 +index 4b002e8b75d117b726b0de274a76d3596fce015b..87fd35ad9c7364124286fa5e9ef1d4b7efa73990 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -72,7 +72,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..a46d3f40642bbf249c2d24e689f474d0 if (implVersion != null) { final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); - paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); -+ paperVersion = "git-Scissors-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Scissors ++ paperVersion = "git-ScissorsASWM-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Scissors } else { paperVersion = "unknown"; } @@ -108,7 +108,7 @@ index e62ebbb2e69df4a79b87cac542482ca913681b02..f0eb2e518cf618dfec7af602d8a77ce4 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ec4b73321205b472f19fa5bd4ad95893020d1340..45f43dc72647f2f3fa91dad767b949d851f7dd46 100644 +index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..26937b8dd0411b0c96e461c57eeee6ae8595211e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper