Merge pull request #1 from Akazukin-Team/dev-34636

依存関係のplがない時のエラーの修正

Author: Currypan1229

.gitignore

@@ -12,6 +12,7 @@ publish/build
 compat/*/build
 module/*/build
 build
+**/src/main/generated
 
 # Ignore Gradle build output directory
 core/.settings

buildSrc/src/main/groovy/buildlogic.java-common-conventions.gradle

@@ -48,6 +48,11 @@ dependencies {
     //testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
+compileJava.options.encoding = 'UTF-8'
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(properties.getOrDefault("java_version", 8) as int)
 compileJava.sourceCompatibility = compileJava.targetCompatibility = properties.getOrDefault("java_version", 8)

core/src/main/java/net/akazukin/library/LibraryPlugin.java

@@ -106,7 +106,7 @@ public static Logger getLogManager() {
 
     @Override
     public void onEnable() {
-        LibraryPlugin.PLUGIN_NAME = getName();
+        LibraryPlugin.PLUGIN_NAME = this.getName();
 
 
         getLogManager().info("Initializing version manager...");
@@ -121,7 +121,7 @@ public void onEnable() {
 
 
         getLogManager().info("Initializing database...");
-        LibrarySQLConfig.setFile(new File(getDataFolder(), "library.db"));
+        LibrarySQLConfig.setFile(new File(this.getDataFolder(), "library.db"));
         final LibrarySQLConfig sqlCfg = LibrarySQLConfig.singleton();
         sqlCfg.getTransactionManager().required(() -> {
             new MUserDaoImpl(sqlCfg).create();
@@ -158,9 +158,9 @@ public void onEnable() {
         COMMAND_MANAGER = new LibraryCommandManager();
         COMMAND_MANAGER.registerCommands();
         for (final Command cmd : COMMAND_MANAGER.getCommands()) {
-            final PluginCommand command = getCommand(cmd.getName());
+            final PluginCommand command = this.getCommand(cmd.getName());
             if (command != null) command.setExecutor(COMMAND_MANAGER);
-            final PluginCommand command2 = getCommand(getPlugin().getName().toLowerCase() + ":" + cmd.getName());
+            final PluginCommand command2 = this.getCommand(getPlugin().getName().toLowerCase() + ":" + cmd.getName());
             if (command2 != null) command2.setExecutor(COMMAND_MANAGER);
         }
         getLogManager().info("Successfully Initialized command manager");

core/src/main/java/net/akazukin/library/compat/grimac/GrimACCompat.java

@@ -1,6 +1,5 @@
 package net.akazukin.library.event;
 
-import ac.grim.grimac.api.events.FlagEvent;
 import net.akazukin.library.LibraryPlugin;
 import net.akazukin.library.compat.minecraft.data.packets.Packet;
 import net.akazukin.library.event.events.PacketReceiveEvent;
@@ -24,7 +23,7 @@
 public class Events implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onServerTick(final ServerTickEvent event) {
-        callEvent(event, EventPriority.HIGHEST);
+        this.callEvent(event, EventPriority.HIGHEST);
     }
 
     private void callEvent(final Event event, final EventPriority priority) {
@@ -33,42 +32,42 @@ private void callEvent(final Event event, final EventPriority priority) {
 
     @EventHandler
     public void onEntityDamage(final EntityDamageEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler
     public void onInventoryOpen(final InventoryOpenEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onInventoryClick(final InventoryClickEvent event) {
-        callEvent(event, EventPriority.HIGH);
+        this.callEvent(event, EventPriority.HIGH);
     }
 
     @EventHandler
     public void onInventoryClose(final InventoryCloseEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler
     public void onPlayerQuit(final PlayerQuitEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerJoin(final PlayerJoinEvent event) {
-        callEvent(event, EventPriority.HIGH);
+        this.callEvent(event, EventPriority.HIGH);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onServerListPing(final ServerListPingEvent event) {
-        callEvent(event, EventPriority.HIGH);
+        this.callEvent(event, EventPriority.HIGH);
     }
 
     @EventHandler
     public void onPlayerMove(final PlayerMoveEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     /*@EventHandler
@@ -78,27 +77,22 @@ public void onPlayerRotation(final PlayerRotationEvent event) {
 
     @EventHandler
     public void onPlayerInteract(final PlayerInteractEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler
     public void onAsyncPlayerChat(final AsyncPlayerChatEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onSignChange(final SignChangeEvent event) {
-        callEvent(event, EventPriority.HIGH);
+        this.callEvent(event, EventPriority.HIGH);
     }
 
     @EventHandler
     public void onPacketReceive(final PacketReceiveEvent event) {
-        callEvent(event, EventPriority.NORMAL);
+        this.callEvent(event, EventPriority.NORMAL);
         final Packet pkt = LibraryPlugin.COMPAT.getWrappedPacket(event.getPacket());
     }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onGrimACDetect(final FlagEvent event) {
-        callEvent(event, EventPriority.HIGH);
-    }
 }

core/src/main/java/net/akazukin/library/compat/grimac/GrimACEvents.java

@@ -1,7 +1,6 @@
 package net.akazukin.library.event;
 
 import net.akazukin.library.LibraryPlugin;
-import net.akazukin.library.compat.grimac.GrimACEvents;
 import net.akazukin.library.gui.GuiManager;
 import net.akazukin.library.manager.PlayerManager;
 import net.akazukin.library.packetlistener.PacketManager;
@@ -10,10 +9,9 @@ public final class LibraryEventManager extends EventManager {
     @Override
     public void registerListeners() {
         LibraryPlugin.getLogManager().info("Registering event listeners");
-        registerListeners(
+        this.registerListeners(
                 GuiManager.singleton(),
                 new PacketManager(),
-                new GrimACEvents(),
                 PlayerManager.SINGLETON
         );
         LibraryPlugin.getLogManager().info("Successfully Registered event listeners");

core/src/main/java/net/akazukin/library/event/Events.java

@@ -8,7 +8,6 @@ softdepend:
   - WorldEdit
   - WorldGuard
   - FastAsyncWorldEdit
-  - GrimAC
 
 database: false
 

core/src/main/java/net/akazukin/library/event/LibraryEventManager.java

@@ -9,4 +9,4 @@ org.gradle.caching           = true
 group                        = net.akazukin
 plugin_name                  = AkazukinLibrary
 artifact                     = plugin-library
-version                      = 1.0.2
+version                      = 1.0.2.1