Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to current Biome API (#1044)

Browse Source
This commit is contained in:
Adam 2020-11-18 10:46:57 -05:00 committed by GitHub
parent 1f98733f3b
commit 8465d19d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/java/me/ryanhamshire/GriefPrevention/AutoExtendClaimTask.java
View File

@ -7,6 +7,8 @@ import org.bukkit.World.Environment;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set; import java.util.Set;
//automatically extends a claim downward based on block types detected //automatically extends a claim downward based on block types detected
@ -15,6 +17,7 @@ class AutoExtendClaimTask implements Runnable
private final Claim claim; private final Claim claim;
private final ArrayList<ChunkSnapshot> chunks; private final ArrayList<ChunkSnapshot> chunks;
private final Environment worldType; private final Environment worldType;
private final Map<Biome, Set<Material>> biomeMaterials = new HashMap<>();
public AutoExtendClaimTask(Claim claim, ArrayList<ChunkSnapshot> chunks, Environment worldType) public AutoExtendClaimTask(Claim claim, ArrayList<ChunkSnapshot> chunks, Environment worldType)
{ {
@ -39,73 +42,42 @@ class AutoExtendClaimTask implements Runnable
if (this.yTooSmall(y)) return y; if (this.yTooSmall(y)) return y;
try for (ChunkSnapshot chunk : this.chunks)
{ {
for (ChunkSnapshot chunk : this.chunks) boolean ychanged = true;
while (!this.yTooSmall(y) && ychanged)
{ {
Biome biome = chunk.getBiome(0, 0); ychanged = false;
Set<Material> playerBlockIDs = RestoreNatureProcessingTask.getPlayerBlocks(this.worldType, biome); for (int x = 0; x < 16; x++)
boolean ychanged = true;
while (!this.yTooSmall(y) && ychanged)
{ {
ychanged = false; for (int z = 0; z < 16; z++)
for (int x = 0; x < 16; x++)
{ {
for (int z = 0; z < 16; z++) Material blockType = chunk.getBlockType(x, y, z);
Biome biome = chunk.getBiome(x, y, z);
while (!this.yTooSmall(y) && this.getBiomeBlocks(biome).contains(blockType))
{ {
Material blockType = chunk.getBlockType(x, y, z); ychanged = true;
while (!this.yTooSmall(y) && playerBlockIDs.contains(blockType)) blockType = chunk.getBlockType(x, --y, z);
{ biome = chunk.getBiome(x, y, z);
ychanged = true;
blockType = chunk.getBlockType(x, --y, z);
}
if (this.yTooSmall(y)) return y;
} }
if (this.yTooSmall(y)) return y;
} }
} }
if (this.yTooSmall(y)) return y;
}
}
catch (NoSuchMethodError e)
{
GriefPrevention.instance.getLogger().severe("You are running an outdated build of Craftbukkit/Spigot/Paper. Please update.");
for (ChunkSnapshot chunk : this.chunks)
{
Biome biome = chunk.getBiome(0, 0);
Set<Material> playerBlockIDs = RestoreNatureProcessingTask.getPlayerBlocks(this.worldType, biome);
boolean ychanged = true;
while (!this.yTooSmall(y) && ychanged)
{
ychanged = false;
for (int x = 0; x < 16; x++)
{
for (int z = 0; z < 16; z++)
{
Material blockType = chunk.getBlockType(x, y, z);
while (!this.yTooSmall(y) && playerBlockIDs.contains(blockType))
{
ychanged = true;
blockType = chunk.getBlockType(x, --y, z);
}
if (this.yTooSmall(y)) return y;
}
}
}
if (this.yTooSmall(y)) return y;
} }
if (this.yTooSmall(y)) return y;
} }
return y; return y;
} }
private Set<Material> getBiomeBlocks(Biome biome)
{
return biomeMaterials.computeIfAbsent(biome, newBiome -> RestoreNatureProcessingTask.getPlayerBlocks(this.worldType, newBiome));
}
private boolean yTooSmall(int y) private boolean yTooSmall(int y)
{ {
return y == 0 || y <= GriefPrevention.instance.config_claims_maxDepth; return y == 0 || y <= GriefPrevention.instance.config_claims_maxDepth;