Merge pull request #40 from r3back/feature/the-assistant-update

Changed particle api
r3back · Oct 20, 2024 · ae98449 · ae98449
2 parents 579e55c + 139f331
commit ae98449
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/TheDragon/src/main/java/com/qualityplus/dragon/api/handler/ParticleHandler.java b/TheDragon/src/main/java/com/qualityplus/dragon/api/handler/ParticleHandler.java
@@ -1,6 +1,6 @@
 package com.qualityplus.dragon.api.handler;
 
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.dragon.api.game.DragonGame;
 
 /**

diff --git a/TheDragon/src/main/java/com/qualityplus/dragon/base/events/DragonFireBallEvent.java b/TheDragon/src/main/java/com/qualityplus/dragon/base/events/DragonFireBallEvent.java
@@ -1,6 +1,6 @@
 package com.qualityplus.dragon.base.events;
 
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.dragon.TheDragon;
 import com.qualityplus.dragon.api.event.DragonGameEvent;
 import com.qualityplus.dragon.api.game.DragonGame;

diff --git a/TheDragon/src/main/java/com/qualityplus/dragon/base/events/DragonNormalFireBallEvent.java b/TheDragon/src/main/java/com/qualityplus/dragon/base/events/DragonNormalFireBallEvent.java
@@ -1,6 +1,6 @@
 package com.qualityplus.dragon.base.events;
 
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.dragon.TheDragon;
 import com.qualityplus.dragon.api.event.DragonGameEvent;
 import com.qualityplus.dragon.api.game.DragonGame;

diff --git a/TheDragon/src/main/java/com/qualityplus/dragon/base/handler/ParticleHandlerImpl.java b/TheDragon/src/main/java/com/qualityplus/dragon/base/handler/ParticleHandlerImpl.java
@@ -2,8 +2,8 @@
 
 import com.qualityplus.assistant.TheAssistantPlugin;
 import com.qualityplus.assistant.api.nms.NMS;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleBuilder;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleBuilder;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.dragon.TheDragon;
 import com.qualityplus.dragon.api.controller.DragonController;
 import com.qualityplus.dragon.api.game.DragonGame;

diff --git a/ThePets/src/main/java/com/qualityplus/pets/base/pet/entity/MinecraftPet.java b/ThePets/src/main/java/com/qualityplus/pets/base/pet/entity/MinecraftPet.java
@@ -2,8 +2,8 @@
 
 import com.qualityplus.assistant.api.util.IPlaceholder;
 import com.qualityplus.assistant.api.util.MathUtil;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleBuilder;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleBuilder;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.assistant.util.StringUtils;
 import com.qualityplus.assistant.util.placeholder.Placeholder;
 import com.qualityplus.pets.ThePets;

diff --git a/TheRunes/src/main/java/com/qualityplus/runes/base/config/RunesFile.java b/TheRunes/src/main/java/com/qualityplus/runes/base/config/RunesFile.java
@@ -1,7 +1,7 @@
 package com.qualityplus.runes.base.config;
 
 import com.qualityplus.assistant.lib.com.cryptomorin.xseries.XMaterial;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.assistant.util.faster.FastMap;
 import com.qualityplus.assistant.util.particle.ParticleColor;
 import com.qualityplus.runes.api.config.RuneTableConfig.RuneItem;

diff --git a/TheRunes/src/main/java/com/qualityplus/runes/base/rune/RuneEffect.java b/TheRunes/src/main/java/com/qualityplus/runes/base/rune/RuneEffect.java
@@ -1,7 +1,7 @@
 package com.qualityplus.runes.base.rune;
 
 import com.qualityplus.assistant.lib.com.cryptomorin.xseries.XMaterial;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleEffect;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleEffect;
 import com.qualityplus.assistant.util.particle.ParticleColor;
 import com.qualityplus.assistant.lib.eu.okaeri.configs.OkaeriConfig;
 import lombok.AllArgsConstructor;

diff --git a/TheRunes/src/main/java/com/qualityplus/runes/base/rune/effects/apply/ChainEffect.java b/TheRunes/src/main/java/com/qualityplus/runes/base/rune/effects/apply/ChainEffect.java
@@ -1,8 +1,8 @@
 package com.qualityplus.runes.base.rune.effects.apply;
 
 import com.qualityplus.assistant.lib.com.cryptomorin.xseries.XMaterial;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.ParticleBuilder;
-import com.qualityplus.assistant.lib.xyz.xenondevs.particle.data.color.RegularColor;
+import com.qualityplus.assistant.lib.com.georgev22.particle.ParticleBuilder;
+import com.qualityplus.assistant.lib.com.georgev22.particle.data.color.RegularColor;
 import com.qualityplus.assistant.util.random.RandomUtil;
 import com.qualityplus.runes.TheRunes;
 import com.qualityplus.runes.base.event.FakeEntitySpawnEvent;

diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ subprojects {
         implementation("org.jetbrains:annotations:22.0.0")
 
         compileOnly("org.projectlombok:lombok:1.18.22")
-        compileOnly 'com.github.r3back:the-assistant:3.2.12'
+        compileOnly 'com.github.r3back:the-assistant:3.2.13'
         //These both are temporal until jar class loader be added
         compileOnly 'io.lettuce:lettuce-core:6.1.1.RELEASE'
         compileOnly 'org.mongodb:mongo-java-driver:3.12.10'

diff --git a/test-suite/mc-config/mc.env b/test-suite/mc-config/mc.env
@@ -1,5 +1,5 @@
 TYPE=PAPER
-VERSION=1.20.2
+VERSION=1.20.4
 EULA=TRUE
 ONLINE_MODE=TRUE
 COPY_CONFIG_DEST=/data