R3944Realms/ModernFix-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce allocation rate from biome zoomer

Browse Source
This commit is contained in:
embeddedt 2023-04-08 20:28:48 -04:00
parent af731b336e
commit d2e2040ce4
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -42,6 +42,7 @@ public class ModernFixEarlyConfig {
this.addMixinRule("perf.state_definition_construct", modPresent("ferritecore"));
this.addMixinRule("perf.cache_strongholds", true);
this.addMixinRule("perf.cache_upgraded_structures", true);
this.addMixinRule("perf.biome_zoomer", true);
this.addMixinRule("bugfix.concurrency", true);
this.addMixinRule("bugfix.edge_chunk_not_saved", true);
this.addMixinRule("bugfix.packet_leak", false);

57
src/main/java/org/embeddedt/modernfix/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java Normal file
View File

@ -0,0 +1,57 @@
package org.embeddedt.modernfix.mixin.perf.biome_zoomer;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeManager;
import net.minecraft.world.level.biome.FuzzyOffsetBiomeZoomer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(FuzzyOffsetBiomeZoomer.class)
public abstract class FuzzyOffsetBiomeZoomerMixin {
@Shadow protected static double getFiddledDistance(long seed, int x, int y, int z, double scaleX, double scaleY, double scaleZ) {
throw new AssertionError();
}
/**
* @author embeddedt
* @reason use the modern logic that doesn't allocate an array of 8 doubles every time
*/
@Overwrite
public Biome getBiome(long seed, int xIn, int yIn, int zIn, BiomeManager.NoiseBiomeSource biomeReader) {
int i = xIn - 2;
int j = yIn - 2;
int k = zIn - 2;
int l = i >> 2;
int i1 = j >> 2;
int j1 = k >> 2;
double d0 = (double)(i & 3) / 4.0D;
double d1 = (double)(j & 3) / 4.0D;
double d2 = (double)(k & 3) / 4.0D;
int k1 = 0;
double d3 = Double.POSITIVE_INFINITY;
for(int l1 = 0; l1 < 8; ++l1) {
boolean flag = (l1 & 4) == 0;
boolean flag1 = (l1 & 2) == 0;
boolean flag2 = (l1 & 1) == 0;
int i2 = flag ? l : l + 1;
int j2 = flag1 ? i1 : i1 + 1;
int k2 = flag2 ? j1 : j1 + 1;
double d4 = flag ? d0 : d0 - 1.0D;
double d5 = flag1 ? d1 : d1 - 1.0D;
double d6 = flag2 ? d2 : d2 - 1.0D;
double d7 = getFiddledDistance(seed, i2, j2, k2, d4, d5, d6);
if (d3 > d7) {
k1 = l1;
d3 = d7;
}
}
int l2 = (k1 & 4) == 0 ? l : l + 1;
int i3 = (k1 & 2) == 0 ? i1 : i1 + 1;
int j3 = (k1 & 1) == 0 ? j1 : j1 + 1;
return biomeReader.getNoiseBiome(l2, i3, j3);
}
}

1
src/main/resources/modernfix.mixins.json
View File

@ -61,6 +61,7 @@
"perf.cache_upgraded_structures.StructureManagerMixin",
"perf.cache_strongholds.ServerLevelMixin",
"perf.state_definition_construct.StateDefinitionMixin",
"perf.biome_zoomer.FuzzyOffsetBiomeZoomerMixin",
"devenv.MinecraftServerMixin"
],
"client": [