Update buttplug4j to 3.1.105 for Java 8 compatibility (#25)

* build: Update buttplug4j to 3.1.105 with the Java 8 compatible websocket client * build: Reduce JDK build version to 8 for 1.12-1.16
RainbowVille · Jan 31, 2024 · 118d924 · 118d924
1 parent d8aa700
commit 118d924
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 43 deletions.
diff --git a/.github/workflows/gradle-forge-1.12.yml b/.github/workflows/gradle-forge-1.12.yml
@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/fg-6.0.yml
     with:
       version: 1.12
-      java-version: 11
+      java-version: 8
diff --git a/.github/workflows/gradle-forge-1.13.yml b/.github/workflows/gradle-forge-1.13.yml
@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/fg-6.0.yml
     with:
       version: 1.13
-      java-version: 11
+      java-version: 8
diff --git a/.github/workflows/gradle-forge-1.14.yml b/.github/workflows/gradle-forge-1.14.yml
@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/fg-6.0.yml
     with:
       version: 1.14
-      java-version: 11
+      java-version: 8
diff --git a/.github/workflows/gradle-forge-1.15.yml b/.github/workflows/gradle-forge-1.15.yml
@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/fg-6.0.yml
     with:
       version: 1.15
-      java-version: 11
+      java-version: 8
diff --git a/.github/workflows/gradle-forge-1.16.yml b/.github/workflows/gradle-forge-1.16.yml
@@ -20,4 +20,4 @@ jobs:
     uses: ./.github/workflows/fg-6.0.yml
     with:
       version: 1.16
-      java-version: 11
+      java-version: 8
diff --git a/README.md b/README.md
@@ -2,17 +2,16 @@
 
 User Guide: https://www.minegasm.net/
 
-| Minecraft                 | Forge MDK    | JDK  | FG  | Gradle | Status                                                                                                                                                                                  |
-|---------------------------|--------------|------|-----|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **1.20**.1                | 47.1.0       | 17   | 6.0 | 8.1.1  | [![1.20](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml) |
-| **1.19**.4                | 45.1.0       | 17   | 6.0 | 8.1.1  | [![1.19](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml) |
-| **1.18**.2                | 40.2.0       | 17   | 6.0 | 8.1.1  | [![1.18](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml) |
-| **1.17**.1                | 37.1.1       | 16   | 6.0 | 8.1.1  | [![1.17](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml) |
-| **1.16**.5                | 36.2.34      | 11\* | 6.0 | 8.1.1  | [![1.16](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml) |
-| **1.15**.2                | 31.2.57      | 11\* | 6.0 | 8.1.1  | [![1.15](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml) |
-| **1.14**.4                | 28.2.26      | 11\* | 6.0 | 8.1.1  | [![1.14](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml) |
-| **1.13**.2                | 25.0.223     | 11\* | 6.0 | 8.1.1  | [![1.13](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml) |
-| **1.12**.2                | 14.23.5.2859 | 11\* | 6.0 | 8.1.1  | [![1.12](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml) |
-| **1. 8**.9 <sup>WIP</sup> | 11.15.1.2318 | 8    | 2.1 | 4.10.3 | [![1.8](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml)    |
+| Minecraft                 | Forge MDK    | JDK | FG  | Gradle | Status                                                                                                                                                                                  |
+|---------------------------|--------------|-----|-----|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **1.20**.1                | 47.1.0       | 17  | 6.0 | 8.1.1  | [![1.20](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.20.yml) |
+| **1.19**.4                | 45.1.0       | 17  | 6.0 | 8.1.1  | [![1.19](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.19.yml) |
+| **1.18**.2                | 40.2.0       | 17  | 6.0 | 8.1.1  | [![1.18](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.18.yml) |
+| **1.17**.1                | 37.1.1       | 16  | 6.0 | 8.1.1  | [![1.17](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.17.yml) |
+| **1.16**.5                | 36.2.34      | 8   | 6.0 | 8.1.1  | [![1.16](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.16.yml) |
+| **1.15**.2                | 31.2.57      | 8   | 6.0 | 8.1.1  | [![1.15](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.15.yml) |
+| **1.14**.4                | 28.2.26      | 8   | 6.0 | 8.1.1  | [![1.14](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.14.yml) |
+| **1.13**.2                | 25.0.223     | 8   | 6.0 | 8.1.1  | [![1.13](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.13.yml) |
+| **1.12**.2                | 14.23.5.2859 | 8   | 6.0 | 8.1.1  | [![1.12](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.12.yml) |
+| **1. 8**.9 <sup>WIP</sup> | 11.15.1.2318 | 8   | 2.1 | 4.10.3 | [![1.8](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml/badge.svg)](https://github.com/RainbowVille/minegasm/actions/workflows/gradle-forge-1.8.yml)    |
 
-*) Forge MDK for 1.12.2&ndash;1.16.5 require JDK 8, but our dependencies require JDK 11.
diff --git a/forge/fg-2.1/1.8/build.gradle b/forge/fg-2.1/1.8/build.gradle
@@ -38,15 +38,15 @@ repositories {
     //repos for libraries (not gradle plugins)
     //example:
     //maven { url "https://repo.dreamys.studio/" }
-    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" }
+    //maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
     //shade will bundle your library to the output jar
     //your libraries will be accessible outside of intellij
     //example:
     //shade "studio.dreamys:libSkyblock:1.1.1"
-    shade "io.github.blackspherefollower:buttplug4j:3.1.+"
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     //compile will make your library available only in this dev environment
     //your libraries wont be accessible outside of intellij

diff --git a/forge/fg-6.0/1.12/build.gradle b/forge/fg-6.0/1.12/build.gradle
@@ -15,7 +15,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.12/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.12/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.13/build.gradle b/forge/fg-6.0/1.13/build.gradle
@@ -15,7 +15,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.13/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.13/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.14/build.gradle b/forge/fg-6.0/1.14/build.gradle
@@ -15,7 +15,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.14/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.14/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.15/build.gradle b/forge/fg-6.0/1.15/build.gradle
@@ -15,7 +15,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.15/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.15/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.16/build.gradle b/forge/fg-6.0/1.16/build.gradle
@@ -15,7 +15,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(11)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.16/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.16/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.17/build.gradle b/forge/fg-6.0/1.17/build.gradle
@@ -136,7 +136,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.17/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.17/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.18/build.gradle b/forge/fg-6.0/1.18/build.gradle
@@ -137,7 +137,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.18/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.18/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.19/build.gradle b/forge/fg-6.0/1.19/build.gradle
@@ -137,7 +137,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.19/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.19/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

diff --git a/forge/fg-6.0/1.20/build.gradle b/forge/fg-6.0/1.20/build.gradle
@@ -137,7 +137,7 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    shade 'io.github.blackspherefollower:buttplug4j:3.0.67'
+    shade 'io.github.blackspherefollower:buttplug4j.connectors.jetty.websocket.client:3.1.105'
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime

diff --git a/forge/fg-6.0/1.20/src/main/java/com/therainbowville/minegasm/client/ToyController.java b/forge/fg-6.0/1.20/src/main/java/com/therainbowville/minegasm/client/ToyController.java
@@ -2,7 +2,7 @@
 
 import com.therainbowville.minegasm.config.MinegasmConfig;
 import io.github.blackspherefollower.buttplug4j.client.ButtplugClientDevice;
-import io.github.blackspherefollower.buttplug4j.client.ButtplugClientWSClient;
+import io.github.blackspherefollower.buttplug4j.connectors.jetty.websocket.client.ButtplugClientWSClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;