Skip to content
This repository has been archived by the owner on Mar 8, 2022. It is now read-only.

Commit

Permalink
update 1.15.2 base 105
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReinWD
ReinWD committed Feb 14, 2020
1 parent 4b6c58f commit 8c7367e
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 225 deletions.
8 changes: 4 additions & 4 deletions patches/0001-unsort-map-value-in-CommandNode-to-prevent-lag.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 3f4f0d632d6e0ac79eb6d2043abbf939adbf2cf0 Mon Sep 17 00:00:00 2001
From baa6bcf9efda74fb26fb3be681a0cc7fb1e7b1e4 Mon Sep 17 00:00:00 2001
From: ReinWD <ReinWDD@gmail.com>
Date: Mon, 30 Dec 2019 23:47:22 +0800
Subject: [PATCH 1/5] unsort map value in CommandNode to prevent lag
Subject: [PATCH 1/7] unsort map value in CommandNode to prevent lag

---
src/main/java/com/mojang/brigadier/tree/CommandNode.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index 98592a3e6..0fbdaf2cb 100644
index 98592a3e..0fbdaf2c 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
Expand All @@ -30,5 +30,5 @@ index 98592a3e6..0fbdaf2cb 100644

public void findAmbiguities(final AmbiguityConsumer<S> consumer) {
--
2.17.1
2.11.0

147 changes: 8 additions & 139 deletions patches/0002-add-three-1.15-src-files.patch
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
From 44b69d76791ee69ed606f35078e8f6b5db9a8b92 Mon Sep 17 00:00:00 2001
From e1f4045cc0c67e7962531f8bdf388230eaa7e85b Mon Sep 17 00:00:00 2001
From: ReinWD <ReinWDD@gmail.com>
Date: Tue, 31 Dec 2019 00:02:45 +0800
Subject: [PATCH 2/5] add three 1.15 src files
Subject: [PATCH 2/7] add three 1.15 src files

---
.../minecraft/server/BehaviorController.java | 244 ++++++++++++++++++
.../server/BehaviorFindPosition.java | 66 +++++
.../server/PathfinderGoalSelector.java | 123 +++++++++
3 files changed, 433 insertions(+)
.../net/minecraft/server/BehaviorController.java | 244 +++++++++++++++++++++
.../net/minecraft/server/BehaviorFindPosition.java | 66 ++++++
2 files changed, 310 insertions(+)
create mode 100644 src/main/java/net/minecraft/server/BehaviorController.java
create mode 100644 src/main/java/net/minecraft/server/BehaviorFindPosition.java
create mode 100644 src/main/java/net/minecraft/server/PathfinderGoalSelector.java

diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
new file mode 100644
index 000000000..a1883eba6
index 00000000..a1883eba
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BehaviorController.java
@@ -0,0 +1,244 @@
Expand Down Expand Up @@ -264,7 +262,7 @@ index 000000000..a1883eba6
+}
diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
new file mode 100644
index 000000000..37006ec1b
index 00000000..37006ec1
--- /dev/null
+++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
@@ -0,0 +1,66 @@
Expand Down Expand Up @@ -334,135 +332,6 @@ index 000000000..37006ec1b
+
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
new file mode 100644
index 000000000..44bb18c59
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -0,0 +1,123 @@
+package net.minecraft.server;
+
+import com.google.common.collect.Sets;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class PathfinderGoalSelector {
+
+ private static final Logger LOGGER = LogManager.getLogger();
+ private static final PathfinderGoalWrapped b = new PathfinderGoalWrapped(Integer.MAX_VALUE, new PathfinderGoal() {
+ @Override
+ public boolean a() {
+ return false;
+ }
+ }) {
+ @Override
+ public boolean g() {
+ return false;
+ }
+ };
+ private final Map<PathfinderGoal.Type, PathfinderGoalWrapped> c = new EnumMap(PathfinderGoal.Type.class);
+ private final Set<PathfinderGoalWrapped> d = Sets.newLinkedHashSet();
+ private final GameProfilerFiller e;
+ private final EnumSet<PathfinderGoal.Type> f = EnumSet.noneOf(PathfinderGoal.Type.class);
+ private int g = 3;
+
+ public PathfinderGoalSelector(GameProfilerFiller gameprofilerfiller) {
+ this.e = gameprofilerfiller;
+ }
+
+ public void a(int i, PathfinderGoal pathfindergoal) {
+ this.d.add(new PathfinderGoalWrapped(i, pathfindergoal));
+ }
+
+ public void a(PathfinderGoal pathfindergoal) {
+ this.d.stream().filter((pathfindergoalwrapped) -> {
+ return pathfindergoalwrapped.j() == pathfindergoal;
+ }).filter(PathfinderGoalWrapped::g).forEach(PathfinderGoalWrapped::d);
+ this.d.removeIf((pathfindergoalwrapped) -> {
+ return pathfindergoalwrapped.j() == pathfindergoal;
+ });
+ }
+
+ public void doTick() {
+ this.e.enter("goalCleanup");
+ this.c().filter((pathfindergoalwrapped) -> {
+ boolean flag;
+
+ if (pathfindergoalwrapped.g()) {
+ Stream stream = pathfindergoalwrapped.i().stream();
+ EnumSet enumset = this.f;
+
+ this.f.getClass();
+ if (!stream.anyMatch(enumset::contains) && pathfindergoalwrapped.b()) {
+ flag = false;
+ return flag;
+ }
+ }
+
+ flag = true;
+ return flag;
+ }).forEach(PathfinderGoal::d);
+ this.c.forEach((pathfindergoal_type, pathfindergoalwrapped) -> {
+ if (!pathfindergoalwrapped.g()) {
+ this.c.remove(pathfindergoal_type);
+ }
+
+ });
+ this.e.exit();
+ this.e.enter("goalUpdate");
+ this.d.stream().filter((pathfindergoalwrapped) -> {
+ return !pathfindergoalwrapped.g();
+ }).filter((pathfindergoalwrapped) -> {
+ Stream stream = pathfindergoalwrapped.i().stream();
+ EnumSet enumset = this.f;
+
+ this.f.getClass();
+ return stream.noneMatch(enumset::contains);
+ }).filter((pathfindergoalwrapped) -> {
+ return pathfindergoalwrapped.i().stream().allMatch((pathfindergoal_type) -> {
+ return ((PathfinderGoalWrapped) this.c.getOrDefault(pathfindergoal_type, PathfinderGoalSelector.b)).a(pathfindergoalwrapped);
+ });
+ }).filter(PathfinderGoalWrapped::a).forEach((pathfindergoalwrapped) -> {
+ pathfindergoalwrapped.i().forEach((pathfindergoal_type) -> {
+ PathfinderGoalWrapped pathfindergoalwrapped1 = (PathfinderGoalWrapped) this.c.getOrDefault(pathfindergoal_type, PathfinderGoalSelector.b);
+
+ pathfindergoalwrapped1.d();
+ this.c.put(pathfindergoal_type, pathfindergoalwrapped);
+ });
+ pathfindergoalwrapped.c();
+ });
+ this.e.exit();
+ this.e.enter("goalTick");
+ this.c().forEach(PathfinderGoalWrapped::e);
+ this.e.exit();
+ }
+
+ public Stream<PathfinderGoalWrapped> c() {
+ return this.d.stream().filter(PathfinderGoalWrapped::g);
+ }
+
+ public void a(PathfinderGoal.Type pathfindergoal_type) {
+ this.f.add(pathfindergoal_type);
+ }
+
+ public void b(PathfinderGoal.Type pathfindergoal_type) {
+ this.f.remove(pathfindergoal_type);
+ }
+
+ public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) {
+ if (flag) {
+ this.b(pathfindergoal_type);
+ } else {
+ this.a(pathfindergoal_type);
+ }
+
+ }
+}
--
2.17.1
2.11.0

14 changes: 7 additions & 7 deletions patches/0003-fix-compile-problems.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 76ecd2eb79f47247f38511b008630b15ac11f96a Mon Sep 17 00:00:00 2001
From 53bb48883cdd135d837aa58a08af0f1e7b62f398 Mon Sep 17 00:00:00 2001
From: ReinWD <ReinWDD@gmail.com>
Date: Wed, 1 Jan 2020 17:06:46 +0800
Subject: [PATCH 3/5] fix compile problems
Subject: [PATCH 3/7] fix compile problems

---
.../java/net/minecraft/server/BehaviorController.java | 8 ++++----
.../java/net/minecraft/server/BehaviorFindPosition.java | 2 +-
src/main/java/net/minecraft/server/BehaviorController.java | 8 ++++----
src/main/java/net/minecraft/server/BehaviorFindPosition.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
index a1883eba6..65fb2157c 100644
index a1883eba..65fb2157 100644
--- a/src/main/java/net/minecraft/server/BehaviorController.java
+++ b/src/main/java/net/minecraft/server/BehaviorController.java
@@ -39,7 +39,7 @@ public class BehaviorController<E extends EntityLiving> implements MinecraftSeri
Expand Down Expand Up @@ -49,7 +49,7 @@ index a1883eba6..65fb2157c 100644
MemoryStatus memorystatus = (MemoryStatus) pair.getSecond();

diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
index 37006ec1b..35eb3a5a6 100644
index 37006ec1..35eb3a5a 100644
--- a/src/main/java/net/minecraft/server/BehaviorFindPosition.java
+++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
@@ -53,7 +53,7 @@ public class BehaviorFindPosition extends Behavior<EntityCreature> {
Expand All @@ -62,5 +62,5 @@ index 37006ec1b..35eb3a5a6 100644
});
} else if (this.f < 5) {
--
2.17.1
2.11.0

14 changes: 7 additions & 7 deletions patches/0004-reduce-villager-AI.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 2f4c86c52b8139af9d85b71cd46e043176a4da5c Mon Sep 17 00:00:00 2001
From a922d3b760255ff8e6033cd193a2355e57457eef Mon Sep 17 00:00:00 2001
From: ReinWD <ReinWDD@gmail.com>
Date: Wed, 1 Jan 2020 17:11:36 +0800
Subject: [PATCH 4/5] reduce villager AI
Subject: [PATCH 4/7] reduce villager AI

---
.../java/net/minecraft/server/BehaviorFindPosition.java | 4 ++--
src/main/java/net/minecraft/server/EntityVillager.java | 8 ++++++++
src/main/java/net/minecraft/server/BehaviorFindPosition.java | 4 ++--
src/main/java/net/minecraft/server/EntityVillager.java | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
index 35eb3a5a6..7cfd1b4b8 100644
index 35eb3a5a..7cfd1b4b 100644
--- a/src/main/java/net/minecraft/server/BehaviorFindPosition.java
+++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
@@ -29,7 +29,7 @@ public class BehaviorFindPosition extends Behavior<EntityCreature> {
Expand All @@ -31,7 +31,7 @@ index 35eb3a5a6..7cfd1b4b8 100644
}
};
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 572723005..428ae7f0c 100644
index 6e0020ae..ede211d6 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -13,6 +13,7 @@ import java.util.Map;
Expand Down Expand Up @@ -62,5 +62,5 @@ index 572723005..428ae7f0c 100644
if (!this.et() && this.bB > 0) {
--this.bB;
--
2.17.1
2.11.0

20 changes: 10 additions & 10 deletions patches/0005-reduce-EntityInsentient-AI.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From e2ae8de7e2db50084237b2fdc2b43818ae6330d5 Mon Sep 17 00:00:00 2001
From ab9cc5fa3d2b9599b4252afebf893d4fb9fd78e3 Mon Sep 17 00:00:00 2001
From: ReinWD <ReinWDD@gmail.com>
Date: Wed, 1 Jan 2020 17:14:11 +0800
Subject: [PATCH 5/5] reduce EntityInsentient AI
Subject: [PATCH 5/7] reduce EntityInsentient AI

---
.../minecraft/server/EntityInsentient.java | 6 ++-
.../server/PathfinderGoalSelector.java | 46 ++++++++++---------
.../net/minecraft/server/EntityInsentient.java | 6 ++-
.../minecraft/server/PathfinderGoalSelector.java | 46 +++++++++++-----------
2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 5fb3c948d..c0158c442 100644
index e54f1e84..071e4636 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -7,6 +7,7 @@ import java.util.List;
Expand All @@ -20,7 +20,7 @@ index 5fb3c948d..c0158c442 100644
import javax.annotation.Nullable;

// CraftBukkit start
@@ -661,11 +662,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -675,11 +676,12 @@ public abstract class EntityInsentient extends EntityLiving {
this.world.getMethodProfiler().enter("sensing");
this.bw.a();
this.world.getMethodProfiler().exit();
Expand All @@ -36,10 +36,10 @@ index 5fb3c948d..c0158c442 100644
this.world.getMethodProfiler().enter("navigation");
this.navigation.c();
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 44bb18c59..397b2a49c 100644
index 93513677..4bfd6130 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -46,7 +46,7 @@ public class PathfinderGoalSelector {
@@ -66,7 +66,7 @@ public class PathfinderGoalSelector {
});
}

Expand All @@ -48,7 +48,7 @@ index 44bb18c59..397b2a49c 100644
this.e.enter("goalCleanup");
this.c().filter((pathfindergoalwrapped) -> {
boolean flag;
@@ -72,29 +72,31 @@ public class PathfinderGoalSelector {
@@ -92,29 +92,31 @@ public class PathfinderGoalSelector {

});
this.e.exit();
Expand Down Expand Up @@ -102,5 +102,5 @@ index 44bb18c59..397b2a49c 100644
this.c().forEach(PathfinderGoalWrapped::e);
this.e.exit();
--
2.17.1
2.11.0

58 changes: 0 additions & 58 deletions patches/0006-fix-villiger-swimming-behavior.patch
View file

This file was deleted.

Loading

0 comments on commit 8c7367e

Please sign in to comment.