From 67e642351796efeb033ae10a88959179d39a3dbb Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 9 Nov 2024 22:17:04 -0500 Subject: [PATCH] Spigot 1.21.3 Support: Fix block states Leaves fix was applied to 1.21 as well. getMaterial() was removed in 1.20 so has been removed from that version onwards as well. --- .../v120_2/BukkitVersionHelperSpigot120_2.java | 1 - .../v120_4/BukkitVersionHelperSpigot120_4.java | 1 - .../v120_5/BukkitVersionHelperSpigot120_5.java | 1 - .../helper/v120/BukkitVersionHelperSpigot120.java | 1 - .../v121_3/BukkitVersionHelperSpigot121_3.java | 12 ++++++------ .../helper/v121/BukkitVersionHelperSpigot121.java | 5 ++--- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java b/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java index a0083e2c..2df731a2 100644 --- a/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java +++ b/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java @@ -185,7 +185,6 @@ public class BukkitVersionHelperSpigot120_2 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } if (bd.e()) { bld.setSolid(); } if (bd.i()) { bld.setAir(); } if (bd.a(TagsBlock.t)) { bld.setLog(); } diff --git a/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java b/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java index ee2bb120..cd1a0c92 100644 --- a/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java +++ b/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java @@ -185,7 +185,6 @@ public class BukkitVersionHelperSpigot120_4 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } if (bd.e()) { bld.setSolid(); } if (bd.i()) { bld.setAir(); } if (bd.a(TagsBlock.t)) { bld.setLog(); } diff --git a/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java b/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java index 8c330b0a..654765d2 100644 --- a/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java +++ b/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java @@ -185,7 +185,6 @@ public class BukkitVersionHelperSpigot120_5 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } if (bd.e()) { bld.setSolid(); } if (bd.i()) { bld.setAir(); } if (bd.a(TagsBlock.t)) { bld.setLog(); } diff --git a/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java b/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java index af48be90..2f8b1dd3 100644 --- a/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java +++ b/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java @@ -185,7 +185,6 @@ public class BukkitVersionHelperSpigot120 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } if (bd.e()) { bld.setSolid(); } if (bd.i()) { bld.setAir(); } if (bd.a(TagsBlock.t)) { bld.setLog(); } diff --git a/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/BukkitVersionHelperSpigot121_3.java b/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/BukkitVersionHelperSpigot121_3.java index efb0357e..4527aaeb 100644 --- a/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/BukkitVersionHelperSpigot121_3.java +++ b/bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/BukkitVersionHelperSpigot121_3.java @@ -171,12 +171,12 @@ public class BukkitVersionHelperSpigot121_3 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } - if (bd.e()) { bld.setSolid(); } - if (bd.i()) { bld.setAir(); } - if (bd.a(TagsBlock.t)) { bld.setLog(); } - if (bd.a(TagsBlock.O)) { bld.setLeaves(); } - if ((!bd.y().c()) && ((bd.b() instanceof BlockFluids) == false)) { // Test if fluid type for block is not empty + if (bd.e()) { bld.setSolid(); } // isSolid + if (bd.l()) { bld.setAir(); } // isAir + if (bd.a(TagsBlock.t)) { bld.setLog(); } // is(OVERWORLD_NATURAL_LOGS) + if (bd.a(TagsBlock.Q)) { bld.setLeaves(); } // is(LEAVES) + // getFluidState.isEmpty(), getBlock + if (!bd.y().c() && ((bd.b() instanceof BlockFluids) == false)) { // Test if fluid type for block is not empty bld.setWaterlogged(); //Log.info("statename=" + bname + "[" + sb + "] = waterlogged"); } diff --git a/bukkit-helper-121/src/main/java/org/dynmap/bukkit/helper/v121/BukkitVersionHelperSpigot121.java b/bukkit-helper-121/src/main/java/org/dynmap/bukkit/helper/v121/BukkitVersionHelperSpigot121.java index 21ade89f..c85a5ce5 100644 --- a/bukkit-helper-121/src/main/java/org/dynmap/bukkit/helper/v121/BukkitVersionHelperSpigot121.java +++ b/bukkit-helper-121/src/main/java/org/dynmap/bukkit/helper/v121/BukkitVersionHelperSpigot121.java @@ -185,11 +185,10 @@ public class BukkitVersionHelperSpigot121 extends BukkitVersionHelper { //Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten); // Fill in base attributes bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setAttenuatesLight(lightAtten); - if (bd.w() != null) { bld.setMaterial(bd.w().toString()); } - if (bd.e()) { bld.setSolid(); } + if (bd.e()) { bld.setSolid(); } if (bd.i()) { bld.setAir(); } if (bd.a(TagsBlock.t)) { bld.setLog(); } - if (bd.a(TagsBlock.O)) { bld.setLeaves(); } + if (bd.a(TagsBlock.P)) { bld.setLeaves(); } if ((!bd.u().c()) && ((bd.b() instanceof BlockFluids) == false)) { // Test if fluid type for block is not empty bld.setWaterlogged(); //Log.info("statename=" + bname + "[" + sb + "] = waterlogged");