Merge remote-tracking branch 'Slimefun/master'

DEV - 984

Slimefun日誌:
- 修復 smithing table listener

pom.xml

@@ -360,7 +360,7 @@
         <dependency>
             <groupId>com.konghq</groupId>
             <artifactId>unirest-java</artifactId>
-            <version>3.13.0</version>
+            <version>3.13.2</version>
             <scope>compile</scope>
 
             <exclusions>
@@ -405,7 +405,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-core</artifactId>
-            <version>7.2.6</version>
+            <version>7.2.7</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -419,7 +419,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.6</version>
+            <version>7.2.7</version>
             <scope>provided</scope>
 
             <exclusions>

src/main/java/io/github/thebusybiscuit/slimefun4/api/items/package-info.java

@@ -1,6 +1,6 @@
 /**
  * This package contains a few classes that revolve around the API for
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}, such as
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}, such as
  * {@link io.github.thebusybiscuit.slimefun4.api.items.ItemSetting}
  */
 package io.github.thebusybiscuit.slimefun4.api.items;

src/main/java/io/github/thebusybiscuit/slimefun4/api/researches/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds everything connected to the {@link io.github.thebusybiscuit.slimefun4.core.researching.Research}
+ * This package holds everything connected to the {@link io.github.thebusybiscuit.slimefun4.api.researches.Research}
  * class.
  */
 package io.github.thebusybiscuit.slimefun4.api.researches;

src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/package-info.java

@@ -1,5 +1,5 @@
 /**
  * This package contains all variations of {@link io.github.thebusybiscuit.slimefun4.core.attributes.ItemAttribute} that
- * can be assigned to a {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * can be assigned to a {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  */
 package io.github.thebusybiscuit.slimefun4.core.attributes;

src/main/java/io/github/thebusybiscuit/slimefun4/core/handlers/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package contains all variations of {@link me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler} that
- * can be assigned to a {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package contains all variations of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemHandler} that
+ * can be assigned to a {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  */
 package io.github.thebusybiscuit.slimefun4.core.handlers;

src/main/java/io/github/thebusybiscuit/slimefun4/core/services/UpdaterService.java

@@ -9,12 +9,13 @@
 
 import io.github.bakedlibs.dough.config.Config;
 import io.github.bakedlibs.dough.updater.GitHubBuildsUpdater;
+import io.github.bakedlibs.dough.updater.PluginUpdater;
 import io.github.bakedlibs.dough.versions.PrefixedVersion;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 
 /**
- * This Class represents our {@link Updater} Service.
+ * This Class represents our {@link PluginUpdater} Service.
  * If enabled, it will automatically connect to https://thebusybiscuit.github.io/builds/
  * to check for updates and to download them automatically.
  *
@@ -29,9 +30,9 @@ public class UpdaterService {
     private final Slimefun plugin;
 
     /**
-     * Our {@link Updater} implementation.
+     * Our {@link PluginUpdater} implementation.
      */
-    private final GitHubBuildsUpdater updater;
+    private final PluginUpdater<PrefixedVersion> updater;
 
     /**
      * The {@link SlimefunBranch} we are currently on.
@@ -127,11 +128,11 @@ public void start() {
     }
 
     /**
-     * This returns whether the {@link Updater} is enabled or not.
+     * This returns whether the {@link PluginUpdater} is enabled or not.
      * This includes the {@link Config} setting but also whether or not we are running an
      * official or unofficial build.
      *
-     * @return Whether the {@link Updater} is enabled
+     * @return Whether the {@link PluginUpdater} is enabled
      */
     public boolean isEnabled() {
         return Slimefun.getCfg().getBoolean("options.auto-update") && updater != null;

src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/package-info.java

@@ -3,7 +3,7 @@
  * {@link io.github.thebusybiscuit.slimefun4.core.services.profiler.SlimefunProfiler}.
  * The {@link io.github.thebusybiscuit.slimefun4.core.services.profiler.SlimefunProfiler} is used to determine
  * {@link org.bukkit.block.Block Blocks}, {@link org.bukkit.Chunk Chunks} or
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem SlimefunItems} that cause lag or performance
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem SlimefunItems} that cause lag or performance
  * drops.
  */
 package io.github.thebusybiscuit.slimefun4.core.services.profiler;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java

@@ -613,7 +613,6 @@ private void registerListeners() {
         new CauldronListener(this);
         new GrindstoneListener(this);
         new CartographyTableListener(this);
-        new SmithingTableListener(this);
         new ButcherAndroidListener(this);
         new MiningAndroidListener(this);
         new NetworkListener(this, networkManager);
@@ -632,6 +631,7 @@ private void registerListeners() {
         // Piglins were added in 1.16
         if (minecraftVersion.isAtLeast(MinecraftVersion.MINECRAFT_1_16)) {
             new PiglinListener(this);
+            new SmithingTableListener(this);
         }
 
         // Item-specific Listeners

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/handlers/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds simple implementations of {@link me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler}.
+ * This package holds simple implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.ItemHandler}.
  * These are just handlers that can be re-used frequently.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.handlers;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java

@@ -66,10 +66,7 @@ public final int getMaxUseCount() {
      *
      * @param count
      *            The maximum number of times this item can be used.
-     *            <<<<<<< HEAD
-     *            =======
      * 
-     *            >>>>>>> branch 'master' of https://github.com/Slimefun/Slimefun4.git
      * @return The {@link LimitedUseItem} for chaining of setters
      */
     public final @Nonnull LimitedUseItem setMaxUseCount(int count) {

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java

@@ -30,7 +30,7 @@ public class VanillaItem extends SlimefunItem {
      * Instantiates a new {@link VanillaItem} with the given arguments.
      *
      * @param itemGroup
-     *            the {@Link ItemGroup} to bind this {@link VanillaItem} to
+     *            the {@link ItemGroup} to bind this {@link VanillaItem} to
      * @param item
      *            the item corresponding to this {@link VanillaItem}
      * @param id

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds the {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} implementations related to
+ * This package holds the {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} implementations related to
  * the {@link io.github.thebusybiscuit.slimefun4.implementation.items.altar.AncientAltar}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.altar;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are related to the {@link io.github.thebusybiscuit.slimefun4.implementation.items.androids.ProgrammableAndroid}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.androids;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package contains implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that are
+ * This package contains implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are
  * related to armor, such as the expandable
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.armor.SlimefunArmorPiece} class for example.
  */

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/RestoredBackpack.java

@@ -29,7 +29,7 @@ public class RestoredBackpack extends SlimefunBackpack {
      * This will create a new {@link SlimefunBackpack} with the given arguments.
      *
      * @param itemGroup
-     *            the {@Link ItemGroup} to bind this {@link SlimefunBackpack} to
+     *            the {@link ItemGroup} to bind this {@link SlimefunBackpack} to
      */
     @ParametersAreNonnullByDefault
     public RestoredBackpack(@Nonnull ItemGroup itemGroup) {

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/package-info.java

@@ -1,6 +1,6 @@
 /**
  * This package contains a few miscellaneous implementations of
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} which are blocks.
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} which are blocks.
  * Such as the {@link io.github.thebusybiscuit.slimefun4.implementation.items.blocks.BlockPlacer} for example.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.blocks;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/cargo/package-info.java

@@ -1,6 +1,6 @@
 /**
  * This package provides the different implementations of
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are related to the {@link io.github.thebusybiscuit.slimefun4.core.networks.cargo.CargoNet}, most
  * notably: Cargo Nodes.
  */

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

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are used in combination with electricity, like the
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.Multimeter} or the
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.electric.gadgets.SolarHelmet}

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

@@ -1,6 +1,6 @@
 /**
  * This package contains the different implementations of
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that are also an
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are also an
  * {@link io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent} with the type {@code CONSUMER}.
  * 
  * Machines do not generate power, they consume it.

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

@@ -1,6 +1,6 @@
 /**
  * This package contains the different implementations of
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that also implement the interface
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that also implement the interface
  * {@link io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent}
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.electric;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/food/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are related to food.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.food;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of any {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that
+ * This package holds implementations of any {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that
  * deals with the {@link io.github.thebusybiscuit.slimefun4.api.geo.GEOResource} API.
  * The most prominent example of this being the
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.geo.GEOScanner} and the

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are related to the {@link io.github.thebusybiscuit.slimefun4.api.gps.GPSNetwork}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.gps;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are considered magical items.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.magical;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/runes/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds any implementation of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that is an ancient rune with functionality.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.magical.runes;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds any implementation of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that is
+ * This package holds any implementation of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that is
  * considered a "Magical Staff".
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.magical.staves;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds any {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} related to the
+ * This package holds any {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} related to the
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans.Talisman}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.magical.talismans;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/medical/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} that are
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} that are
  * related to healing yourself.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.medical;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/misc/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds any miscellaneous {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds any miscellaneous {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * implementations.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.misc;

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

@@ -1,5 +1,5 @@
 /**
  * This package contains the different classes for each
- * {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/teleporter/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are related to the {@link io.github.thebusybiscuit.slimefun4.implementation.items.teleporter.Teleporter}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.teleporter;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are tools.
  */
 package io.github.thebusybiscuit.slimefun4.implementation.items.tools;

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/package-info.java

@@ -1,5 +1,5 @@
 /**
- * This package holds implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem}
+ * This package holds implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem}
  * that are weapons, implementations of
  * {@link io.github.thebusybiscuit.slimefun4.implementation.items.weapons.SlimefunBow} for example.
  */

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/package-info.java

@@ -1,6 +1,6 @@
 /**
  * This package holds all classes that are related to the actual implementation of this plugin.
- * This includes implementations of {@link me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem} but also any
+ * This includes implementations of {@link io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem} but also any
  * {@link org.bukkit.event.Listener}.
  */
 package io.github.thebusybiscuit.slimefun4.implementation;