Replaced reflection with abstraction (because reflection bad and slow!11). Downwards buckets with gravity now have an option to be guided with a block under. All config values are now cached so performance has increased 1000000% (not literally but still should be faster xd).

Author: biscuut

Abstraction/src/main/java/codes/biscuit/genbucket/hooks/MinecraftAbstraction.java

@@ -0,0 +1,8 @@
+package codes.biscuit.genbucket.hooks;
+
+import org.bukkit.block.Block;
+
+public interface MinecraftAbstraction {
+
+    void setBlockData(Block block, byte data);
+}

GenBucketPlugin/pom.xml

@@ -75,6 +75,12 @@
             <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <artifactId>MC_1_8</artifactId>
+            <groupId>codes.biscuit.genbucket</groupId>
+            <version>MC_1_8</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <artifactId>WG_6</artifactId>
             <groupId>codes.biscuit.genbucket</groupId>

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/GenBucket.java

@@ -16,6 +16,7 @@ public class GenBucket extends JavaPlugin {
     private Utils utils;
     private HookUtils hookUtils;
     private BucketManager bucketManager;
+    private boolean underOneThirteen = false;
 
     @Override
     public void onEnable() {
@@ -32,6 +33,11 @@ public void onEnable() {
         utils.registerRecipes();
         utils.updateConfig();
         configValues.loadBuckets();
+        String bukkitVersion = Bukkit.getVersion();
+        bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
+        if (!bukkitVersion.equals("1.13")) {
+            underOneThirteen = true;
+        }
     }
 
     public ConfigValues getConfigValues() {
@@ -49,4 +55,8 @@ public HookUtils getHookUtils() {
     public BucketManager getBucketManager() {
         return bucketManager;
     }
+
+    public boolean isUnderOneThirteen() {
+        return underOneThirteen;
+    }
 }

GenBucketPlugin/src/main/java/codes/biscuit/genbucket/hooks/HookUtils.java

@@ -48,6 +48,17 @@ public HookUtils(GenBucket main) {
             main.getLogger().info("Hooked into CoreProtect");
             enabledHooks.put(Hooks.COREPROTECT, new CoreProtectHook());
         }
+        if (main.isUnderOneThirteen()) {
+            main.getLogger().info("Hooked into Minecraft < 1.13");
+            enabledHooks.put(Hooks.MINECRAFTONEEIGHT, new Minecraft_1_8());
+        }
+    }
+
+    public void setData(Block block, byte data) {
+        if (enabledHooks.containsKey(Hooks.MINECRAFTONEEIGHT)) {
+            MinecraftAbstraction minecraftHook = (MinecraftAbstraction)enabledHooks.get(Hooks.MINECRAFTONEEIGHT);
+            minecraftHook.setBlockData(block, data);
+        }
     }
 
     public boolean canPlaceHere(Player p, Location loc) {
@@ -248,6 +259,7 @@ enum Hooks {
         MASSIVECOREFACTIONS,
         COREPROTECT,
         WORLDGUARD,
-        WORLDBORDER
+        WORLDBORDER,
+        MINECRAFTONEEIGHT
     }
 }

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

@@ -2,17 +2,13 @@
 
 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;
@@ -36,12 +32,13 @@ public GenningTimer(Player p, Bucket bucket, Block startingBlock, BlockFace dire
         this.limit = limit;
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation"})
     @Override
     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.getBlockItem().getType()))) {
+                (main.getConfigValues().getIgnoredBlockList().contains(currentBlock.getType()) || (bucket.isPatch() && currentBlock.getType() == bucket.getBlockItem().getType()) ||
+                        (bucket.getBlockItem().getType().hasGravity() && direction == BlockFace.DOWN && main.getConfigValues().addBlockUnderGravity() && currentBlock.getType() == main.getConfigValues().getGravityBlock().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())) {
@@ -51,12 +48,17 @@ public void run() {
             }
             main.getHookUtils().logBlock(p, currentBlock.getLocation(), currentBlock.getType(), currentBlock.getData());
             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 (main.isUnderOneThirteen()) {
+                main.getHookUtils().setData(currentBlock, bucket.getBlockItem().getData().getData());
+            }
+            if (bucket.getBlockItem().getType().hasGravity() && direction == BlockFace.DOWN && main.getConfigValues().addBlockUnderGravity()) {
+                Block underblock = currentBlock.getRelative(BlockFace.DOWN);
+                if (!(underblock.getY() > main.getConfigValues().getMaxY()) &&
+                        main.getHookUtils().canGenBlock(p, underblock.getLocation(), false) &&
+                        (main.getConfigValues().getIgnoredBlockList().contains(underblock.getType()) || (bucket.isPatch() && underblock.getType() == bucket.getBlockItem().getType()))) {
+                    underblock.setType(main.getConfigValues().getGravityBlock().getType());
+                    if (main.isUnderOneThirteen()) {
+                        main.getHookUtils().setData(underblock, main.getConfigValues().getGravityBlock().getData().getData());
                     }
                 }
             }

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

@@ -2,6 +2,9 @@
 
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
+import java.util.Map;
+
 public class Bucket {
 
     private String id;
@@ -10,12 +13,14 @@ public class Bucket {
     private Direction direction;
     private boolean byChunk;
     private boolean isPatch;
-//    private int width;
     private ItemStack guiItem;
     private int slot;
     private double buyPrice;
     private boolean infinite;
     private double placePrice;
+    private Map<Character, ItemStack> ingredients;
+    private List<String> recipeShape;
+    private int recipeAmount;
 
     Bucket(String id) {
         this.id = id;
@@ -105,6 +110,30 @@ void setBlockItem(ItemStack blockItem) {
         this.blockItem = blockItem;
     }
 
+    List<String> getRecipeShape() {
+        return recipeShape;
+    }
+
+    void setRecipeShape(List<String> recipeShape) {
+        this.recipeShape = recipeShape;
+    }
+
+    Map<Character, ItemStack> getIngredients() {
+        return ingredients;
+    }
+
+    void setIngredients(Map<Character, ItemStack> ingredients) {
+        this.ingredients = ingredients;
+    }
+
+    int getRecipeAmount() {
+        return recipeAmount;
+    }
+
+    void setRecipeAmount(int recipeAmount) {
+        this.recipeAmount = recipeAmount;
+    }
+
     @SuppressWarnings("unused")
     public enum Direction {
         ANY,

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

@@ -27,7 +27,7 @@ public Bucket matchBucket(ItemStack item) {
         for (Map.Entry<String, Bucket> entry : buckets.entrySet()) {
             Bucket bucket = getBucket(entry.getKey());
             ItemStack otherItem = bucket.getItem();
-            if (otherItem.getType() == item.getType() && ((item.hasItemMeta() && otherItem.hasItemMeta()) || (!item.hasItemMeta() && !otherItem.hasItemMeta()))
+            if (otherItem.getType() == item.getType() && ((item.hasItemMeta() && otherItem.getItemMeta().hasDisplayName()) || (!item.hasItemMeta() && !otherItem.getItemMeta().hasDisplayName()))
                     && otherItem.getItemMeta().getDisplayName().equals(item.getItemMeta().getDisplayName()) && ((!otherItem.getItemMeta().hasLore() && !item.getItemMeta().hasLore()) || (otherItem.getItemMeta().getLore().containsAll(item.getItemMeta().getLore())))) {
                 return bucket;
             }