From 35f921a9a0b70777b8de9e9290bfc5b457c9e3e8 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sun, 23 Aug 2020 05:40:15 +0200 Subject: [PATCH] Fix loading old walls --- .../de/diddiz/LogBlock/MaterialConverter.java | 19 ++++++++++++++++++- src/main/resources/blockdata.txt | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/MaterialConverter.java b/src/main/java/de/diddiz/LogBlock/MaterialConverter.java index 9dbceac..3d0988c 100644 --- a/src/main/java/de/diddiz/LogBlock/MaterialConverter.java +++ b/src/main/java/de/diddiz/LogBlock/MaterialConverter.java @@ -154,7 +154,7 @@ public class MaterialConverter { return null; } if (blockStateId >= 0 && blockStateId < idToBlockState.length && idToBlockState[blockStateId] != null) { - material = material + idToBlockState[blockStateId]; + material = material + updateBlockState(material, idToBlockState[blockStateId]); } try { return Bukkit.createBlockData(material); @@ -236,4 +236,21 @@ public class MaterialConverter { nextBlockStateId = key + 1; } } + + private static String updateBlockState(String material, String blockState) { + // since 1.16 + if (material.endsWith("_wall")) { + if (blockState.contains("east=false") || blockState.contains("east=true")) { + blockState = blockState.replace("east=false", "east=none"); + blockState = blockState.replace("west=false", "west=none"); + blockState = blockState.replace("north=false", "north=none"); + blockState = blockState.replace("south=false", "south=none"); + blockState = blockState.replace("east=true", "east=low"); + blockState = blockState.replace("west=true", "west=low"); + blockState = blockState.replace("north=true", "north=low"); + blockState = blockState.replace("south=true", "south=low"); + } + } + return blockState; + } } diff --git a/src/main/resources/blockdata.txt b/src/main/resources/blockdata.txt index 4a6dd57..8859bb3 100644 --- a/src/main/resources/blockdata.txt +++ b/src/main/resources/blockdata.txt @@ -1113,8 +1113,8 @@ 137:14,minecraft:command_block[conditional=true,facing=down] 137:15,minecraft:command_block[conditional=true,facing=up] 138:0,minecraft:beacon -139:0,minecraft:cobblestone_wall[east=false,north=false,south=false,up=false,waterlogged=false,west=false] -139:1,minecraft:mossy_cobblestone_wall[east=false,north=false,south=false,up=false,waterlogged=false,west=false] +139:0,minecraft:cobblestone_wall[east=none,north=none,south=none,up=false,waterlogged=false,west=none] +139:1,minecraft:mossy_cobblestone_wall[east=none,north=none,south=none,up=false,waterlogged=false,west=none] 140:0,minecraft:flower_pot 141:0,minecraft:carrots[age=0] 141:1,minecraft:carrots[age=1]