From 4e5b066b916631a3858fda28cf846ae4211fdec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 6 Dec 2023 22:24:55 -0700 Subject: [PATCH] add bukkit grass workaround --- .../terra/bukkit/handles/BukkitWorldHandle.java | 12 ++++++++++++ .../bukkit/common/src/main/resources/plugin.yml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index d28798518..700819232 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -29,16 +29,28 @@ import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class BukkitWorldHandle implements WorldHandle { private final BlockState air; + private static final Logger logger = LoggerFactory.getLogger(BukkitWorldHandle.class); + public BukkitWorldHandle() { this.air = BukkitBlockState.newInstance(Material.AIR.createBlockData()); } @Override public synchronized @NotNull BlockState createBlockState(@NotNull String data) { + if(data.equals("minecraft:grass")) { //TODO: remove in 7.0 + data = "minecraft:short_grass"; + logger.warn( + "Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" + + ". You are advised to preform this rename in your config backs as this translation will be removed in the next major " + + "version of Terra."); + } org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData( data); // somehow bukkit managed to make this not thread safe! :) return BukkitBlockState.newInstance(bukkitData); diff --git a/platforms/bukkit/common/src/main/resources/plugin.yml b/platforms/bukkit/common/src/main/resources/plugin.yml index d4bfd5534..4db59a81e 100644 --- a/platforms/bukkit/common/src/main/resources/plugin.yml +++ b/platforms/bukkit/common/src/main/resources/plugin.yml @@ -4,6 +4,6 @@ version: "@VERSION@" load: "STARTUP" author: dfsek website: "@WIKI@" -api-version: "1.13" +api-version: "1.20.3" description: "@DESCRIPTION@" folia-supported: true