mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2020-11-23 14:47:16 -05:00
parent ac04ef34d7
commit ad01a157ce
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/nms/v16_2/NMSChunkGenerator_16_2.java
View File

@ -215,13 +215,13 @@ public final class NMSChunkGenerator_16_2 extends ChunkGenerator {
@Override @Override
public void setBiome(int x, int y, int z, Biome bio) public void setBiome(int x, int y, int z, Biome bio)
{ {
protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); protochunk.getBiomeIndex().setBiome(x, y, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
} }
@Override @Override
public void setBiome(int x, int z, Biome bio) public void setBiome(int x, int z, Biome bio)
{ {
protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); protochunk.getBiomeIndex().setBiome(x, 0, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
} }
@Override @Override

7
src/main/java/com/volmit/iris/nms/v16_2/NMSWorldChunkManager16_2.java
View File

@ -3,9 +3,10 @@ package com.volmit.iris.nms.v16_2;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.Lifecycle; import com.mojang.serialization.Lifecycle;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.volmit.iris.nms.INMS;
import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
import net.minecraft.server.v1_16_R2.*; import net.minecraft.server.v1_16_R2.*;
import org.bukkit.craftbukkit.v1_16_R2.util.CraftNamespacedKey; import org.bukkit.block.Biome;
public class NMSWorldChunkManager16_2 extends WorldChunkManager { public class NMSWorldChunkManager16_2 extends WorldChunkManager {
public static final Codec<NMSWorldChunkManager16_2> e = RecordCodecBuilder.create((var0) -> { public static final Codec<NMSWorldChunkManager16_2> e = RecordCodecBuilder.create((var0) -> {
@ -45,12 +46,12 @@ public class NMSWorldChunkManager16_2 extends WorldChunkManager {
public BiomeBase getBiome(int var0, int var1, int var2) { public BiomeBase getBiome(int var0, int var1, int var2) {
try try
{ {
return k.get(CraftNamespacedKey.toMinecraft(compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative().getKey())); return (BiomeBase) INMS.get().getBiomeBase(k, compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative());
} }
catch(Throwable e) catch(Throwable e)
{ {
return k.get(Biomes.THE_VOID.a()); return (BiomeBase) INMS.get().getBiomeBase(k, Biome.THE_VOID);
} }
} }
} }

4
src/main/java/com/volmit/iris/nms/v16_3/NMSChunkGenerator16_3.java
View File

@ -215,13 +215,13 @@ public final class NMSChunkGenerator16_3 extends ChunkGenerator {
@Override @Override
public void setBiome(int x, int y, int z, Biome bio) public void setBiome(int x, int y, int z, Biome bio)
{ {
protochunk.getBiomeIndex().setBiome(x, y, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); protochunk.getBiomeIndex().setBiome(x, y, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
} }
@Override @Override
public void setBiome(int x, int z, Biome bio) public void setBiome(int x, int z, Biome bio)
{ {
protochunk.getBiomeIndex().setBiome(x, 0, z, CraftBlock.biomeToBiomeBase(ws.get().r().b(IRegistry.ay), bio)); protochunk.getBiomeIndex().setBiome(x, 0, z, (BiomeBase) INMS.get().getBiomeBase(ws.get().r().b(IRegistry.ay), bio));
} }
@Override @Override

7
src/main/java/com/volmit/iris/nms/v16_3/NMSWorldChunkManager16_3.java
View File

@ -3,9 +3,10 @@ package com.volmit.iris.nms.v16_3;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.Lifecycle; import com.mojang.serialization.Lifecycle;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import com.volmit.iris.nms.INMS;
import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; import com.volmit.iris.scaffold.engine.EngineCompositeGenerator;
import net.minecraft.server.v1_16_R3.*; import net.minecraft.server.v1_16_R3.*;
import org.bukkit.craftbukkit.v1_16_R3.util.CraftNamespacedKey; import org.bukkit.block.Biome;
public class NMSWorldChunkManager16_3 extends WorldChunkManager { public class NMSWorldChunkManager16_3 extends WorldChunkManager {
public static final Codec<NMSWorldChunkManager16_3> e = RecordCodecBuilder.create((var0) -> { public static final Codec<NMSWorldChunkManager16_3> e = RecordCodecBuilder.create((var0) -> {
@ -45,12 +46,12 @@ public class NMSWorldChunkManager16_3 extends WorldChunkManager {
public BiomeBase getBiome(int var0, int var1, int var2) { public BiomeBase getBiome(int var0, int var1, int var2) {
try try
{ {
return k.get(CraftNamespacedKey.toMinecraft(compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative().getKey())); return (BiomeBase) INMS.get().getBiomeBase(k, compound.getComposite().getDefaultEngine().getSurfaceBiome(var0, var2).getVanillaDerivative());
} }
catch(Throwable e) catch(Throwable e)
{ {
return k.get(Biomes.THE_VOID.a()); return (BiomeBase) INMS.get().getBiomeBase(k, Biome.THE_VOID);
} }
} }
} }

4
src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
View File

@ -52,7 +52,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
this.production = production; this.production = production;
this.dimensionHint = hint; this.dimensionHint = hint;
initialized = new AtomicBoolean(false); initialized = new AtomicBoolean(false);
art = J.ar(this::tick, 20); art = J.ar(this::tick, 100);
populators = new KList<BlockPopulator>().qadd(new BlockPopulator() { populators = new KList<BlockPopulator>().qadd(new BlockPopulator() {
@Override @Override
public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) { public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk chunk) {
@ -106,7 +106,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
try try
{ {
hotloader.check(); J.a(() -> hotloader.check());
getComposite().clean(); getComposite().clean();
} }