Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle new 1.16.1 wall state and render logic

This commit is contained in:
Mike Primm 2020-06-27 14:17:52 -05:00
parent b700dbbfc0
commit d9152d11c8
3 changed files with 107 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View File

@ -560,7 +560,7 @@ public class DynmapCore implements DynmapCommonAPI {
/* Print version info */
Log.info("version " + plugin_ver + " is enabled - core version " + version );
Log.info("For support, visit https://reddit.com/r/Dynmap");
Log.info("For support, visit https://reddit.com/r/Dynmap or our Discord at https://discord.gg/s3rd5qn");
Log.info("To report or track bugs, visit https://github.com/webbukkit/dynmap/issues");
Log.info("If you'd like to donate, please visit https://www.patreon.com/dynmap or https://ko-fi.com/michaelprimm");
@ -573,19 +573,32 @@ public class DynmapCore implements DynmapCommonAPI {
//dumpColorMap("misa.txt", "misa.zip");
//dumpColorMap("sphax.txt", "sphax.zip");
// Log.info("Block Name dump");
// Log.info("---------------");
// for (int i = 0; i < DynmapBlockState.getGlobalIndexMax(); ) {
// DynmapBlockState bs = DynmapBlockState.getStateByGlobalIndex(i);
// if (bs != null) {
// Log.info(String.format("%d,%s,%d", i, bs.blockName, bs.getStateCount()));
// i += bs.getStateCount();
// }
// else {
// i++;
// }
// }
// Log.info("---------------");
if (configuration.getBoolean("dumpBlockState", false)) {
Log.info("Block State Dump");
Log.info("----------------");
for (int i = 0; i < DynmapBlockState.getGlobalIndexMax(); i++) {
DynmapBlockState bs = DynmapBlockState.getStateByGlobalIndex(i);
if (bs != null) {
Log.info(String.format("%d: %s", i, bs.toString()));
}
}
Log.info("----------------");
}
if (configuration.getBoolean("dumpBlockNames", false)) {
Log.info("Block Name dump");
Log.info("---------------");
for (int i = 0; i < DynmapBlockState.getGlobalIndexMax(); ) {
DynmapBlockState bs = DynmapBlockState.getStateByGlobalIndex(i);
if (bs != null) {
Log.info(String.format("%d,%s,%d", i, bs.blockName, bs.getStateCount()));
i += bs.getStateCount();
}
else {
i++;
}
}
Log.info("---------------");
}
return true;
}

79
DynmapCore/src/main/java/org/dynmap/hdmap/renderer/FenceWallBlockStateRenderer.java
View File

@ -5,6 +5,7 @@ import java.util.BitSet;
import java.util.List;
import java.util.Map;
import org.dynmap.Log;
import org.dynmap.renderer.CustomRenderer;
import org.dynmap.renderer.MapDataContext;
import org.dynmap.renderer.RenderPatch;
@ -14,7 +15,8 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
private static final int TEXTURE_SIDES = 0;
private static final int TEXTURE_TOP = 1;
private static final int TEXTURE_BOTTOM = 2;
private boolean check_yplus;
private boolean is_wall;
private boolean is_tall_wall;
private static final int SIDE_XP = 0x1; // East
private static final int SIDE_XN = 0x2; // West
@ -24,8 +26,14 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
private static final int SIDE_Z = SIDE_ZN | SIDE_ZP;
private static final int SIDE_YP = 0x10; // Up
// Meshes, indexed by connection combination (bit 0=X+, bit 1=X-, bit 2=Z+, bit 3=Z-, bit 4=Y+)
private RenderPatch[][] meshes = new RenderPatch[32][];
// For tall wall
private static final int SIDE_XP_MULT = 1;
private static final int SIDE_XN_MULT = 3;
private static final int SIDE_ZP_MULT = 9;
private static final int SIDE_ZN_MULT = 27;
private static final int SIDE_UP_MULT = 81;
private RenderPatch[][] meshes;
@Override
public boolean initializeRenderer(RenderPatchFactory rpf, String blkname, BitSet blockdatamask, Map<String,String> custparm) {
@ -35,7 +43,11 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
String type = custparm.get("type");
if((type != null) && (type.equals("wall"))) {
buildWallMeshes(rpf);
check_yplus = true;
is_wall = true;
}
else if((type != null) && (type.equals("tallwall"))) {
buildTallWallMeshes(rpf);
is_tall_wall = true;
}
else {
buildFenceMeshes(rpf);
@ -55,6 +67,7 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
}
private void buildFenceMeshes(RenderPatchFactory rpf) {
meshes = new RenderPatch[16][];
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
for(int dat = 0; dat < 16; dat++) {
/* Add center post */
@ -93,6 +106,7 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
}
private void buildWallMeshes(RenderPatchFactory rpf) {
meshes = new RenderPatch[32][];
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
for(int dat = 0; dat < 32; dat++) {
boolean need_post = ((dat & 0xF) == 0) || ((dat & 0x10) == 0x10);
@ -129,18 +143,71 @@ public class FenceWallBlockStateRenderer extends CustomRenderer {
list.clear();
}
}
private void buildTallWallMeshes(RenderPatchFactory rpf) {
meshes = new RenderPatch[162][];
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
for(int dat = 0; dat < 162; dat++) {
switch ((dat / SIDE_XN_MULT) % 3) {
case 1: // low
addBox(rpf, list, 0.0, 0.5, 0.0, 0.8125, 0.3125, 0.6875);
break;
case 2: // Tall
addBox(rpf, list, 0.0, 0.5, 0.0, 1.0, 0.3125, 0.6875);
break;
}
switch ((dat / SIDE_XP_MULT) % 3) {
case 1: // low
addBox(rpf, list, 0.5, 1.0, 0.0, 0.8125, 0.3125, 0.6875);
break;
case 2: // Tall
addBox(rpf, list, 0.5, 1.0, 0.0, 1.0, 0.3125, 0.6875);
break;
}
switch ((dat / SIDE_ZN_MULT) % 3) {
case 1: // low
addBox(rpf, list, 0.3125, 0.6875, 0.0, 0.8125, 0.0, 0.5);
break;
case 2: // Tall
addBox(rpf, list, 0.3125, 0.6875, 0.0, 1.0, 0.0, 0.5);
break;
}
switch ((dat / SIDE_ZP_MULT) % 3) {
case 1: // low
addBox(rpf, list, 0.3125, 0.6875, 0.0, 0.8125, 0.5, 1.0);
break;
case 2: // Tall
addBox(rpf, list, 0.3125, 0.6875, 0.0, 1.0, 0.5, 1.0);
break;
}
switch ((dat / SIDE_UP_MULT) % 2) {
case 0: // true
addBox(rpf, list, 0.25, 0.75, 0.0, 1.0, 0.25, 0.75);
break;
}
meshes[dat] = list.toArray(new RenderPatch[list.size()]);
list.clear();
}
}
@Override
public RenderPatch[] getRenderPatchList(MapDataContext ctx) {
int idx = ctx.getBlockType().stateIndex;
int off = 0;
if(check_yplus) { // Wall?
if (is_wall) { // Wall?
if ((idx & 0x20) == 0) off += SIDE_XP; // East connected
if ((idx & 0x10) == 0) off += SIDE_ZN; // North connected
if ((idx & 0x08) == 0) off += SIDE_ZP; // South connected
if ((idx & 0x04) == 0) off += SIDE_YP; // Up connected
if ((idx & 0x01) == 0) off += SIDE_XN; // West connected
}
else if (is_tall_wall) {
off += (idx % 3) * SIDE_XN_MULT;
off += ((idx / 6) % 2) * SIDE_UP_MULT;
off += ((idx / 12) % 3) * SIDE_ZP_MULT;
off += ((idx / 36) % 3) * SIDE_ZN_MULT;
off += ((idx / 108) % 3) * SIDE_XP_MULT;
}
else { // Fence
if ((idx & 0x10) == 0) off += SIDE_XP; // East connected
if ((idx & 0x08) == 0) off += SIDE_ZN; // North connected

11
DynmapCore/src/main/resources/models_1.txt
View File

@ -1012,7 +1012,8 @@ patchblock:id=beacon,patch0=BeaconGlassSide,patch1=BeaconGlassSide@90,patch2=Bea
# Cobblestone wall
# Mossy cobblestone wall
customblock:id=cobblestone_wall,id=mossy_cobblestone_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
[-1.15.2]customblock:id=cobblestone_wall,id=mossy_cobblestone_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
[1.16.0-]customblock:id=cobblestone_wall,id=mossy_cobblestone_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
# Flower pot
patchblock:id=flower_pot,patch0=FlowerPotTop,patch1=FlowerPotBottom,patch2=FlowerPotSide,patch3=FlowerPotSide@90,patch4=FlowerPotSide@180,patch5=FlowerPotSide@270,patch6=FlowerPotDirt
@ -1293,7 +1294,8 @@ customblock:id=spruce_door,id=birch_door,id=jungle_door,id=acacia_door,id=dark_o
#block:id=end_rod,patch0=0:end_rod,transparency=TRANSPARENT
# Chorus Plant
customblock:id=chorus_plant,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall,link0=200
[-1.15.2]customblock:id=chorus_plant,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall,link0=200
[1.16.0-]customblock:id=chorus_plant,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall,link0=200
# Chorus Flower
block:id=chorus_flower,scale=8
@ -1478,7 +1480,8 @@ patchblock:id=bubble_column
# Sandstone wall
# End stone brick wall
# Diorite wall
[1.14-]customblock:id=brick_wall,id=prismarine_wall,id=red_sandstone_wall,id=mossy_stone_brick_wall,id=granite_wall,id=stone_brick_wall,id=nether_brick_wall,id=andesite_wall,id=red_nether_brick_wall,id=sandstone_wall,id=end_stone_brick_wall,id=diorite_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
[1.14-1.15.2]customblock:id=brick_wall,id=prismarine_wall,id=red_sandstone_wall,id=mossy_stone_brick_wall,id=granite_wall,id=stone_brick_wall,id=nether_brick_wall,id=andesite_wall,id=red_nether_brick_wall,id=sandstone_wall,id=end_stone_brick_wall,id=diorite_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
[1.16-]customblock:id=brick_wall,id=prismarine_wall,id=red_sandstone_wall,id=mossy_stone_brick_wall,id=granite_wall,id=stone_brick_wall,id=nether_brick_wall,id=andesite_wall,id=red_nether_brick_wall,id=sandstone_wall,id=end_stone_brick_wall,id=diorite_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall
# Scaffolding
[1.14-]boxlist:id=scaffolding,box=0:1:0.99:1:0:1:0/0/-1/-1/-1/-1,box=0:0.125:0:1:0:0.125:2/-1/1/1/1/1,box=0:0.125:0:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0:1:0:0.125:2/-1/1/1/1/1,box=0.125:0.875:0.875:1:0:0.125:2/-1/1/1/1/1,box=0.125:0.875:0.875:1:0.875:1:2/-1/1/1/1/1,box=0.875:1:0.875:1:0.125:0.875:2/-1/1/1/1/1,box=0:0.125:0.875:1:0.125:0.875:2/-1/1/1/1/1
# Composter
@ -1741,4 +1744,4 @@ patchblock:id=bubble_column
# Blackstone wall
# Polished Blackstone wall
# Polished Blackstone Brick wall
[1.16-]customblock:id=blackstone_wall,id=polished_blackstone_wall,id=polished_blackstone_brick_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=wall
[1.16-]customblock:id=blackstone_wall,id=polished_blackstone_wall,id=polished_blackstone_brick_wall,class=org.dynmap.hdmap.renderer.FenceWallBlockStateRenderer,type=tallwall