From efe5c49463c6382a4591cc6d7175257c35e0db90 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Fri, 4 Feb 2022 11:03:59 +0900
Subject: [PATCH] serialisation of HRQNG is fixed so it would not make illegal
 reflective access on Java 17

---
 .idea/misc.xml                                |  2 +-
 .idea/runConfigurations/Terrarum.xml          |  2 +-
 .../Terrarum__no_DEV_MODE_.xml                |  2 +-
 .../mods/basegame/gui/construction_grid.tga   |  3 +++
 src/net/torvald/random/HQRNG.java             | 10 ++++----
 .../terrarum/console/ScreencapNogui.kt        |  9 ++++----
 .../terrarum/modulebasegame/IngameRenderer.kt | 23 ++++++++++++++++---
 src/net/torvald/terrarum/serialise/Common.kt  | 14 +++++++++++
 work_files/UI/construction_grid_mockup.kra    |  3 +++
 9 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 assets/mods/basegame/gui/construction_grid.tga
 create mode 100644 work_files/UI/construction_grid_mockup.kra

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4034f6c8e..5b95ada26 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressKotlinCodeStyleNotification">
diff --git a/.idea/runConfigurations/Terrarum.xml b/.idea/runConfigurations/Terrarum.xml
index a04dbd166..6928af11a 100644
--- a/.idea/runConfigurations/Terrarum.xml
+++ b/.idea/runConfigurations/Terrarum.xml
@@ -4,7 +4,7 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <module name="terrarum.terrarum" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
diff --git a/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml b/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
index a4ceb41ac..8e156951b 100644
--- a/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
+++ b/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
@@ -3,7 +3,7 @@
     <option name="JAR_PATH" value="$PROJECT_DIR$/out/TerrarumBuild.jar" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <module name="terrarum.terrarum" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
diff --git a/assets/mods/basegame/gui/construction_grid.tga b/assets/mods/basegame/gui/construction_grid.tga
new file mode 100644
index 000000000..212b06eff
--- /dev/null
+++ b/assets/mods/basegame/gui/construction_grid.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c560541a93bc4cfafaf362e447c029c1bd3f13e949e7f1fde0b3a311f927073
+size 1042
diff --git a/src/net/torvald/random/HQRNG.java b/src/net/torvald/random/HQRNG.java
index 1ead5a016..b958cc6ab 100644
--- a/src/net/torvald/random/HQRNG.java
+++ b/src/net/torvald/random/HQRNG.java
@@ -11,12 +11,12 @@ import java.util.Random;
  */
 public class HQRNG extends Random {
 
-    private static final long DOUBLE_MASK = (1L << 53) - 1;
-    private static final double NORM_53 = 1. / (1L << 53);
-    private static final long FLOAT_MASK = (1L << 24) - 1;
-    private static final double NORM_24 = 1. / (1L << 24);
+    transient private static final long DOUBLE_MASK = (1L << 53) - 1;
+    transient private static final double NORM_53 = 1. / (1L << 53);
+    transient private static final long FLOAT_MASK = (1L << 24) - 1;
+    transient private static final double NORM_24 = 1. / (1L << 24);
 
-    private static final long serialVersionUID = 1018744536171610262L;
+    transient private static final long serialVersionUID = 1018744536171610262L;
 
     private long state0, state1;
 
diff --git a/src/net/torvald/terrarum/console/ScreencapNogui.kt b/src/net/torvald/terrarum/console/ScreencapNogui.kt
index 718abeeb1..090e6894c 100644
--- a/src/net/torvald/terrarum/console/ScreencapNogui.kt
+++ b/src/net/torvald/terrarum/console/ScreencapNogui.kt
@@ -12,18 +12,19 @@ object ScreencapNogui: ConsoleCommand {
     override fun execute(args: Array<String>) {
         if (args.size == 2) {
             IngameRenderer.screencapExportCallback = {
-                val w = 960
-                val h = 640
-                val p = Pixmap.createFromFrameBuffer((it.width - w).ushr(1), (it.height - h).ushr(1), w, h)
+                val p = Pixmap.createFromFrameBuffer(0, 0, it.width, it.height)
                 PixmapIO2.writeTGA(Gdx.files.absolute(App.defaultDir + "/Exports/${args[1]}.tga"), p, true)
                 p.dispose()
             }
             IngameRenderer.screencapRequested = true
             Echo("FBO exported to$ccG Exports/${args[1]}.tga")
         }
+        else {
+            printUsage()
+        }
     }
 
     override fun printUsage() {
-
+        Echo("Usage: screencapnogui <output filename>")
     }
 }
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
index ffea42fd9..ae978a2ad 100644
--- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
@@ -402,9 +402,10 @@ object IngameRenderer : Disposable {
             Gdx.gl.glDisable(GL20.GL_BLEND)
         }
 
-//        processBlur(lightmapFboA, lightmapFboB)
-        processKawaseBlur(lightmapFbo)
-//        processNoBlur()
+        if (KeyToggler.isOn(Input.Keys.F5))
+            processNoBlur(lightmapFbo)
+        else
+            processKawaseBlur(lightmapFbo)
 
 
         blendNormal(batch)
@@ -668,6 +669,22 @@ object IngameRenderer : Disposable {
 
     private const val KAWASE_POWER = 1.5f
 
+    fun processNoBlur(outFbo: FloatFrameBuffer) {
+
+        blurtex0.dispose()
+
+
+        outFbo.inAction(camera, batch) {
+            blurtex0 = LightmapRenderer.draw()
+            blurtex0.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
+            blurtex0.bind(0)
+            App.shaderPassthruRGBA.bind()
+            App.shaderPassthruRGBA.setUniformMatrix("u_projTrans", camera.combined)
+            App.shaderPassthruRGBA.setUniformi("u_texture", 0)
+            blurWriteQuad.render(App.shaderPassthruRGBA, GL20.GL_TRIANGLES)
+        }
+    }
+
     fun processKawaseBlur(outFbo: FloatFrameBuffer) {
 
         blurtex0.dispose()
diff --git a/src/net/torvald/terrarum/serialise/Common.kt b/src/net/torvald/terrarum/serialise/Common.kt
index 86e002236..ff5d6f4ae 100644
--- a/src/net/torvald/terrarum/serialise/Common.kt
+++ b/src/net/torvald/terrarum/serialise/Common.kt
@@ -3,6 +3,7 @@ package net.torvald.terrarum.serialise
 import com.badlogic.gdx.utils.Json
 import com.badlogic.gdx.utils.JsonValue
 import com.badlogic.gdx.utils.JsonWriter
+import net.torvald.random.HQRNG
 import net.torvald.terrarum.console.EchoError
 import net.torvald.terrarum.gameworld.BlockLayer
 import net.torvald.terrarum.gameworld.GameWorld
@@ -187,6 +188,19 @@ object Common {
                 return UUID.fromString(jsonData.asString())
             }
         })
+        // HQRNG
+        jsoner.setSerializer(HQRNG::class.java, object : Json.Serializer<HQRNG> {
+            override fun write(json: Json, obj: HQRNG, knownType: Class<*>?) {
+                json.writeValue("${obj.state0.toString()},${obj.state1.toString()}")
+            }
+
+            override fun read(json: Json, jsonData: JsonValue, type: Class<*>?): HQRNG {
+                val rng = HQRNG()
+                val seedstr = jsonData.asString().split(',')
+                rng.setSeed(seedstr[0].toLong(), seedstr[1].toLong())
+                return rng
+            }
+        })
     }
 
     private data class LayerInfo(val h: String, val b: String, val x: Int, val y: Int)
diff --git a/work_files/UI/construction_grid_mockup.kra b/work_files/UI/construction_grid_mockup.kra
new file mode 100644
index 000000000..4cc271346
--- /dev/null
+++ b/work_files/UI/construction_grid_mockup.kra
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bb88b24c20203703f4887760cb0e75e886dc73be0f4fe2004605d4445152bc8
+size 4620816