fix servers, bump rfb, misc mod fixes

addon.gradle

@@ -18,9 +18,11 @@ def addOpens = [
     "java.base/java.nio=ALL-UNNAMED",
     "java.base/java.io=ALL-UNNAMED",
     "java.base/java.lang=ALL-UNNAMED",
+    "java.base/java.lang.invoke=ALL-UNNAMED",
     "java.base/java.lang.ref=ALL-UNNAMED",
     "java.base/java.util.concurrent.locks=ALL-UNNAMED",
     "java.base/java.lang.reflect=ALL-UNNAMED",
+    "java.base/java.security=ALL-UNNAMED",
     "java.base/java.text=ALL-UNNAMED",
     "java.base/java.util=ALL-UNNAMED",
     "java.base/jdk.internal.reflect=ALL-UNNAMED",
@@ -139,6 +141,7 @@ def forgePatchesJar = tasks.register('forgePatchesJar', Jar) {
         def libraryList = [
             "libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.jar",
             "libraries/com/typesafe/config/1.2.1/config-1.2.1.jar",
+            "libraries/org/jline/jline/3.5.1/jline-3.5.1.jar",
             "libraries/org/scala-lang/scala-actors-migration_2.11/1.1.0/scala-actors-migration_2.11-1.1.0.jar",
             "libraries/org/scala-lang/scala-compiler/2.11.1/scala-compiler-2.11.1.jar",
             "libraries/org/scala-lang/plugins/scala-continuations-library_2.11/1.0.2/scala-continuations-library_2.11-1.0.2.jar",
@@ -149,9 +152,13 @@ def forgePatchesJar = tasks.register('forgePatchesJar', Jar) {
             "libraries/org/scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar",
             "libraries/org/scala-lang/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar",
             "libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar",
-            "libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar",
-            "libraries/com/google/guava/guava/17.0/guava-17.0.jar",
-            "forge-1.12.2-14.23.5.2860-1.12.2-universal.jar",
+            "libraries/java3d/vecmath/1.5.2/vecmath-1.5.2.jar",
+            "libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar",
+            "libraries/org/apache/maven/maven-artifact/3.5.3/maven-artifact-3.5.3.jar",
+            "libraries/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
+            "libraries/org/apache/logging/log4j/log4j-api/2.15.0/log4j-api-2.15.0.jar",
+            "libraries/org/apache/logging/log4j/log4j-core/2.15.0/log4j-core-2.15.0.jar",
+            "forge-1.12.2-14.23.5.2860.jar",
             "minecraft_server.1.12.2.jar"
         ]
         attributes(

dependencies.gradle

@@ -8,7 +8,7 @@ def addGtForTesting = Boolean.parseBoolean(project.getProperties().getOrDefault(
 def addReikaModsForTesting = Boolean.parseBoolean(project.getProperties().getOrDefault("withReikaMods", "false").toString())
 
 def asmVersion = '9.7'
-def rfbVersion = '1.0.4'
+def rfbVersion = '1.0.6'
 // 100% binary compatible, 1 minor source compatibility issue (removed a throws IOException clause)
 def gsonVersion = '2.10.1'
 

gradle.properties

@@ -91,7 +91,7 @@ customMavenPublishUrl = https\://maven.gtceu.com/
 #
 # The project's ID on Modrinth. Can be either the slug or the ID.
 # Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId = ebCpW4mx;
+modrinthProjectId = ebCpW4mx
 
 
 # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.

java9args.txt

@@ -12,8 +12,16 @@ java.base/java.io=ALL-UNNAMED
 --add-opens
 java.base/java.lang=ALL-UNNAMED
 --add-opens
+java.base/java.lang.invoke=ALL-UNNAMED
+--add-opens
+java.base/java.lang.ref=ALL-UNNAMED
+--add-opens
+java.base/java.util.concurrent.locks=ALL-UNNAMED
+--add-opens
 java.base/java.lang.reflect=ALL-UNNAMED
 --add-opens
+java.base/java.security=ALL-UNNAMED
+--add-opens
 java.base/java.text=ALL-UNNAMED
 --add-opens
 java.base/java.util=ALL-UNNAMED

src/main/java/me/eigenraven/lwjgl3ify/rfb/EarlyConfig.java

@@ -26,7 +26,10 @@ public class EarlyConfig {
         "net.minecraft.item.EnumRarity", "net.minecraft.entity.passive.HorseArmorType",
         "net.minecraft.entity.EntityLiving$SpawnPlacementType",
         // Not in EnumHelper but relied on by Forge anyway
-        "net.minecraft.world.DimensionType" };
+        "net.minecraft.world.DimensionType",
+
+        // GTCEu
+        "net.minecraft.util.BlockRenderLayer", "net.minecraft.util.EnumBlockRenderType" };
 
     public static final Set<String> EXTENSIBLE_ENUMS = new HashSet<>(Arrays.asList(DEFAULT_EXTENSIBLE_ENUMS));