diff --git a/pom.xml b/pom.xml index a402c55..89ef2ba 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ org.spigotmc spigot-api - 1.20.1-R0.1-SNAPSHOT + 1.20.4-R0.1-SNAPSHOT provided diff --git a/src/main/java/de/diddiz/LogBlock/Updater.java b/src/main/java/de/diddiz/LogBlock/Updater.java index 34653c0..b1a83f8 100644 --- a/src/main/java/de/diddiz/LogBlock/Updater.java +++ b/src/main/java/de/diddiz/LogBlock/Updater.java @@ -950,6 +950,11 @@ class Updater { renameMaterial("minecraft:grass_path", Material.DIRT_PATH); } + if (comparablePreviousMinecraftVersion.compareTo("1.20.4") < 0 && comparableCurrentMinecraftVersion.compareTo("1.20.4") >= 0) { + logblock.getLogger().info("[Updater] Upgrading Materials to 1.20.4"); + renameMaterial("minecraft:grass", Material.SHORT_GRASS); + } + config.set("previousMinecraftVersion", currentMinecraftVersion); logblock.saveConfig(); } diff --git a/src/main/java/de/diddiz/LogBlock/listeners/BlockSpreadLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/BlockSpreadLogging.java index ebcafa6..c2a1255 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/BlockSpreadLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/BlockSpreadLogging.java @@ -29,7 +29,7 @@ public class BlockSpreadLogging extends LoggingListener { World world = event.getNewState().getWorld(); Material type = event.getNewState().getType(); - if (type == Material.GRASS) { + if (type == Material.SHORT_GRASS) { if (!isLogging(world, Logging.GRASSGROWTH)) { return; } diff --git a/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java index 86d6ed5..c44e021 100644 --- a/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java @@ -211,7 +211,7 @@ public class BukkitUtils { singleBlockPlants = new HashSet<>(); singleBlockPlants.addAll(smallFlowers); - singleBlockPlants.add(Material.GRASS); + singleBlockPlants.add(Material.SHORT_GRASS); singleBlockPlants.add(Material.FERN); singleBlockPlants.add(Material.DEAD_BUSH); singleBlockPlants.add(Material.BROWN_MUSHROOM); @@ -314,7 +314,7 @@ public class BukkitUtils { fallingEntityKillers.add(Material.REPEATER); fallingEntityKillers.add(Material.COMPARATOR); fallingEntityKillers.add(Material.DAYLIGHT_DETECTOR); - fallingEntityKillers.remove(Material.GRASS); + fallingEntityKillers.remove(Material.SHORT_GRASS); fallingEntityKillers.remove(Material.NETHER_SPROUTS); // Container Blocks