Merge pull request #8 from SlimefunGuguProject/dev

SlimefunGuguProject · Apr 7, 2022 · 80ef887 · 80ef887
2 parents 996ebdd + 2a39c2e
commit 80ef887
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 115 deletions.
diff --git a/src/main/java/bxx2004/bump/Bump.java b/src/main/java/bxx2004/bump/Bump.java
@@ -13,6 +13,7 @@ public final class Bump extends AbstractAddon {
 
     public Bump() {
         super("SlimefunGuguProject", "Bump", "main", "options.auto-update");
+        setupMetrics(14870);
     }
 
     @Override

diff --git a/src/main/java/bxx2004/bump/abstracts/BumpBow.java b/src/main/java/bxx2004/bump/abstracts/BumpBow.java
@@ -0,0 +1,20 @@
+package bxx2004.bump.abstracts;
+
+import bxx2004.bump.handlers.BowUseHandler;
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
+import io.github.thebusybiscuit.slimefun4.core.attributes.DamageableItem;
+import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
+import org.bukkit.inventory.ItemStack;
+
+public abstract class BumpBow extends SimpleSlimefunItem<BowUseHandler> implements DamageableItem {
+    protected BumpBow(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
+        super(itemGroup, item, recipeType, recipe);
+    }
+
+    @Override
+    public boolean isDamageable() {
+        return true;
+    }
+}
diff --git a/...p/slimefun/items/food/ConsumableFood.java → ...xx2004/bump/abstracts/ConsumableFood.java b/...p/slimefun/items/food/ConsumableFood.java → ...xx2004/bump/abstracts/ConsumableFood.java
@@ -1,4 +1,4 @@
-package bxx2004.bump.slimefun.items.food;
+package bxx2004.bump.abstracts;
 
 import bxx2004.bump.Bump;
 import bxx2004.bump.slimefun.BumpItemGroups;

diff --git a/...04/bump/slimefun/items/food/ItemFood.java → ...java/bxx2004/bump/abstracts/ItemFood.java b/...04/bump/slimefun/items/food/ItemFood.java → ...java/bxx2004/bump/abstracts/ItemFood.java
@@ -1,4 +1,4 @@
-package bxx2004.bump.slimefun.items.food;
+package bxx2004.bump.abstracts;
 
 import bxx2004.bump.Bump;
 import bxx2004.bump.slimefun.BumpItemGroups;

diff --git a/src/main/java/bxx2004/bump/event/MachineEvent.java b/src/main/java/bxx2004/bump/event/MachineEvent.java
diff --git a/...xx2004/bump/handlers/BowShootHandler.java → .../bxx2004/bump/handlers/BowUseHandler.java b/...xx2004/bump/handlers/BowShootHandler.java → .../bxx2004/bump/handlers/BowUseHandler.java
@@ -10,7 +10,7 @@
 
 import java.util.Optional;
 
-public interface BowShootHandler extends ItemHandler {
+public interface BowUseHandler extends ItemHandler {
 
     void onShoot(EntityShootBowEvent e, Player p, ItemStack item);
 
@@ -25,6 +25,6 @@ default Optional<IncompatibleItemHandlerException> validate(SlimefunItem item) {
 
     @Override
     default Class<? extends ItemHandler> getIdentifier() {
-        return BowShootHandler.class;
+        return BowUseHandler.class;
     }
 }
diff --git a/src/main/java/bxx2004/bump/listeners/BowShootListener.java b/src/main/java/bxx2004/bump/listeners/BowShootListener.java
@@ -1,6 +1,6 @@
 package bxx2004.bump.listeners;
 
-import bxx2004.bump.handlers.BowShootHandler;
+import bxx2004.bump.handlers.BowUseHandler;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -22,7 +22,7 @@ public void onBowShoot(EntityShootBowEvent e) {
             SlimefunItem sfItem = SlimefunItem.getByItem(item);
 
             if (sfItem != null && sfItem.canUse(p, true)) {
-                sfItem.callItemHandler(BowShootHandler.class, handler -> handler.onShoot(e, p, item));
+                sfItem.callItemHandler(BowUseHandler.class, handler -> handler.onShoot(e, p, item));
             }
         }
     }

diff --git a/src/main/java/bxx2004/bump/slimefun/items/food/Fangbianmian.java b/src/main/java/bxx2004/bump/slimefun/items/food/Fangbianmian.java
@@ -1,5 +1,6 @@
 package bxx2004.bump.slimefun.items.food;
 
+import bxx2004.bump.abstracts.ItemFood;
 import bxx2004.bump.slimefun.BumpItems;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;

diff --git a/src/main/java/bxx2004/bump/slimefun/items/food/Kele.java b/src/main/java/bxx2004/bump/slimefun/items/food/Kele.java
@@ -1,5 +1,6 @@
 package bxx2004.bump.slimefun.items.food;
 
+import bxx2004.bump.abstracts.ConsumableFood;
 import bxx2004.bump.slimefun.BumpItems;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;

diff --git a/src/main/java/bxx2004/bump/slimefun/items/food/Kouxiangtang.java b/src/main/java/bxx2004/bump/slimefun/items/food/Kouxiangtang.java
@@ -1,5 +1,6 @@
 package bxx2004.bump.slimefun.items.food;
 
+import bxx2004.bump.abstracts.ItemFood;
 import bxx2004.bump.slimefun.BumpItems;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;

diff --git a/src/main/java/bxx2004/bump/slimefun/items/food/Latiao.java b/src/main/java/bxx2004/bump/slimefun/items/food/Latiao.java
@@ -1,5 +1,6 @@
 package bxx2004.bump.slimefun.items.food;
 
+import bxx2004.bump.abstracts.ConsumableFood;
 import bxx2004.bump.slimefun.BumpItems;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;

diff --git a/src/main/java/bxx2004/bump/slimefun/items/food/Xuebi.java b/src/main/java/bxx2004/bump/slimefun/items/food/Xuebi.java
@@ -1,5 +1,6 @@
 package bxx2004.bump.slimefun.items.food;
 
+import bxx2004.bump.abstracts.ConsumableFood;
 import bxx2004.bump.slimefun.BumpItems;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import org.bukkit.Material;

diff --git a/src/main/java/bxx2004/bump/slimefun/items/weapon/LightBow.java b/src/main/java/bxx2004/bump/slimefun/items/weapon/LightBow.java
@@ -1,18 +1,18 @@
 package bxx2004.bump.slimefun.items.weapon;
 
 import bxx2004.bump.Bump;
-import bxx2004.bump.handlers.BowShootHandler;
+import bxx2004.bump.abstracts.BumpBow;
+import bxx2004.bump.handlers.BowUseHandler;
 import bxx2004.bump.slimefun.BumpItemGroups;
 import bxx2004.bump.slimefun.BumpItems;
 import bxx2004.bump.util.Utils;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
-import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
 import org.bukkit.inventory.ItemStack;
 
 import javax.annotation.Nonnull;
 
-public class LightBow extends SimpleSlimefunItem<BowShootHandler> {
+public class LightBow extends BumpBow {
 
     public LightBow() {
         super(BumpItemGroups.WEAPON, BumpItems.LIGHT_BOW, RecipeType.ARMOR_FORGE, new ItemStack[] {
@@ -24,11 +24,12 @@ public LightBow() {
 
     @Nonnull
     @Override
-    public BowShootHandler getItemHandler() {
+    public BowUseHandler getItemHandler() {
         return (e, p, item) -> {
             e.setCancelled(true);
             if (p.getFoodLevel() >= 10) {
                 Utils.changeFoodLevel(p, p.getFoodLevel() - 10);
+                damageItem(p, item);
 
                 Bump.getLocalization().sendActionbarMessage(p, "weapon.light_bow");
 

diff --git a/src/main/java/bxx2004/bump/slimefun/items/weapon/WitherSkullBow.java b/src/main/java/bxx2004/bump/slimefun/items/weapon/WitherSkullBow.java
@@ -1,19 +1,19 @@
 package bxx2004.bump.slimefun.items.weapon;
 
 import bxx2004.bump.Bump;
-import bxx2004.bump.handlers.BowShootHandler;
+import bxx2004.bump.abstracts.BumpBow;
+import bxx2004.bump.handlers.BowUseHandler;
 import bxx2004.bump.slimefun.BumpItemGroups;
 import bxx2004.bump.slimefun.BumpItems;
 import bxx2004.bump.util.Utils;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
-import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem;
 import org.bukkit.entity.WitherSkull;
 import org.bukkit.inventory.ItemStack;
 
 import javax.annotation.Nonnull;
 
-public class WitherSkullBow extends SimpleSlimefunItem<BowShootHandler> {
+public class WitherSkullBow extends BumpBow {
 
     public WitherSkullBow() {
         super(BumpItemGroups.WEAPON, BumpItems.WITHERSKULL_ROW, RecipeType.ARMOR_FORGE, new ItemStack[] {
@@ -25,11 +25,12 @@ public WitherSkullBow() {
 
     @Nonnull
     @Override
-    public BowShootHandler getItemHandler() {
+    public BowUseHandler getItemHandler() {
         return (e, p, item) -> {
             e.setCancelled(true);
             if (p.getFoodLevel() >= 5) {
                 Utils.changeFoodLevel(p, p.getFoodLevel() - 5);
+                damageItem(p, item);
 
                 e.setCancelled(true);
                 Bump.getLocalization().sendActionbarMessage(p, "weapon.wither_skull_bow");

diff --git a/src/main/java/bxx2004/bump/util/AppraiseUtils.java b/src/main/java/bxx2004/bump/util/AppraiseUtils.java
@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.logging.Level;
 
 /**
  * Utility methods for appraise

diff --git a/src/main/java/bxx2004/bump/util/Utils.java b/src/main/java/bxx2004/bump/util/Utils.java
@@ -10,7 +10,6 @@
 import org.bukkit.inventory.ItemStack;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.text.MessageFormat;
 import java.util.ArrayList;