core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build updates (#6992)

This commit is contained in:
Jason 2021-12-01 23:21:14 -08:00 committed by GitHub
parent a5a7782f40
commit 956124f86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
java java
`maven-publish` `maven-publish`
id("com.github.johnrengelman.shadow") version "7.1.0" apply false id("com.github.johnrengelman.shadow") version "7.1.0" apply false
id("io.papermc.paperweight.core") version "1.3.0" id("io.papermc.paperweight.core") version "1.3.1"
} }
allprojects { allprojects {
@ -46,7 +46,7 @@ repositories {
} }
dependencies { dependencies {
paramMappings("net.fabricmc:yarn:1.18-rc3+build.2:mergedv2") paramMappings("net.fabricmc:yarn:1.18+build.1:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.7.0:fat") remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22") decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:3.0.2") paperclip("io.papermc:paperclip:3.0.2")
@ -72,10 +72,11 @@ paperweight {
"com.destroystokyo.paper", "com.destroystokyo.paper",
"com.mojang", "com.mojang",
"io.papermc.paper", "io.papermc.paper",
"ca.spottedleaf",
"net.kyori.adventure.bossbar", "net.kyori.adventure.bossbar",
"net.minecraft", "net.minecraft",
"org.bukkit.craftbukkit", "org.bukkit.craftbukkit",
"org.spigotmc" "org.spigotmc",
) )
} }
} }

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

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
patches/server/0615-Add-Block-isValidTool.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add Block#isValidTool
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 4c30b6d0d70a48b39bd99b5e9761f950b8b0c340..011f34034bf6d8481e91b08894c68d87de41f2c1 100644 index a992c5d0cbc3882d7fb1343aa4ca784cad6cc1a9..1cc8edc51bedc53ee82490bc1df4a36a5a88c028 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -672,5 +672,9 @@ public class CraftBlock implements Block { @@ -675,5 +675,9 @@ public class CraftBlock implements Block {
} }
return speed; return speed;
} }