diff --git a/NachoSpigot-API/pom.xml b/NachoSpigot-API/pom.xml
index 60f3ebe07..160cdf18a 100644
--- a/NachoSpigot-API/pom.xml
+++ b/NachoSpigot-API/pom.xml
@@ -48,13 +48,13 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <!-- Update modified guava classes when updating -->
-            <version>31.0.1-jre</version>
+            <version>31.1-jre</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.avaje</groupId>
@@ -83,16 +83,15 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.21.0</version>
+            <version>3.21.2</version>
         </dependency>
         <!-- Kyori api -->
         <!-- https://mvnrepository.com/artifact/net.kyori/adventure-api -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-key</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.1</version>
         </dependency>
-
         <!-- testing -->
         <dependency>
             <groupId>junit</groupId>
@@ -108,13 +107,20 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>spigotmc-public</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+
     <build>
         <finalName>NachoSpigot-API</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.10.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/NachoSpigot-Server/pom.xml b/NachoSpigot-Server/pom.xml
index 4e5161035..071485ebd 100644
--- a/NachoSpigot-Server/pom.xml
+++ b/NachoSpigot-Server/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
-            <version>8.5.6</version>
+            <version>8.5.8</version>
         </dependency>
         <dependency>
             <groupId>net.jafama</groupId>
@@ -69,14 +69,14 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>3.2</version>
+            <version>5.0.4</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
-            <version>2.12.1</version>
+            <version>2.14.6</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.14</version>
+            <version>5.1.49</version>
             <type>jar</type>
             <scope>runtime</scope>
         </dependency>
@@ -100,28 +100,11 @@
             <artifactId>log4j-core</artifactId>
             <version>2.17.1</version>
             <scope>compile</scope>
-        </dependency>
-	    <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-iostreams</artifactId>
-            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.32</version>
+            <version>1.7.36</version>
             <scope>compile</scope>
         </dependency>
 
@@ -169,8 +152,8 @@
             <url>https://maven.elmakers.com/repository/</url>
         </repository>
         <repository>
-            <id>velocity-repo</id>
-            <url>https://repo.velocitypowered.com/snapshots/</url>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -180,18 +163,17 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>com.lukegb.mojo</groupId>
-                <artifactId>gitdescribe-maven-plugin</artifactId>
-                <version>1.3</version>
+                <groupId>net.md-5</groupId>
+                <artifactId>scriptus</artifactId>
+                <version>0.4</version>
                 <configuration>
-                    <outputPrefix>git-NachoSpigot-</outputPrefix>
                     <scmDirectory>..</scmDirectory>
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>initialize</phase>
                         <goals>
-                            <goal>gitdescribe</goal>
+                            <goal>describe</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -199,7 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.2.2</version>
                 <configuration>
                     <finalName>NachoSpigot</finalName>
                     <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
@@ -312,7 +294,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/BlockStateEnum.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/BlockStateEnum.java
index ca38c5959..a768d23be 100644
--- a/NachoSpigot-Server/src/main/java/net/minecraft/server/BlockStateEnum.java
+++ b/NachoSpigot-Server/src/main/java/net/minecraft/server/BlockStateEnum.java
@@ -42,8 +42,7 @@ public String a(T t0) {
 
     // TacoSpigot start
     @Override
-    public int
-getValueId(T value) {
+    public int getValueId(T value) {
         return value.ordinal();
     }
 
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/DataWatcher.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/DataWatcher.java
index 42b431d07..1e4c84a3e 100644
--- a/NachoSpigot-Server/src/main/java/net/minecraft/server/DataWatcher.java
+++ b/NachoSpigot-Server/src/main/java/net/minecraft/server/DataWatcher.java
@@ -30,7 +30,7 @@ public class DataWatcher {
     // TacoSpigot end
     // Spigot End
     private boolean e;
-//    private ReadWriteLock f = new ReentrantReadWriteLock(); // Spigot - Remove DataWatcher Locking
+    //private ReadWriteLock f = new ReentrantReadWriteLock(); // Spigot - Remove DataWatcher Locking
     boolean registrationLocked; // Spigot
 
     public DataWatcher(Entity entity) {
@@ -50,9 +50,9 @@ public <T> void a(int i, T t0) {
         } else {
             DataWatcher.WatchableObject datawatcher_watchableobject = new DataWatcher.WatchableObject(integer, i, t0); // Spigot
 
-//            this.f.writeLock().lock(); // Spigot - not required
+            //this.f.writeLock().lock(); // Spigot - not required
             this.dataValues.put(i, datawatcher_watchableobject); // Spigot
-//            this.f.writeLock().unlock(); // Spigot - not required
+            //this.f.writeLock().unlock(); // Spigot - not required
             this.b = false;
         }
     }
@@ -109,8 +109,8 @@ private DataWatcher.WatchableObject j(int i) {
 
         this.f.readLock().unlock();
         return datawatcher_watchableobject;
+        */
 
-         */
         return (WatchableObject) this.dataValues.get(i);
     }
 
@@ -157,7 +157,7 @@ public List<DataWatcher.WatchableObject> b() {
         ArrayList arraylist = null;
 
         if (this.e) {
-//            this.f.readLock().lock(); // Spigot - not required
+            //this.f.readLock().lock(); // Spigot - not required
             Iterator iterator = this.dataValues.values().iterator(); // Spigot // TacoSpigot
 
             while (iterator.hasNext()) {
@@ -169,7 +169,7 @@ public List<DataWatcher.WatchableObject> b() {
                         arraylist = Lists.newArrayList();
                     }
 
-                   // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
+                    // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
                     if ( datawatcher_watchableobject.b() instanceof ItemStack )
                     {
                         datawatcher_watchableobject = new WatchableObject(
@@ -184,7 +184,7 @@ public List<DataWatcher.WatchableObject> b() {
                 }
             }
 
-//            this.f.readLock().unlock(); // Spigot - not required
+            //this.f.readLock().unlock(); // Spigot - not required
         }
 
         this.e = false;
@@ -192,7 +192,7 @@ public List<DataWatcher.WatchableObject> b() {
     }
 
     public void a(PacketDataSerializer serializer) throws IOException {
-//        this.f.readLock().lock(); // Spigot - not required
+        //this.f.readLock().lock(); // Spigot - not required
         Iterator iterator = this.dataValues.values().iterator(); // Spigot // TacoSpigot
 
         while (iterator.hasNext()) {
@@ -201,14 +201,14 @@ public void a(PacketDataSerializer serializer) throws IOException {
             a(serializer, datawatcher_watchableobject);
         }
 
-//        this.f.readLock().unlock(); // Spigot - not required
+        //this.f.readLock().unlock(); // Spigot - not required
         serializer.writeByte(127);
     }
 
     public List<DataWatcher.WatchableObject> c() {
         ArrayList arraylist = Lists.newArrayList(); // Spigot
 
-//        this.f.readLock().lock(); // Spigot - not required
+        //this.f.readLock().lock(); // Spigot - not required
 
         arraylist.addAll(this.dataValues.values()); // Spigot // TacoSpigot
         // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
@@ -227,7 +227,7 @@ public List<DataWatcher.WatchableObject> c() {
         }
         // Spigot end
 
-//        this.f.readLock().unlock(); // Spigot - not required
+        //this.f.readLock().unlock(); // Spigot - not required
         return arraylist;
     }
 
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 18f7fdded..70882e82a 100644
--- a/NachoSpigot-Server/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/NachoSpigot-Server/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -30,9 +30,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
     private double derailedX = 0.5;
     private double derailedY = 0.5;
     private double derailedZ = 0.5;
-    private double flyingX = 0.95;
-    private double flyingY = 0.95;
-    private double flyingZ = 0.95;
+    private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
+    private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
+    private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
     public double maxSpeed = 0.4D;
     // CraftBukkit end
 
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/ItemBoat.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/ItemBoat.java
index eb62bbb68..0c00f07fe 100644
--- a/NachoSpigot-Server/src/main/java/net/minecraft/server/ItemBoat.java
+++ b/NachoSpigot-Server/src/main/java/net/minecraft/server/ItemBoat.java
@@ -52,8 +52,8 @@ public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
                 return itemstack;
             } else {
                 if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
-                    BlockPosition blockposition = movingobjectposition.a();
 
+                    BlockPosition blockposition = movingobjectposition.a();
                     // CraftBukkit start - Boat placement
                     org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, blockposition, movingobjectposition.direction, itemstack);
 
@@ -67,7 +67,6 @@ public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
                     }
 
                     EntityBoat entityboat = new EntityBoat(world, (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 1.0F), (double) ((float) blockposition.getZ() + 0.5F));
-
                     entityboat.yaw = (float) (((MathHelper.floor((double) (entityhuman.yaw * 4.0F / 360.0F) + 0.5D) & 3) - 1) * 90);
                     if (!world.getCubes(entityboat, entityboat.getBoundingBox().grow(-0.1D, -0.1D, -0.1D)).isEmpty()) {
                         return itemstack;
diff --git a/NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntityHopper.java b/NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntityHopper.java
index 460a43705..72b8b264a 100644
--- a/NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -569,7 +569,7 @@ private static ItemStack c(IInventory iinventory, ItemStack itemstack, int i, En
                         tileentityhopper.d(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot
                     }
 
-//                    iinventory.update(); // Paper
+                    //iinventory.update(); // Paper
                 }
 
                 iinventory.update();
diff --git a/README.md b/README.md
index c5c3812ab..289a91f02 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,8 @@ See: [Contributors Page](https://github.com/CobbleSword/NachoSpigot/graphs/contr
 [Paper-0352] Optimize BlockPosition helper methods by Spottedleaf
 [Paper-0353] Send nearby packets from world player list not server list by Mystiflow
 [Paper-0389] performance improvement for Chunk.getEntities by wea_ondara
-[Paper-0539] Optimize NetworkManager Exception Handling by Andrew Steinborn
 [Paper-0451] Reduce memory footprint of NBTTagCompound by spottedleaf
+[Paper-0539] Optimize NetworkManager Exception Handling by Andrew Steinborn
 [Paper-0797] Use Velocity compression and cipher natives
 [Paper-????] Cleanup allocated favicon ByteBuf by Shane Freeder
 
diff --git a/pom.xml b/pom.xml
index 84f6e9492..bca7519f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
     <groupId>dev.cobblesword.nachospigot</groupId>
     <artifactId>parent</artifactId>
     <version>dev-SNAPSHOT</version>