fix: Update paperweight mcdev and fix CraftBukkit patch

This commit is contained in:
Kyle Wood 2021-06-11 15:17:37 -05:00
parent a588190780
commit 7ea73d48d4
No known key found for this signature in database
GPG key ID: 86AF5613ACA30CC5
3 changed files with 19 additions and 2 deletions

View file

@ -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<GlobalPos> optional = entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE);
-
- if (optional.isPresent()) {
@@ -42,7 +42,7 @@
BlockPosition blockposition = globalpos.getBlockPosition();

View file

@ -1,7 +1,7 @@
plugins { plugins {
java java
id("com.github.johnrengelman.shadow") version "7.0.0" apply false 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" group = "io.papermc.paper"
@ -81,5 +81,6 @@ paperweight {
mappingsPatch.set(file("build-data/mappings-patch.tiny")) mappingsPatch.set(file("build-data/mappings-patch.tiny"))
additionalSpigotMemberMappings.set(file("build-data/additional-spigot-member-mappings.csrg")) additionalSpigotMemberMappings.set(file("build-data/additional-spigot-member-mappings.csrg"))
craftBukkitPatchPatchesDir.set(file("build-data/craftbukkit-patch-patches"))
} }
} }

View file

@ -1,6 +1,5 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal()
gradlePluginPortal() gradlePluginPortal()
maven("https://wav.jfrog.io/artifactory/repo/") maven("https://wav.jfrog.io/artifactory/repo/")
} }