From 45cf0c3a0147e11dda45f0ad2e7718fe8e163a8b Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Wed, 24 Jun 2020 20:54:27 -0700
Subject: [PATCH] fixes after testing

---
 dist/pom.xml                                                | 6 ++++++
 .../main/java/com/denizenscript/denizen/nms/NMSVersion.java | 3 ++-
 .../java/com/denizenscript/denizen/nms/v1_16/Handler.java   | 2 +-
 .../denizen/nms/v1_16/helpers/EntityHelperImpl.java         | 2 +-
 .../denizen/nms/v1_16/helpers/PacketHelperImpl.java         | 2 +-
 .../denizen/nms/v1_16/helpers/PlayerHelperImpl.java         | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index d83630cec7..3fcdf08f1d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -50,6 +50,12 @@
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.denizenscript</groupId>
+            <artifactId>denizen-v1_16</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.denizenscript</groupId>
             <artifactId>denizen-paper</artifactId>
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java
index aa228a02a1..6db4c49c44 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSVersion.java
@@ -6,7 +6,8 @@ public enum NMSVersion {
     v1_12,
     v1_13,
     v1_14,
-    v1_15;
+    v1_15,
+    v1_16;
 
     public boolean isAtLeast(NMSVersion version) {
         return ordinal() >= version.ordinal();
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 6f033bcc96..d10b71f944 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
@@ -74,7 +74,7 @@ public void undisableAsyncCatcher() {
 
     @Override
     public boolean isCorrectMappingsCode() {
-        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("5684afcc1835d966e1b6eb0ed3f72edb");
+        return ((CraftMagicNumbers) CraftMagicNumbers.INSTANCE).getMappingsVersion().equals("25afc67716a170ea965092c1067ff439");
     }
 
     @Override
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 ab3f6e6f5b..e23e348e08 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
@@ -40,7 +40,7 @@ public class EntityHelperImpl extends EntityHelper {
 
     public static final Field RECIPE_BOOK_DISCOVERED_SET = ReflectionHelper.getFields(RecipeBook.class).get("a");
 
-    public static final MethodHandle ENTITY_HOVER_TEXT_GETTER = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_16_R1.Entity.class, "bS");
+    public static final MethodHandle ENTITY_HOVER_TEXT_GETTER = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_16_R1.Entity.class, "ca");
 
     public static final MethodHandle ENTITY_SETPOSE = ReflectionHelper.getMethodHandle(net.minecraft.server.v1_16_R1.Entity.class, "setPose", EntityPose.class);
 
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 bfd029a22b..c845354ec6 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
@@ -125,7 +125,7 @@ else if (entityType == EntityType.ENDERMAN) {
 
     @Override
     public void showDemoScreen(Player player) {
-        sendPacket(player, new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.f, 0.0F));
+        sendPacket(player, new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.f, 0f));
     }
 
     @Override
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 c0b34711e0..6b61769f89 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
@@ -194,7 +194,7 @@ public void setTemporaryOp(Player player, boolean op) {
     @Override
     public void showEndCredits(Player player) {
         ((CraftPlayer) player).getHandle().viewingCredits = true;
-        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.e, 0.0F));
+        ((CraftPlayer) player).getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.e, 1f));
     }
 
     @Override