Skip to content

Commit cafef9c

Browse files
authored
[ci skip] Move EntityUtil to correct directory (#12092)
1 parent edacfdf commit cafef9c

File tree

2 files changed

+46
-52
lines changed

2 files changed

+46
-52
lines changed

paper-server/patches/features/0016-Moonrise-optimisation-patches.patch

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -27976,7 +27976,7 @@ index 4eb040006f5d41b47e5ac9df5d9f19c4315d6343..7fa41dea184b01891f45d8e404bc1cba
2797627976
this.generatingStep = generatingStep;
2797727977
this.cache = cache;
2797827978
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
27979-
index ff0315cffdb282fdc0a1ffd15e2954caa76835c9..5e94dd9e26aa4fd6545dbaae2ae0cb51cb6f13e0 100644
27979+
index 5d88b2790710a885957ffcffc02fb99c917123c5..7d1d4abfb04829d8c4722e326c6c6b8fb2ab91f4 100644
2798027980
--- a/net/minecraft/server/players/PlayerList.java
2798127981
+++ b/net/minecraft/server/players/PlayerList.java
2798227982
@@ -1312,7 +1312,7 @@ public abstract class PlayerList {
@@ -28372,7 +28372,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
2837228372
+ // Paper end - block counting
2837328373
}
2837428374
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
28375-
index 55e0bd63a65867f4e496ec0b188ccba7a4a8ebef..161c7a53427917fdbd328401a84a7cab703701a8 100644
28375+
index 449c43286e1483b69667c626b234529a16c19ee1..b268b428ec8f2e50737e1dd5cc705c537322433c 100644
2837628376
--- a/net/minecraft/world/entity/Entity.java
2837728377
+++ b/net/minecraft/world/entity/Entity.java
2837828378
@@ -135,7 +135,7 @@ import net.minecraft.world.scores.ScoreHolder;
@@ -35961,53 +35961,3 @@ index 5b6bd88a5bbbce6cce351938418eba4326e41002..faf45ac459f7c25309d6ef6dce371d48
3596135961
int i = -this.pendingTicks.size();
3596235962

3596335963
for (SavedTick<T> savedTick : this.pendingTicks) {
35964-
diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/EntityUtil.java b/src/main/java/ca/spottedleaf/moonrise/common/util/EntityUtil.java
35965-
new file mode 100644
35966-
index 0000000000000000000000000000000000000000..db5805298d33fbde3f3ed23d706dbc6af814122d
35967-
--- /dev/null
35968-
+++ b/src/main/java/ca/spottedleaf/moonrise/common/util/EntityUtil.java
35969-
@@ -0,0 +1,44 @@
35970-
+package ca.spottedleaf.moonrise.common.util;
35971-
+
35972-
+import net.minecraft.world.entity.Entity;
35973-
+import net.minecraft.world.phys.Vec3;
35974-
+import java.text.DecimalFormat;
35975-
+import java.util.ArrayList;
35976-
+import java.util.List;
35977-
+
35978-
+public final class EntityUtil {
35979-
+
35980-
+ private static final ThreadLocal<DecimalFormat> THREE_DECIMAL_PLACES = ThreadLocal.withInitial(() -> {
35981-
+ return new DecimalFormat("#,##0.000");
35982-
+ });
35983-
+
35984-
+ private static String formatVec(final Vec3 vec) {
35985-
+ final DecimalFormat format = THREE_DECIMAL_PLACES.get();
35986-
+
35987-
+ return "(" + format.format(vec.x) + "," + format.format(vec.y) + "," + format.format(vec.z) + ")";
35988-
+ }
35989-
+
35990-
+ private static String dumpEntityWithoutReferences(final Entity entity) {
35991-
+ if (entity == null) {
35992-
+ return "{null}";
35993-
+ }
35994-
+
35995-
+ return "{type=" + entity.getClass().getSimpleName() + ",id=" + entity.getId() + ",uuid=" + entity.getUUID() + ",pos=" + formatVec(entity.position())
35996-
+ + ",mot=" + formatVec(entity.getDeltaMovement()) + ",aabb=" + entity.getBoundingBox() + ",removed=" + entity.getRemovalReason() + ",has_vehicle=" + (entity.getVehicle() != null)
35997-
+ + ",passenger_count=" + entity.getPassengers().size();
35998-
+ }
35999-
+
36000-
+ public static String dumpEntity(final Entity entity) {
36001-
+ final List<Entity> passengers = entity.getPassengers();
36002-
+ final List<String> passengerStrings = new ArrayList<>(passengers.size());
36003-
+
36004-
+ for (final Entity passenger : passengers) {
36005-
+ passengerStrings.add("(" + dumpEntityWithoutReferences(passenger) + ")");
36006-
+ }
36007-
+
36008-
+ return "{root=[" + dumpEntityWithoutReferences(entity) + "], vehicle=[" + dumpEntityWithoutReferences(entity.getVehicle())
36009-
+ + "], passengers=[" + String.join(",", passengerStrings) + "]";
36010-
+ }
36011-
+
36012-
+ private EntityUtil() {}
36013-
+}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package ca.spottedleaf.moonrise.common.util;
2+
3+
import net.minecraft.world.entity.Entity;
4+
import net.minecraft.world.phys.Vec3;
5+
import java.text.DecimalFormat;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
9+
public final class EntityUtil {
10+
11+
private static final ThreadLocal<DecimalFormat> THREE_DECIMAL_PLACES = ThreadLocal.withInitial(() -> {
12+
return new DecimalFormat("#,##0.000");
13+
});
14+
15+
private static String formatVec(final Vec3 vec) {
16+
final DecimalFormat format = THREE_DECIMAL_PLACES.get();
17+
18+
return "(" + format.format(vec.x) + "," + format.format(vec.y) + "," + format.format(vec.z) + ")";
19+
}
20+
21+
private static String dumpEntityWithoutReferences(final Entity entity) {
22+
if (entity == null) {
23+
return "{null}";
24+
}
25+
26+
return "{type=" + entity.getClass().getSimpleName() + ",id=" + entity.getId() + ",uuid=" + entity.getUUID() + ",pos=" + formatVec(entity.position())
27+
+ ",mot=" + formatVec(entity.getDeltaMovement()) + ",aabb=" + entity.getBoundingBox() + ",removed=" + entity.getRemovalReason() + ",has_vehicle=" + (entity.getVehicle() != null)
28+
+ ",passenger_count=" + entity.getPassengers().size();
29+
}
30+
31+
public static String dumpEntity(final Entity entity) {
32+
final List<Entity> passengers = entity.getPassengers();
33+
final List<String> passengerStrings = new ArrayList<>(passengers.size());
34+
35+
for (final Entity passenger : passengers) {
36+
passengerStrings.add("(" + dumpEntityWithoutReferences(passenger) + ")");
37+
}
38+
39+
return "{root=[" + dumpEntityWithoutReferences(entity) + "], vehicle=[" + dumpEntityWithoutReferences(entity.getVehicle())
40+
+ "], passengers=[" + String.join(",", passengerStrings) + "]";
41+
}
42+
43+
private EntityUtil() {}
44+
}

0 commit comments

Comments
 (0)