From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Taiyou06 Date: Thu, 7 Nov 2024 21:50:47 +0100 Subject: [PATCH] Lithium: fast util This patch is based on the following mixins: * "net/caffeinemc/mods/lithium/mixin/math/fast_util/DirectionMixin.java" * "net/caffeinemc/mods/lithium/mixin/math/fast_util/AABBMixin.java" By: 2No2Name <2No2Name@web.de> As part of: Lithium (https://github.com/CaffeineMC/lithium) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/core/Direction.java b/net/minecraft/core/Direction.java index 55d56d61036dae4613d24309a57c072592e984a8..8447557b808f420f22c54882bf51a308965063fe 100644 --- a/net/minecraft/core/Direction.java +++ b/net/minecraft/core/Direction.java @@ -222,7 +222,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa } public Direction getOpposite() { - return this.opposite; // Paper - optimise collisions + return VALUES[this.oppositeIndex]; // Leaf - Lithium - fast util } public Direction getClockWise(Direction.Axis axis) { @@ -355,7 +355,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa } public static Direction getRandom(RandomSource random) { - return Util.getRandom(VALUES, random); + return VALUES[random.nextInt(VALUES.length)]; // Leaf - Lithium - fast util } public static Direction getApproximateNearest(double x, double y, double z) { diff --git a/net/minecraft/world/phys/AABB.java b/net/minecraft/world/phys/AABB.java index e53398996bbb278c6e06024d8ca945b364a44c10..2010b30bf1050273694db707b0059ed8251a41f8 100644 --- a/net/minecraft/world/phys/AABB.java +++ b/net/minecraft/world/phys/AABB.java @@ -19,6 +19,15 @@ public class AABB { public final double maxY; public final double maxZ; + // Leaf start - Lithium - fast util + static { + assert Direction.Axis.X.ordinal() == 0; + assert Direction.Axis.Y.ordinal() == 1; + assert Direction.Axis.Z.ordinal() == 2; + assert Direction.Axis.values().length == 3; + } + // Leaf end - Lithium - fast util + public AABB(double x1, double y1, double z1, double x2, double y2, double z2) { this.minX = Math.min(x1, x2); this.minY = Math.min(y1, y2); @@ -80,11 +89,33 @@ public class AABB { } public double min(Direction.Axis axis) { - return axis.choose(this.minX, this.minY, this.minZ); + // Leaf start - Lithium - fast util + switch (axis.ordinal()) { + case 0: //X + return this.minX; + case 1: //Y + return this.minY; + case 2: //Z + return this.minZ; + } + + throw new IllegalArgumentException(); + // Leaf end - Lithium - fast util } public double max(Direction.Axis axis) { - return axis.choose(this.maxX, this.maxY, this.maxZ); + // Leaf start - Lithium - fast util + switch (axis.ordinal()) { + case 0: //X + return this.maxX; + case 1: //Y + return this.maxY; + case 2: //Z + return this.maxZ; + } + + throw new IllegalArgumentException(); + // Leaf end - Lithium - fast util } @Override