Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

1.14+ support

Browse Source
This commit is contained in:
Daniel Mills
2020-09-04 07:33:00 -04:00
parent 4340d584c1
commit fbc02881d7
22 changed files with 305 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/volmit/iris/util/BiomeStorage.java
View File

@@ -1,75 +0,0 @@
package com.volmit.iris.util;
import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
public class BiomeStorage
{
private static final int e;
private static final int f;
public static final int a;
public static final int b;
public static final int c;
private final Biome[] g;
static
{
e = (int) Math.round(Math.log(16.0) / Math.log(2.0)) - 2;
f = (int) Math.round(Math.log(256.0) / Math.log(2.0)) - 2;
a = 1 << BiomeStorage.e + BiomeStorage.e + BiomeStorage.f;
b = (1 << BiomeStorage.e) - 1;
c = (1 << BiomeStorage.f) - 1;
}
public BiomeStorage(final Biome[] aBiome)
{
this.g = aBiome;
}
public BiomeStorage()
{
this(new Biome[BiomeStorage.a]);
}
public BiomeStorage b()
{
return new BiomeStorage(this.g.clone());
}
public void inject(BiomeGrid grid)
{
for(int i = 0; i < 256; i++)
{
for(int j = 0; j < 16; j++)
{
for(int k = 0; k < 16; k++)
{
Biome b = getBiome(j, i, k);
if(b == null || b.equals(Biome.THE_VOID))
{
continue;
}
grid.setBiome(j, i, k, b);
}
}
}
}
public Biome getBiome(final int i, final int j, final int k)
{
final int l = i & BiomeStorage.b;
final int i2 = MathHelper.clamp(j, 0, BiomeStorage.c);
final int j2 = k & BiomeStorage.b;
return this.g[i2 << BiomeStorage.e + BiomeStorage.e | j2 << BiomeStorage.e | l];
}
public void setBiome(final int i, final int j, final int k, final Biome biome)
{
final int l = i & BiomeStorage.b;
final int i2 = MathHelper.clamp(j, 0, BiomeStorage.c);
final int j2 = k & BiomeStorage.b;
this.g[i2 << BiomeStorage.e + BiomeStorage.e | j2 << BiomeStorage.e | l] = biome;
}
}

13
src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java
View File

@@ -3,6 +3,8 @@ package com.volmit.iris.util;
import org.bukkit.block.Biome;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
import com.volmit.iris.Iris;
public class InvertedBiomeGrid implements BiomeGrid
{
private BiomeGrid grid;
@@ -22,6 +24,11 @@ public class InvertedBiomeGrid implements BiomeGrid
@Override
public Biome getBiome(int arg0, int arg1, int arg2)
{
if(!Iris.biome3d)
{
return getBiome(arg0, arg2);
}
return grid.getBiome(arg0, 255 - arg1, arg2);
}
@@ -35,6 +42,12 @@ public class InvertedBiomeGrid implements BiomeGrid
@Override
public void setBiome(int arg0, int arg1, int arg2, Biome arg3)
{
if(!Iris.biome3d)
{
setBiome(arg0, arg2, arg3);
return;
}
grid.setBiome(arg0, 255 - arg1, arg2, arg3);
}
}

58
src/main/java/com/volmit/iris/util/PhasicBiomeStorage.java
View File

@@ -1,58 +0,0 @@
package com.volmit.iris.util;
import org.bukkit.block.Biome;
public class PhasicBiomeStorage
{
private static final int e = (int) Math.round(Math.log(16.0D) / Math.log(2.0D)) - 2;
private static final int f = (int) Math.round(Math.log(256.0D) / Math.log(2.0D)) - 2;
public static final int a;
public static final int b;
public static final int c;
private final Biome[] g;
static
{
a = 1 << e + e + f;
b = (1 << e) - 1;
c = (1 << f) - 1;
}
public PhasicBiomeStorage(Biome[] abiomebase)
{
this.g = abiomebase;
}
public PhasicBiomeStorage()
{
this(new Biome[a]);
}
public static int clamp(int var0, int var1, int var2)
{
if(var0 < var1)
{
return var1;
}
else
{
return var0 > var2 ? var2 : var0;
}
}
public Biome getBiome(int i, int j, int k)
{
int l = i & b;
int i1 = clamp(j, 0, c);
int j1 = k & b;
return this.g[i1 << e + e | j1 << e | l];
}
public void setBiome(int i, int j, int k, Biome biome)
{
int l = i & b;
int i1 = clamp(j, 0, c);
int j1 = k & b;
this.g[i1 << e + e | j1 << e | l] = biome;
}
}

137
src/main/java/com/volmit/iris/util/PreemptiveChunk.java
View File

@@ -1,137 +0,0 @@
package com.volmit.iris.util;
import org.bukkit.Material;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator.BiomeGrid;
import org.bukkit.generator.ChunkGenerator.ChunkData;
import org.bukkit.material.MaterialData;
@SuppressWarnings("deprecation")
public class PreemptiveChunk implements BiomeGrid, ChunkData
{
private ChunkData c;
private BiomeStorage b;
public PreemptiveChunk(ChunkData c)
{
this.c = c;
this.b = new BiomeStorage();
}
public void inject(ChunkData ic, BiomeGrid ib)
{
for(int i = 0; i < 16; i++)
{
for(int j = 0; j < 256; j++)
{
for(int k = 0; k < 16; k++)
{
if(!getType(i, j, k).equals(Material.AIR))
{
ic.setBlock(i, j, k, getBlockData(i, j, k));
}
}
}
}
b.inject(ib);
}
@Override
public Biome getBiome(int arg0, int arg1)
{
throw new UnsupportedOperationException("Not Supported. Use x y z");
}
@Override
public Biome getBiome(int x, int y, int z)
{
return b.getBiome(x, y, z);
}
@Override
public void setBiome(int x, int z, Biome arg2)
{
for(int i = 0; i < 256; i++)
{
b.setBiome(x, i, z, arg2);
}
}
@Override
public void setBiome(int arg0, int arg1, int arg2, Biome arg3)
{
b.setBiome(arg0, arg1, arg2, arg3);
}
@Override
public BlockData getBlockData(int arg0, int arg1, int arg2)
{
return c.getBlockData(arg0, arg1, arg2);
}
@Deprecated
@Override
public byte getData(int arg0, int arg1, int arg2)
{
return c.getData(arg0, arg1, arg2);
}
@Override
public int getMaxHeight()
{
return c.getMaxHeight();
}
@Override
public Material getType(int arg0, int arg1, int arg2)
{
return c.getType(arg0, arg1, arg2);
}
@Deprecated
@Override
public MaterialData getTypeAndData(int arg0, int arg1, int arg2)
{
return c.getTypeAndData(arg0, arg1, arg2);
}
@Override
public void setBlock(int arg0, int arg1, int arg2, Material arg3)
{
c.setBlock(arg0, arg1, arg2, arg3);
}
@Deprecated
@Override
public void setBlock(int arg0, int arg1, int arg2, MaterialData arg3)
{
c.setBlock(arg0, arg1, arg2, arg3);
}
@Override
public void setBlock(int arg0, int arg1, int arg2, BlockData arg3)
{
c.setBlock(arg0, arg1, arg2, arg3);
}
@Override
public void setRegion(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, Material arg6)
{
c.setRegion(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
}
@Deprecated
@Override
public void setRegion(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, MaterialData arg6)
{
c.setRegion(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
}
@Override
public void setRegion(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, BlockData arg6)
{
c.setRegion(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
}
}

11
src/main/java/com/volmit/iris/util/PregenJob.java
View File

@@ -157,7 +157,16 @@ public class PregenJob implements Listener
if(chunkSpiraler.hasNext())
{
chunkSpiraler.next();
consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.YELLOW);
try
{
consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.YELLOW);
}
catch(Throwable e)
{
}
if(isChunkWithin(chunkX, chunkZ))
{