v3.4.3

.gitignore

@@ -14,4 +14,6 @@
 /V1_19_R2/target/
 /V1_19_R2/pom.xml.versionsBackup
 /V1_19_R3/target/
-/V1_19_R3/pom.xml.versionsBackup
+/V1_19_R3/pom.xml.versionsBackup
+/V1_20_R1/target/
+/V1_20_R1/pom.xml.versionsBackup

Core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -62,42 +62,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nexmedia.playerblocktracker</groupId>
-            <artifactId>PlayerBlockTracker</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>V1_19_R3</artifactId>
-            <version>3.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>V1_19_R2</artifactId>
-            <version>3.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>V1_19_R1</artifactId>
-            <version>3.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>V1_18_R2</artifactId>
-            <version>3.4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>su.nightexpress.excellentenchants</groupId>
-            <artifactId>V1_17_R1</artifactId>
-            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>fr.neatmonster</groupId>
@@ -122,6 +87,46 @@
             <version>2.11.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>su.nexmedia.playerblocktracker</groupId>
+            <artifactId>PlayerBlockTracker</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>NMS</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_17_R1</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_18_R2</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_19_R1</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_19_R2</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_19_R3</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>V1_20_R1</artifactId>
+            <version>3.4.3</version>
+        </dependency>
     </dependencies>
 
     <build>

Core/src/main/java/su/nightexpress/excellentenchants/ExcellentEnchants.java

@@ -24,6 +24,7 @@ import su.nightexpress.excellentenchants.nms.v1_18_R2.V1_18_R2;
 import su.nightexpress.excellentenchants.nms.v1_19_R1.V1_19_R1;
 import su.nightexpress.excellentenchants.nms.v1_19_R2.V1_19_R2;
 import su.nightexpress.excellentenchants.nms.v1_19_R3.V1_19_R3;
+import su.nightexpress.excellentenchants.nms.v1_20_R1.V1_20_R1;
 import su.nightexpress.excellentenchants.tier.TierManager;
 
 public class ExcellentEnchants extends NexPlugin<ExcellentEnchants> {
@@ -79,6 +80,7 @@ public class ExcellentEnchants extends NexPlugin<ExcellentEnchants> {
             case V1_19_R1 -> new V1_19_R1();
             case V1_19_R2 -> new V1_19_R2();
             case V1_19_R3 -> new V1_19_R3();
+            case V1_20_R1 -> new V1_20_R1();
         };
     }
 

Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/armor/EnchantFlameWalker.java

@@ -148,7 +148,7 @@ public class EnchantFlameWalker extends ExcellentEnchant implements ICleanable {
             long now = System.currentTimeMillis();
 
             BLOCKS_TO_DESTROY.keySet().removeIf(block -> {
-                if (block.isEmpty()) return true;
+                if (block.isEmpty() || block.getType() != Material.MAGMA_BLOCK) return true;
 
                 Pair<Long, Integer> pair = BLOCKS_TO_DESTROY.get(block);
                 long time = pair.getFirst();

Core/src/main/java/su/nightexpress/excellentenchants/enchantment/task/AbstractEnchantmentTask.java

@@ -17,7 +17,7 @@ public abstract class AbstractEnchantmentTask extends AbstractTask<ExcellentEnch
     }
 
     @NotNull
-    protected Collection<@NotNull ? extends LivingEntity> getEntities() {
+    protected Collection<? extends LivingEntity> getEntities() {
         Set<LivingEntity> list = new HashSet<>(plugin.getServer().getOnlinePlayers());
 
         if (Config.ENCHANTMENTS_ENTITY_PASSIVE_FOR_MOBS.get()) {

NMS/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

V1_17_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
         </dependency>
     </dependencies>
 

V1_18_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
         </dependency>
     </dependencies>
 

V1_19_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
         </dependency>
     </dependencies>
 

V1_19_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
         </dependency>
     </dependencies>
 

V1_19_R3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.4.1</version>
+        <version>3.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.4.1</version>
+            <version>3.4.3</version>
         </dependency>
     </dependencies>
 

V1_20_R1/pom.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ExcellentEnchants</artifactId>
+        <groupId>su.nightexpress.excellentenchants</groupId>
+        <version>3.4.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>V1_20_R1</artifactId>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <classifier>remapped-mojang</classifier>
+        </dependency>
+        <dependency>
+            <groupId>su.nightexpress.excellentenchants</groupId>
+            <artifactId>NMS</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.md-5</groupId>
+                <artifactId>specialsource-maven-plugin</artifactId>
+                <version>1.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-obf</id>
+                        <configuration>
+                            <srgIn>org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <reverse>true</reverse>
+                            <remappedDependencies>org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedArtifactAttached>true</remappedArtifactAttached>
+                            <remappedClassifierName>remapped-obf</remappedClassifierName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-spigot</id>
+                        <configuration>
+                            <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+                            <srgIn>org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

V1_20_R1/src/main/java/su/nightexpress/excellentenchants/nms/v1_20_R1/V1_20_R1.java

@@ -0,0 +1,94 @@
+package su.nightexpress.excellentenchants.nms.v1_20_R1;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.game.ClientboundAnimatePacket;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.projectile.FishingHook;
+import net.minecraft.world.item.SpawnEggItem;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftFishHook;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
+import org.bukkit.entity.FishHook;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import su.nightexpress.excellentenchants.nms.EnchantNMS;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class V1_20_R1 implements EnchantNMS {
+
+    @Override
+    public void sendAttackPacket(@NotNull Player player, int id) {
+        CraftPlayer craftPlayer = (CraftPlayer) player;
+        Entity entity = craftPlayer.getHandle();
+        ClientboundAnimatePacket packet = new ClientboundAnimatePacket(entity, id);
+        craftPlayer.getHandle().connection.send(packet);
+    }
+
+    @Override
+    public void retrieveHook(@NotNull FishHook hook, @NotNull ItemStack item) {
+        CraftFishHook craftFishHook = (CraftFishHook) hook;
+        FishingHook handle = craftFishHook.getHandle();
+        handle.retrieve(CraftItemStack.asNMSCopy(item));
+    }
+
+    @Override
+    @Nullable
+    public ItemStack getSpawnEgg(@NotNull LivingEntity entity) {
+        CraftLivingEntity craftLivingEntity = (CraftLivingEntity) entity;
+        net.minecraft.world.entity.LivingEntity livingEntity = craftLivingEntity.getHandle();
+
+        SpawnEggItem eggItem = SpawnEggItem.byId(livingEntity.getType());
+        if (eggItem == null) return null;
+
+        return CraftItemStack.asBukkitCopy(eggItem.getDefaultInstance());
+    }
+
+    @Override
+    @NotNull
+    public Set<Block> handleFlameWalker(@NotNull LivingEntity bukkitEntity, @NotNull Location location, int level) {
+        Entity entity = ((CraftLivingEntity) bukkitEntity).getHandle();
+        BlockPos pos = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        ServerLevel world = ((CraftWorld) bukkitEntity.getWorld()).getHandle();
+
+        int radius = Math.min(16, 2 + level);
+        BlockState bStone = Blocks.MAGMA_BLOCK.defaultBlockState();
+        BlockPos.MutableBlockPos posAbove = new BlockPos.MutableBlockPos();
+
+        Set<Block> blocks = new HashSet<>();
+        for (BlockPos posNear : BlockPos.betweenClosed(pos.offset(-radius, -1, -radius), pos.offset(radius, -1, radius))) {
+            if (!posNear.closerThan(entity.blockPosition(), radius)) continue;
+
+            posAbove.set(posNear.getX(), posNear.getY() + 1, posNear.getZ());
+
+            BlockState bLavaAbove = world.getBlockState(posAbove);
+            BlockState bLava = world.getBlockState(posNear);
+
+            if (!bLavaAbove.isAir()) continue;
+            if (!bLava.getBlock().equals(Blocks.LAVA)) continue;
+            if (bLava.getValue(LiquidBlock.LEVEL) != 0) continue;
+            if (!bStone.canSurvive(world, posNear)) continue;
+            if (!world.isUnobstructed(bStone, posNear, CollisionContext.empty())) continue;
+            if (!CraftEventFactory.handleBlockFormEvent(world, posNear, bStone, entity)) continue;
+            //world.scheduleTick(posNear, Blocks.STONE, Rnd.get(60, 120));
+
+            Location bukkitLoc = new Location(world.getWorld(), posNear.getX(), posNear.getY(), posNear.getZ());
+            blocks.add(bukkitLoc.getBlock());
+        }
+        return blocks;
+    }
+}

pom.xml

@@ -7,7 +7,7 @@
     <groupId>su.nightexpress.excellentenchants</groupId>
     <artifactId>ExcellentEnchants</artifactId>
     <packaging>pom</packaging>
-    <version>3.4.1</version>
+    <version>3.4.3</version>
     <modules>
         <module>Core</module>
         <module>NMS</module>
@@ -16,6 +16,7 @@
         <module>V1_19_R1</module>
         <module>V1_19_R2</module>
         <module>V1_19_R3</module>
+        <module>V1_20_R1</module>
     </modules>
 
     <properties>