From 5c75d75e7a6896e998d1c63ee40c772ed6994eff Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Sat, 10 Dec 2016 01:19:44 +0900
Subject: [PATCH] Slick wireframes when antialised

Former-commit-id: ff43e4904ace96db4915e9684c07f0ef53d91634
Former-commit-id: 2397086bc1157242df81cdc0d3fb3cfaa5a02f79
---
 .idea/libraries/lib.xml                           |  4 ----
 .idea/misc.xml                                    | 15 +--------------
 .idea/vcs.xml                                     |  2 +-
 Terrarum_renewed.iml                              |  5 +++++
 src/net/torvald/terrarum/StateInGame.kt           |  2 --
 src/net/torvald/terrarum/console/SetAV.kt         |  2 +-
 .../terrarum/virtualcomputer/luaapi/Filesystem.kt |  2 +-
 src/net/torvald/terrarum/weather/WeatherMixer.kt  |  4 ++--
 8 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
index 19151d642..5a7878cf7 100644
--- a/.idea/libraries/lib.xml
+++ b/.idea/libraries/lib.xml
@@ -5,7 +5,6 @@
       <root url="jar://$PROJECT_DIR$/lib/commons-csv-1.2.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/gson-2.5.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/ibxm.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jbox2d-library-2.1.2.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/jinput.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/jnlp.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/jogg-0.0.7.jar!/" />
@@ -15,8 +14,6 @@
       <root url="jar://$PROJECT_DIR$/lib/lwjgl.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/lwjgl_util.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/slick.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/OpenComputers-JNLua.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/OpenComputers-LuaJ.jar!/" />
       <root url="file://$PROJECT_DIR$/lib" />
     </CLASSES>
     <JAVADOC>
@@ -29,7 +26,6 @@
       <root url="file://$PROJECT_DIR$/lib" />
     </NATIVE>
     <SOURCES>
-      <root url="file://$USER_HOME$/Downloads/slick/src" />
       <root url="jar://$PROJECT_DIR$/lib/kotlin-runtime-sources.jar!/" />
       <root url="file://$PROJECT_DIR$/lib" />
     </SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 18d93cc08..2c55e21aa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,20 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f4..35eb1ddfb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Terrarum_renewed.iml b/Terrarum_renewed.iml
index 728bcc8a5..f1d33d1b1 100644
--- a/Terrarum_renewed.iml
+++ b/Terrarum_renewed.iml
@@ -5,6 +5,11 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/core" />
+      <excludeFolder url="file://$MODULE_DIR$/desktop" />
+      <excludeFolder url="file://$MODULE_DIR$/gradle" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt
index b636799cb..d0757b0a4 100644
--- a/src/net/torvald/terrarum/StateInGame.kt
+++ b/src/net/torvald/terrarum/StateInGame.kt
@@ -275,8 +275,6 @@ constructor() : BasicGameState() {
         actorsDrawFrameBuffer.graphics.clear()
         uisDrawFrameBuffer.graphics.clear()
 
-
-        gwin.isAntiAlias = true
         blendNormal()
 
 
diff --git a/src/net/torvald/terrarum/console/SetAV.kt b/src/net/torvald/terrarum/console/SetAV.kt
index 76d9408ba..2a9e5e1f0 100644
--- a/src/net/torvald/terrarum/console/SetAV.kt
+++ b/src/net/torvald/terrarum/console/SetAV.kt
@@ -27,7 +27,7 @@ internal class SetAV : ConsoleCommand {
 
     override fun execute(args: Array<String>) {
         fun parseAVInput(arg: String): Any {
-            val `val`: Any
+            var `val`: Any
 
             try {
                 `val` = Integer(arg) // try for integer
diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt
index 94ac875ff..692574c9e 100644
--- a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt
+++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt
@@ -56,7 +56,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) {
                 throw IOException("path contains invalid characters")
         }
 
-        val isCaseInsensitive: Boolean
+        var isCaseInsensitive: Boolean
 
         init {
             try {
diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt
index b4a0ff097..6a187af22 100644
--- a/src/net/torvald/terrarum/weather/WeatherMixer.kt
+++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt
@@ -162,10 +162,10 @@ object WeatherMixer {
         val skybox: Image
         val extraImages = ArrayList<Image>()
         val classification = JSON.get("classification").asJsonPrimitive.asString
-        val mixFrom: String?
+        var mixFrom: String?
         try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString }
         catch (e: NullPointerException) { mixFrom = null }
-        val mixPercentage: Double?
+        var mixPercentage: Double?
         try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble }
         catch (e: NullPointerException) { mixPercentage = null }