Fix relocating libraries, code improvements.

imDMK · imDMK · commit 9b7801e152e0 · 2025-05-29T15:57:36.000+02:00
diff --git a/doublejump-plugin/build.gradle.kts b/doublejump-plugin/build.gradle.kts
@@ -44,7 +44,7 @@ bukkit {
     apiVersion = "1.17"
     main = "com.github.imdmk.doublejump.DoubleJumpPlugin"
     author = "imDMK"
-    description = "Efficient double jump plugin with many features and configuration possibilities"
+    description = ""
     website = "https://github.com/imDMK/DoubleJump"
     softDepend = listOf("WorldGuard")
 }
@@ -65,11 +65,15 @@ tasks.withType<ShadowJar> {
     val libPrefix = "com.github.imdmk.doublejump.lib"
     listOf(
         "com.eternalcode",
+        "com.github.benmanes",
         "dev.rollczi",
+        "dev.triumphteam",
+        "com.j256.ormlite",
         "eu.okaeri",
         "javassist",
         "net.kyori",
         "org.bstats",
+        "org.checkerframework",
         "org.json",
         "org.panda_lang",
         "org.yaml",
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/DoubleJump.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/DoubleJump.java
@@ -37,14 +37,14 @@
 import com.github.imdmk.doublejump.jump.feature.item.usage.ItemUsageStrategy;
 import com.github.imdmk.doublejump.jump.feature.item.usage.ItemUsageStrategyFactory;
 import com.github.imdmk.doublejump.jump.feature.restriction.JumpRestrictionController;
+import com.github.imdmk.doublejump.jump.feature.restriction.JumpRestrictionNotifier;
 import com.github.imdmk.doublejump.jump.feature.restriction.JumpRestrictionService;
 import com.github.imdmk.doublejump.jump.feature.restriction.RestrictionChecker;
 import com.github.imdmk.doublejump.jump.feature.restriction.delay.DelayRestrictionController;
-import com.github.imdmk.doublejump.jump.feature.restriction.JumpRestrictionNotifier;
 import com.github.imdmk.doublejump.jump.feature.velocity.JumpVelocityService;
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisualService;
-import com.github.imdmk.doublejump.jump.feature.visual.configuration.JumpVisualConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisualSessionController;
+import com.github.imdmk.doublejump.jump.feature.visual.configuration.JumpVisualConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.gui.JumpVisualGui;
 import com.github.imdmk.doublejump.jump.feature.visual.particle.JumpParticleController;
 import com.github.imdmk.doublejump.jump.feature.visual.particle.gui.JumpParticleGui;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/ConfigGuiItem.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/ConfigGuiItem.java
@@ -1,4 +1,4 @@
-package com.github.imdmk.doublejump.infrastructure.gui.configuration.item;
+package com.github.imdmk.doublejump.infrastructure.gui.configuration;
 
 import com.github.imdmk.doublejump.util.ComponentUtil;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/ConfigGuiItemSerializer.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/ConfigGuiItemSerializer.java
@@ -1,4 +1,4 @@
-package com.github.imdmk.doublejump.infrastructure.gui.configuration.item;
+package com.github.imdmk.doublejump.infrastructure.gui.configuration;
 
 import eu.okaeri.configs.schema.GenericsDeclaration;
 import eu.okaeri.configs.serdes.DeserializationData;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/GuiConfiguration.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/infrastructure/gui/configuration/GuiConfiguration.java
@@ -3,8 +3,6 @@
 import com.github.imdmk.doublejump.configuration.ConfigSection;
 import com.github.imdmk.doublejump.configuration.serializer.ComponentSerializer;
 import com.github.imdmk.doublejump.configuration.serializer.EnchantmentSerializer;
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItemSerializer;
 import com.github.imdmk.doublejump.jump.feature.visual.gui.JumpVisualGuiConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.configuration.JumpSoundSerializer;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.configuration.SoundSerializer;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/restriction/JumpRestrictionService.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/restriction/JumpRestrictionService.java
@@ -2,12 +2,12 @@
 
 import com.github.imdmk.doublejump.jump.JumpConfiguration;
 import com.github.imdmk.doublejump.jump.cache.JumpPlayerCache;
+import com.github.imdmk.doublejump.jump.feature.restriction.checker.SetRestrictionChecker;
+import com.github.imdmk.doublejump.jump.feature.restriction.checker.WorldGuardRestrictionChecker;
 import com.github.imdmk.doublejump.jump.feature.restriction.checker.player.GlidingRestrictionChecker;
-import com.github.imdmk.doublejump.jump.feature.restriction.delay.DelayRestrictionChecker;
 import com.github.imdmk.doublejump.jump.feature.restriction.checker.player.PermissionRestrictionChecker;
 import com.github.imdmk.doublejump.jump.feature.restriction.checker.player.PingRestrictionChecker;
-import com.github.imdmk.doublejump.jump.feature.restriction.checker.SetRestrictionChecker;
-import com.github.imdmk.doublejump.jump.feature.restriction.checker.WorldGuardRestrictionChecker;
+import com.github.imdmk.doublejump.jump.feature.restriction.delay.DelayRestrictionChecker;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.panda_lang.utilities.inject.annotations.Inject;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/JumpVisualSessionController.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/JumpVisualSessionController.java
@@ -35,7 +35,7 @@ void onPlayerJoin(final PlayerJoinEvent event) {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    void onServerReload(ServerLoadEvent event) {
+    void onServerReload(final ServerLoadEvent event) {
         if (event.getType() != ServerLoadEvent.LoadType.RELOAD) {
             return;
         }
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/gui/JumpVisualGuiConfiguration.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/gui/JumpVisualGuiConfiguration.java
@@ -1,6 +1,6 @@
 package com.github.imdmk.doublejump.jump.feature.visual.gui;
 
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
+import com.github.imdmk.doublejump.infrastructure.gui.configuration.ConfigGuiItem;
 import com.github.imdmk.doublejump.jump.feature.visual.particle.gui.JumpParticleGuiConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.gui.JumpSoundGuiConfiguration;
 import com.github.imdmk.doublejump.util.ComponentUtil;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/JumpParticleWrapper.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/JumpParticleWrapper.java
@@ -1,6 +1,5 @@
-package com.github.imdmk.doublejump.jump.feature.visual.particle.wrapper;
+package com.github.imdmk.doublejump.jump.feature.visual.particle;
 
-import com.github.imdmk.doublejump.jump.feature.visual.particle.JumpParticle;
 import com.github.imdmk.doublejump.jump.feature.visual.repository.JumpVisualWrapper;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/gui/JumpParticleGui.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/gui/JumpParticleGui.java
@@ -2,7 +2,7 @@
 
 import com.github.imdmk.doublejump.infrastructure.gui.AbstractGui;
 import com.github.imdmk.doublejump.infrastructure.gui.ParameterizedGui;
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
+import com.github.imdmk.doublejump.infrastructure.gui.configuration.ConfigGuiItem;
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisual;
 import com.github.imdmk.doublejump.jump.feature.visual.configuration.JumpVisualConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.gui.JumpVisualGui;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/gui/JumpParticleGuiConfiguration.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/particle/gui/JumpParticleGuiConfiguration.java
@@ -1,6 +1,6 @@
 package com.github.imdmk.doublejump.jump.feature.visual.particle.gui;
 
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
+import com.github.imdmk.doublejump.infrastructure.gui.configuration.ConfigGuiItem;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.JumpSound;
 import com.github.imdmk.doublejump.util.ComponentUtil;
 import eu.okaeri.configs.OkaeriConfig;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/repository/JumpVisualWrapper.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/repository/JumpVisualWrapper.java
@@ -2,9 +2,9 @@
 
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisual;
 import com.github.imdmk.doublejump.jump.feature.visual.particle.JumpParticle;
-import com.github.imdmk.doublejump.jump.feature.visual.particle.wrapper.JumpParticleWrapper;
+import com.github.imdmk.doublejump.jump.feature.visual.particle.JumpParticleWrapper;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.JumpSound;
-import com.github.imdmk.doublejump.jump.feature.visual.sound.wrapper.JumpSoundPersister;
+import com.github.imdmk.doublejump.jump.feature.visual.sound.JumpSoundPersister;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.ForeignCollection;
 import com.j256.ormlite.field.DatabaseField;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/repository/impl/DaoJumpVisualRepository.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/repository/impl/DaoJumpVisualRepository.java
@@ -1,7 +1,7 @@
 package com.github.imdmk.doublejump.jump.feature.visual.repository.impl;
 
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisual;
-import com.github.imdmk.doublejump.jump.feature.visual.particle.wrapper.JumpParticleWrapper;
+import com.github.imdmk.doublejump.jump.feature.visual.particle.JumpParticleWrapper;
 import com.github.imdmk.doublejump.jump.feature.visual.repository.JumpVisualCache;
 import com.github.imdmk.doublejump.jump.feature.visual.repository.JumpVisualRepository;
 import com.github.imdmk.doublejump.jump.feature.visual.repository.JumpVisualWrapper;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/JumpSoundPersister.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/JumpSoundPersister.java
@@ -1,6 +1,5 @@
-package com.github.imdmk.doublejump.jump.feature.visual.sound.wrapper;
+package com.github.imdmk.doublejump.jump.feature.visual.sound;
 
-import com.github.imdmk.doublejump.jump.feature.visual.sound.JumpSound;
 import com.j256.ormlite.field.FieldType;
 import com.j256.ormlite.field.SqlType;
 import com.j256.ormlite.field.types.BaseDataType;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/configuration/SoundSerializer.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/configuration/SoundSerializer.java
@@ -4,8 +4,6 @@
 import eu.okaeri.configs.serdes.DeserializationData;
 import eu.okaeri.configs.serdes.ObjectSerializer;
 import eu.okaeri.configs.serdes.SerializationData;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
 import org.bukkit.Sound;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/gui/JumpSoundGui.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/gui/JumpSoundGui.java
@@ -2,7 +2,7 @@
 
 import com.github.imdmk.doublejump.infrastructure.gui.AbstractGui;
 import com.github.imdmk.doublejump.infrastructure.gui.ParameterizedGui;
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
+import com.github.imdmk.doublejump.infrastructure.gui.configuration.ConfigGuiItem;
 import com.github.imdmk.doublejump.jump.feature.visual.JumpVisual;
 import com.github.imdmk.doublejump.jump.feature.visual.configuration.JumpVisualConfiguration;
 import com.github.imdmk.doublejump.jump.feature.visual.gui.JumpVisualGui;
diff --git a/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/gui/JumpSoundGuiConfiguration.java b/doublejump-plugin/src/main/java/com/github/imdmk/doublejump/jump/feature/visual/sound/gui/JumpSoundGuiConfiguration.java
@@ -1,6 +1,6 @@
 package com.github.imdmk.doublejump.jump.feature.visual.sound.gui;
 
-import com.github.imdmk.doublejump.infrastructure.gui.configuration.item.ConfigGuiItem;
+import com.github.imdmk.doublejump.infrastructure.gui.configuration.ConfigGuiItem;
 import com.github.imdmk.doublejump.jump.feature.visual.sound.JumpSound;
 import com.github.imdmk.doublejump.util.ComponentUtil;
 import eu.okaeri.configs.OkaeriConfig;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.imdmk.doublejump.infrastructure.gui.configuration.item;`
	`1`	`+package com.github.imdmk.doublejump.infrastructure.gui.configuration;`
`2`	`2`
`3`	`3`	`import com.github.imdmk.doublejump.util.ComponentUtil;`
`4`	`4`	`import dev.triumphteam.gui.builder.item.ItemBuilder;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void onPlayerJoin(final PlayerJoinEvent event) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)`
`38`		`- void onServerReload(ServerLoadEvent event) {`
	`38`	`+ void onServerReload(final ServerLoadEvent event) {`
`39`	`39`	`if (event.getType() != ServerLoadEvent.LoadType.RELOAD) {`
`40`	`40`	`return;`
`41`	`41`	`}`