Merge pull request #107 from satoshinm/spigot117

Update to SpigotAPI 1.17
satoshinm · Sep 6, 2021 · 60f7e40 · 60f7e40
2 parents 9f5a3ce + c9dae3a
commit 60f7e40
Show file tree

Hide file tree

Showing 5 changed files with 349 additions and 266 deletions.
diff --git a/README.md b/README.md
@@ -33,9 +33,9 @@ TODO: missing features
 * Build the WebSandboxMC plugin: `mvn package`
 
 ## Usage
-* Copy target/WebSandboxMC.jar to the `plugins` folder of your [Glowstone](https://www.glowstone.net) server (note: may/not work with other Bukkit-compatible servers, TODO: test)
-* Visit http://localhost:4081/ in a modern browser (requires WebGL, Pointer Lock, WebSockets)
-* Play the game
+1. Copy target/WebSandboxMC.jar to the `plugins` folder of your Bukkit-compatible server (see below)
+2. Visit http://localhost:4081/ in a modern browser (requires WebGL, Pointer Lock, WebSockets)
+3. Play the game
 
 ## Configuration
 
@@ -119,6 +119,10 @@ server compatibility. Known compatible server software:
 * [Glowstone](https://www.glowstone.net): for a fully open source end-to-end gameplay experience
 * [SpigotMC](https://www.spigotmc.org)
 
+WebSandboxMC 2.x is compatible with 1.17 (and possibly newer) down to 1.14 API version.
+
+WebSandboxMC 1.x is compatible down to 1.7, but will use "legacy materials" on API versions newer than 1.12. 
+
 ## License
 
 MIT
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.satoshinm</groupId>
   <artifactId>WebSandboxMC</artifactId>
-  <version>1.10.5</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>WebSandboxMC</name>
   <url>https://github.com/satoshinm/WebSandboxMC</url>
 
@@ -22,17 +22,17 @@
   </repositories>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <netty.version>4.1.56.Final</netty.version>
+    <netty.version>4.1.59.Final</netty.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.12.2-R0.1-SNAPSHOT</version>
+      <version>1.17.1-R0.1-SNAPSHOT</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -54,6 +54,12 @@
       <version>${netty.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -74,8 +80,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.0</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -97,6 +103,12 @@
                     io.github.satoshinm.WebSandboxMC.dep.io.netty
                   </shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.json.simple</pattern>
+                  <shadedPattern>
+                    io.github.satoshinm.WebSandboxMC.dep.org.json.simple
+                  </shadedPattern>
+                </relocation>
               </relocations>
             </configuration>
           </execution>