Jan před 1 měsícem
rodič
revize
2e6e637e3d
23 změnil soubory, kde provedl 43 přidání a 58 odebrání
  1. 7 2
      pom.xml
  2. 2 2
      src/main/java/me/lethunderhawk/fluxapi/Services.java
  3. 1 2
      src/main/java/me/lethunderhawk/fluxapi/util/CustomHeadCreator.java
  4. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/MessageSender.java
  5. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/UnItalic.java
  6. 2 2
      src/main/java/me/lethunderhawk/fluxapi/util/animation/Animation.java
  7. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/command/CommandNode.java
  8. 2 2
      src/main/java/me/lethunderhawk/fluxapi/util/command/CustomCommand.java
  9. 2 2
      src/main/java/me/lethunderhawk/fluxapi/util/gui/ConfirmationMenu.java
  10. 2 2
      src/main/java/me/lethunderhawk/fluxapi/util/gui/GoBackItem.java
  11. 2 2
      src/main/java/me/lethunderhawk/fluxapi/util/gui/InventoryGUI.java
  12. 1 2
      src/main/java/me/lethunderhawk/fluxapi/util/gui/InventoryManager.java
  13. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/gui/PlayerHeadListGUI.java
  14. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/gui/input/SignMenuFactory.java
  15. 3 3
      src/main/java/me/lethunderhawk/fluxapi/util/interfaces/BazaarFluxModule.java
  16. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/itemdesign/LoreDesigner.java
  17. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/lang/RomanNumbers.java
  18. 1 1
      src/main/java/me/lethunderhawk/fluxapi/util/loottables/RiggedChanceGenerator.java
  19. 2 2
      src/main/java/me/lethunderhawk/main/Main.java
  20. 2 2
      src/main/java/me/lethunderhawk/npc/NPCModule.java
  21. 4 4
      src/main/java/me/lethunderhawk/npc/command/NPCCommand.java
  22. 1 1
      src/main/java/me/lethunderhawk/npc/manager/NPCManager.java
  23. 2 20
      src/main/resources/plugin.yml

+ 7 - 2
pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>me.lethunderhawk</groupId>
-    <artifactId>FluxNPC</artifactId>
+    <artifactId>FluxAPI</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>FluxNPC</name>
+    <name>FluxAPI</name>
 
     <properties>
         <java.version>21</java.version>
@@ -78,5 +78,10 @@
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.dmulloy2</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>5.4.0</version>
+        </dependency>
     </dependencies>
 </project>

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/service/Services.java → src/main/java/me/lethunderhawk/fluxapi/Services.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.service;
+package me.lethunderhawk.fluxapi;
 
-import me.lethunderhawk.bazaarflux.util.interfaces.BazaarFluxModule;
+import me.lethunderhawk.fluxapi.util.interfaces.BazaarFluxModule;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+ 1 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/CustomHeadCreator.java → src/main/java/me/lethunderhawk/fluxapi/util/CustomHeadCreator.java

@@ -1,8 +1,7 @@
-package me.lethunderhawk.bazaarflux.util;
+package me.lethunderhawk.fluxapi.util;
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import com.destroystokyo.paper.profile.ProfileProperty;
-import me.lethunderhawk.main.util.UnItalic;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/MessageSender.java → src/main/java/me/lethunderhawk/fluxapi/util/MessageSender.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util;
+package me.lethunderhawk.fluxapi.util;
 
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;

+ 1 - 1
src/main/java/me/lethunderhawk/main/util/UnItalic.java → src/main/java/me/lethunderhawk/fluxapi/util/UnItalic.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.main.util;
+package me.lethunderhawk.fluxapi.util;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/animation/Animation.java → src/main/java/me/lethunderhawk/fluxapi/util/animation/Animation.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.util.animation;
+package me.lethunderhawk.fluxapi.util.animation;
 
-import me.lethunderhawk.bazaarflux.service.Services;
+import me.lethunderhawk.fluxapi.Services;
 import me.lethunderhawk.main.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/command/CommandNode.java → src/main/java/me/lethunderhawk/fluxapi/util/command/CommandNode.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.command;
+package me.lethunderhawk.fluxapi.util.command;
 
 import org.bukkit.command.CommandSender;
 

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/command/CustomCommand.java → src/main/java/me/lethunderhawk/fluxapi/util/command/CustomCommand.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.util.command;
+package me.lethunderhawk.fluxapi.util.command;
 
-import me.lethunderhawk.bazaarflux.util.interfaces.BazaarFluxModule;
+import me.lethunderhawk.fluxapi.util.interfaces.BazaarFluxModule;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/gui/ConfirmationMenu.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/ConfirmationMenu.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.util.gui;
+package me.lethunderhawk.fluxapi.util.gui;
 
-import me.lethunderhawk.main.util.UnItalic;
+import me.lethunderhawk.fluxapi.util.UnItalic;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/gui/GoBackItem.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/GoBackItem.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.util.gui;
+package me.lethunderhawk.fluxapi.util.gui;
 
-import me.lethunderhawk.main.util.UnItalic;
+import me.lethunderhawk.fluxapi.util.UnItalic;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;

+ 2 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/gui/InventoryGUI.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/InventoryGUI.java

@@ -1,6 +1,6 @@
-package me.lethunderhawk.bazaarflux.util.gui;
+package me.lethunderhawk.fluxapi.util.gui;
 
-import me.lethunderhawk.main.util.UnItalic;
+import me.lethunderhawk.fluxapi.util.UnItalic;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

+ 1 - 2
src/main/java/me/lethunderhawk/bazaarflux/util/gui/InventoryManager.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/InventoryManager.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.gui;
+package me.lethunderhawk.fluxapi.util.gui;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -10,7 +10,6 @@ import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/gui/PlayerHeadListGUI.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/PlayerHeadListGUI.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.gui;
+package me.lethunderhawk.fluxapi.util.gui;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/gui/input/SignMenuFactory.java → src/main/java/me/lethunderhawk/fluxapi/util/gui/input/SignMenuFactory.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.gui.input;
+package me.lethunderhawk.fluxapi.util.gui.input;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;

+ 3 - 3
src/main/java/me/lethunderhawk/bazaarflux/util/interfaces/BazaarFluxModule.java → src/main/java/me/lethunderhawk/fluxapi/util/interfaces/BazaarFluxModule.java

@@ -1,7 +1,7 @@
-package me.lethunderhawk.bazaarflux.util.interfaces;
+package me.lethunderhawk.fluxapi.util.interfaces;
 
-import me.lethunderhawk.bazaarflux.service.Services;
-import me.lethunderhawk.bazaarflux.util.MessageSender;
+import me.lethunderhawk.fluxapi.Services;
+import me.lethunderhawk.fluxapi.util.MessageSender;
 import me.lethunderhawk.main.Main;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/itemdesign/LoreDesigner.java → src/main/java/me/lethunderhawk/fluxapi/util/itemdesign/LoreDesigner.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.itemdesign;
+package me.lethunderhawk.fluxapi.util.itemdesign;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentBuilder;

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/lang/RomanNumbers.java → src/main/java/me/lethunderhawk/fluxapi/util/lang/RomanNumbers.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.lang;
+package me.lethunderhawk.fluxapi.util.lang;
 
 public class RomanNumbers {
     public static String intToRoman(int num) {

+ 1 - 1
src/main/java/me/lethunderhawk/bazaarflux/util/loottables/RiggedChanceGenerator.java → src/main/java/me/lethunderhawk/fluxapi/util/loottables/RiggedChanceGenerator.java

@@ -1,4 +1,4 @@
-package me.lethunderhawk.bazaarflux.util.loottables;
+package me.lethunderhawk.fluxapi.util.loottables;
 
 import java.util.*;
 import java.util.function.Supplier;

+ 2 - 2
src/main/java/me/lethunderhawk/main/Main.java

@@ -1,6 +1,6 @@
 package me.lethunderhawk.main;
 
-import me.lethunderhawk.bazaarflux.service.Services;
+import me.lethunderhawk.fluxapi.Services;
 import me.lethunderhawk.npc.manager.NPCManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -8,8 +8,8 @@ public class Main extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        Services.register(Main.class, this);
         NPCManager manager = new NPCManager();
         Services.register(NPCManager.class, manager);
-
     }
 }

+ 2 - 2
src/main/java/me/lethunderhawk/npc/NPCModule.java

@@ -1,7 +1,7 @@
 package me.lethunderhawk.npc;
 
-import me.lethunderhawk.bazaarflux.service.Services;
-import me.lethunderhawk.bazaarflux.util.interfaces.BazaarFluxModule;
+import me.lethunderhawk.fluxapi.Services;
+import me.lethunderhawk.fluxapi.util.interfaces.BazaarFluxModule;
 import me.lethunderhawk.npc.command.NPCCommand;
 import me.lethunderhawk.npc.event.NPCListener;
 import me.lethunderhawk.npc.manager.NPCManager;

+ 4 - 4
src/main/java/me/lethunderhawk/npc/command/NPCCommand.java

@@ -1,9 +1,9 @@
 package me.lethunderhawk.npc.command;
 
-import me.lethunderhawk.bazaarflux.service.Services;
-import me.lethunderhawk.bazaarflux.util.command.CommandNode;
-import me.lethunderhawk.bazaarflux.util.command.CustomCommand;
-import me.lethunderhawk.bazaarflux.util.interfaces.BazaarFluxModule;
+import me.lethunderhawk.fluxapi.Services;
+import me.lethunderhawk.fluxapi.util.command.CommandNode;
+import me.lethunderhawk.fluxapi.util.command.CustomCommand;
+import me.lethunderhawk.fluxapi.util.interfaces.BazaarFluxModule;
 import me.lethunderhawk.npc.manager.NPCManager;
 import me.lethunderhawk.npc.util.NPC;
 import me.lethunderhawk.npc.util.NPCOptions;

+ 1 - 1
src/main/java/me/lethunderhawk/npc/manager/NPCManager.java

@@ -8,7 +8,7 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import me.lethunderhawk.bazaarflux.service.Services;
+import me.lethunderhawk.fluxapi.Services;
 import me.lethunderhawk.main.Main;
 import me.lethunderhawk.npc.event.NPCClickAction;
 import me.lethunderhawk.npc.event.NPCInteractionEvent;

+ 2 - 20
src/main/resources/plugin.yml

@@ -1,23 +1,5 @@
-name: BazaarFlux
+name: FluxAPI
 version: '${project.version}'
 main: me.lethunderhawk.main.Main
 api-version: 1.21.10
-prefix: BazaarFlux
-commands:
-  eco:
-    description: Economy administration command
-    usage: /eco <set|add|remove|get> <player> <amount>
-    permission: currency.eco
-  trade:
-    description: Sende eine Handelsanfrage
-  tradeaccept:
-    description: Akzeptiere eine Handelsanfrage
-
-permissions:
-  currency.eco:
-    description: Allows economy administration
-    default: op
-  trade.trade:
-    description: Allows initiating a trade
-  trade.acceptTrade:
-    description: Allows accepting a trade
+prefix: FluxAPI