Merge branch 'master' into feature/auto-crafters

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoDisenchanter.java

@@ -22,5 +22,4 @@ public class AutoDisenchanter extends io.github.thebusybiscuit.slimefun4.impleme
     public AutoDisenchanter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
         super(category, item, recipeType, recipe);
     }
-
+}
-}

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/AutoEnchanter.java

@@ -22,5 +22,4 @@ public class AutoEnchanter extends io.github.thebusybiscuit.slimefun4.implementa
     public AutoEnchanter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
         super(category, item, recipeType, recipe);
     }
-
+}
-}

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/accelerators/package-info.java

@@ -2,4 +2,4 @@
  * This package contains any electric machines related to growth accelerations.
  * These growth accelerators speed up the growth of animals or plants.
  */
-package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators;
+package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.accelerators; 

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/entities/ExpCollector.java

@@ -0,0 +1,146 @@
+package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities;
+
+import java.util.Iterator;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ExperienceOrb;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.inventory.ItemStack;
+
+import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
+import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent;
+import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler;
+import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
+import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
+import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
+import me.mrCookieSlime.Slimefun.Lists.RecipeType;
+import me.mrCookieSlime.Slimefun.Objects.Category;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.InventoryBlock;
+import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
+import me.mrCookieSlime.Slimefun.api.BlockStorage;
+import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
+import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
+import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
+
+public class ExpCollector extends SlimefunItem implements InventoryBlock, EnergyNetComponent {
+
+    private final int[] border = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 };
+
+    private static final int ENERGY_CONSUMPTION = 10;
+    private static final String DATA_KEY = "stored-exp";
+
+    public ExpCollector(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
+        super(category, item, recipeType, recipe);
+
+        createPreset(this, this::constructMenu);
+
+        addItemHandler(onPlace());
+        registerBlockHandler(getId(), (p, b, stack, reason) -> {
+            BlockMenu inv = BlockStorage.getInventory(b);
+
+            if (inv != null) {
+                inv.dropItems(b.getLocation(), getOutputSlots());
+            }
+
+            return true;
+        });
+    }
+
+    private BlockPlaceHandler onPlace() {
+        return new BlockPlaceHandler(false) {
+
+            @Override
+            public void onPlayerPlace(BlockPlaceEvent e) {
+                BlockStorage.addBlockInfo(e.getBlock(), "owner", e.getPlayer().getUniqueId().toString());
+            }
+        };
+    }
+
+    @Override
+    public int[] getInputSlots() {
+        return new int[0];
+    }
+
+    @Override
+    public int[] getOutputSlots() {
+        return new int[] { 12, 13, 14 };
+    }
+
+    @Override
+    public EnergyNetComponentType getEnergyComponentType() {
+        return EnergyNetComponentType.CONSUMER;
+    }
+
+    @Override
+    public int getCapacity() {
+        return 1024;
+    }
+
+    protected void constructMenu(BlockMenuPreset preset) {
+        for (int slot : border) {
+            preset.addItem(slot, new CustomItem(Material.PURPLE_STAINED_GLASS_PANE, " "), (p, s, item, action) -> false);
+        }
+    }
+
+    @Override
+    public void preRegister() {
+        addItemHandler(new BlockTicker() {
+
+            @Override
+            public void tick(Block b, SlimefunItem sf, Config data) {
+                ExpCollector.this.tick(b);
+            }
+
+            @Override
+            public boolean isSynchronized() {
+                return true;
+            }
+        });
+    }
+
+    protected void tick(Block b) {
+        Iterator<Entity> iterator = b.getWorld().getNearbyEntities(b.getLocation(), 4.0, 4.0, 4.0, n -> n instanceof ExperienceOrb && n.isValid()).iterator();
+        int experiencePoints = 0;
+
+        while (iterator.hasNext() && experiencePoints == 0) {
+            Entity entity = iterator.next();
+
+            if (getCharge(b.getLocation()) < ENERGY_CONSUMPTION) {
+                return;
+            }
+
+            experiencePoints = getStoredExperience(b) + ((ExperienceOrb) entity).getExperience();
+
+            removeCharge(b.getLocation(), ENERGY_CONSUMPTION);
+            entity.remove();
+
+            int withdrawn = 0;
+            BlockMenu menu = BlockStorage.getInventory(b);
+
+            for (int level = 0; level < getStoredExperience(b); level = level + 10) {
+                if (menu.fits(SlimefunItems.FILLED_FLASK_OF_KNOWLEDGE, getOutputSlots())) {
+                    withdrawn = withdrawn + 10;
+                    menu.pushItem(SlimefunItems.FILLED_FLASK_OF_KNOWLEDGE.clone(), getOutputSlots());
+                }
+            }
+
+            BlockStorage.addBlockInfo(b, DATA_KEY, String.valueOf(experiencePoints - withdrawn));
+        }
+    }
+
+    private int getStoredExperience(Block b) {
+        Config cfg = BlockStorage.getLocationInfo(b.getLocation());
+        String value = cfg.getString(DATA_KEY);
+
+        if (value != null) {
+            return Integer.parseInt(value);
+        } else {
+            BlockStorage.addBlockInfo(b, DATA_KEY, "0");
+            return 0;
+        }
+    }
+
+}

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java

@@ -110,7 +110,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.enchanting.BookBinder;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.IronGolemAssembler;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.WitherAssembler;
-import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.XPCollector;
+import io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines.entities.ExpCollector;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NetherStarReactor;
 import io.github.thebusybiscuit.slimefun4.implementation.items.electric.reactors.NuclearReactor;
 import io.github.thebusybiscuit.slimefun4.implementation.items.elevator.ElevatorPlate;
@@ -2293,7 +2293,7 @@ public final class SlimefunItemSetup {
         new ItemStack[] {null, SlimefunItems.CARBONADO, null, SlimefunItems.ELECTRIC_MOTOR, new ItemStack(Material.DIAMOND_AXE), SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.MAGNESIUM_SALT, SlimefunItems.BIG_CAPACITOR, SlimefunItems.MAGNESIUM_SALT})
         .register(plugin);
         
-        new XPCollector(categories.electricity, SlimefunItems.EXP_COLLECTOR, RecipeType.ENHANCED_CRAFTING_TABLE,
+        new ExpCollector(categories.electricity, SlimefunItems.EXP_COLLECTOR, RecipeType.ENHANCED_CRAFTING_TABLE,
         new ItemStack[] {null, SlimefunItems.BLISTERING_INGOT_3, null, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.AUTO_ENCHANTER, SlimefunItems.WITHER_PROOF_OBSIDIAN, SlimefunItems.ALUMINUM_BRONZE_INGOT, SlimefunItems.ELECTRIC_MOTOR, SlimefunItems.ALUMINUM_BRONZE_INGOT})
         .register(plugin);
 

src/main/java/me/mrCookieSlime/Slimefun/Lists/RecipeType.java

@@ -229,4 +229,4 @@ public class RecipeType implements Keyed {
         List<ItemStack[]> recipes = machine.getRecipes();
         return recipes.get((recipes.indexOf(input) + 1))[0];
     }
-}
+}

src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java

@@ -51,7 +51,6 @@ import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper;
 import me.mrCookieSlime.Slimefun.Lists.RecipeType;
 import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler;
 import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
 import me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler;
 import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
@@ -1201,8 +1200,8 @@ public class SlimefunItem implements Placeable {
      *            The handler
      */
     @Deprecated
-    public static void registerBlockHandler(String id, SlimefunBlockHandler handler) {
+    public static void registerBlockHandler(String id, me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler handler) {
         SlimefunPlugin.getRegistry().getBlockHandlers().put(id, handler);
     }
 
-}
+}