allow fruits to be placed

Author: Jsinco

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "dev.jsinco.brewery.garden"
-version = "BX3.4.5-RV2"
+version = "BX3.4.6"
 
 repositories {
     mavenCentral()
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("com.dre.brewery:BreweryX:3.4.5-SNAPSHOT#4")
+    compileOnly("com.dre.brewery:BreweryX:3.4.6")
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
     compileOnly("org.projectlombok:lombok:1.18.30")

src/main/java/dev/jsinco/brewery/garden/BreweryGarden.java

@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Random;
 
-@AddonInfo(name = "BreweryGarden", version = "BX3.4.5", author = "Jsinco", description = "Adds plants to BreweryX, lightweight ExoticGarden.")
+@AddonInfo(name = "BreweryGarden", version = "BX3.4.6", author = "Jsinco", description = "Adds plants to BreweryX, lightweight ExoticGarden.")
 public final class BreweryGarden extends BreweryAddon {
 
     // TODO:

src/main/java/dev/jsinco/brewery/garden/constants/PlantType.java

@@ -9,6 +9,8 @@
 import io.papermc.paper.datacomponent.item.FoodProperties;
 import io.papermc.paper.datacomponent.item.ResolvableProfile;
 import lombok.Getter;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -33,7 +35,6 @@
 @Getter
 public final class PlantType extends GenericPlantType {
 
-    // TODO: get some plant base64 textures
     public static final PlantType BERRY = new PlantType(
             "<dark_purple>Berry",
             fromHashCode("1e4883a1e22c324e753151e2ac424c74f1cc646eec8ea0db3420f1dd1d8b")
@@ -117,11 +118,29 @@ public ItemStack getItemStack(int amount) {
 
         // TODO: Ask in Paper discord how to use PDC with new ItemMeta API
         ItemMeta meta = item.getItemMeta();
+        meta.lore(List.of(Component.text("A sweet fruit").color(NamedTextColor.DARK_GRAY)));
         meta.getPersistentDataContainer().set(PERSISTENT_DATA_KEY, PersistentDataType.STRING, FIELD_NAME);
         item.setItemMeta(meta);
         return item;
     }
 
+    public void setDataOnPlayerSkullBlock(Block block) {
+        if (block.getType() != Material.PLAYER_HEAD) {
+            return;
+        }
+        Skull skull = (Skull) block.getState();
+        skull.getPersistentDataContainer().set(PERSISTENT_DATA_KEY, PersistentDataType.STRING, FIELD_NAME);
+        skull.update();
+    }
+
+    public static boolean isPlayerSkullBlock(Block block) {
+        if (block.getType() != Material.PLAYER_HEAD) {
+            return false;
+        }
+        Skull skull = (Skull) block.getState();
+        return skull.getPersistentDataContainer().has(PERSISTENT_DATA_KEY);
+    }
+
     private PlayerProfile getPlayerProfile() {
         PlayerProfile profile = Bukkit.createProfile(CONSTANT_UUID);
         profile.getProperties().add(new ProfileProperty("textures", base64));
@@ -143,6 +162,15 @@ public static PlantType getPlantType(ItemStack item) {
         return valueOf(field_name);
     }
 
+    @Nullable
+    public static PlantType getPlantType(Block block) {
+        if (block.getType() != Material.PLAYER_HEAD) return null;
+        Skull skull = (Skull) block.getState();
+        String field_name = skull.getPersistentDataContainer().get(PERSISTENT_DATA_KEY, PersistentDataType.STRING);
+        if (field_name == null) return null;
+        return valueOf(field_name);
+    }
+
 
 
     // Reflect

src/main/java/dev/jsinco/brewery/garden/constants/PlantTypeSeeds.java

@@ -5,6 +5,7 @@
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
@@ -64,6 +65,7 @@ public ItemStack getItemStack(int amount) {
 
         // TODO: Ask in Paper discord how to use PDC with new ItemMeta API
         ItemMeta meta = item.getItemMeta();
+        meta.lore(List.of(Component.text("Rough seeds").color(NamedTextColor.DARK_GRAY)));
         meta.getPersistentDataContainer().set(PERSISTENT_DATA_KEY, PersistentDataType.STRING, FIELD_NAME);
         item.setItemMeta(meta);
         return item;

src/main/java/dev/jsinco/brewery/garden/events/EventListeners.java

@@ -53,6 +53,10 @@ public void onBlockBreak(BlockBreakEvent event) {
             // Drop a seed
             block.getWorld().dropItemNaturally(block.getLocation(),
                     seedsList.get(RANDOM.nextInt(seedsList.size())).getItemStack(1));
+        } else if (PlantType.isPlayerSkullBlock(block)) {
+            PlantType plantType = PlantType.getPlantType(block);
+            event.setDropItems(false);
+            block.getWorld().dropItemNaturally(block.getLocation(), plantType.getItemStack(1));
         }
 
         GardenPlant gardenPlant = gardenManager.getByLocation(block);
@@ -90,7 +94,8 @@ public void onPlayerInteract(PlayerInteractEvent event) {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
         if (PlantType.isPlant(event.getItemInHand())) {
-            event.setCancelled(true);
+            PlantType plantType = PlantType.getPlantType(event.getItemInHand());
+            plantType.setDataOnPlayerSkullBlock(event.getBlock());
         }
     }