From d4ab0a597a7ce070f238442c7a21b02d0d1d7e52 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Tue, 3 Nov 2020 12:21:45 -0800 Subject: [PATCH] md_5 is just an asshole at this point, 3rd time the module's renamed --- .../denizen/nms/v1_16/Handler.java | 14 +++---- .../v1_16/helpers/AdvancementHelperImpl.java | 8 ++-- .../v1_16/helpers/AnimationHelperImpl.java | 6 +-- .../nms/v1_16/helpers/BlockHelperImpl.java | 38 +++++++++---------- .../nms/v1_16/helpers/ChunkHelperImpl.java | 10 ++--- .../v1_16/helpers/CustomEntityHelperImpl.java | 8 ++-- .../nms/v1_16/helpers/EntityHelperImpl.java | 38 +++++++++---------- .../nms/v1_16/helpers/FishingHelperImpl.java | 10 ++--- .../nms/v1_16/helpers/ItemHelperImpl.java | 30 +++++++-------- .../nms/v1_16/helpers/PacketHelperImpl.java | 22 +++++------ .../nms/v1_16/helpers/PlayerHelperImpl.java | 16 ++++---- .../nms/v1_16/helpers/WorldHelperImpl.java | 6 +-- .../denizen/nms/v1_16/impl/BiomeNMSImpl.java | 6 +-- .../v1_16/impl/ImprovedOfflinePlayerImpl.java | 6 +-- .../denizen/nms/v1_16/impl/ParticleImpl.java | 4 +- .../nms/v1_16/impl/ProfileEditorImpl.java | 6 +-- .../denizen/nms/v1_16/impl/SidebarImpl.java | 2 +- .../nms/v1_16/impl/blocks/BlockLightImpl.java | 6 +-- .../impl/entities/CraftFakeArrowImpl.java | 6 +-- .../impl/entities/CraftFakePlayerImpl.java | 4 +- .../entities/CraftItemProjectileImpl.java | 6 +-- .../impl/entities/EntityFakeArrowImpl.java | 12 +++--- .../impl/entities/EntityFakePlayerImpl.java | 4 +- .../entities/EntityItemProjectileImpl.java | 2 +- .../nms/v1_16/impl/jnbt/CompoundTagImpl.java | 2 +- .../network/fakes/FakeNetworkManagerImpl.java | 4 +- .../fakes/FakePlayerConnectionImpl.java | 2 +- .../handlers/AbstractListenerPlayInImpl.java | 4 +- .../handlers/DenizenNetworkManagerImpl.java | 6 +-- .../handlers/DenizenPacketListenerImpl.java | 2 +- .../network/handlers/FakeBlockHelper.java | 4 +- .../PacketInResourcePackStatusImpl.java | 2 +- .../packets/PacketInSteerVehicleImpl.java | 2 +- .../network/packets/PacketOutChatImpl.java | 6 +-- .../packets/PacketOutEntityMetadataImpl.java | 4 +- .../network/packets/PacketOutSetSlotImpl.java | 6 +-- .../packets/PacketOutSpawnEntityImpl.java | 2 +- .../packets/PacketOutTradeListImpl.java | 8 ++-- .../packets/PacketOutWindowItemsImpl.java | 8 ++-- 39 files changed, 166 insertions(+), 166 deletions(-) diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java index 83661caa73..e929957606 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java @@ -27,16 +27,16 @@ 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_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.block.Biome; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventoryCustom; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftChatMessage; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; +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.util.CraftChatMessage; +import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java index 66d45954ec..724c58e57d 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AdvancementHelperImpl.java @@ -4,12 +4,12 @@ import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizen.nms.v1_16.Handler; import com.denizenscript.denizen.utilities.FormattedTextHelper; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +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.entity.Player; import java.util.Collections; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java index 4af6faa767..a14d7211fb 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/AnimationHelperImpl.java @@ -1,9 +1,9 @@ package com.denizenscript.denizen.nms.v1_16.helpers; import com.denizenscript.denizen.nms.abstracts.AnimationHelper; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftHorse; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPolarBear; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftSkeleton; +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 org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java index 72df71fd16..83bdbee3e6 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/BlockHelperImpl.java @@ -11,18 +11,18 @@ 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_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Skull; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlockEntityState; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlockState; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftSkull; -import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; +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.event.world.PortalCreateEvent; import java.lang.invoke.MethodHandle; @@ -118,7 +118,7 @@ public void setNbtData(Block block, CompoundTag ctag) { te.load(((CraftBlockData) block.getBlockData()).getState(), ((CompoundTagImpl) ctag).toNMSTag()); } - private static net.minecraft.server.v1_16_R2.Block getBlockFrom(Material material) { + private static net.minecraft.server.v1_16_R3.Block getBlockFrom(Material material) { if (material == Material.FLOWER_POT) { return Blocks.FLOWER_POT; } @@ -140,22 +140,22 @@ public boolean hasBlock(Material material) { @Override public boolean setBlockResistance(Material material, float resistance) { - net.minecraft.server.v1_16_R2.Block block = getBlockFrom(material); + net.minecraft.server.v1_16_R3.Block block = getBlockFrom(material); if (block == null) { return false; } // protected final float durability; - ReflectionHelper.setFieldValue(net.minecraft.server.v1_16_R2.BlockBase.class, "durability", block, resistance); + ReflectionHelper.setFieldValue(net.minecraft.server.v1_16_R3.BlockBase.class, "durability", block, resistance); return true; } @Override public float getBlockResistance(Material material) { - net.minecraft.server.v1_16_R2.Block block = getBlockFrom(material); + net.minecraft.server.v1_16_R3.Block block = getBlockFrom(material); if (block == null) { return 0; } - return ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R2.BlockBase.class, "durability", block); + return ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R3.BlockBase.class, "durability", block); } @Override @@ -163,19 +163,19 @@ 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_R2.BlockBase.class).get("material"); + public static final Field BLOCK_MATERIAL = ReflectionHelper.getFields(net.minecraft.server.v1_16_R3.BlockBase.class).get("material"); - public static final MethodHandle MATERIAL_PUSH_REACTION_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R2.Material.class, "S"); + public static final MethodHandle MATERIAL_PUSH_REACTION_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.Material.class, "S"); - public static final MethodHandle BLOCK_STRENGTH_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R2.BlockBase.BlockData.class, "strength"); + public static final MethodHandle BLOCK_STRENGTH_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.BlockBase.BlockData.class, "strength"); - public net.minecraft.server.v1_16_R2.Block getMaterialBlock(Material bukkitMaterial) { + public net.minecraft.server.v1_16_R3.Block getMaterialBlock(Material bukkitMaterial) { return ((CraftBlockData) bukkitMaterial.createBlockData()).getState().getBlock(); } - public net.minecraft.server.v1_16_R2.Material getInternalMaterial(Material bukkitMaterial) { + public net.minecraft.server.v1_16_R3.Material getInternalMaterial(Material bukkitMaterial) { try { - return (net.minecraft.server.v1_16_R2.Material) BLOCK_MATERIAL.get(getMaterialBlock(bukkitMaterial)); + return (net.minecraft.server.v1_16_R3.Material) BLOCK_MATERIAL.get(getMaterialBlock(bukkitMaterial)); } catch (Throwable ex) { Debug.echoError(ex); diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ChunkHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ChunkHelperImpl.java index 815b62bb90..3adc2a6ab1 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ChunkHelperImpl.java +++ b/v1_16/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_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.World; import org.bukkit.Chunk; -import org.bukkit.craftbukkit.v1_16_R2.CraftChunk; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.CraftChunk; +import org.bukkit.craftbukkit.v1_16_R3.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_R2.World.class).get("serverThread"); - worldThreadFieldSetter = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R2.World.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"); } public Thread resetServerThread; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/CustomEntityHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/CustomEntityHelperImpl.java index 5b8e421c1f..5127b6c213 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/CustomEntityHelperImpl.java +++ b/v1_16/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_R2.PlayerInteractManager; -import net.minecraft.server.v1_16_R2.WorldServer; +import net.minecraft.server.v1_16_R3.PlayerInteractManager; +import net.minecraft.server.v1_16_R3.WorldServer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.inventory.ItemStack; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java index 4878e0a798..005c73c366 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/EntityHelperImpl.java @@ -10,17 +10,17 @@ import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizen.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; 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_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; -import org.bukkit.craftbukkit.v1_16_R2.entity.*; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +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.inventory.CraftItemStack; import org.bukkit.entity.*; import org.bukkit.entity.Entity; import org.bukkit.event.entity.EntityTargetEvent; @@ -38,9 +38,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_R2.Entity.class, "setPose", EntityPose.class); + public static final MethodHandle ENTITY_SETPOSE = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_16_R3.Entity.class, "setPose", EntityPose.class); - public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R2.Entity.class, "onGround"); + public static final MethodHandle ENTITY_ONGROUND_SETTER = ReflectionHelper.getFinalSetter(net.minecraft.server.v1_16_R3.Entity.class, "onGround"); @Override public double getAbsorption(LivingEntity entity) { @@ -92,7 +92,7 @@ public double getDamageTo(LivingEntity attacker, Entity target) { else { source = DamageSource.mobAttack(((CraftLivingEntity) attacker).getHandle()); } - net.minecraft.server.v1_16_R2.Entity nmsTarget = ((CraftEntity) target).getHandle(); + net.minecraft.server.v1_16_R3.Entity nmsTarget = ((CraftEntity) target).getHandle(); if (nmsTarget.isInvulnerable(source)) { return 0; } @@ -196,7 +196,7 @@ public void forceInteraction(Player player, Location location) { @Override public Entity getEntity(World world, UUID uuid) { - net.minecraft.server.v1_16_R2.Entity entity = ((CraftWorld) world).getHandle().getEntity(uuid); + net.minecraft.server.v1_16_R3.Entity entity = ((CraftWorld) world).getHandle().getEntity(uuid); return entity == null ? null : entity.getBukkitEntity(); } @@ -238,7 +238,7 @@ public void stopFollowing(Entity follower) { @Override public void stopWalking(Entity entity) { - net.minecraft.server.v1_16_R2.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle(); if (!(nmsEntity instanceof EntityInsentient)) { return; } @@ -247,7 +247,7 @@ public void stopWalking(Entity entity) { @Override public double getSpeed(Entity entity) { - net.minecraft.server.v1_16_R2.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); if (!(nmsEntityEntity instanceof EntityInsentient)) { return 0.0; } @@ -257,7 +257,7 @@ public double getSpeed(Entity entity) { @Override public void setSpeed(Entity entity, double speed) { - net.minecraft.server.v1_16_R2.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); if (!(nmsEntityEntity instanceof EntityInsentient)) { return; } @@ -272,7 +272,7 @@ public void follow(final Entity target, final Entity follower, final double spee return; } - final net.minecraft.server.v1_16_R2.Entity nmsEntityFollower = ((CraftEntity) follower).getHandle(); + final net.minecraft.server.v1_16_R3.Entity nmsEntityFollower = ((CraftEntity) follower).getHandle(); if (!(nmsEntityFollower instanceof EntityInsentient)) { return; } @@ -338,7 +338,7 @@ public void walkTo(final LivingEntity entity, Location location, double speed, f return; } - net.minecraft.server.v1_16_R2.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity nmsEntityEntity = ((CraftEntity) entity).getHandle(); if (!(nmsEntityEntity instanceof EntityInsentient)) { return; } @@ -424,7 +424,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_R2.Entity other = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity other = ((CraftEntity) entity).getHandle(); PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId()); if (entry != null) { entry.clear(entityPlayer); @@ -445,7 +445,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_R2.Entity other = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity other = ((CraftEntity) entity).getHandle(); PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId()); if (entry != null) { entry.clear(entityPlayer); @@ -471,7 +471,7 @@ else if (entity instanceof LivingEntity) { look(entity, yaw, pitch); } else { - net.minecraft.server.v1_16_R2.Entity handle = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle(); handle.yaw = yaw; handle.pitch = pitch; } @@ -479,13 +479,13 @@ else if (entity instanceof LivingEntity) { @Override public float getBaseYaw(Entity entity) { - net.minecraft.server.v1_16_R2.Entity handle = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle(); return ((EntityLiving) handle).aD; } @Override public void look(Entity entity, float yaw, float pitch) { - net.minecraft.server.v1_16_R2.Entity handle = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_16_R3.Entity handle = ((CraftEntity) entity).getHandle(); if (handle != null) { handle.yaw = yaw; if (handle instanceof EntityLiving) { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/FishingHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/FishingHelperImpl.java index 057c7a2880..1a03599886 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/FishingHelperImpl.java +++ b/v1_16/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_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftFishHook; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +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.entity.FishHook; import org.bukkit.entity.Player; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java index 35a94e01de..4d269a8f03 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java @@ -16,17 +16,17 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.chat.ComponentSerializer; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventoryPlayer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftNamespacedKey; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_16_R3.util.CraftNamespacedKey; import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.Recipe; @@ -184,7 +184,7 @@ public String getRawHoverText(ItemStack itemStack) { @Override public PlayerProfile getSkullSkin(ItemStack is) { - net.minecraft.server.v1_16_R2.ItemStack itemStack = CraftItemStack.asNMSCopy(is); + net.minecraft.server.v1_16_R3.ItemStack itemStack = CraftItemStack.asNMSCopy(is); if (itemStack.hasTag()) { NBTTagCompound tag = itemStack.getTag(); if (tag.hasKeyOfType("SkullOwner", 10)) { @@ -212,7 +212,7 @@ public ItemStack setSkullSkin(ItemStack itemStack, PlayerProfile playerProfile) gameProfile.getProperties().put("textures", new Property("textures", playerProfile.getTexture())); } } - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound tag = nmsItemStack.hasTag() ? nmsItemStack.getTag() : new NBTTagCompound(); tag.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameProfile)); nmsItemStack.setTag(tag); @@ -221,7 +221,7 @@ public ItemStack setSkullSkin(ItemStack itemStack, PlayerProfile playerProfile) @Override public ItemStack addNbtData(ItemStack itemStack, String key, Tag value) { - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); NBTTagCompound tag = nmsItemStack.hasTag() ? nmsItemStack.getTag() : new NBTTagCompound(); CompoundTag compound = CompoundTagImpl.fromNMSTag(tag).createBuilder().put(key, value).build(); nmsItemStack.setTag(((CompoundTagImpl) compound).toNMSTag()); @@ -230,7 +230,7 @@ public ItemStack addNbtData(ItemStack itemStack, String key, Tag value) { @Override public CompoundTag getNbtData(ItemStack itemStack) { - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); if (nmsItemStack != null && nmsItemStack.hasTag()) { return CompoundTagImpl.fromNMSTag(nmsItemStack.getTag()); } @@ -239,7 +239,7 @@ public CompoundTag getNbtData(ItemStack itemStack) { @Override public ItemStack setNbtData(ItemStack itemStack, CompoundTag compoundTag) { - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack); nmsItemStack.setTag(((CompoundTagImpl) compoundTag).toNMSTag()); return CraftItemStack.asBukkitCopy(nmsItemStack); } @@ -274,7 +274,7 @@ public String getDisplayName(ItemTag item) { if (!item.getItemMeta().hasDisplayName()) { return null; } - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); String jsonText = ((NBTTagCompound) nmsItemStack.getTag().get("display")).getString("Name"); BaseComponent[] nameComponent = ComponentSerializer.parse(jsonText); return FormattedTextHelper.stringify(nameComponent); @@ -285,7 +285,7 @@ public List getLore(ItemTag item) { if (!item.getItemMeta().hasLore()) { return null; } - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); NBTTagList list = ((NBTTagCompound) nmsItemStack.getTag().get("display")).getList("Lore", 8); List outList = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { @@ -297,7 +297,7 @@ public List getLore(ItemTag item) { @Override public void setDisplayName(ItemTag item, String name) { - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); NBTTagCompound tag = nmsItemStack.getOrCreateTag(); NBTTagCompound display = tag.getCompound("display"); if (!tag.hasKey("display")) { @@ -318,7 +318,7 @@ public void setDisplayName(ItemTag item, String name) { @Override public void setLore(ItemTag item, List lore) { - net.minecraft.server.v1_16_R2.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); + net.minecraft.server.v1_16_R3.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(item.getItemStack()); NBTTagCompound tag = nmsItemStack.getOrCreateTag(); NBTTagCompound display = tag.getCompound("display"); if (!tag.hasKey("display")) { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PacketHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PacketHelperImpl.java index 64fdfade16..f82974e7af 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PacketHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PacketHelperImpl.java @@ -10,17 +10,17 @@ import com.denizenscript.denizen.utilities.FormattedTextHelper; import com.denizenscript.denizen.utilities.debugging.Debug; import com.mojang.datafixers.util.Pair; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.block.banner.Pattern; -import org.bukkit.craftbukkit.v1_16_R2.CraftEquipmentSlot; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R3.CraftEquipmentSlot; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; @@ -194,8 +194,8 @@ public void showTitle(Player player, String title, String subtitle, int fadeInTi @Override public void showEquipment(Player player, LivingEntity entity, EquipmentSlot equipmentSlot, ItemStack itemStack) { - Pair pair = new Pair<>(CraftEquipmentSlot.getNMS(equipmentSlot), CraftItemStack.asNMSCopy(itemStack)); - ArrayList> pairList = new ArrayList<>(); + Pair pair = new Pair<>(CraftEquipmentSlot.getNMS(equipmentSlot), CraftItemStack.asNMSCopy(itemStack)); + ArrayList> pairList = new ArrayList<>(); pairList.add(pair); sendPacket(player, new PacketPlayOutEntityEquipment(entity.getEntityId(), pairList)); } @@ -267,8 +267,8 @@ public void forceSpectate(Player player, Entity entity) { static { try { - ENTITY_CUSTOM_NAME_METADATA = ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R2.Entity.class, "aq", null); - ENTITY_CUSTOM_NAME_VISIBLE_METADATA = ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R2.Entity.class, "ar", null); + ENTITY_CUSTOM_NAME_METADATA = ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R3.Entity.class, "aq", null); + ENTITY_CUSTOM_NAME_VISIBLE_METADATA = ReflectionHelper.getFieldValue(net.minecraft.server.v1_16_R3.Entity.class, "ar", null); } catch (Throwable ex) { ex.printStackTrace(); diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PlayerHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PlayerHelperImpl.java index eda105b5fa..001c9a7347 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PlayerHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/PlayerHelperImpl.java @@ -13,15 +13,15 @@ import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; import com.mojang.datafixers.util.Pair; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.*; import org.bukkit.Chunk; import org.bukkit.SoundCategory; import org.bukkit.boss.BossBar; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.boss.CraftBossBar; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.boss.CraftBossBar; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -56,7 +56,7 @@ public class PlayerHelperImpl extends PlayerHelper { @Override public void stopSound(Player player, String sound, SoundCategory category) { MinecraftKey soundKey = sound == null ? null : new MinecraftKey(sound); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutStopSound(soundKey, net.minecraft.server.v1_16_R2.SoundCategory.valueOf(category.name()))); + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutStopSound(soundKey, net.minecraft.server.v1_16_R3.SoundCategory.valueOf(category.name()))); } @Override @@ -74,7 +74,7 @@ public void deTrackEntity(Player player, Entity entity) { @Override public Entity sendEntitySpawn(Player player, EntityType entityType, Location location, ArrayList mechanisms, int customId, UUID customUUID) { PlayerConnection conn = ((CraftPlayer) player).getHandle().playerConnection; - net.minecraft.server.v1_16_R2.Entity nmsEntity = ((CraftWorld) location.getWorld()).createEntity(location, entityType.getEntityClass()); + net.minecraft.server.v1_16_R3.Entity nmsEntity = ((CraftWorld) location.getWorld()).createEntity(location, entityType.getEntityClass()); if (customUUID != null) { nmsEntity.e(customId); nmsEntity.a_(customUUID); @@ -96,7 +96,7 @@ public Entity sendEntitySpawn(Player player, EntityType entityType, Location loc ItemStack nmsItemStack = nmsLivingEntity.getEquipment(itemSlot); if (nmsItemStack != null && nmsItemStack.getItem() != Items.AIR) { Pair pair = new Pair<>(itemSlot, nmsItemStack); - ArrayList> pairList = new ArrayList<>(); + ArrayList> pairList = new ArrayList<>(); pairList.add(pair); conn.sendPacket(new PacketPlayOutEntityEquipment(nmsLivingEntity.getId(), pairList)); } diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/WorldHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/WorldHelperImpl.java index dbcaf9f1d6..936f249f17 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/WorldHelperImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/WorldHelperImpl.java @@ -3,10 +3,10 @@ import com.denizenscript.denizen.nms.interfaces.WorldAccess; import com.denizenscript.denizen.nms.interfaces.WorldHelper; import com.denizenscript.denizencore.utilities.ReflectionHelper; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; public class WorldHelperImpl implements WorldHelper { @@ -20,7 +20,7 @@ public boolean isStatic(World world) { @Override public void setStatic(World world, boolean isStatic) { WorldServer worldServer = ((CraftWorld) world).getHandle(); - ReflectionHelper.setFieldValue(net.minecraft.server.v1_16_R2.World.class, "isClientSide", worldServer, isStatic); + ReflectionHelper.setFieldValue(net.minecraft.server.v1_16_R3.World.class, "isClientSide", worldServer, isStatic); } @Override diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/BiomeNMSImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/BiomeNMSImpl.java index 5b78bc293e..678eb83b59 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/BiomeNMSImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/BiomeNMSImpl.java @@ -2,12 +2,12 @@ import com.denizenscript.denizen.nms.abstracts.BiomeNMS; import com.denizenscript.denizencore.utilities.ReflectionHelper; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.block.Biome; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ImprovedOfflinePlayerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ImprovedOfflinePlayerImpl.java index cfd7f07ed8..2029fd242b 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ImprovedOfflinePlayerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ImprovedOfflinePlayerImpl.java @@ -3,10 +3,10 @@ import com.denizenscript.denizen.nms.abstracts.ImprovedOfflinePlayer; import com.denizenscript.denizen.nms.v1_16.impl.jnbt.CompoundTagImpl; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventoryPlayer; import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ParticleImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ParticleImpl.java index 5ef911f124..bb4f268eb1 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ParticleImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ParticleImpl.java @@ -2,8 +2,8 @@ import com.denizenscript.denizen.nms.interfaces.Particle; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData; -import org.bukkit.craftbukkit.v1_16_R2.util.CraftMagicNumbers; +import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_16_R3.util.CraftMagicNumbers; import org.bukkit.entity.Player; import org.bukkit.material.MaterialData; import org.bukkit.util.Vector; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ProfileEditorImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ProfileEditorImpl.java index 7d572ad2e8..0269a4307b 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ProfileEditorImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/ProfileEditorImpl.java @@ -11,10 +11,10 @@ import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.CoreUtilities; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/SidebarImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/SidebarImpl.java index 2711d9c96c..cc1d168451 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/SidebarImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/SidebarImpl.java @@ -5,7 +5,7 @@ import com.denizenscript.denizen.nms.abstracts.Sidebar; import com.denizenscript.denizen.utilities.FormattedTextHelper; import com.denizenscript.denizen.utilities.Utilities; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/blocks/BlockLightImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/blocks/BlockLightImpl.java index 105a46e17c..881d5f09fa 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/blocks/BlockLightImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/blocks/BlockLightImpl.java @@ -4,11 +4,11 @@ import com.denizenscript.denizen.nms.abstracts.BlockLight; import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.CraftChunk; -import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_16_R3.CraftChunk; +import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; import org.bukkit.util.Vector; import java.lang.invoke.MethodHandle; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakeArrowImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakeArrowImpl.java index a67db15243..b8e2340534 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakeArrowImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakeArrowImpl.java @@ -1,9 +1,9 @@ package com.denizenscript.denizen.nms.v1_16.impl.entities; import com.denizenscript.denizen.nms.interfaces.FakeArrow; -import net.minecraft.server.v1_16_R2.EntityArrow; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftArrow; +import net.minecraft.server.v1_16_R3.EntityArrow; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftArrow; public class CraftFakeArrowImpl extends CraftArrow implements FakeArrow { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakePlayerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakePlayerImpl.java index 4d938b7263..9da8722416 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakePlayerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftFakePlayerImpl.java @@ -4,8 +4,8 @@ import com.denizenscript.denizen.nms.NMSHandler; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftItemProjectileImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftItemProjectileImpl.java index 6247441126..0414a7ab07 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftItemProjectileImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/CraftItemProjectileImpl.java @@ -1,9 +1,9 @@ package com.denizenscript.denizen.nms.v1_16.impl.entities; import com.denizenscript.denizen.nms.interfaces.ItemProjectile; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; import org.bukkit.projectiles.ProjectileSource; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakeArrowImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakeArrowImpl.java index 80b204b162..02fbb98e30 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakeArrowImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakeArrowImpl.java @@ -2,14 +2,14 @@ import com.denizenscript.denizen.nms.v1_16.Handler; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.EntitySpectralArrow; -import net.minecraft.server.v1_16_R2.EntityTypes; -import net.minecraft.server.v1_16_R2.ItemStack; -import net.minecraft.server.v1_16_R2.Items; +import net.minecraft.server.v1_16_R3.EntitySpectralArrow; +import net.minecraft.server.v1_16_R3.EntityTypes; +import net.minecraft.server.v1_16_R3.ItemStack; +import net.minecraft.server.v1_16_R3.Items; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; -import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; public class EntityFakeArrowImpl extends EntitySpectralArrow { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakePlayerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakePlayerImpl.java index ffd6715635..5695563cec 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakePlayerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityFakePlayerImpl.java @@ -5,9 +5,9 @@ import com.denizenscript.denizen.nms.v1_16.impl.network.fakes.FakePlayerConnectionImpl; import com.mojang.authlib.GameProfile; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R2.CraftServer; +import org.bukkit.craftbukkit.v1_16_R3.CraftServer; import org.bukkit.event.entity.CreatureSpawnEvent; public class EntityFakePlayerImpl extends EntityPlayer { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityItemProjectileImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityItemProjectileImpl.java index 13e9a23d25..b77e1d9eab 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityItemProjectileImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/entities/EntityItemProjectileImpl.java @@ -3,7 +3,7 @@ import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizen.utilities.debugging.Debug; import com.google.common.base.Preconditions; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Location; import java.lang.invoke.MethodHandle; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/jnbt/CompoundTagImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/jnbt/CompoundTagImpl.java index fd46e457b3..db0e50db24 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/jnbt/CompoundTagImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/jnbt/CompoundTagImpl.java @@ -2,7 +2,7 @@ import com.denizenscript.denizen.nms.util.jnbt.*; import com.denizenscript.denizen.nms.util.jnbt.Tag; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import java.util.HashMap; import java.util.List; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakeNetworkManagerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakeNetworkManagerImpl.java index f589816574..2e6e6e9285 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakeNetworkManagerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakeNetworkManagerImpl.java @@ -1,7 +1,7 @@ package com.denizenscript.denizen.nms.v1_16.impl.network.fakes; -import net.minecraft.server.v1_16_R2.EnumProtocolDirection; -import net.minecraft.server.v1_16_R2.NetworkManager; +import net.minecraft.server.v1_16_R3.EnumProtocolDirection; +import net.minecraft.server.v1_16_R3.NetworkManager; import java.net.SocketAddress; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakePlayerConnectionImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakePlayerConnectionImpl.java index de98cfbf3a..ad639319d4 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakePlayerConnectionImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/fakes/FakePlayerConnectionImpl.java @@ -1,6 +1,6 @@ package com.denizenscript.denizen.nms.v1_16.impl.network.fakes; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; public class FakePlayerConnectionImpl extends PlayerConnection { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/AbstractListenerPlayInImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/AbstractListenerPlayInImpl.java index 3afd67ca51..c684e8e5e0 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/AbstractListenerPlayInImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/AbstractListenerPlayInImpl.java @@ -4,9 +4,9 @@ import com.denizenscript.denizencore.utilities.debugging.Debug; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.event.player.PlayerTeleportEvent; import javax.annotation.Nullable; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java index 7a30079c97..f76dcdc40c 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java @@ -21,10 +21,10 @@ import com.denizenscript.denizen.nms.NMSHandler; import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenPacketListenerImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenPacketListenerImpl.java index 7a399c34cf..5d92a980a1 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenPacketListenerImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenPacketListenerImpl.java @@ -7,7 +7,7 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import com.denizenscript.denizen.nms.NMSHandler; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java index d5efd3b6d0..2c3f88835f 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java @@ -5,8 +5,8 @@ import com.denizenscript.denizen.utilities.blocks.FakeBlock; import com.denizenscript.denizen.utilities.debugging.Debug; import io.netty.buffer.Unpooled; -import net.minecraft.server.v1_16_R2.*; -import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData; +import net.minecraft.server.v1_16_R3.*; +import org.bukkit.craftbukkit.v1_16_R3.block.data.CraftBlockData; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInResourcePackStatusImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInResourcePackStatusImpl.java index 6a9a0ba0fa..a1c403f5fc 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInResourcePackStatusImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInResourcePackStatusImpl.java @@ -1,7 +1,7 @@ package com.denizenscript.denizen.nms.v1_16.impl.network.packets; import com.denizenscript.denizen.nms.interfaces.packets.PacketInResourcePackStatus; -import net.minecraft.server.v1_16_R2.PacketPlayInResourcePackStatus; +import net.minecraft.server.v1_16_R3.PacketPlayInResourcePackStatus; public class PacketInResourcePackStatusImpl implements PacketInResourcePackStatus { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInSteerVehicleImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInSteerVehicleImpl.java index 720f5532d9..6094159c9e 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInSteerVehicleImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketInSteerVehicleImpl.java @@ -1,7 +1,7 @@ package com.denizenscript.denizen.nms.v1_16.impl.network.packets; import com.denizenscript.denizen.nms.interfaces.packets.PacketInSteerVehicle; -import net.minecraft.server.v1_16_R2.PacketPlayInSteerVehicle; +import net.minecraft.server.v1_16_R3.PacketPlayInSteerVehicle; public class PacketInSteerVehicleImpl implements PacketInSteerVehicle { diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java index 19ed945e8d..f4ea8a2c53 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutChatImpl.java @@ -8,9 +8,9 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.chat.ComponentSerializer; -import net.minecraft.server.v1_16_R2.ChatMessageType; -import net.minecraft.server.v1_16_R2.IChatBaseComponent; -import net.minecraft.server.v1_16_R2.PacketPlayOutChat; +import net.minecraft.server.v1_16_R3.ChatMessageType; +import net.minecraft.server.v1_16_R3.IChatBaseComponent; +import net.minecraft.server.v1_16_R3.PacketPlayOutChat; import java.lang.reflect.Field; import java.util.Map; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutEntityMetadataImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutEntityMetadataImpl.java index a8303ffaf0..0332bfd9c4 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutEntityMetadataImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutEntityMetadataImpl.java @@ -3,8 +3,8 @@ import com.denizenscript.denizen.nms.interfaces.packets.PacketOutEntityMetadata; import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.DataWatcher; -import net.minecraft.server.v1_16_R2.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_16_R3.DataWatcher; +import net.minecraft.server.v1_16_R3.PacketPlayOutEntityMetadata; import java.lang.reflect.Field; import java.util.List; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSetSlotImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSetSlotImpl.java index 971a4e483c..24f1d13fba 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSetSlotImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSetSlotImpl.java @@ -3,9 +3,9 @@ import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSetSlot; import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.ItemStack; -import net.minecraft.server.v1_16_R2.PacketPlayOutSetSlot; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import net.minecraft.server.v1_16_R3.ItemStack; +import net.minecraft.server.v1_16_R3.PacketPlayOutSetSlot; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import java.lang.reflect.Field; import java.util.Map; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSpawnEntityImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSpawnEntityImpl.java index f1de1504f1..a45a861d74 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSpawnEntityImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutSpawnEntityImpl.java @@ -2,7 +2,7 @@ import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSpawnEntity; import com.denizenscript.denizencore.utilities.ReflectionHelper; -import net.minecraft.server.v1_16_R2.*; +import net.minecraft.server.v1_16_R3.*; import java.util.UUID; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutTradeListImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutTradeListImpl.java index 9a2a64aa7a..7378f52477 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutTradeListImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutTradeListImpl.java @@ -4,10 +4,10 @@ import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizen.nms.util.TradeOffer; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.MerchantRecipe; -import net.minecraft.server.v1_16_R2.MerchantRecipeList; -import net.minecraft.server.v1_16_R2.PacketPlayOutOpenWindowMerchant; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import net.minecraft.server.v1_16_R3.MerchantRecipe; +import net.minecraft.server.v1_16_R3.MerchantRecipeList; +import net.minecraft.server.v1_16_R3.PacketPlayOutOpenWindowMerchant; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutWindowItemsImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutWindowItemsImpl.java index 46688f501a..a07c5ccad5 100644 --- a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutWindowItemsImpl.java +++ b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/impl/network/packets/PacketOutWindowItemsImpl.java @@ -3,10 +3,10 @@ import com.denizenscript.denizen.nms.interfaces.packets.PacketOutWindowItems; import com.denizenscript.denizencore.utilities.ReflectionHelper; import com.denizenscript.denizencore.utilities.debugging.Debug; -import net.minecraft.server.v1_16_R2.ItemStack; -import net.minecraft.server.v1_16_R2.NonNullList; -import net.minecraft.server.v1_16_R2.PacketPlayOutWindowItems; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; +import net.minecraft.server.v1_16_R3.ItemStack; +import net.minecraft.server.v1_16_R3.NonNullList; +import net.minecraft.server.v1_16_R3.PacketPlayOutWindowItems; +import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import java.lang.reflect.Field; import java.util.List;