From 7ea73d48d46c0208908748067b6955b01891d042 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Fri, 11 Jun 2021 15:17:37 -0500 Subject: [PATCH] fix: Update paperweight mcdev and fix CraftBukkit patch --- .../BehaviorWorkComposter.patch.patch | 17 +++++++++++++++++ build.gradle.kts | 3 ++- settings.gradle.kts | 1 - 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch diff --git a/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch b/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch new file mode 100644 index 0000000000..9f2bdc4a2c --- /dev/null +++ b/build-data/craftbukkit-patch-patches/BehaviorWorkComposter.patch.patch @@ -0,0 +1,17 @@ +--- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch ++++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch +@@ -1,14 +1,5 @@ + --- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java + +++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java +-@@ -23,7 +23,7 @@ +- public BehaviorWorkComposter() {} +- +- @Override +-- protected void a(WorldServer worldserver, EntityVillager entityvillager) { +-+ protected void doWork(WorldServer worldserver, EntityVillager entityvillager) { // PAIL +- Optional optional = entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE); +- +- if (optional.isPresent()) { + @@ -42,7 +42,7 @@ + BlockPosition blockposition = globalpos.getBlockPosition(); + diff --git a/build.gradle.kts b/build.gradle.kts index e0b14dc32d..c72aad1bc8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.core") version "1.0.0-LOCAL-SNAPSHOT" + id("io.papermc.paperweight.core") version "1.0.0-SNAPSHOT" } group = "io.papermc.paper" @@ -81,5 +81,6 @@ paperweight { mappingsPatch.set(file("build-data/mappings-patch.tiny")) additionalSpigotMemberMappings.set(file("build-data/additional-spigot-member-mappings.csrg")) + craftBukkitPatchPatchesDir.set(file("build-data/craftbukkit-patch-patches")) } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 302bcb31ab..54bb957497 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,5 @@ pluginManagement { repositories { - mavenLocal() gradlePluginPortal() maven("https://wav.jfrog.io/artifactory/repo/") }