diff --git a/README.md b/README.md
index 5792eed..e88e513 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Compiled artifacts and additional information can be found on Ore: https://ore.s
 
 ## Developers
 
-SuperPiston requires Java 17 and Gradle 7 to build.
+SuperPiston requires Java 17 to build.
 
 Tasks:
 
diff --git a/build.gradle b/build.gradle
index 5d9d733..cb35961 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@
 
 plugins {
     id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
 }
 
@@ -33,7 +33,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(8)
+            languageVersion = JavaLanguageVersion.of(17)
         }
     }
 
@@ -58,7 +58,7 @@ allprojects {
     }
 
     jar {
-        classifier 'base'
+        archiveClassifier = 'base'
     }
 }
 
@@ -66,7 +66,7 @@ subprojects {
     apply plugin: 'com.github.johnrengelman.shadow'
 
     shadowJar {
-        classifier 'shadow'
+        archiveClassifier = 'shadow'
         configurations = [project.configurations.shade]
 
         dependencies {
@@ -92,14 +92,14 @@ subprojects {
 }
 
 dependencies {
-    provided 'org.spongepowered:sponge:1.16.5-8.1.0-SNAPSHOT:dev'
-    provided 'org.spongepowered:mixin:0.8.4'
-    provided 'org.ow2.asm:asm-util:9.2'
+    provided 'org.spongepowered:sponge:1.19.4-10.0.0-SNAPSHOT:dev'
+    provided 'org.spongepowered:mixin:0.8.5'
+    provided 'org.ow2.asm:asm-util:9.7'
 
-    shade 'net.smoofyuniverse:oreupdater:1.1.2'
-    shade 'net.smoofyuniverse:worldmap:1.1.0'
+    shade 'net.smoofyuniverse:oreupdater:1.2.0'
+    shade 'net.smoofyuniverse:worldmap:1.2.0'
 }
 
 minecraft {
-    version '1.16.5'
+    version '1.19.4'
 }
diff --git a/forge/build.gradle b/forge/build.gradle
index 070bf2c..b97bfd2 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 plugins {
-    id "net.smoofyuniverse.loom" version "0.12.0-SNAPSHOT"
+    id "dev.architectury.loom" version "1.5-SNAPSHOT"
 }
 
 archivesBaseName = 'SuperPiston-forge'
@@ -38,11 +38,11 @@ configurations {
 }
 
 dependencies {
-    minecraft 'com.mojang:minecraft:1.16.5'
-    forge 'net.minecraftforge:forge:1.16.5-36.2.5'
+    minecraft 'com.mojang:minecraft:1.19.4'
+    forge 'net.minecraftforge:forge:1.19.4-45.1.19'
     mappings loom.officialMojangMappings()
 
-    spongeforge 'org.spongepowered:spongeforge:1.16.5-36.2.5-8.1.0-RC1185:universal'
+    spongeforge('org.spongepowered:spongeforge:1.19.4-45.1.19-10.0.0-RC1552:universal') { transitive = false }
 }
 
 remapJar {
@@ -52,7 +52,7 @@ remapJar {
 
 build.dependsOn remapJar
 
-task setupServer(type: Copy) {
+tasks.register('setupServer', Copy) {
     into 'run/mods'
 
     from configurations.spongeforge
diff --git a/forge/src/main/resources/META-INF/sponge_plugins.json b/forge/src/main/resources/META-INF/sponge_plugins.json
index 4d712b2..80f93ec 100644
--- a/forge/src/main/resources/META-INF/sponge_plugins.json
+++ b/forge/src/main/resources/META-INF/sponge_plugins.json
@@ -25,13 +25,13 @@
       "dependencies": [
         {
           "id": "spongeapi",
-          "version": "8.1.0",
+          "version": "10.0.0",
           "load-order": "AFTER",
           "optional": false
         },
         {
           "id": "spongeforge",
-          "version": "8.1.0",
+          "version": "10.0.0",
           "load-order": "AFTER",
           "optional": false
         }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7454180
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..48c0a02
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..c53aefa
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
index 0d4bc24..77f110a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,6 @@ pluginManagement {
     repositories {
         maven { url "https://repo.spongepowered.org/repository/maven-public" }
         maven { url "https://maven.architectury.dev/" }
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         gradlePluginPortal()
     }
 }
diff --git a/src/main/java/net/smoofyuniverse/superpiston/impl/BlockUtil.java b/src/main/java/net/smoofyuniverse/superpiston/impl/BlockUtil.java
index 15d692e..67d67d9 100644
--- a/src/main/java/net/smoofyuniverse/superpiston/impl/BlockUtil.java
+++ b/src/main/java/net/smoofyuniverse/superpiston/impl/BlockUtil.java
@@ -27,8 +27,8 @@
 
 public class BlockUtil {
 
-	public static boolean isEntityBlock(org.spongepowered.api.block.BlockState state) {
-		return ((BlockState) state).getBlock().isEntityBlock();
+	public static boolean hasBlockEntity(org.spongepowered.api.block.BlockState state) {
+		return ((BlockState) state).hasBlockEntity();
 	}
 
 	public static boolean isAir(org.spongepowered.api.block.BlockState state) {
diff --git a/src/main/java/net/smoofyuniverse/superpiston/impl/ReactionUtil.java b/src/main/java/net/smoofyuniverse/superpiston/impl/ReactionUtil.java
index 0008259..1bd7e57 100644
--- a/src/main/java/net/smoofyuniverse/superpiston/impl/ReactionUtil.java
+++ b/src/main/java/net/smoofyuniverse/superpiston/impl/ReactionUtil.java
@@ -51,7 +51,7 @@ public static MovementReaction getDefaultReaction(ServerWorld world, org.spongep
 		if (pos.y() > h || (movement == Direction.UP && pos.y() == h))
 			return MovementReaction.BLOCK;
 
-		if (BlockUtil.isEntityBlock(state))
+		if (BlockUtil.hasBlockEntity(state))
 			return MovementReaction.BLOCK;
 
 		BlockState nmsState = (BlockState) state;
@@ -59,7 +59,9 @@ public static MovementReaction getDefaultReaction(ServerWorld world, org.spongep
 		if (block == Blocks.PISTON || block == Blocks.STICKY_PISTON)
 			return nmsState.getValue(PistonBaseBlock.EXTENDED) ? MovementReaction.BLOCK : MovementReaction.NORMAL;
 
-		if (block == Blocks.OBSIDIAN || nmsState.getDestroySpeed(level, blockPos) == -1.0f)
+		if (block == Blocks.OBSIDIAN || block == Blocks.CRYING_OBSIDIAN
+				|| block == Blocks.RESPAWN_ANCHOR || block == Blocks.REINFORCED_DEEPSLATE
+				|| nmsState.getDestroySpeed(level, blockPos) == -1.0f)
 			return MovementReaction.BLOCK;
 
 		return fromNMS(nmsState.getPistonPushReaction());
diff --git a/vanilla/build.gradle b/vanilla/build.gradle
index d5dc225..fa28d0b 100644
--- a/vanilla/build.gradle
+++ b/vanilla/build.gradle
@@ -26,16 +26,16 @@ configurations {
 }
 
 dependencies {
-    spongevanilla 'org.spongepowered:spongevanilla:1.16.5-8.1.0-RC1185:universal'
+    spongevanilla('org.spongepowered:spongevanilla:1.19.4-10.0.0-RC1552:universal') { transitive = false }
 }
 
 shadowJar {
-    classifier ''
+    archiveClassifier = ''
 }
 
 build.dependsOn shadowJar
 
-task setupServer(type: Copy) {
+tasks.register('setupServer', Copy) {
     into 'run'
 
     from configurations.spongevanilla
diff --git a/vanilla/src/main/resources/META-INF/sponge_plugins.json b/vanilla/src/main/resources/META-INF/sponge_plugins.json
index f507b56..8456b32 100644
--- a/vanilla/src/main/resources/META-INF/sponge_plugins.json
+++ b/vanilla/src/main/resources/META-INF/sponge_plugins.json
@@ -25,13 +25,13 @@
       "dependencies": [
         {
           "id": "spongeapi",
-          "version": "8.1.0",
+          "version": "10.0.0",
           "load-order": "AFTER",
           "optional": false
         },
         {
           "id": "spongevanilla",
-          "version": "8.1.0",
+          "version": "10.0.0",
           "load-order": "AFTER",
           "optional": false
         }