Sulkta-Coop/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle waterlogged block states

Browse source
This commit is contained in:
Mike Primm 2018-08-19 23:09:55 -04:00
parent 2a23ec10e9
commit 4d1602c418
3 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
DynmapCoreAPI/src/main/java/org/dynmap/renderer/DynmapBlockState.java
View file

@ -33,6 +33,7 @@ public class DynmapBlockState {
private static int MATCH_SNOW = 1 << 2;
private static int MATCH_LOG = 1 << 3;
private static int MATCH_GRASS = 1 << 4;
private static int MATCH_WATERLOGGED = 1 << 5;
// Map of base blocks by name
private static HashMap<String, DynmapBlockState> blocksByName = new HashMap<String, DynmapBlockState>();
@ -84,7 +85,7 @@ public class DynmapBlockState {
public DynmapBlockState(DynmapBlockState base, int stateidx, String blkname, String statename) {
globalStateIndex = (nextGlobalStateIndex++); // Assign index
if (base == null) base = this;
baseState = this;
baseState = base;
stateIndex = stateidx;
if (blkname.indexOf(':') == -1) { // No mod:, assume minecraft:
blkname = "minecraft:" + blkname;
@ -123,6 +124,7 @@ public class DynmapBlockState {
matchflags |= isWater(blockName) ? MATCH_WATER : 0;
matchflags |= (blockName.equals(SNOW_BLOCK) || blockName.equals(SNOW_LAYER_BLOCK)) ? MATCH_SNOW : 0;
matchflags |= blockName.equals(GRASS_BLOCK) ? MATCH_GRASS : 0;
matchflags |= stateName.contains("waterlogged=true") ? MATCH_WATERLOGGED : 0;
}
/**
* Get state for same base block with given index
@ -273,6 +275,12 @@ public class DynmapBlockState {
public final boolean isGrass() {
return (matchflags & MATCH_GRASS) != 0;
}
/**
* Test if block is waterlogged (in block filled with water)
*/
public final boolean isWaterlogged() {
return (matchflags & MATCH_WATERLOGGED) != 0;
}
/**
* Test for matching blockname
*/