Dropped problematic patches

This commit is contained in:
M2ke4U
2024-01-28 18:23:34 +08:00
committed by GitHub
parent 7322788353
commit 004b0a731a

View File

@@ -1,54 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <novau233@163.com>
Date: Sun, 28 Jan 2024 09:31:27 +0000
Subject: [PATCH] Gale Faster floating-point positive modulo
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/util/Mth.java b/src/main/java/net/minecraft/util/Mth.java
index d9e0224dc108a99c194d4947d18f2d855a341534..79419f6e1ba900c1686fa9b43866fc43649123a1 100644
--- a/src/main/java/net/minecraft/util/Mth.java
+++ b/src/main/java/net/minecraft/util/Mth.java
@@ -148,14 +148,26 @@ public class Mth {
return Math.floorMod(dividend, divisor);
}
- public static float positiveModulo(float dividend, float divisor) {
+ public static float positiveModuloForAnyDivisor(float dividend, float divisor) { // Gale - faster floating-point positive modulo
return (dividend % divisor + divisor) % divisor;
}
- public static double positiveModulo(double dividend, double divisor) {
+ public static double positiveModuloForAnyDivisor(double dividend, double divisor) { // Gale - faster floating-point positive modulo
return (dividend % divisor + divisor) % divisor;
}
+ // Gale start - faster floating-point positive modulo
+ public static float positiveModuloForPositiveIntegerDivisor(float dividend, float divisor) {
+ var modulo = dividend % divisor;
+ return modulo < 0 ? modulo + divisor : modulo;
+ }
+
+ public static double positiveModuloForPositiveIntegerDivisor(double dividend, double divisor) {
+ var modulo = dividend % divisor;
+ return modulo < 0 ? modulo + divisor : modulo;
+ }
+ // Gale end - faster floating-point positive modulo
+
public static boolean isMultipleOf(int a, int b) {
return a % b == 0;
}
diff --git a/src/main/java/net/minecraft/world/level/levelgen/blending/Blender.java b/src/main/java/net/minecraft/world/level/levelgen/blending/Blender.java
index 8d40205f56a7b204a65505f9e1b4e20000221755..fe4a27e9e8265fc60e1db6dd070f91b212904e30 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/blending/Blender.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/blending/Blender.java
@@ -139,7 +139,7 @@ public class Blender {
private static double heightToOffset(double height) {
double d = 1.0D;
double e = height + 0.5D;
- double f = Mth.positiveModulo(e, 8.0D);
+ double f = Mth.positiveModuloForPositiveIntegerDivisor(e, 8.0D); // Gale - faster floating-point positive modulo
return 1.0D * (32.0D * (e - 128.0D) - 3.0D * (e - 120.0D) * f + 3.0D * f * f) / (128.0D * (32.0D - 3.0D * f));
}