Add compiling instructions for Windows and update Metrics class

This commit is contained in:
Telesphoreo 2023-10-20 22:36:42 -05:00
parent 7ceedf9453
commit e393f9b057
3 changed files with 12 additions and 3 deletions

3
.gitignore vendored
View File

@ -50,3 +50,6 @@ Scissors-Server
Scissors-API
!gradle/wrapper/gradle-wrapper.jar
aswm-api/src
aswm-core/src

View File

@ -5,6 +5,12 @@ 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 go to the `aswm-api/src`
and `aswm-core/src` files and replace the default paths with the **full path** to
the `submodules/AdvancedSlimePaper/api` and `submodules/AdvancedSlimePaper/core` on your local machine. This does not
need to be done on macOS or Linux. Example: `../submodules/AdvancedSlimePaper/api/src`
becomes `C:/Users/telesphoreo/IdeaProjects/Scissors-slime-1.20.2/submodules/AdvancedSlimePaper/api/src`
## Links
### [Scissors Download](https://ci.plex.us.org/job/Scissors)
### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.1)

View File

@ -56,7 +56,7 @@ index a79461457ea19339f47572c70705d655ebc55276..321c6408bdaf7fb99d40e1130b2b687b
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 {
@ -73,7 +73,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";
}