Removed ununsed injector

build.gradle

@@ -0,0 +1,37 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.0"
+}
+
+configurations {
+    common
+    shadowMe
+    implementation.extendsFrom shadowMe
+}
+
+dependencies {
+    // Toml
+    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
+
+    // Compression
+    common('org.tukaani:xz:1.9')
+    common('org.apache.commons:commons-compress:1.21')
+    shadowMe 'org.tukaani:xz:1.9'
+    shadowMe 'org.apache.commons:commons-compress:1.21'
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowMe]
+    relocate 'org.tukaani', 'shaded.tukaani'
+    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
+    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
+
+    relocate 'com.seibel.lod.common', 'fabric.com.seibel.lod.common'
+
+    classifier "dev-shadow"
+}
+
+//remapJar {
+//    input.set shadowJar.archiveFile
+//    dependsOn shadowJar
+//    classifier null
+//}

src/main/java/com/seibel/lod/core/ModInfo.java

@@ -18,7 +18,6 @@
  */
 
 package com.seibel.lod.core;
-
 /**
  * This file is similar to mcmod.info
  * <br>
@@ -41,5 +40,5 @@ public final class ModInfo
 	/** Human readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
 	public static final String API = "LodAPI";
-	public static final String VERSION = "1.6.3a";
+	public static final String VERSION = "1.6.12a";
 }

src/main/java/com/seibel/lod/core/config/ConfigAnnotations.java

@@ -28,9 +28,12 @@ import java.lang.annotation.Target;
  * Where the annotations for the config are defined
  * If there is no annotation then the config will not touch it
  *
- * @author coolGi2007
+ * REMOVED IN a1.7
+ *
+ * @author coolGi
  * @version 02-07-2022
  */
+@Deprecated
 public class ConfigAnnotations {
     /** A textField, button, etc. that can be interacted with */
     @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/seibel/lod/core/handlers/LodDimensionFinder.java

@@ -47,6 +47,7 @@ import org.apache.logging.log4j.LogManager;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.UUID;
@@ -532,7 +533,7 @@ public class LodDimensionFinder
 				newDimension.mkdirs();
 				
 				File oldDataNewPath = new File(newDimension.getPath() + File.separatorChar + folder.getName());
-				Files.move(folder.toPath(), oldDataNewPath.toPath());
+				Files.move(folder.toPath(), oldDataNewPath.toPath(), StandardCopyOption.REPLACE_EXISTING);
 			}
 			else
 			{

src/main/java/com/seibel/lod/core/handlers/dimensionFinder/PlayerData.java

@@ -107,11 +107,17 @@ public class PlayerData
 	/** Writes everything from this object to the file given. */
 	public void toTomlFile(CommentedFileConfig toml)
 	{
-		// player block pos
-		toml.add(PLAYER_BLOCK_POS_X_PATH, playerBlockPos.getX());
-		toml.add(PLAYER_BLOCK_POS_Y_PATH, playerBlockPos.getY());
-		toml.add(PLAYER_BLOCK_POS_Z_PATH, playerBlockPos.getZ());
-		
+		if (playerBlockPos == null)
+		{
+			toml.remove(PLAYER_BLOCK_POS_X_PATH);
+			toml.remove(PLAYER_BLOCK_POS_Y_PATH);
+			toml.remove(PLAYER_BLOCK_POS_Z_PATH);
+		} else {
+			// player block pos
+			toml.add(PLAYER_BLOCK_POS_X_PATH, playerBlockPos.getX());
+			toml.add(PLAYER_BLOCK_POS_Y_PATH, playerBlockPos.getY());
+			toml.add(PLAYER_BLOCK_POS_Z_PATH, playerBlockPos.getZ());
+		}
 		toml.save();
 	}
 	

src/main/java/com/seibel/lod/core/objects/opengl/RenderRegion.java

@@ -175,6 +175,15 @@ public class RenderRegion implements AutoCloseable
 			for (LodDirection dir : LodDirection.ADJ_DIRECTIONS) {
 				adjRegions[dir.ordinal() - 2] = lodDim.getRegion(regionPos.x+dir.getNormal().x, regionPos.z+dir.getNormal().z);
 			}
+		} catch (NullPointerException | ArrayIndexOutOfBoundsException e) { // HOTFIX: Error ignoring for a concurrency caused issue
+			setNeedRegen();
+			if (!backState.compareAndSet(BackState.Building, BackState.Unused)) {
+				EVENT_LOGGER.error("\"Lod Builder Starter\""
+								+ " encountered error on catching exceptions and fallback on starting build task: ",
+						new ConcurrentModificationException("RenderRegion Illegal State"));
+			}
+			EVENT_LOGGER.info("\"Lod Builder Starter\" failed due to possible known concurrency issue: ", e);
+			return CompletableFuture.completedFuture(null);
 		} catch (Throwable t) {
 			setNeedRegen();
 			if (!backState.compareAndSet(BackState.Building, BackState.Unused)) {
@@ -200,6 +209,9 @@ public class RenderRegion implements AutoCloseable
 					buildRun.run();
 				EVENT_LOGGER.trace("RenderRegion end QuadBuild @ {}", regionPos);
 				return builder;
+			} catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
+				EVENT_LOGGER.info("\"LodNodeBufferBuilder\" failed due to possible known concurrency issue: ", e);
+				throw e; // HOTFIX: Error ignoring for a concurrency caused issue
 			} catch (Throwable e3) {
 				EVENT_LOGGER.error("\"LodNodeBufferBuilder\" was unable to build quads: ", e3);
 				throw e3;

src/main/java/com/seibel/lod/core/render/F3Screen.java

@@ -0,0 +1,14 @@
+package com.seibel.lod.core.render;
+
+import com.seibel.lod.core.ModInfo;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class F3Screen {
+    public static List<String> f3List = Arrays.asList(
+            "",
+            ModInfo.READABLE_NAME + " version: " + ModInfo.VERSION
+    );
+    public static boolean renderCustomF3 = false;
+}

src/main/java/com/seibel/lod/core/render/GLProxy.java

@@ -64,7 +64,7 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
  */
 public class GLProxy
 {
-	public static final boolean OVERWIDE_VANILLA_GL_LOGGER = true;
+	public static final boolean OVERWIDE_VANILLA_GL_LOGGER = false;
 	
 	private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class);
 

src/main/java/com/seibel/lod/core/util/LodUtil.java

@@ -391,9 +391,8 @@ public class LodUtil
 		numb = Float.intBitsToFloat(i);
 		return numb * (1.5F - half * numb * numb);
 	}
-	public static float pow2(float x) {return x*x;}
 	public static double pow2(double x) {return x*x;}
-	public static int pow2(int x) {return x*x;}
+	public static long pow2(long x) {return x*x;}
 
 	
 	// True if the requested threshold pass, or false otherwise

src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java

@@ -24,7 +24,6 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
-import org.spongepowered.asm.mixin.injection.Inject;
 
 /**
  * @author James Seibel

src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java

@@ -24,7 +24,7 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
 /**
  * Checks if a mod is loaded
  *
- * @author coolGi2007
+ * @author coolGi
  * @version 3-5-2022
  */
 public interface IModChecker extends IBindable {

src/main/resources/LICENSE.LESSER.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.