Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-21 07:49:22 +00:00
Code Issues Releases Activity

Faster floating-point positive modulo

Browse Source
This commit is contained in:
Martijn Muijsers
2023-08-29 22:39:50 +02:00
parent 2be9395e1a
commit 9ebba5cedd
129 changed files with 121 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
patches/server/0002-Dev-import-deobfuscation-fixes.patch
View File

@@ -366,3 +366,62 @@ index 915c1cbcc0ecf634cc76f02bba53dc82d22be698..0c05aa0d0938b19453f45adf5931c887
}
@Override
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..a6434f2c2d1ddb33e7c51d0a099fd127d8a785e6 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
@@ -113,13 +113,15 @@ public class Blender {
MutableDouble mutableDouble3 = new MutableDouble(Double.POSITIVE_INFINITY);
this.heightAndBiomeBlendingData.forEach((chunkPos, data) -> {
data.iterateHeights(QuartPos.fromSection(ChunkPos.getX(chunkPos)), QuartPos.fromSection(ChunkPos.getZ(chunkPos)), (biomeX, biomeZ, height) -> {
- double d = Mth.length((double)(i - biomeX), (double)(j - biomeZ));
- if (!(d > (double)HEIGHT_BLENDING_RANGE_CELLS)) {
- if (d < mutableDouble3.doubleValue()) {
- mutableDouble3.setValue(d);
+ // Gale start - dev import deobfuscation fixes
+ double distance = Mth.length((double)(i - biomeX), (double)(j - biomeZ));
+ if (!(distance > (double)HEIGHT_BLENDING_RANGE_CELLS)) {
+ if (distance < mutableDouble3.doubleValue()) {
+ mutableDouble3.setValue(distance);
}
- double e = 1.0D / (d * d * d * d);
+ double e = 1.0D / (distance * distance * distance * distance);
+ // Gale end - dev import deobfuscation fixes
mutableDouble2.add(height * e);
mutableDouble.add(e);
}
@@ -156,13 +158,15 @@ public class Blender {
MutableDouble mutableDouble3 = new MutableDouble(Double.POSITIVE_INFINITY);
this.densityBlendingData.forEach((chunkPos, data) -> {
data.iterateDensities(QuartPos.fromSection(ChunkPos.getX(chunkPos)), QuartPos.fromSection(ChunkPos.getZ(chunkPos)), j - 1, j + 1, (biomeX, halfSectionY, biomeZ, collidableBlockDensity) -> {
- double d = Mth.length((double)(i - biomeX), (double)((j - halfSectionY) * 2), (double)(k - biomeZ));
- if (!(d > 2.0D)) {
- if (d < mutableDouble3.doubleValue()) {
- mutableDouble3.setValue(d);
+ // Gale start - dev import deobfuscation fixes
+ double distance = Mth.length((double)(i - biomeX), (double)((j - halfSectionY) * 2), (double)(k - biomeZ));
+ if (!(distance > 2.0D)) {
+ if (distance < mutableDouble3.doubleValue()) {
+ mutableDouble3.setValue(distance);
}
- double e = 1.0D / (d * d * d * d);
+ double e = 1.0D / (distance * distance * distance * distance);
+ // Gale end - dev import deobfuscation fixes
mutableDouble2.add(collidableBlockDensity * e);
mutableDouble.add(e);
}
@@ -317,8 +321,10 @@ public class Blender {
double f = (double)offsetZ + 0.5D + SHIFT_NOISE.getValue((double)offsetZ, (double)offsetX, (double)y) * 4.0D;
return distanceGetter.getDistance(d, e, f) < 4.0D;
};
- Stream.of(GenerationStep.Carving.values()).map(chunk::getOrCreateCarvingMask).forEach((mask) -> {
- mask.setAdditionalMask(mask);
+ // Gale start - dev import deobfuscation fixes
+ Stream.of(GenerationStep.Carving.values()).map(chunk::getOrCreateCarvingMask).forEach((carvingMask) -> {
+ carvingMask.setAdditionalMask(mask);
+ // Gale end - dev import deobfuscation fixes
});
}
}