From 8351c58d7b066595590f24cde63a35f1166fefff Mon Sep 17 00:00:00 2001
From: tom lee <tomlee92502@yahoo.com>
Date: Mon, 21 Mar 2022 15:16:37 +0800
Subject: [PATCH] Update core + remove Manifold from core + remove awt.Colors

---
 build.gradle                                  |  9 ++++++++-
 .../minecraft/MinecraftClientWrapper.java     | 19 +------------------
 .../minecraft/MinecraftRenderWrapper.java     | 14 +++++++-------
 .../common/wrappers/world/BiomeWrapper.java   |  8 +++++---
 core                                          |  2 +-
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index bbf15f9e7..481392063 100644
--- a/build.gradle
+++ b/build.gradle
@@ -180,10 +180,17 @@ allprojects { p ->
 //		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
 //		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
 //
-        options.compilerArgs += ['-Xplugin:Manifold']
+        //options.compilerArgs += ['-deprecation']
+        //options.compilerArgs += ['-verbose']
+        //options.compilerArgs += ['-Xlint:unchecked']
+        //options.compilerArgs += ['-Xdiags:verbose']
+        //options.compilerArgs += ['-Xprint']
+        //options.compilerArgs += ['-XprintProcessorInfo']
+        //options.compilerArgs += ['-XprintRounds']
 
 		// println options.compilerArgs
         if (p != project(":core")) {
+            options.compilerArgs += ['-Xplugin:Manifold']
             options.release = rootProject.java_version as Integer
         }
     }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
index e66fd2537..c451d7d48 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java
@@ -187,7 +187,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
     {
         if (lightMap == null)
         {
-            sendChatMessage("new");
+            //sendChatMessage("new");
             // make sure the lightMap is up-to-date
             getCurrentLightMap();
         }
@@ -195,23 +195,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
         return lightMap.getPixelRGBA(blockLight, skyLight);
     }
 
-    /**
-     * Returns the Color at the given pixel coordinates
-     * from the current lightmap.
-     * @param blockLight x location in texture space
-     * @param skyLight z location in texture space
-     */
-    @Override
-    public Color getColorFromLightMap(int blockLight, int skyLight) {
-        if (lightMap == null) {
-            // make sure the lightMap is up-to-date
-            getCurrentLightMap();
-        }
-
-        return LodUtil.intToColor(lightMap.getPixelRGBA(blockLight, skyLight));
-    }
-
-
 
 
     //=============//
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java
index c2d158073..bc58abf36 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java
@@ -235,7 +235,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				// this could probably be kept as a int, but
 				// it is easier to test and see the colors when debugging this way.
 				// When creating a new release this should be changed to the int version.
-				Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));
+				int col = lightMap.getLightValue(u, v);
 				
 				// these should both create a totally white image
 //					int col =
@@ -245,12 +245,12 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 //							(0b11111111 << 8) + // green
 //							(0b11111111 << 16) + // blue
 //							(0b11111111 << 24); // blue
-				
-				int col =
-						((c.getRed() & 0xFF) << 16) | // blue
-								((c.getGreen() & 0xFF) << 8) | // green
-								((c.getBlue() & 0xFF)) | // red
-								((c.getAlpha() & 0xFF) << 24); // alpha
+
+//				int col =
+//						((c.getRed() & 0xFF) << 16) | // blue
+//								((c.getGreen() & 0xFF) << 8) | // green
+//								((c.getBlue() & 0xFF)) | // red
+//								((c.getAlpha() & 0xFF) << 24); // alpha
 				
 				// 2D array stored in a 1D array.
 				// Thank you Tim from College ;)
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java
index 820b75bdc..432bddc16 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java
@@ -110,9 +110,11 @@ public class BiomeWrapper implements IBiomeWrapper
             case SAVANNA:
             case SWAMP:
             default:
-                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
-                tmp = tmp.darker();
-                colorInt = LodUtil.colorToInt(tmp);
+                colorInt = biome.getGrassColor(x,z);
+                //FIXME: Repair what James did - LeeTom
+//                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+//                tmp = tmp.darker();
+//                colorInt = LodUtil.colorToInt(tmp);
                 break;
 
         }
diff --git a/core b/core
index 4f2bf9b83..ca625f9f8 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 4f2bf9b834df5f54d8440986bc0603b93a82c710
+Subproject commit ca625f9f8b51aee9b731e83b91f8b5c149534e5a