Merge branch 'master' into chore/update-to-1-20-5

Author: md5sha256

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -20,6 +20,8 @@ body:
     options:
     - label: I am using the official english version of Slimefun and did not modify the jar.
       required: true
+    - label: I downloaded the official version from the new build site [Blob Builds](https://blob.build/).
+      required: true
     - label: I am using an up to date "DEV" (not "RC") version of Slimefun.
       required: true
     - label: I am aware that issues related to Slimefun addons need to be reported on their bug trackers and not here.

src/main/java/io/github/thebusybiscuit/slimefun4/api/events/TalismanActivateEvent.java

@@ -93,4 +93,4 @@ public void setCancelled(boolean cancel) {
 	public static @Nonnull HandlerList getHandlerList() {
 		return handlers;
 	}
-}
+}

src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java

@@ -160,6 +160,21 @@ public SlimefunItem(ItemGroup itemGroup, SlimefunItemStack item, RecipeType reci
         this.recipeOutput = recipeOutput;
     }
 
+    /**
+     * This creates a new {@link SlimefunItem} from the given arguments.
+     *
+     * @param itemGroup
+     *                  The {@link ItemGroup} this {@link SlimefunItem} belongs
+     *                  to
+     * @param item
+     *                  The {@link SlimefunItemStack} that describes the visual
+     *                  features of our {@link SlimefunItem}
+     */
+    @ParametersAreNonnullByDefault
+    public SlimefunItem(ItemGroup itemGroup, SlimefunItemStack item) {
+        this(itemGroup, item, RecipeType.NULL, new ItemStack[] {});
+    }
+
     // Previously deprecated constructor, now only for internal purposes
     @ParametersAreNonnullByDefault
     protected SlimefunItem(ItemGroup itemGroup, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiTool.java

@@ -1,18 +1,20 @@
 package io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import io.github.bakedlibs.dough.common.ChatColors;
+import io.github.bakedlibs.dough.data.persistent.PersistentDataAPI;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.EntityType;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
@@ -28,18 +30,20 @@
 /**
  * The {@link MultiTool} is an electric device which can mimic
  * the behaviour of any other {@link SlimefunItem}.
- * 
- * @author TheBusyBiscuit
  *
+ * @author TheBusyBiscuit
  */
 public class MultiTool extends SlimefunItem implements Rechargeable {
 
     private static final float COST = 0.3F;
 
-    private final Map<UUID, Integer> selectedMode = new HashMap<>();
     private final List<MultiToolMode> modes = new ArrayList<>();
     private final float capacity;
 
+    private static final NamespacedKey key = new NamespacedKey(Slimefun.instance(), "multitool_mode");
+    private static final String LORE_PREFIX = ChatColors.color("&8\u21E8 &7Mode: ");
+    private static final Pattern REGEX = Pattern.compile(ChatColors.color("(&c&o)?" + LORE_PREFIX) + "(.+)");
+
     @ParametersAreNonnullByDefault
     public MultiTool(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, float capacity, String... items) {
         super(itemGroup, item, recipeType, recipe);
@@ -75,25 +79,44 @@ protected ItemUseHandler getItemUseHandler() {
         return e -> {
             Player p = e.getPlayer();
             ItemStack item = e.getItem();
+            ItemMeta meta = item.getItemMeta();
             e.cancel();
 
-            int index = selectedMode.getOrDefault(p.getUniqueId(), 0);
+            int index = PersistentDataAPI.getInt(meta, key, 0);
+            SlimefunItem sfItem = modes.get(index).getItem();
 
             if (!p.isSneaking()) {
-                if (removeItemCharge(item, COST)) {
-                    SlimefunItem sfItem = modes.get(index).getItem();
-
-                    if (sfItem != null) {
-                        sfItem.callItemHandler(ItemUseHandler.class, handler -> handler.onRightClick(e));
-                    }
+                if (sfItem != null && removeItemCharge(item, COST)) {
+                    sfItem.callItemHandler(ItemUseHandler.class, handler -> handler.onRightClick(e));
                 }
             } else {
                 index = nextIndex(index);
 
                 SlimefunItem selectedItem = modes.get(index).getItem();
                 String itemName = selectedItem != null ? selectedItem.getItemName() : "Unknown";
                 Slimefun.getLocalization().sendMessage(p, "messages.multi-tool.mode-change", true, msg -> msg.replace("%device%", "Multi Tool").replace("%mode%", ChatColor.stripColor(itemName)));
-                selectedMode.put(p.getUniqueId(), index);
+
+                PersistentDataAPI.setInt(meta, key, index);
+
+                List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+
+                boolean regexMatchFound = false;
+                for (int i = 0; i < lore.size(); i++) {
+                    String line = lore.get(i);
+
+                    if (REGEX.matcher(line).matches()) {
+                        lore.set(i, LORE_PREFIX + ChatColor.stripColor(itemName));
+                        regexMatchFound = true;
+                        break;
+                    }
+                }
+
+                if (!regexMatchFound) {
+                    lore.add(2, LORE_PREFIX + ChatColor.stripColor(itemName));
+                }
+
+                meta.setLore(lore);
+                item.setItemMeta(meta);
             }
         };
     }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/MultiToolMode.java

@@ -8,22 +8,43 @@
 
 class MultiToolMode {
 
+    private final int id;
+    private final String itemId;
     private final ItemSetting<String> item;
     private final ItemSetting<Boolean> enabled;
 
+    // TODO: Move "id" into some NamespacedKey
     MultiToolMode(@Nonnull MultiTool multiTool, int id, @Nonnull String itemId) {
+        this.id = id;
+        this.itemId = itemId;
         this.item = new ItemSetting<>(multiTool, "mode." + id + ".item", itemId);
         this.enabled = new ItemSetting<>(multiTool, "mode." + id + ".enabled", true);
 
         multiTool.addItemSetting(item, enabled);
     }
 
+    /**
+     * This method is deprecated and should not be used.
+     *
+     *
+     * @return The ID of this mode
+     */
+    @Deprecated(since = "RC-37", forRemoval = true)
+    public int getId() {
+        return id;
+    }
+
     @Nullable
     SlimefunItem getItem() {
         return SlimefunItem.getById(item.getValue());
     }
 
+    @Nonnull
+    String getItemId() {
+        return itemId;
+    }
+
     boolean isEnabled() {
         return enabled.getValue();
     }
-}
+}

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

@@ -44,6 +44,10 @@ protected void tick(Block b) {
         for (int slot : getInputSlots()) {
             ItemStack item = inv.getItemInSlot(slot);
 
+            if (item == null || item.getAmount() != 1) {
+                continue;
+            }
+
             if (charge(b, inv, slot, item)) {
                 return;
             }

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RadiationTask.java

@@ -1,30 +1,26 @@
 package io.github.thebusybiscuit.slimefun4.implementation.tasks.armor;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
 import io.github.bakedlibs.dough.common.ChatColors;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
 import io.github.thebusybiscuit.slimefun4.core.attributes.ProtectionType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.RadiationSymptom;
 import io.github.thebusybiscuit.slimefun4.core.attributes.Radioactive;
-import io.github.thebusybiscuit.slimefun4.implementation.listeners.RadioactivityListener;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
-import io.github.thebusybiscuit.slimefun4.implementation.items.RadioactiveItem;
+import io.github.thebusybiscuit.slimefun4.implementation.listeners.RadioactivityListener;
 import io.github.thebusybiscuit.slimefun4.utils.RadiationUtils;
-
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * The {@link RadiationTask} handles radioactivity for
@@ -48,13 +44,15 @@ protected void onPlayerTick(Player p, PlayerProfile profile) {
         }
 
         int exposureTotal = 0;
-        if (!profile.hasFullProtectionAgainst(ProtectionType.RADIATION) && p.getGameMode() != GameMode.CREATIVE && p.getGameMode() != GameMode.SPECTATOR) {
+        if (!profile.hasFullProtectionAgainst(ProtectionType.RADIATION)
+                && p.getGameMode() != GameMode.CREATIVE
+                && p.getGameMode() != GameMode.SPECTATOR) {
             for (ItemStack item : p.getInventory()) {
                 if (item == null || item.getType().isAir()) {
                     continue;
                 }
                 SlimefunItem sfItem = SlimefunItem.getByItem(item);
-                if (sfItem instanceof RadioactiveItem radioactiveItem) {
+                if (sfItem instanceof Radioactive radioactiveItem) {
                     exposureTotal += item.getAmount() * radioactiveItem.getRadioactivity().getExposureModifier();
                 }
             }
@@ -72,7 +70,7 @@ protected void onPlayerTick(Player p, PlayerProfile profile) {
 
             int exposureLevelAfter = RadiationUtils.getExposure(p);
 
-            Slimefun.runSync(() ->  {
+            Slimefun.runSync(() -> {
                 for (RadiationSymptom symptom : symptoms) {
                     if (symptom.shouldApply(exposureLevelAfter)) {
                         symptom.apply(p);
@@ -81,8 +79,11 @@ protected void onPlayerTick(Player p, PlayerProfile profile) {
             });
 
             if (exposureLevelAfter > 0 || exposureLevelBefore > 0) {
-                String msg = Slimefun.getLocalization().getMessage(p, "actionbar.radiation").replace("%level%", "" + exposureLevelAfter);
-                BaseComponent[] components = new ComponentBuilder().append(ChatColors.color(msg)).create();
+                String msg = Slimefun.getLocalization()
+                        .getMessage(p, "actionbar.radiation")
+                        .replace("%level%", "" + exposureLevelAfter);
+                BaseComponent[] components =
+                        new ComponentBuilder().append(ChatColors.color(msg)).create();
                 p.spigot().sendMessage(ChatMessageType.ACTION_BAR, components);
             }
         } else {

src/main/java/me/mrCookieSlime/CSCoreLibPlugin/Configuration/Config.java

@@ -13,10 +13,8 @@
  * An old remnant of CS-CoreLib.
  * This will be removed once we updated everything.
  * Don't look at the code, it will be gone soon, don't worry.
- *
- * @deprecated Only used by the legacy {@link BlockStorage} system.
+ * Only used by the legacy {@link BlockStorage} system.
  */
-@Deprecated
 public class Config {
 
     private final File file;

src/main/java/me/mrCookieSlime/CSCoreLibPlugin/general/Inventory/ChestMenu.java

@@ -16,9 +16,7 @@
  * An old remnant of CS-CoreLib.
  * This will be removed once we updated everything.
  * Don't look at the code, it will be gone soon, don't worry.
- *
  */
-@Deprecated
 public class ChestMenu {
 
     private boolean clickable;
@@ -207,7 +205,6 @@ public ChestMenu addMenuCloseHandler(MenuCloseHandler handler) {
      *
      * @return The ChestMenu Instance
      */
-    @Deprecated
     public ChestMenu build() {
         return this;
     }

src/main/java/me/mrCookieSlime/CSCoreLibPlugin/general/Inventory/ClickAction.java

@@ -4,9 +4,7 @@
  * An old remnant of CS-CoreLib.
  * This will be removed once we updated everything.
  * Don't look at the code, it will be gone soon, don't worry.
- *
  */
-@Deprecated
 public class ClickAction {
 
     private boolean right;