Added some reflection to allow using block data values for genbuckets on versions < 1.13.

Author: biscuut

GenBucketPlugin/pom.xml

@@ -9,7 +9,7 @@
     <artifactId>GenBucketPlugin</artifactId>
     <packaging>jar</packaging>
     <name>GenBucketPlugin</name>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <repositories>
         <repository>

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/timers/GenningTimer.java

@@ -2,13 +2,17 @@
 
 import codes.biscuit.genbucket.GenBucket;
 import codes.biscuit.genbucket.utils.Bucket;
+import codes.biscuit.genbucket.utils.ReflectionUtils;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 public class GenningTimer extends BukkitRunnable {
 
     private Player p;
@@ -37,7 +41,7 @@ public GenningTimer(Player p, Bucket bucket, Block startingBlock, BlockFace dire
     public void run() {
         if (blockCounter < limit && !(currentBlock.getY() > main.getConfigValues().getMaxY()) &&
                 main.getHookUtils().canGenBlock(p, currentBlock.getLocation(), direction != BlockFace.UP && direction != BlockFace.DOWN) &&
-                (main.getConfigValues().getIgnoredBlockList().contains(currentBlock.getType()) || (bucket.isPatch() && currentBlock.getType() == bucket.getBlockMaterial()))) {
+                (main.getConfigValues().getIgnoredBlockList().contains(currentBlock.getType()) || (bucket.isPatch() && currentBlock.getType() == bucket.getBlockItem().getType()))) {
             if (previousChunk == null || !previousChunk.equals(currentBlock.getChunk())) { // Check every chunk only once for efficiency.
                 previousChunk = currentBlock.getChunk();
                 if (!main.getHookUtils().canGenChunk(p, currentBlock.getChunk())) {
@@ -46,7 +50,16 @@ public void run() {
                 }
             }
             main.getHookUtils().logBlock(p, currentBlock.getLocation(), currentBlock.getType(), currentBlock.getData());
-            currentBlock.setType(bucket.getBlockMaterial());
+            currentBlock.setType(bucket.getBlockItem().getType());
+            if (!ReflectionUtils.getVersion().contains("1_13")) {
+                Method setData = ReflectionUtils.getMethod(currentBlock.getClass(), "setData", byte.class);
+                if (setData != null) {
+                    try {
+                        setData.invoke(currentBlock, bucket.getBlockItem().getData().getData());
+                    } catch (IllegalAccessException | InvocationTargetException ignored) {
+                    }
+                }
+            }
             if (bucket.isByChunk() && currentBlock.getChunk() != currentBlock.getRelative(direction).getChunk()) {
                 chunkCounter++;
                 if (chunkCounter >= main.getConfigValues().getMaxChunks()) cancel();

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/utils/Bucket.java

@@ -1,13 +1,12 @@
 package codes.biscuit.genbucket.utils;
 
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 public class Bucket {
 
     private String id;
     private ItemStack item;
-    private Material blockMaterial;
+    private ItemStack blockItem;
     private Direction direction;
     private boolean byChunk;
     private boolean isPatch;
@@ -42,14 +41,6 @@ void setGuiItem(ItemStack guiItem) {
         this.guiItem = guiItem;
     }
 
-    public Material getBlockMaterial() {
-        return blockMaterial;
-    }
-
-    void setBlockMaterial(Material blockMaterial) {
-        this.blockMaterial = blockMaterial;
-    }
-
     public Direction getDirection() {
         return direction;
     }
@@ -106,6 +97,14 @@ void setPlacePrice(double placePrice) {
         this.placePrice = placePrice;
     }
 
+    public ItemStack getBlockItem() {
+        return blockItem;
+    }
+
+    void setBlockItem(ItemStack blockItem) {
+        this.blockItem = blockItem;
+    }
+
     @SuppressWarnings("unused")
     public enum Direction {
         ANY,

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/utils/ConfigValues.java

@@ -29,7 +29,7 @@ public void loadBuckets() {
                 main.getUtils().addGlow(item);
             }
             bucket.setItem(item);
-            bucket.setBlockMaterial(main.getUtils().materialFromString(main.getConfig().getString("items."+bucketId+".block.material")));
+            bucket.setBlockItem(main.getUtils().itemFromString(main.getConfig().getString("items."+bucketId+".block.material")));
             try {
                 bucket.setDirection(Bucket.Direction.valueOf(main.getConfig().getString("items."+bucketId+".block.direction").toUpperCase()));
             } catch (IllegalArgumentException ex) {

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/utils/ReflectionUtils.java

@@ -0,0 +1,66 @@
+package codes.biscuit.genbucket.utils;
+
+import org.bukkit.Bukkit;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ReflectionUtils {
+
+    /*
+     * The server version string to location NMS & OBC classes
+     */
+    private static String versionString;
+
+    /*
+     * Cache of methods that we've found in particular classes
+     */
+    private static Map<Class<?>, Map<String, Method>> loadedMethods = new HashMap<>();
+
+    /**
+     * Gets the version string for NMS & OBC class paths
+     *
+     * @return The version string of OBC and NMS packages
+     */
+    public static String getVersion() {
+        if (versionString == null) {
+            String name = Bukkit.getServer().getClass().getPackage().getName();
+            versionString = name.substring(name.lastIndexOf('.') + 1) + ".";
+        }
+
+        return versionString;
+    }
+
+    /**
+     * Get a method from a class that has the specific paramaters
+     *
+     * @param clazz      The class we are searching
+     * @param methodName The name of the method
+     * @param params     Any parameters that the method has
+     * @return The method with appropriate paramaters
+     */
+    public static Method getMethod(Class<?> clazz, String methodName, Class<?>... params) {
+        if (!loadedMethods.containsKey(clazz)) {
+            loadedMethods.put(clazz, new HashMap<>());
+        }
+
+        Map<String, Method> methods = loadedMethods.get(clazz);
+
+        if (methods.containsKey(methodName)) {
+            return methods.get(methodName);
+        }
+
+        try {
+            Method method = clazz.getMethod(methodName, params);
+            methods.put(methodName, method);
+            loadedMethods.put(clazz, methods);
+            return method;
+        } catch (Exception e) {
+            e.printStackTrace();
+            methods.put(methodName, null);
+            loadedMethods.put(clazz, methods);
+            return null;
+        }
+    }
+}

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/utils/Utils.java

@@ -66,22 +66,6 @@ ItemStack itemFromString(String rawItem) {
         return new ItemStack(material, 1, damage);
     }
 
-    Material materialFromString(String rawMaterial) {
-        Material material;
-        String[] rawSplit;
-        if (rawMaterial.contains(":")) {
-            rawSplit = rawMaterial.split(":");
-        } else {
-            rawSplit = new String[] {rawMaterial};
-        }
-        try {
-            material = Material.valueOf(rawSplit[0]);
-        } catch (IllegalArgumentException ex) {
-            material = Material.DIRT;
-        }
-        return material;
-    }
-
     public ItemStack addGlow(ItemStack item) {
         item.addUnsafeEnchantment(Enchantment.LUCK, 1);
         ItemMeta meta = item.getItemMeta();