From 8d844254c20a2a080f352e8bd4443ba1b9b01b7a Mon Sep 17 00:00:00 2001 From: Name1ess Date: Mon, 25 Jan 2021 12:15:18 +0800 Subject: [PATCH 1/2] fix: register recipes when speed is not 0 --- .../Objects/SlimefunItem/abstractItems/AContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index 2572751b1..e32edf19d 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -74,8 +74,6 @@ public abstract class AContainer extends SlimefunItem implements InventoryBlock, processing.remove(b); return true; }); - - registerDefaultRecipes(); } @ParametersAreNonnullByDefault @@ -238,6 +236,8 @@ public abstract class AContainer extends SlimefunItem implements InventoryBlock, warn("The processing speed has not been configured correctly. The Item was disabled."); warn("Make sure to call '" + getClass().getSimpleName() + "#setProcessingSpeed(...)' before registering!"); } + + registerDefaultRecipes(); if (getCapacity() > 0 && getEnergyConsumption() > 0 && getSpeed() > 0) { super.register(addon); From a6bcab266f167175b6dcb6d282debefd34f380c4 Mon Sep 17 00:00:00 2001 From: StarWishsama Date: Mon, 25 Jan 2021 12:18:24 +0800 Subject: [PATCH 2/2] chore: remove register call when initialize --- .../electric/machines/ElectricSmeltery.java | 27 +++++++++---------- .../machines/HeatedPressureChamber.java | 23 +++++++--------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java index a0ce3cd4d..aac0dc718 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java @@ -1,16 +1,5 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; - -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.ItemStack; - import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.slimefun4.core.attributes.NotHopperable; @@ -22,13 +11,23 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.AdvancedMenu import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; 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; import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.ItemStack; + +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; /** * The {@link ElectricSmeltery} is an electric version of the standard {@link Smeltery}. @@ -112,12 +111,10 @@ public class ElectricSmeltery extends AContainer implements NotHopperable { processing.remove(b); return true; }); - - this.registerDefaultRecipes(); } private Comparator compareSlots(DirtyChestMenu menu) { - return (slot1, slot2) -> menu.getItemInSlot(slot1).getAmount() - menu.getItemInSlot(slot2).getAmount(); + return Comparator.comparingInt(slot -> menu.getItemInSlot(slot).getAmount()); } @Override diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java index 95b62ac1f..5a5d16fc2 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java @@ -1,15 +1,5 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machines; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.protection.ProtectableAction; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; @@ -22,6 +12,15 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; public class HeatedPressureChamber extends AContainer { @@ -73,12 +72,10 @@ public class HeatedPressureChamber extends AContainer { } } }; - - this.registerDefaultRecipes(); } private Comparator compareSlots(DirtyChestMenu menu) { - return (slot1, slot2) -> menu.getItemInSlot(slot1).getAmount() - menu.getItemInSlot(slot2).getAmount(); + return Comparator.comparingInt(slot -> menu.getItemInSlot(slot).getAmount()); } @Override