v1_17 part 3: automatic import swap

DenizenScript · Jun 11, 2021 · aca6053 · aca6053
1 parent 51b0ba2
commit aca6053
Show file tree

Hide file tree

Showing 39 changed files with 179 additions and 179 deletions.
diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java
@@ -28,18 +28,18 @@
 import net.md_5.bungee.api.chat.hover.content.Item;
 import net.md_5.bungee.api.chat.hover.content.Text;
 import net.md_5.bungee.chat.ComponentSerializer;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.block.Biome;
-import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_16_R3.persistence.CraftPersistentDataContainer;
-import org.bukkit.craftbukkit.v1_16_R3.util.CraftChatMessage;
-import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_17_R1.persistence.CraftPersistentDataContainer;
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java
@@ -5,12 +5,12 @@
 import com.denizenscript.denizen.nms.v1_16.Handler;
 import com.denizenscript.denizen.utilities.FormattedTextHelper;
 import net.md_5.bungee.api.ChatColor;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 import java.util.Collections;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java
@@ -1,11 +1,11 @@
 package com.denizenscript.denizen.nms.v1_16.helpers;
 
 import com.denizenscript.denizen.nms.abstracts.AnimationHelper;
-import net.minecraft.server.v1_16_R3.Entity;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHorse;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPolarBear;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftSkeleton;
+import net.minecraft.server.v1_17_R1.Entity;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftHorse;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPolarBear;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftSkeleton;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Horse;
 import org.bukkit.entity.IronGolem;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java
@@ -10,21 +10,21 @@
 import com.denizenscript.denizencore.utilities.ReflectionHelper;
 import com.denizenscript.denizen.nms.util.jnbt.CompoundTag;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_16_R3.CraftChunk;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlockEntityState;
-import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlockState;
-import org.bukkit.craftbukkit.v1_16_R3.block.CraftSkull;
-import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlockEntityState;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftSkull;
+import org.bukkit.craftbukkit.v1_17_R1.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.util.CraftMagicNumbers;
 import org.bukkit.event.world.PortalCreateEvent;
 
 import java.lang.invoke.MethodHandle;
@@ -130,7 +130,7 @@ public void setNbtData(Block block, CompoundTag ctag) {
         te.load(((CraftBlockData) block.getBlockData()).getState(), ((CompoundTagImpl) ctag).toNMSTag());
     }
 
-    private static net.minecraft.server.v1_16_R3.Block getBlockFrom(Material material) {
+    private static net.minecraft.server.v1_17_R1.Block getBlockFrom(Material material) {
         if (material == Material.FLOWER_POT) {
             return Blocks.FLOWER_POT;
         }
@@ -152,42 +152,42 @@ public boolean hasBlock(Material material) {
 
     @Override
     public boolean setBlockResistance(Material material, float resistance) {
-        net.minecraft.server.v1_16_R3.Block block = getBlockFrom(material);
+        net.minecraft.server.v1_17_R1.Block block = getBlockFrom(material);
         if (block == null) {
             return false;
         }
         // protected final float durability;
-        ReflectionHelper.setFieldValue(net.minecraft.server.v1_16_R3.BlockBase.class, "durability", block, resistance);
+        ReflectionHelper.setFieldValue(net.minecraft.server.v1_17_R1.BlockBase.class, "durability", block, resistance);
         return true;
     }
 
     @Override
     public float getBlockResistance(Material material) {
-        net.minecraft.server.v1_16_R3.Block block = getBlockFrom(material);
+        net.minecraft.server.v1_17_R1.Block block = getBlockFrom(material);
         if (block == null) {
             return 0;
         }
-        return ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R3.BlockBase.class, "durability", block);
+        return ReflectionHelper.getFieldValue(net.minecraft.server.v1_17_R1.BlockBase.class, "durability", block);
     }
 
     @Override
     public org.bukkit.block.BlockState generateBlockState(Material mat) {
         return new CraftBlockState(mat);
     }
 
-    public static final Field BLOCK_MATERIAL = ReflectionHelper.getFields(net.minecraft.server.v1_16_R3.BlockBase.class).get("material");
+    public static final Field BLOCK_MATERIAL = ReflectionHelper.getFields(net.minecraft.server.v1_17_R1.BlockBase.class).get("material");
 
-    public static final MethodHandle MATERIAL_PUSH_REACTION_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.Material.class, "T");
+    public static final MethodHandle MATERIAL_PUSH_REACTION_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_17_R1.Material.class, "T");
 
-    public static final MethodHandle BLOCK_STRENGTH_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.BlockBase.BlockData.class, "strength");
+    public static final MethodHandle BLOCK_STRENGTH_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_17_R1.BlockBase.BlockData.class, "strength");
 
-    public net.minecraft.server.v1_16_R3.Block getMaterialBlock(Material bukkitMaterial) {
+    public net.minecraft.server.v1_17_R1.Block getMaterialBlock(Material bukkitMaterial) {
         return ((CraftBlockData) bukkitMaterial.createBlockData()).getState().getBlock();
     }
 
-    public net.minecraft.server.v1_16_R3.Material getInternalMaterial(Material bukkitMaterial) {
+    public net.minecraft.server.v1_17_R1.Material getInternalMaterial(Material bukkitMaterial) {
         try {
-            return (net.minecraft.server.v1_16_R3.Material) BLOCK_MATERIAL.get(getMaterialBlock(bukkitMaterial));
+            return (net.minecraft.server.v1_17_R1.Material) BLOCK_MATERIAL.get(getMaterialBlock(bukkitMaterial));
         }
         catch (Throwable ex) {
             Debug.echoError(ex);

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ChunkHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ChunkHelperImpl.java
@@ -4,11 +4,11 @@
 import com.denizenscript.denizen.nms.interfaces.ChunkHelper;
 import com.denizenscript.denizencore.utilities.ReflectionHelper;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.World;
 import org.bukkit.Chunk;
-import org.bukkit.craftbukkit.v1_16_R3.CraftChunk;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Field;
@@ -23,8 +23,8 @@ public class ChunkHelperImpl implements ChunkHelper {
     static {
         chunkProviderServerThreadField = ReflectionHelper.getFields(ChunkProviderServer.class).get("serverThread");
         chunkProviderServerThreadFieldSetter = ReflectionHelper.getFinalSetter(ChunkProviderServer.class, "serverThread");
-        worldThreadField = ReflectionHelper.getFields(net.minecraft.server.v1_16_R3.World.class).get("serverThread");
-        worldThreadFieldSetter = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.World.class, "serverThread");
+        worldThreadField = ReflectionHelper.getFields(net.minecraft.server.v1_17_R1.World.class).get("serverThread");
+        worldThreadFieldSetter = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_17_R1.World.class, "serverThread");
     }
 
     public Thread resetServerThread;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/CustomEntityHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/CustomEntityHelperImpl.java
@@ -13,13 +13,13 @@
 import com.denizenscript.denizen.nms.interfaces.ItemProjectile;
 import com.denizenscript.denizen.nms.util.PlayerProfile;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
-import net.minecraft.server.v1_16_R3.PlayerInteractManager;
-import net.minecraft.server.v1_16_R3.WorldServer;
+import net.minecraft.server.v1_17_R1.PlayerInteractManager;
+import net.minecraft.server.v1_17_R1.WorldServer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java
@@ -9,18 +9,18 @@
 import com.denizenscript.denizen.nms.util.jnbt.CompoundTag;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_16_R3.entity.*;
-import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_17_R1.entity.*;
+import org.bukkit.craftbukkit.v1_17_R1.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -39,9 +39,9 @@ public class EntityHelperImpl extends EntityHelper {
 
     public static final Field RECIPE_BOOK_DISCOVERED_SET = ReflectionHelper.getFields(RecipeBook.class).get("recipes");
 
-    public static final MethodHandle ENTITY_SETPOSE = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_16_R3.Entity.class, "setPose", EntityPose.class);
+    public static final MethodHandle ENTITY_SETPOSE = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_17_R1.Entity.class, "setPose", EntityPose.class);
 
-    public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.Entity.class, "onGround");
+    public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_17_R1.Entity.class, "onGround");
 
     @Override
     public void setInvisible(Entity entity, boolean invisible) {
@@ -100,7 +100,7 @@ public double getDamageTo(LivingEntity attacker, Entity target) {
             else {
                 source = DamageSource.mobAttack(((CraftLivingEntity) attacker).getHandle());
             }
-            net.minecraft.server.v1_16_R3.Entity nmsTarget = ((CraftEntity) target).getHandle();
+            net.minecraft.server.v1_17_R1.Entity nmsTarget = ((CraftEntity) target).getHandle();
             if (nmsTarget.isInvulnerable(source)) {
                 return 0;
             }
@@ -204,7 +204,7 @@ public void forceInteraction(Player player, Location location) {
 
     @Override
     public Entity getEntity(World world, UUID uuid) {
-        net.minecraft.server.v1_16_R3.Entity entity = ((CraftWorld) world).getHandle().getEntity(uuid);
+        net.minecraft.server.v1_17_R1.Entity entity = ((CraftWorld) world).getHandle().getEntity(uuid);
         return entity == null ? null : entity.getBukkitEntity();
     }
 
@@ -246,7 +246,7 @@ public void stopFollowing(Entity follower) {
 
     @Override
     public void stopWalking(Entity entity) {
-        net.minecraft.server.v1_16_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle();
         if (!(nmsEntity instanceof EntityInsentient)) {
             return;
         }
@@ -255,7 +255,7 @@ public void stopWalking(Entity entity) {
 
     @Override
     public double getSpeed(Entity entity) {
-        net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
         if (!(nmsEntityEntity instanceof EntityInsentient)) {
             return 0.0;
         }
@@ -265,7 +265,7 @@ public double getSpeed(Entity entity) {
 
     @Override
     public void setSpeed(Entity entity, double speed) {
-        net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
         if (!(nmsEntityEntity instanceof EntityInsentient)) {
             return;
         }
@@ -280,7 +280,7 @@ public void follow(final Entity target, final Entity follower, final double spee
             return;
         }
 
-        final net.minecraft.server.v1_16_R3.Entity nmsEntityFollower = ((CraftEntity) follower).getHandle();
+        final net.minecraft.server.v1_17_R1.Entity nmsEntityFollower = ((CraftEntity) follower).getHandle();
         if (!(nmsEntityFollower instanceof EntityInsentient)) {
             return;
         }
@@ -351,7 +351,7 @@ public void walkTo(final LivingEntity entity, Location location, Double speed, f
             return;
         }
 
-        net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle();
         if (!(nmsEntityEntity instanceof EntityInsentient)) {
             return;
         }
@@ -440,7 +440,7 @@ public void sendHidePacket(Player pl, Entity entity) {
         EntityPlayer entityPlayer = craftPlayer.getHandle();
         if (entityPlayer.playerConnection != null && !craftPlayer.equals(entity)) {
             PlayerChunkMap tracker = ((WorldServer) craftPlayer.getHandle().world).getChunkProvider().playerChunkMap;
-            net.minecraft.server.v1_16_R3.Entity other = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_17_R1.Entity other = ((CraftEntity) entity).getHandle();
             PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
             if (entry != null) {
                 entry.clear(entityPlayer);
@@ -461,7 +461,7 @@ public void sendShowPacket(Player pl, Entity entity) {
         EntityPlayer entityPlayer = craftPlayer.getHandle();
         if (entityPlayer.playerConnection != null && !craftPlayer.equals(entity)) {
             PlayerChunkMap tracker = ((WorldServer) craftPlayer.getHandle().world).getChunkProvider().playerChunkMap;
-            net.minecraft.server.v1_16_R3.Entity other = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_17_R1.Entity other = ((CraftEntity) entity).getHandle();
             PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
             if (entry != null) {
                 entry.clear(entityPlayer);
@@ -487,21 +487,21 @@ else if (entity instanceof LivingEntity) {
             look(entity, yaw, pitch);
         }
         else {
-            net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle();
+            net.minecraft.server.v1_17_R1.Entity handle = ((CraftEntity) entity).getHandle();
             handle.yaw = yaw - 360;
             handle.pitch = pitch;
         }
     }
 
     @Override
     public float getBaseYaw(Entity entity) {
-        net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity handle = ((CraftEntity) entity).getHandle();
         return ((EntityLiving) handle).aB;
     }
 
     @Override
     public void look(Entity entity, float yaw, float pitch) {
-        net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity handle = ((CraftEntity) entity).getHandle();
         if (handle != null) {
             handle.yaw = yaw;
             if (handle instanceof EntityLiving) {
@@ -594,7 +594,7 @@ public void move(Entity entity, Vector vector) {
 
     @Override
     public void teleport(Entity entity, Location loc) {
-        net.minecraft.server.v1_16_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle();
         nmsEntity.yaw = loc.getYaw();
         nmsEntity.pitch = loc.getPitch();
         if (nmsEntity instanceof EntityPlayer) {
@@ -682,7 +682,7 @@ public void damage(LivingEntity target, float amount, Entity source, EntityDamag
             return;
         }
         EntityLiving nmsTarget = ((CraftLivingEntity) target).getHandle();
-        net.minecraft.server.v1_16_R3.Entity nmsSource = source == null ? null : ((CraftEntity) source).getHandle();
+        net.minecraft.server.v1_17_R1.Entity nmsSource = source == null ? null : ((CraftEntity) source).getHandle();
         CraftEventFactory.entityDamage = nmsSource;
         try {
             DamageSource src = DamageSource.GENERIC;

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/FishingHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/FishingHelperImpl.java
@@ -1,12 +1,12 @@
 package com.denizenscript.denizen.nms.v1_16.helpers;
 
 import com.denizenscript.denizen.nms.interfaces.FishingHelper;
-import net.minecraft.server.v1_16_R3.*;
+import net.minecraft.server.v1_17_R1.*;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFishHook;
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftFishHook;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;