mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-27 07:05:39 +00:00
Begin work on 1.19.3
Only got through one patch as of now. Not publishing JARs to Jenkins for now
This commit is contained in:
parent
690ddc47e4
commit
6b23f8bc8f
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -27,7 +27,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
stage('publish') {
|
stage('publish') {
|
||||||
when {
|
when {
|
||||||
branch "1.19.2"
|
branch "skip"
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
withCredentials([usernamePassword(credentialsId: '8150559b-ec1d-41bd-a576-aa668a52c1ba', passwordVariable: 'scissorsPassword', usernameVariable: 'scissorsUser')]) {
|
withCredentials([usernamePassword(credentialsId: '8150559b-ec1d-41bd-a576-aa668a52c1ba', passwordVariable: 'scissorsPassword', usernameVariable: 'scissorsUser')]) {
|
||||||
@ -40,7 +40,7 @@ pipeline {
|
|||||||
}
|
}
|
||||||
post {
|
post {
|
||||||
always {
|
always {
|
||||||
archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true
|
// archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true
|
||||||
junit 'Scissors-Server/build/test-results/test/*.xml'
|
junit 'Scissors-Server/build/test-results/test/*.xml'
|
||||||
junit 'Scissors-API/build/test-results/test/*.xml'
|
junit 'Scissors-API/build/test-results/test/*.xml'
|
||||||
cleanWs()
|
cleanWs()
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
group=me.totalfreedom.scissors
|
group=me.totalfreedom.scissors
|
||||||
version=1.19.2-R0.1-SNAPSHOT
|
version=1.19.3-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion=1.19.2
|
mcVersion=1.19.3
|
||||||
paperRef=476ef25d053c523aea416487a38f72011d72a9cf
|
paperRef=1143b636634183fe9ee6d8cf9709afd4b3239de4
|
||||||
|
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
@ -5,10 +5,10 @@ Subject: [PATCH] Add Scissors configuration file
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||||
index e43fef0152468944d8a33036344a43e95fe58476..ec79086cb61d4207c4228bc97a7cc49555aea622 100644
|
index 2204336d8800311b65e894739ab1b27273e7c6f2..766d0143290cfc5062c548c2361316dbddca9afe 100644
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
--- a/src/main/java/org/bukkit/Server.java
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
+++ b/src/main/java/org/bukkit/Server.java
|
||||||
@@ -1969,6 +1969,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
@@ -1971,6 +1971,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||||
}
|
}
|
||||||
// Paper end
|
// Paper end
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb565cfa183 100644
|
index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..936341d202df27fca75109b3e9a2b5ffffdbe47b 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -7,8 +7,10 @@ plugins {
|
@@ -7,8 +7,10 @@ plugins {
|
||||||
@ -15,13 +15,13 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5
|
|||||||
- implementation(project(":paper-api"))
|
- implementation(project(":paper-api"))
|
||||||
- implementation(project(":paper-mojangapi"))
|
- implementation(project(":paper-mojangapi"))
|
||||||
+ implementation(project(":Scissors-API"))
|
+ implementation(project(":Scissors-API"))
|
||||||
+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
|
+ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
|
||||||
+ exclude("io.papermc.paper", "paper-api")
|
+ exclude("io.papermc.paper", "paper-api")
|
||||||
+ }
|
+ }
|
||||||
// Paper start
|
// Paper start
|
||||||
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
implementation("org.jline:jline-terminal-jansi:3.21.0")
|
||||||
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||||
@@ -58,11 +60,17 @@ tasks.jar {
|
@@ -57,11 +59,17 @@ tasks.jar {
|
||||||
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
|
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
|
||||||
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
|
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
|
||||||
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
|
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
|
||||||
@ -41,7 +41,7 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5
|
|||||||
"Implementation-Vendor" to date, // Paper
|
"Implementation-Vendor" to date, // Paper
|
||||||
"Specification-Title" to "Bukkit",
|
"Specification-Title" to "Bukkit",
|
||||||
"Specification-Version" to project.version,
|
"Specification-Version" to project.version,
|
||||||
@@ -134,7 +142,7 @@ fun TaskContainer.registerRunTask(
|
@@ -133,7 +141,7 @@ fun TaskContainer.registerRunTask(
|
||||||
name: String,
|
name: String,
|
||||||
block: JavaExec.() -> Unit
|
block: JavaExec.() -> Unit
|
||||||
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
): TaskProvider<JavaExec> = register<JavaExec>(name) {
|
||||||
@ -51,7 +51,7 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5
|
|||||||
standardInput = System.`in`
|
standardInput = System.`in`
|
||||||
workingDir = rootProject.layout.projectDirectory
|
workingDir = rootProject.layout.projectDirectory
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..0ef065d4d193841ccaca21df70f55cdd5fe15455 100644
|
index 710ca7d3a5659953f64bc6dccdd93b43300961cc..ad9cd0987098c8969fdf002969188458b0398924 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
@ -64,10 +64,10 @@ index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..0ef065d4d193841ccaca21df70f55cdd
|
|||||||
|
|
||||||
public SystemReport fillSystemReport(SystemReport details) {
|
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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 4212568bf8de6988c71f43d3e2152fa0fe51d0d7..6042a736a7af975331bcfeeae48529368a3057b1 100644
|
index 47df6f4268a63118da8187f4102c876bd37d1680..653c34ae4a5f55773f0c4af54c8cbb426ddb7d7b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
|
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
|
||||||
import javax.annotation.Nonnull; // Paper
|
import javax.annotation.Nonnull; // Paper
|
||||||
|
|
||||||
public final class CraftServer implements Server {
|
public final class CraftServer implements Server {
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Video <videogamesm12@gmail.com>
|
From: Telesphoreo <me@telesphoreo.me>
|
||||||
Date: Sat, 12 Mar 2022 19:34:59 -0700
|
Date: Sat, 10 Dec 2022 22:25:38 -0600
|
||||||
Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid
|
Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
||||||
index 587db9a70f8f930412d34c4a412c19a30faa2a4e..b50cd7a39c077dcbabdfea1b9290bf5b144d4384 100644
|
index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 100644
|
||||||
--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
||||||
+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
|
||||||
@@ -174,7 +174,14 @@ public class HoverEvent {
|
@@ -174,7 +174,14 @@ public class HoverEvent {
|
||||||
} else {
|
} else {
|
||||||
JsonObject jsonObject = json.getAsJsonObject();
|
JsonObject jsonObject = json.getAsJsonObject();
|
||||||
EntityType<?> entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type")));
|
EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type")));
|
||||||
- UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
|
- UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
|
||||||
+ // Scissors start
|
+ // Scissors start
|
||||||
+ UUID uUID;
|
+ UUID uUID;
|
||||||
@ -27,7 +27,7 @@ index 587db9a70f8f930412d34c4a412c19a30faa2a4e..b50cd7a39c077dcbabdfea1b9290bf5b
|
|||||||
@@ -186,7 +193,14 @@ public class HoverEvent {
|
@@ -186,7 +193,14 @@ public class HoverEvent {
|
||||||
CompoundTag compoundTag = TagParser.parseTag(text.getString());
|
CompoundTag compoundTag = TagParser.parseTag(text.getString());
|
||||||
Component component = Component.Serializer.fromJson(compoundTag.getString("name"));
|
Component component = Component.Serializer.fromJson(compoundTag.getString("name"));
|
||||||
EntityType<?> entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
|
EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
|
||||||
- UUID uUID = UUID.fromString(compoundTag.getString("id"));
|
- UUID uUID = UUID.fromString(compoundTag.getString("id"));
|
||||||
+ // Scissors start
|
+ // Scissors start
|
||||||
+ UUID uUID;
|
+ UUID uUID;
|
||||||
|
Loading…
Reference in New Issue
Block a user