Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

build but not run (https://paste.lucko.me/4irApmTrcF)

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-02 18:29:46 -05:00
parent 14fe7284ab
commit a73832cc01
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -19,7 +19,7 @@ repositories {
dependencies {
remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:3.0.2-SNAPSHOT")
paperclip("io.papermc:paperclip:3.0.2")
}
allprojects {

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.18-R0.1-SNAPSHOT
mcVersion = 1.18
packageVersion = 1_18_R1
paperCommit = 956124f86a93515cf67ee850e96cfd7bc58e27e8
paperCommit = 057adb04f18f319dafeecd2e4294dd090c8360d1
org.gradle.caching = true
org.gradle.parallel = true

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

18
patches/server/0002-Rebrand.patch
View File

@@ -5,21 +5,25 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index cd74406039704e5a880f00b9b60bb7b1dedc5398..c0051daa10e2d2300f8f1e551554732bdf82fe1e 100644
index cd74406039704e5a880f00b9b60bb7b1dedc5398..ef00dddbbf432d3f9f06bc6095ab5a8256961529 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -18,8 +18,12 @@ repositories {
}
dependencies {
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":purpur-api")) // Purpur
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // Purpur
+ // Purpur start
+ implementation(project(":purpur-api"))
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
+ // Purpur end
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -49,6 +49,8 @@ dependencies {
@@ -49,6 +53,8 @@ dependencies {
isTransitive = false
}
// Paper end
@@ -28,7 +32,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..c0051daa10e2d2300f8f1e551554732b
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("junit:junit:4.13.1")
@@ -67,7 +69,7 @@ tasks.jar {
@@ -67,7 +73,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -37,7 +41,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..c0051daa10e2d2300f8f1e551554732b
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -158,7 +160,7 @@ fun TaskContainer.registerRunTask(
@@ -158,7 +164,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {

13
patches/server/0006-Ridables.patch
View File

@@ -73,7 +73,7 @@ index ed8b90e90dc4878bce9eecbbf944f5264630f6bb..e38a9ff1024669a5ea9c45a7f33c6061
+
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 23074f0b00cde60e3a42335c7aa3eb4f6162d44d..56015828fe1f0bf66eefa41164e58cc4ebe59f20 100644
index 48f95c3a9148a21b76b464c10eb41179d23004de..634de4e0b941ee236bd605b66bfbb2123fc03294 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2369,6 +2369,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -86,18 +86,9 @@ index 23074f0b00cde60e3a42335c7aa3eb4f6162d44d..56015828fe1f0bf66eefa41164e58cc4
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 23c17a1ebb63290168b2b67f2dbeb7741c368e7b..8389be51e564c734b899ee1049eeb811d111d263 100644
index 1aeca95a271ad925f3615fdc543c7a212ff151fa..4844974e4728aeb5199c05b6dfb74fb3077d80db 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public float yRotO;
public float xRotO;
private AABB bb;
- protected boolean onGround;
+ public boolean onGround; // Purpur - protected -> public
public boolean horizontalCollision;
public boolean verticalCollision;
public boolean minorHorizontalCollision;
@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
private final Set<String> tags;
private final double[] pistonDeltas;