Now uses Architectury and added Forge support

.gitattributes

@@ -0,0 +1,5 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf

.gitignore

@@ -1,33 +1,49 @@
-# gradle
-
-.gradle/
-build/
-out/
-classes/
-
 # eclipse
-
+bin
 *.launch
-
-# idea
-
-.idea/
-*.iml
-*.ipr
-*.iws
-
-# vscode
-
-.settings/
-.vscode/
-bin/
+.settings
+.metadata
 .classpath
 .project
 
-# macos
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
 
-*.DS_Store
+# gradle
+build
+.gradle
 
-# fabric
+# other
+eclipse
+run
 
+# Files from Forge MDK
+logs
+forge*changelog.txt
+
+.architectury-transformer/
+build/
+*.ipr
 run/
+*.iws
+out/
+*.iml
+.gradle/
+output/
+bin/
+libs/
+
+.classpath
+.project
+.idea/
+classes/
+.metadata
+.vscode
+.settings
+*.launch
+
+**/src/generated/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "core"]
+	path = core
+	url = https://gitlab.com/jeseibel/distant-horizons-core.git

Readme.md

@@ -7,8 +7,6 @@ allowing for an increased view distance without harming performance.
 Or in other words: this mod lets you see farther without turning your game into a slide show.\
 If you want to see a quick demo, check out a video covering the mod here:
 
-# WARNING: This is a very early version of the 1.18 version, EXPECT BUGS
-
 <a href="https://www.youtube.com/watch?v=H2tnvEVbO1c" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.5](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp)</a>
 
 Fabric version: 0.12.6\

build.gradle

@@ -1,138 +1,65 @@
 plugins {
-    id 'fabric-loom' version '0.10-SNAPSHOT'
-    id 'maven-publish'
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }
 
-version = '1.0'
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
-loom {
-    accessWidenerPath = file("src/main/resources/lod.accesswidener")
+architectury {
+    minecraft = rootProject.minecraft_version
 }
 
-// this is required so that we can use 
-// jitpack in the dependencies section below 
-repositories {
-    mavenCentral()
-	// used to download and compile dependencies from git repos 
-	maven { url 'https://jitpack.io' }
+subprojects { p ->
+    apply plugin: "dev.architectury.loom"
 
-    // Required for ModMenu
-    maven { url "https://maven.terraformersmc.com/" }
-}
-
-configurations {
-    shadowMe
-    compileOnly.extendsFrom(embed)
-}
-
-dependencies {
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
-
-    // Fabric API
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-
-    // Mod Menu
-    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
+    loom {
+        silentMojangMappingsLicense()
     }
 
-    implementation 'org.tukaani:xz:1.9'
-    shadowMe 'org.tukaani:xz:1.9'
-    implementation 'org.apache.commons:commons-compress:1.21'
-    shadowMe 'org.apache.commons:commons-compress:1.21'
-}
-
-shadowJar {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    configurations = [project.configurations.getByName("shadowMe")]
-    relocate 'org.tukaani', 'shaded.tukaani'
-    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-    archiveClassifier = 'unmapped'
-
-    from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}"}
+    configurations {
+        common
+        shadowMe
+        implementation.extendsFrom shadowMe
     }
-}
 
-jar {
-    archiveClassifier = 'unmapped'
-}
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        // The following line declares the mojmap mappings
+        mappings loom.officialMojangMappings()
 
-remapJar {
-    dependsOn(shadowJar)
-    mustRunAfter(shadowJar)
-    input = shadowJar.archiveFile
+        if (p != project(":forge")) {
+            // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+            // Do NOT use other classes from fabric loader unless working with fabric
+            modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+        }
 
-    archiveBaseName = "${project.name}"
-    archiveVersion = "${project.version}"
-    archiveClassifier = ''
-}
 
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    // ensure that the encoding is set to UTF-8, no matter what the system default is
-    // this fixes some edge cases with special characters not displaying correctly
-    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-    // If Javadoc is generated, this must be specified in that task too.
-    it.options.encoding = "UTF-8"
-
-    // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-    it.options.release = 17
-}
-
-java {
-    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-    // if it is present.
-    // If you remove this line, sources will not be generated.
-    withSourcesJar()
-}
-
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            // add all the jars that should be included when publishing to maven
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
+        if (p != project(":core")) {
+            common(project(":core")) { transitive false }
+            shadowMe(project(":core")) { transitive false }
         }
     }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-        // Notice: This block does NOT have the same function as the block in the top level.
-        // The repositories here will be used for publishing your artifact, not for
-        // retrieving dependencies.
-    }
 }
 
-//// add Distant Horizon's Core source folders
-//sourceSets {
-//    main {
-//        java {
-//            srcDirs("core/src/main/java");
-//            srcDirs("core/src/main/resources")
-//        }
-//    }
-//}
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
+
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
+
+    repositories {
+        mavenCentral()
+        // used to download and compile dependencies from git repos
+        maven { url 'https://jitpack.io' }
+    }
+
+    tasks.withType(JavaCompile) {
+        // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+        options.release = 17
+    }
+
+    java {
+        withSourcesJar()
+    }
+}

common/build.gradle

@@ -0,0 +1,36 @@
+loom {
+    accessWidenerPath.set(file("src/main/resources/lod.accesswidener"))
+}
+
+architectury {
+    common()
+}
+
+afterEvaluate {
+    tasks {
+        remapJar {
+            remapAccessWidener.set(false)
+        }
+    }
+}
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = rootProject.archives_base_name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}
+
+dependencies {
+    implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
+    shadowMe("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
+        exclude(module: "gson")
+    }
+}

common/src/main/java/com/seibel/lod/common/Config.java

@@ -52,37 +52,37 @@ public class Config extends ConfigGui
 	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
 
 	@ScreenEntry(to = "client")
-	public static ScreenEntry client;
+	public static Client client;
 
 
 	public static class Client
 	{
 		@Category("client")
 		@ScreenEntry(to = "graphics")
-		public static ScreenEntry graphics;
+		public static Graphics graphics;
 
 		@Category("client")
 		@ScreenEntry(to = "worldGenerator")
-		public static ScreenEntry worldGenerator;
+		public static WorldGenerator worldGenerator;
 
 		@Category("client")
 		@ScreenEntry(to = "advanced")
-		public static ScreenEntry advanced;
+		public static Advanced advanced;
 
 
 		public static class Graphics
 		{
 			@Category("client.graphics")
 			@ScreenEntry(to = "quality")
-			public static ScreenEntry quality;
+			public static Quality quality;
 
 			@Category("client.graphics")
 			@ScreenEntry(to = "fogQuality")
-			public static ScreenEntry fogQuality;
+			public static FogQuality fogQuality;
 
 			@Category("client.graphics")
 			@ScreenEntry(to = "advancedGraphics")
-			public static ScreenEntry advancedGraphics;
+			public static AdvancedGraphics advancedGraphics;
 
 
 			public static class Quality
@@ -179,15 +179,15 @@ public class Config extends ConfigGui
 		{
 			@Category("client.advanced")
 			@ScreenEntry(to = "threading")
-			public static ScreenEntry threading;
+			public static Threading threading;
 
 			@Category("client.advanced")
 			@ScreenEntry(to = "debugging")
-			public static ScreenEntry debugging;
+			public static Debugging debugging;
 
 			@Category("client.advanced")
 			@ScreenEntry(to = "buffers")
-			public static ScreenEntry buffers;
+			public static Buffers buffers;
 
 
 			public static class Threading

common/src/main/java/com/seibel/lod/common/LodCommonMain.java

@@ -0,0 +1,29 @@
+package com.seibel.lod.common;
+
+import com.seibel.lod.common.forge.LodForgeMethodCaller;
+import com.seibel.lod.common.wrappers.DependencySetup;
+import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.core.ModInfo;
+
+/**
+ * This is the common main class
+ * @author Ran
+ */
+public class LodCommonMain {
+    public static boolean forge = false;
+    public static LodForgeMethodCaller forgeMethodCaller;
+
+    public static void startup(LodForgeMethodCaller caller) {
+        if (caller != null) {
+            LodCommonMain.forge = true;
+            forgeMethodCaller = caller;
+        }
+
+        DependencySetup.createInitialBindings();
+    }
+
+
+    public static void initConfig() {
+        ConfigGui.init(ModInfo.ID, Config.class);
+    }
+}

common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java

@@ -2,13 +2,10 @@ package com.seibel.lod.common.wrappers.config;
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.moandjiezana.toml.Toml;
+import com.moandjiezana.toml.TomlWriter;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.seibel.lod.core.ModInfo;
-//import net.fabricmc.api.EnvType;
-//import net.fabricmc.api.Environment;
-//import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -26,6 +23,8 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -39,15 +38,14 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
-
 /**
- * which is based upon TinyConfig
+ * Based upon TinyConfig
  * https://github.com/Minenash/TinyConfig
  *
  * Credits to Motschen
  *
  * @author coolGi2007
- * @version 12-06-2021
+ * @version 12-09-2021
  */
 // Everything required is packed into 1 class, so it is easier to copy
 // This config should work for both Fabric and Forge as long as you use Mojang mappings
@@ -106,6 +104,13 @@ public abstract class ConfigGui {
      To make a textured button to the options screen look in the mixins/MixinOptionsScreen class and TexturedButtonWidget class
      Remember to add the MixinOptionsScreen to your ModID.mixins.json
     */
+
+    /*
+            This is a small to do list for the config
+
+        Make config save
+        Add a way to add min and max from another variable
+     */
     private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
     private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
 
@@ -114,14 +119,14 @@ public abstract class ConfigGui {
     protected static class EntryInfo {
         Field field;
         Object widget;
-        int width;
+        int width = 0;
         int max;
         Map.Entry<EditBox, Component> error;
         Object defaultValue;
         Object value;
         String tempValue;
         boolean inLimits = true;
-        String id;
+        String id;              // ModID
         TranslatableComponent name;
         int index;
         boolean button = false; // This asks if it is a button to goto a new screen
@@ -132,28 +137,29 @@ public abstract class ConfigGui {
     public static final Map<String,Class<?>> configClass = new HashMap<>();
     private static Path path;
 
-    private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
-
     public static void init(String modid, Class<?> config) {
-        path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".json");
+        path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".toml");
         configClass.put(modid, config);
 
         for (Field field : config.getFields()) {
             EntryInfo info = new EntryInfo();
             if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class) || field.isAnnotationPresent(ScreenEntry.class))
-                // TODO: Fix the check for client/server
+                // TODO[CONFIG]: Fix the check for client/server
 //                if (Minecraft.getInstance().getEnvironmentType() == EnvType.CLIENT)
                     initClient(modid, field, info);
             if (field.isAnnotationPresent(Entry.class))
                 try {
                     info.defaultValue = field.get(null);
                 } catch (IllegalAccessException ignored) {}
+            if (field.isAnnotationPresent(ScreenEntry.class)) {
+                ConfigGui.init(modid, field.getType());
+            }
+
         }
 
         // File saving stuff
-        // TODO[CONFIG]: Change to .toml
         try {
-            gson.fromJson(Files.newBufferedReader(path), config);
+            new Toml().read(Files.newBufferedReader(path)).to(config);
         }   catch (Exception e) {
             write(modid);
         }
@@ -168,11 +174,15 @@ public abstract class ConfigGui {
         }
     }
     private static void initClient(String modid, Field field, EntryInfo info) {
+        // This adds the buttons to the queue to be rendered
         Class<?> type = field.getType();
         Category c = field.getAnnotation(Category.class);
         Entry e = field.getAnnotation(Entry.class);
         ScreenEntry s = field.getAnnotation(ScreenEntry.class);
-        info.width = e != null ? e.width() : 0;
+        if (e!=null)
+            info.width = e.width();
+        else if (s!=null)
+            info.width = s.width();
         info.field = field;
         info.id = modid;
         info.category = c != null ? c.value() : "";
@@ -180,20 +190,20 @@ public abstract class ConfigGui {
         if (e != null) {
             if (!e.name().equals(""))
                 info.name = new TranslatableComponent(e.name());
-            if (type == int.class)
+            if (type == int.class) // For int
                 textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
-            else if (type == double.class)
+            else if (type == double.class) // For double
                 textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
-            else if (type == String.class || type == List.class) {
+            else if (type == String.class || type == List.class) {  // For string or list
                 info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
                 textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
-            } else if (type == boolean.class) {
+            } else if (type == boolean.class) { // For boolean
                 Function<Object, Component> func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
                 info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
                     info.value = !(Boolean) info.value;
                     button.setMessage(func.apply(info.value));
                 }, func);
-            } else if (type.isEnum()) {
+            } else if (type.isEnum()) { // For enum
                 List<?> values = Arrays.asList(field.getType().getEnumConstants());
                 Function<Object, Component> func = value -> new TranslatableComponent(modid + ".config." + "enum." + type.getSimpleName() + "." + info.value.toString());
                 info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
@@ -244,13 +254,13 @@ public abstract class ConfigGui {
         };
     }
 
-    // Creates the modid.json
+    // Creates the modid.toml
     public static void write(String modid) {
-        path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".json");
+        path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".toml");
         try {
             if (!Files.exists(path))
                 Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
+            new TomlWriter().write(configClass.get(modid).getDeclaredConstructor().newInstance(), path.toFile());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -284,7 +294,7 @@ public abstract class ConfigGui {
         }
         private void loadValues() {
             try {
-                gson.fromJson(Files.newBufferedReader(path), configClass.get(modid));
+                new Toml().read(Files.newBufferedReader(path)).to(configClass.get(modid));
             }   catch (Exception e) {
                 write(modid);
             }
@@ -368,7 +378,7 @@ public abstract class ConfigGui {
                         widget.setFilter(processor);
                         this.list.addButton(widget, resetButton, null, name);
                     } else if (info.button) {
-                        Button widget = new Button(this.width / 2 - 100, this.height - 28, 200, 20, name, (button -> {
+                        Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width*2, 20, name, (button -> {
                             Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, ModInfo.ID, info.gotoScreen));
                         }));
                         this.list.addButton(widget, null, null, null);
@@ -493,6 +503,7 @@ public abstract class ConfigGui {
     public @interface ScreenEntry {
         String to();
         String name() default "";
+        int width() default 100;
     }
 
     // Where the @Category is defined

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -3,6 +3,10 @@ package com.seibel.lod.common.wrappers.minecraft;
 import java.awt.*;
 import java.util.HashSet;
 
+import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.core.util.LodUtil;
+import net.minecraft.client.renderer.LightTexture;
 import org.lwjgl.opengl.GL20;
 
 import com.mojang.math.Vector3f;
@@ -31,21 +35,22 @@ import net.minecraft.world.phys.Vec3;
  * related to rendering in Minecraft.
  *
  * @author James Seibel
- * @version 11-26-2021
+ * @version 12-05-2021
  */
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
     public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
+    public static final MinecraftWrapper MC_WRAPPER = MinecraftWrapper.INSTANCE;
 
-    private final GameRenderer gameRenderer = Minecraft.getInstance().gameRenderer;
-    private final static Minecraft mc = Minecraft.getInstance();
+    private static final Minecraft MC = Minecraft.getInstance();
+    private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
 
 
 
     @Override
     public Vec3f getLookAtVector()
     {
-        Camera camera = gameRenderer.getMainCamera();
+        Camera camera = GAME_RENDERER.getMainCamera();
         Vector3f cameraDir = camera.getLookVector();
         return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
     }
@@ -53,7 +58,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     @Override
     public AbstractBlockPosWrapper getCameraBlockPosition()
     {
-        Camera camera = gameRenderer.getMainCamera();
+        Camera camera = GAME_RENDERER.getMainCamera();
         BlockPos blockPos = camera.getBlockPosition();
         return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
     }
@@ -61,13 +66,13 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     @Override
     public boolean playerHasBlindnessEffect()
     {
-        return mc.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
+        return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
     }
 
     @Override
     public Vec3d getCameraExactPosition()
     {
-        Camera camera = gameRenderer.getMainCamera();
+        Camera camera = GAME_RENDERER.getMainCamera();
         Vec3 projectedView = camera.getPosition();
 
         return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
@@ -76,13 +81,13 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     @Override
     public Mat4f getDefaultProjectionMatrix(float partialTicks)
     {
-        return McObjectConverter.Convert(gameRenderer.getProjectionMatrix(gameRenderer.getFov(gameRenderer.getMainCamera(), partialTicks, true)));
+        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
     }
 
     @Override
     public double getGamma()
     {
-        return mc.options.gamma;
+        return MC.options.gamma;
     }
 
     @Override
@@ -94,8 +99,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
     @Override
     public Color getSkyColor() {
-        if (mc.level.dimensionType().hasSkyLight()) {
-            Vec3 colorValues = mc.level.getSkyColor(mc.gameRenderer.getMainCamera().getPosition(), mc.getFrameTime());
+        if (MC.level.dimensionType().hasSkyLight()) {
+            Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
             return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
         } else
             return new Color(0, 0, 0);
@@ -104,25 +109,25 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     @Override
     public double getFov(float partialTicks)
     {
-        return gameRenderer.getFov(gameRenderer.getMainCamera(), partialTicks, true);
+        return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
     }
 
     /** Measured in chunks */
     @Override
     public int getRenderDistance()
     {
-        return mc.options.renderDistance;
+        return MC.options.renderDistance;
     }
 
     @Override
     public int getScreenWidth()
     {
-        return mc.getWindow().getWidth();
+        return MC.getWindow().getWidth();
     }
     @Override
     public int getScreenHeight()
     {
-        return mc.getWindow().getHeight();
+        return MC.getWindow().getHeight();
     }
 
     /**
@@ -141,7 +146,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
         // Wow, those are some long names!
 
         // go through every RenderInfo to get the compiled chunks
-        LevelRenderer renderer = mc.levelRenderer;
+        LevelRenderer renderer = MC.levelRenderer;
         /*
         for (RenderChunkInfo worldRenderer$LocalRenderInformationContainer : renderer.renderChunks)
         {
@@ -159,4 +164,102 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
         return loadedPos;
     }
 
+
+    @Override
+    public int[] getLightmapPixels()
+    {
+        LightTexture tex = GAME_RENDERER.lightTexture();
+        NativeImage lightMapPixels = tex.lightPixels;
+        LightMapWrapper lightMap = new LightMapWrapper(lightMapPixels);
+
+
+        int lightMapHeight = getLightmapTextureHeight();
+        int lightMapWidth = getLightmapTextureWidth();
+
+        int pixels[] = new int[lightMapWidth * lightMapHeight];
+        for (int u = 0; u < lightMapWidth; u++)
+        {
+            for (int v = 0; v < lightMapWidth; v++)
+            {
+                // 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));
+
+                // these should both create a totally white image
+//					int col =
+//							Integer.MAX_VALUE;
+//					int col =
+//							0b11111111 + // red
+//							(0b11111111 << 8) + // green
+//							(0b11111111 << 16) + // blue
+//							(0b11111111 << 24); // blue
+
+                int col =
+                        (c.getRed() & 0b11111111) + // red
+                                ((c.getGreen() & 0b11111111) << 8) + // green
+                                ((c.getBlue() & 0b11111111) << 16) + // blue
+                                ((c.getAlpha() & 0b11111111) << 24); // alpha
+
+                // 2D array stored in a 1D array.
+                // Thank you Tim from College ;)
+                pixels[u * lightMapWidth + v] = col;
+            }
+        }
+
+        return pixels;
+    }
+
+
+    @Override
+    public int getLightmapTextureHeight()
+    {
+        int height = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null)
+        {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null)
+            {
+                height = tex.getHeight();
+            }
+        }
+
+        return height;
+    }
+
+    @Override
+    public int getLightmapTextureWidth()
+    {
+        int width = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null)
+        {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null)
+            {
+                width = tex.getWidth();
+            }
+        }
+
+        return width;
+    }
+
+
+    @Override
+    public int getLightmapGLFormat() {
+        int glFormat = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null) {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null) {
+                glFormat = tex.format().glFormat();
+            }
+        }
+
+        return glFormat;
+    }
 }

common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftWrapper.java

@@ -73,7 +73,7 @@ public class MinecraftWrapper implements IMinecraftWrapper
 {
     public static final MinecraftWrapper INSTANCE = new MinecraftWrapper();
 
-    private final Minecraft mc = Minecraft.getInstance();
+    public final Minecraft mc = Minecraft.getInstance();
 
     /**
      * The lightmap for the current:
@@ -178,31 +178,36 @@ public class MinecraftWrapper implements IMinecraftWrapper
     /**
      * Returns the color int at the given pixel coordinates
      * from the current lightmap.
-     * @param u x location in texture space
-     * @param v z location in texture space
+     * @param blockLight x location in texture space
+     * @param skyLight z location in texture space
      */
     @Override
-    public int getColorIntFromLightMap(int u, int v)
+    public int getColorIntFromLightMap(int blockLight, int skyLight)
     {
         if (lightMap == null)
         {
+            sendChatMessage("new");
             // make sure the lightMap is up-to-date
             getCurrentLightMap();
         }
 
-        return lightMap.getPixelRGBA(u, v);
+        return lightMap.getPixelRGBA(blockLight, skyLight);
     }
 
     /**
      * Returns the Color at the given pixel coordinates
      * from the current lightmap.
-     * @param u x location in texture space
-     * @param v z location in texture space
+     * @param blockLight x location in texture space
+     * @param skyLight z location in texture space
      */
     @Override
-    public Color getColorFromLightMap(int u, int v)
-    {
-        return LodUtil.intToColor(lightMap.getPixelRGBA(u, v));
+    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));
     }
 
 

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/LodServerWorld.java

@@ -137,22 +137,6 @@ public class LodServerWorld implements WorldGenLevel
         return predicate.test(chunk.getFluidState(blockPos));
     }
 
-    @Override
-    public long nextSubTickCount() {
-        return 0;
-    }
-
-    @Override
-    public LevelTickAccess<Block> getBlockTicks()
-    {
-        return null;
-    }
-
-    @Override
-    public LevelTickAccess<Fluid> getFluidTicks() {
-        return null;
-    }
-
     @Override
     public ChunkAccess getChunk(int x, int z, ChunkStatus requiredStatus, boolean nonnull)
     {
@@ -274,6 +258,21 @@ public class LodServerWorld implements WorldGenLevel
     }
 
 
+    @Override
+    public long nextSubTickCount() {
+        return 0;
+    }
+
+    @Override
+    public LevelTickAccess<Block> getBlockTicks() {
+        return null;
+    }
+
+    @Override
+    public LevelTickAccess<Fluid> getFluidTicks() {
+        return null;
+    }
+
     @Override
     public LevelData getLevelData()
     {

common/src/main/resources/assets/lod/lang/en_us.json

@@ -116,9 +116,5 @@
   "lod.config.enum.GpuUploadMethod.DATA": "Data",
   "lod.config.enum.BufferRebuildTimes.FREQUENT": "Frequent",
   "lod.config.enum.BufferRebuildTimes.NORMAL": "Normal",
-  "lod.config.enum.BufferRebuildTimes.RARE": "Rare",
-  "toast.lod.title": "Distant Horizons",
-  "key.lod.category": "Distant Horizons",
-  "key.lod.DebugToggle": "Debug toggle",
-  "key.lod.DrawToggle": "Draw toggle"
+  "lod.config.enum.BufferRebuildTimes.RARE": "Rare"
 }

fabric/build.gradle

@@ -0,0 +1,130 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.0"
+}
+
+loom {
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+}
+
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+configurations {
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+}
+
+repositories {
+    // Required for ModMenu
+    maven { url "https://maven.terraformersmc.com/" }
+}
+
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+
+    // TODO: This is only for LodMain, try to find a way to remove it
+    // Fabric API
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+
+    // Mod Menu
+    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
+
+    implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
+    shadowMe("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
+        exclude(module: "gson")
+    }
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+
+    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'
+}
+
+// This method copies the access wideners from the common project to the fabric project. And it was generated by Github Copilot
+task copyAccessWidener(type: Copy) {
+    from project(":common").file("src/main/resources/lod.accesswidener")
+    into file("src/generated/resources")
+}
+
+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+task deleteResources(type: Delete) {
+    delete file("build/resources/main")
+}
+
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+runClient {
+    dependsOn(copyCoreResources)
+    dependsOn(copyCommonResources)
+    finalizedBy(deleteResources)
+}
+
+processResources {
+    dependsOn(copyAccessWidener)
+    inputs.property "version", project.version
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowMe]
+    relocate 'org.tukaani', 'shaded.tukaani'
+    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
+    relocate 'com.moandjiezana.toml', 'shaded.moandjiezana.toml'
+
+    classifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier null
+}
+
+jar {
+    classifier "dev"
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenFabric(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

fabric/src/main/java/com/seibel/lod/fabric/Main.java

@@ -42,8 +42,6 @@ public class Main implements ClientModInitializer
 	// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
 	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
 
-	public static Main instance;
-
 	public static ClientProxy client_proxy;
 
 

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinWorldRenderer.java

@@ -50,13 +50,13 @@ public class MixinWorldRenderer
 {
 	private static float previousPartialTicks = 0;
 
-//	@Inject(at = @At("RETURN"), method = "renderClouds(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/math/Matrix4f;FDDD)V")
-//	private void renderClouds(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float partialTicks, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, CallbackInfo callback)
-//	{
-//		// get the partial ticks since renderChunkLayer doesn't
-//		// have access to them
-//		previousPartialTicks = partialTicks;
-//	}
+	@Inject(at = @At("RETURN"), method = "renderClouds(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/math/Matrix4f;FDDD)V")
+	private void renderClouds(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float partialTicks, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, CallbackInfo callback)
+	{
+		// get the partial ticks since renderChunkLayer doesn't
+		// have access to them
+		previousPartialTicks = partialTicks;
+	}
 
 	// HEAD or RETURN
 	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V")

fabric/src/main/resources/lod.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [],
   "client": [
     "MixinMinecraft",

forge/build.gradle

@@ -0,0 +1,107 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.0"
+}
+
+loom {
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+
+    forge {
+        convertAccessWideners.set(true)
+        extraAccessWideners.add("lod.accesswidener")
+        mixinConfigs("lod.mixins.json")
+    }
+}
+
+architectury {
+    platformSetupLoomIde()
+    forge()
+}
+
+configurations {
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+
+    implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
+    forgeDependencies("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
+        exclude(module: "gson")
+    }
+
+//    forgeDependencies(project(":core")) { transitive false }
+
+    forgeDependencies('org.tukaani:xz:1.9')
+    forgeDependencies('org.apache.commons:commons-compress:1.21')
+    shadowMe 'org.tukaani:xz:1.9'
+    shadowMe 'org.apache.commons:commons-compress:1.21'
+}
+
+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+processResources {
+    dependsOn(copyCoreResources)
+    dependsOn(copyCommonResources)
+}
+
+shadowJar {
+    dependencies {
+        exclude(dependency("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"))
+    }
+    exclude "fabric.mod.json"
+    configurations = [project.configurations.shadowMe]
+    relocate 'org.tukaani', 'shaded.tukaani'
+    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
+    relocate 'com.moandjiezana.toml', 'shaded.moandjiezana.toml'
+
+    classifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier null
+}
+
+jar {
+    classifier "dev"
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenForge(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

forge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=forge

forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java

@@ -0,0 +1,107 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.forge;
+
+import com.seibel.lod.core.api.EventApi;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper;
+import com.seibel.lod.common.wrappers.world.WorldWrapper;
+
+import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.event.world.ChunkEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+/**
+ * This handles all events sent to the client,
+ * and is the starting point for most of the mod.
+ * 
+ * @author James_Seibel
+ * @version 11-12-2021
+ */
+public class ForgeClientProxy
+{
+	private final EventApi eventApi = EventApi.INSTANCE;
+	
+	
+	
+	@SubscribeEvent
+	public void serverTickEvent(TickEvent.ServerTickEvent event)
+	{
+		eventApi.serverTickEvent();
+	}
+	
+	@SubscribeEvent
+	public void chunkLoadEvent(ChunkEvent.Load event)
+	{
+		eventApi.chunkLoadEvent(new ChunkWrapper(event.getChunk()), DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType()));
+	}
+	
+	@SubscribeEvent
+	public void worldSaveEvent(WorldEvent.Save event)
+	{
+		eventApi.worldSaveEvent();
+	}
+	
+	/** This is also called when a new dimension loads */
+	@SubscribeEvent
+	public void worldLoadEvent(WorldEvent.Load event)
+	{
+		if (event.getWorld() != null) {
+			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
+		}
+	}
+	
+	@SubscribeEvent
+	public void worldUnloadEvent(WorldEvent.Unload event)
+	{
+		eventApi.worldUnloadEvent();
+	}
+	
+	@SubscribeEvent
+	public void blockChangeEvent(BlockEvent event)
+	{
+		// we only care about certain block events
+		if (event.getClass() == BlockEvent.BreakEvent.class ||
+				event.getClass() == BlockEvent.EntityPlaceEvent.class ||
+				event.getClass() == BlockEvent.EntityMultiPlaceEvent.class ||
+				event.getClass() == BlockEvent.FluidPlaceBlockEvent.class ||
+				event.getClass() == BlockEvent.PortalSpawnEvent.class)
+		{
+			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()));
+			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
+			
+			// recreate the LOD where the blocks were changed
+			eventApi.blockChangeEvent(chunk, dimType);
+		}
+	}
+	
+	@SubscribeEvent
+	public void onKeyInput(InputEvent.KeyInputEvent event)
+	{
+		eventApi.onKeyInput(event.getKey(), event.getAction());
+	}
+	
+	
+	
+}

forge/src/main/java/com/seibel/lod/forge/ForgeMain.java

@@ -0,0 +1,90 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.forge;
+
+import com.seibel.lod.common.Config;
+import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.common.forge.LodForgeMethodCaller;
+import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
+
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraftforge.client.model.data.ModelDataMap;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Initialize and setup the Mod. <br>
+ * If you are looking for the real start of the mod
+ * check out the ClientProxy.
+ * 
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+@Mod(ModInfo.ID)
+public class ForgeMain implements LodForgeMethodCaller
+{
+	public static ForgeClientProxy forgeClientProxy;
+	
+	private void init(final FMLCommonSetupEvent event)
+	{
+		// make sure the dependencies are set up before the mod needs them
+		LodCommonMain.initConfig();
+		LodCommonMain.startup(this);
+		ForgeDependencySetup.createInitialBindings();
+	}
+	
+	
+	public ForgeMain()
+	{
+		// Register the methods
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
+		
+		// Register ourselves for server and other game events we are interested in
+		MinecraftForge.EVENT_BUS.register(this);
+	}
+	
+	private void onClientStart(final FMLClientSetupEvent event)
+	{
+		forgeClientProxy = new ForgeClientProxy();
+		MinecraftForge.EVENT_BUS.register(forgeClientProxy);
+	}
+
+	private ModelDataMap dataMap = new ModelDataMap.Builder().build();
+	@Override
+	public List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
+		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
+	}
+}

forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java

@@ -0,0 +1,48 @@
+package com.seibel.lod.forge.mixins;
+
+import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.common.wrappers.config.TexturedButtonWidget;
+import com.seibel.lod.core.ModInfo;
+import net.minecraft.client.gui.screens.OptionsScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.resources.ResourceLocation;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Objects;
+
+/**
+ * Adds a button to the menu to goto the config
+ *
+ * @author coolGi2007
+ * @version 12-02-2021
+ */
+@Mixin(OptionsScreen.class)
+public class MixinOptionsScreen extends Screen {
+    // Get the texture for the button
+    private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID,"textures/gui/button.png");
+    protected MixinOptionsScreen(Component title) {
+        super(title);
+    }
+
+    @Inject(at = @At("HEAD"),method = "init")
+    private void lodconfig$init(CallbackInfo ci) {
+        this.addRenderableWidget(new TexturedButtonWidget(
+                // Where the button is on the screen
+                this.width / 2 - 180, this.height / 6 - 12,
+                // Width and height of the button
+                20, 20,
+                // Offset
+                0, 0,
+                // Some textuary stuff
+                20, ICON_TEXTURE, 20, 40,
+                // Create the button and tell it where to go
+                (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, ModInfo.ID, "client")),
+                // Add a title to the screen
+                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
+    }
+}

forge/src/main/java/com/seibel/lod/forge/mixins/MixinWorldRenderer.java

@@ -0,0 +1,72 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.forge.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.objects.math.Mat4f;
+import com.seibel.lod.common.wrappers.McObjectConverter;
+
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.RenderType;
+
+/**
+ * This class is used to mix in my rendering code
+ * before Minecraft starts rendering blocks.
+ * If this wasn't done, and we used Forge's
+ * render last event, the LODs would render on top
+ * of the normal terrain.
+ *
+ * @author James Seibel
+ * @version 9-19-2021
+ */
+@Mixin(LevelRenderer.class)
+public class MixinWorldRenderer
+{
+	private static float previousPartialTicks = 0;
+
+	@Inject(at = @At("RETURN"), method = "renderClouds(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/math/Matrix4f;FDDD)V")
+	private void renderClouds(PoseStack modelViewMatrixStack, Matrix4f projectionMatrix, float partialTicks, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, CallbackInfo callback)
+	{
+		// get the partial ticks since renderChunkLayer doesn't
+		// have access to them
+		previousPartialTicks = partialTicks;
+	}
+
+	// HEAD or RETURN
+	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V")
+	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
+	{
+		// only render before solid blocks
+		if (renderType.equals(RenderType.solid()))
+		{
+			Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+			Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+
+			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
+		}
+	}
+}

forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java

@@ -0,0 +1,23 @@
+package com.seibel.lod.forge.wrappers;
+
+import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
+import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+
+/**
+ * Binds all necessary dependencies so we
+ * can access them in Core. <br>
+ * This needs to be called before any Core classes
+ * are loaded.
+ * 
+ * @author James Seibel
+ * @author Ran
+ * @version 12-1-2021
+ */
+public class ForgeDependencySetup
+{
+	public static void createInitialBindings()
+	{
+		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+	}
+}

forge/src/main/resources/META-INF/mods.toml

@@ -0,0 +1,51 @@
+#// This is an example mods.toml file. It contains the data relating to the loading mods.
+#// There are several mandatory fields (#mandatory), and many more that are optional (#optional).
+#// The overall format is standard TOML format, v0.5.0.
+#// Note that there are a couple of TOML lists in this file.
+#// Find more information on toml format here:  https://github.com/toml-lang/toml
+#// The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
+modLoader="javafml" #mandatory
+
+#// A version range to match for said mod loader - for regular FML @Mod it will be the forge version
+loaderVersion="[37,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+
+#// The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
+#// Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
+license="GNU GPLv3"
+
+#// A URL to refer people to when problems occur with this mod
+issueTrackerURL="https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues" #optional
+#// A list of mods - how many allowed here is determined by the individual mod loader
+[[mods]] #mandatory
+
+#// The modid of the mod
+modId="lod" #mandatory
+
+#// The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
+#//${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
+#// see the associated build.gradle script for how to populate this completely automatically during a build
+version="1.5.4a" #mandatory
+
+#// A display name for the mod
+displayName="Distant Horizons" #mandatory
+
+#// A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
+#//updateJSONURL="https://change.me.example.invalid/updates.json" #optional
+
+#// A URL for the "homepage" for this mod, displayed in the mod UI
+displayURL="https://www.curseforge.com/minecraft/mc-mods/lod-level-of-detail" #optional
+
+#// A file name (in the root of the mod JAR) containing a logo for display
+logoFile="logo.png" #optional
+
+#// A file name (in the root of the mod JAR) containing a icon for display by catalogue
+catalogueImageIcon="icon.png"
+
+#// A text field displayed in the mod UI
+credits="TechnoVision, Vike, and Darkhax for their modding tutorials." #optional
+
+#// A text field displayed in the mod UI
+authors="James Seibel, Leonardo Amato, and Cola" #optional
+
+#// The description text for the mod (multi line!) (#mandatory)
+description='''This mod generates and renders simplified terrain beyond the normal view distance, at a low performance cost.'''

forge/src/main/resources/lod.mixins.json

@@ -0,0 +1,11 @@
+{
+	"required": true,
+	"package": "com.seibel.lod.forge.mixins",
+	"compatibilityLevel": "JAVA_17",
+	"refmap": "lod.refmap.json",
+	"mixins": [
+      "MixinWorldRenderer",
+      "MixinOptionsScreen"
+	],
+	"minVersion": "0.8"
+}

forge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "",
+        "pack_format": 7
+    }
+}

gradle.properties

@@ -1,12 +1,14 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx2048M
 
-# Minecraft
 minecraft_version=1.18
-fabric_loader_version=0.12.6
 
-# Mod dependencies
+archives_base_name=DistantHorizons
+mod_version=1.5.4a
+maven_group=com.seibel.lod
+toml_version=0.7.2
+
+fabric_loader_version=0.12.6
 fabric_api_version=0.43.1+1.18
-modmenu_version=3.0.0
+modmenu_version=3.0.0
+
+forge_version=38.0.14

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

src/main/java/com/seibel/lod/common/LodCommonMain.java

@@ -1,40 +0,0 @@
-package com.seibel.lod.common;
-
-import com.seibel.lod.common.forge.LodForgeMethodCaller;
-import com.seibel.lod.common.wrappers.DependencySetup;
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.core.ModInfo;
-
-/**
- * This is the common main class
- * @author Ran
- */
-public class LodCommonMain {
-    public static boolean forge = false;
-    public static LodForgeMethodCaller forgeMethodCaller;
-
-    public static void startup(LodForgeMethodCaller caller) {
-        if (caller != null) {
-            LodCommonMain.forge = true;
-            forgeMethodCaller = caller;
-        }
-
-        DependencySetup.createInitialBindings();
-    }
-
-
-    // TODO[CONFIG]: Find a better way to initialise everything
-    public static void initConfig() {
-        ConfigGui.init(ModInfo.ID, Config.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Graphics.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Graphics.Quality.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Graphics.FogQuality.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Graphics.AdvancedGraphics.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.WorldGenerator.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Advanced.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Threading.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Debugging.class);
-        ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Buffers.class);
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core;
-
-/**
- * This file is similar to mcmod.info
- * <br>
- * If you are looking at this mod's source code and don't
- * know where to start.
- * Go to the api/lod package (folder) and take a look at the ClientApi.java file,
- * Pretty much all of the mod stems from there.
- * 
- * @author James Seibel
- * @version 11-29-2021
- */
-public final class ModInfo
-{
-	public static final String ID = "lod";
-	/** The internal mod name */
-	public static final String NAME = "DistantHorizons";
-	/** Human readable version of NAME */
-	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String API = "LodAPI";
-	public static final String VERSION = "a1.5.4";
-}

src/main/java/com/seibel/lod/core/api/ApiShared.java

@@ -1,53 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.api;
-
-import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory;
-import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
-import com.seibel.lod.core.objects.lod.LodWorld;
-
-/**
- * This stores objects and variables that
- * are shared between the different Core api classes.
- * 
- * @author James Seibel
- * @version 11-12-2021
- */
-public class ApiShared
-{
-	public ApiShared INSTANCE = new ApiShared();
-	
-	public static final LodBufferBuilderFactory lodBufferBuilderFactory = new LodBufferBuilderFactory();
-	public static final LodWorld lodWorld = new LodWorld();
-	public static final LodBuilder lodBuilder = new LodBuilder();
-	
-	/** Used to determine if the LODs should be regenerated */
-	public static int previousChunkRenderDistance = 0;
-	/** Used to determine if the LODs should be regenerated */
-	public static int previousLodRenderDistance = 0;
-	
-	
-	
-	private ApiShared()
-	{
-		
-	}
-	
-}

src/main/java/com/seibel/lod/core/api/ClientApi.java

@@ -1,190 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.api;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.objects.math.Mat4f;
-import com.seibel.lod.core.render.GLProxy;
-import com.seibel.lod.core.render.LodRenderer;
-import com.seibel.lod.core.util.DetailDistanceUtil;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-
-/**
- * This holds the methods that should be called
- * by the host mod loader (Fabric, Forge, etc.).
- * Specifically for the client.
- * 
- * @author James Seibel
- * @version 11-12-2021
- */
-public class ClientApi
-{
-	public static final ClientApi INSTANCE = new ClientApi();
-	public static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);
-	
-	public static LodRenderer renderer = new LodRenderer(ApiShared.lodBufferBuilderFactory);
-	
-	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
-	private static final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	private static final EventApi EVENT_API = EventApi.INSTANCE;
-	
-	/**
-	 * there is some setup that should only happen once,
-	 * once this is true that setup has completed
-	 */
-	private boolean firstTimeSetupComplete = false;
-	private boolean configOverrideReminderPrinted = false;
-	
-	
-	
-	private ClientApi()
-	{
-		
-	}
-	
-	
-	
-	
-	public void renderLods(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
-	{
-		// comment out when creating a release
-		applyConfigOverrides();
-		
-		// clear any out of date objects
-		MC.clearFrameObjectCache();
-		
-		try
-		{
-			// only run the first time setup once
-			if (!firstTimeSetupComplete)
-				firstFrameSetup();
-			
-			
-			if (!MC.playerExists() || ApiShared.lodWorld.getIsWorldNotLoaded())
-				return;
-			
-			LodDimension lodDim = ApiShared.lodWorld.getLodDimension(MC.getCurrentDimension());
-			if (lodDim == null)
-				return;
-			
-			DetailDistanceUtil.updateSettings();
-			EVENT_API.viewDistanceChangedEvent();
-			EVENT_API.playerMoveEvent(lodDim);
-			
-			lodDim.cutRegionNodesAsync(MC.getPlayerBlockPos().getX(), MC.getPlayerBlockPos().getZ());
-			lodDim.expandOrLoadRegionsAsync(MC.getPlayerBlockPos().getX(), MC.getPlayerBlockPos().getZ());
-			
-			
-			
-			if (CONFIG.client().advanced().debugging().getDrawLods())
-			{
-				// Note to self:
-				// if "unspecified" shows up in the pie chart, it is
-				// possibly because the amount of time between sections
-				// is too small for the profiler to measure
-				IProfilerWrapper profiler = MC.getProfiler();
-				profiler.pop(); // get out of "terrain"
-				profiler.push("LOD");
-				
-				
-				ClientApi.renderer.drawLODs(lodDim, mcModelViewMatrix, mcProjectionMatrix, partialTicks, MC.getProfiler());
-				
-				profiler.pop(); // end LOD
-				profiler.push("terrain"); // go back into "terrain"
-			}
-			
-			
-			
-			// these can't be set until after the buffers are built (in renderer.drawLODs)
-			// otherwise the buffers may be set to the wrong size, or not changed at all
-			ApiShared.previousChunkRenderDistance = MC_RENDER.getRenderDistance();
-			ApiShared.previousLodRenderDistance = CONFIG.client().graphics().quality().getLodChunkRenderDistance();
-		}
-		catch (Exception e)
-		{
-			ClientApi.LOGGER.error("client proxy: " + e.getMessage());
-			e.printStackTrace();
-		}
-	}
-	
-	/** used in a development environment to change settings on the fly */
-	private void applyConfigOverrides()
-	{
-		// remind the developer(s) that the config override is active
-		if (!configOverrideReminderPrinted)
-		{
-			MC.sendChatMessage(ModInfo.READABLE_NAME + " experimental build " + ModInfo.VERSION);
-			MC.sendChatMessage("You are running a unsupported version of the mod!");
-			MC.sendChatMessage("Here be dragons!");
-			
-			configOverrideReminderPrinted = true;
-		}
-		
-//		CONFIG.client().worldGenerator().setDistanceGenerationMode(DistanceGenerationMode.FULL);
-		
-//		CONFIG.client().worldGenerator().setGenerationPriority(GenerationPriority.AUTO);		
-		
-//		CONFIG.client().graphics().advancedGraphics().setGpuUploadMethod(GpuUploadMethod.BUFFER_STORAGE);
-//		CONFIG.client().graphics().quality().setLodChunkRenderDistance(128);
-		
-//		CONFIG.client().graphics().fogQuality().setFogDrawMode(FogDrawMode.FOG_ENABLED);
-//		CONFIG.client().graphics().fogQuality().setFogDistance(FogDistance.FAR);
-//		CONFIG.client().graphics().fogQuality().setDisableVanillaFog(true);
-		
-//		CONFIG.client().advanced().buffers().setRebuildTimes(BufferRebuildTimes.FREQUENT);
-		
-		
-		CONFIG.client().advanced().debugging().setDebugKeybindingsEnabled(true);
-	}
-	
-	
-	
-	
-	//=================//
-	// Lod maintenance //
-	//=================//
-	
-	/** This event is called once during the first frame Minecraft renders in the world. */
-	public void firstFrameSetup()
-	{
-		// make sure the GLProxy is created before the LodBufferBuilder needs it
-		GLProxy.getInstance();
-		
-		firstTimeSetupComplete = true;
-	}
-	
-	
-	
-	
-	
-
-	
-	
-	
-}

src/main/java/com/seibel/lod/core/api/EventApi.java

@@ -1,244 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.api;
-
-import org.lwjgl.glfw.GLFW;
-
-import com.seibel.lod.core.builders.worldGeneration.LodGenWorker;
-import com.seibel.lod.core.builders.worldGeneration.LodWorldGenerator;
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.objects.lod.RegionPos;
-import com.seibel.lod.core.render.LodRenderer;
-import com.seibel.lod.core.util.DataPointUtil;
-import com.seibel.lod.core.util.DetailDistanceUtil;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.util.ThreadMapUtil;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-
-/**
- * This holds the methods that should be called
- * by the host mod loader (Fabric, Forge, etc.).
- * Specifically server and client events.
- * 
- * @author James Seibel
- * @version 11-12-2021
- */
-public class EventApi
-{
-	public static final EventApi INSTANCE = new EventApi();
-	
-	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	
-	/**
-	 * can be set if we want to recalculate variables related
-	 * to the LOD view distance
-	 */
-	private boolean recalculateWidths = false;
-	
-	
-	private EventApi()
-	{
-		
-	}
-	
-	
-	
-	
-	//=============//
-	// tick events //
-	//=============//
-	
-	public void serverTickEvent()
-	{
-		if (!MC.playerExists() || ApiShared.lodWorld.getIsWorldNotLoaded())
-			return;
-		
-		LodDimension lodDim = ApiShared.lodWorld.getLodDimension(MC.getCurrentDimension());
-		if (lodDim == null)
-			return;
-		
-		LodWorldGenerator.INSTANCE.queueGenerationRequests(lodDim, ClientApi.renderer, ApiShared.lodBuilder);
-	}
-	
-	
-	
-	
-	//==============//
-	// world events //
-	//==============//
-	
-	public void chunkLoadEvent(IChunkWrapper chunk, IDimensionTypeWrapper dimType)
-	{
-		ApiShared.lodBuilder.generateLodNodeAsync(chunk, ApiShared.lodWorld, dimType, DistanceGenerationMode.FULL);
-	}
-	
-	public void worldSaveEvent()
-	{
-		ApiShared.lodWorld.saveAllDimensions();
-	}
-	
-	/** This is also called when a new dimension loads */
-	public void worldLoadEvent(IWorldWrapper world)
-	{
-		DataPointUtil.WORLD_HEIGHT = world.getHeight();
-		//LodNodeGenWorker.restartExecutorService();
-		//ThreadMapUtil.clearMaps();
-		
-		// the player just loaded a new world/dimension
-		ApiShared.lodWorld.selectWorld(LodUtil.getWorldID(world));
-		
-		// make sure the correct LODs are being rendered
-		// (if this isn't done the previous world's LODs may be drawn)
-		ClientApi.renderer.regenerateLODsNextFrame();
-	}
-	
-	/** This is also called when the user disconnects from a server+ */
-	public void worldUnloadEvent()
-	{
-		// the player just unloaded a world/dimension
-		ThreadMapUtil.clearMaps();
-		
-		new Thread(() -> checkIfDisconnectedFromServer()).start();
-	}
-	private void checkIfDisconnectedFromServer()
-	{
-		try
-		{
-			// world unloading events are called before disconnecting from the server,
-			// so we need to wait a second for MC to disconnect 
-			Thread.sleep(1000);
-		}
-		catch (InterruptedException e)
-		{
-			// this should never happen, but just in case
-			e.printStackTrace();
-		}
-		
-		
-		if (MC.getWrappedClientWorld() == null || (!MC.connectedToServer() && !MC.hasSinglePlayerServer()))
-		{
-			// the player just left the server
-			
-			// TODO should "resetMod()" be called here? -James
-			
-			// if this isn't done unfinished tasks may be left in the queue
-			// preventing new LodChunks form being generated
-			LodGenWorker.restartExecutorService();
-			
-			LodWorldGenerator.INSTANCE.numberOfChunksWaitingToGenerate.set(0);
-			ApiShared.lodWorld.deselectWorld();
-			
-			
-			// prevent issues related to the buffer builder
-			// breaking or retaining previous data when changing worlds.
-			ClientApi.renderer.destroyBuffers();
-			recalculateWidths = true;
-			ClientApi.renderer = new LodRenderer(ApiShared.lodBufferBuilderFactory);
-			
-			
-			// make sure the nulled objects are freed.
-			// (this prevents an out of memory error when
-			// changing worlds)
-			System.gc();
-		}
-	}
-	
-	public void blockChangeEvent(IChunkWrapper chunk, IDimensionTypeWrapper dimType)
-	{
-		// recreate the LOD where the blocks were changed
-		ApiShared.lodBuilder.generateLodNodeAsync(chunk, ApiShared.lodWorld, dimType);		
-	}
-	
-	
-	
-	
-	//=============//
-	// Misc Events //
-	//=============//
-	
-	public void onKeyInput(int key, int keyAction)
-	{
-		if (CONFIG.client().advanced().debugging().getDebugKeybindingsEnabled())
-		{
-			if (key == GLFW.GLFW_KEY_F4 && keyAction == GLFW.GLFW_PRESS)
-			{
-				CONFIG.client().advanced().debugging().setDebugMode(CONFIG.client().advanced().debugging().getDebugMode().getNext());
-			}
-			
-			if (key == GLFW.GLFW_KEY_F6 && keyAction == GLFW.GLFW_PRESS)
-			{
-				CONFIG.client().advanced().debugging().setDrawLods(!CONFIG.client().advanced().debugging().getDrawLods());
-			}
-		}
-	}
-	
-	/** Re-centers the given LodDimension if it needs to be. */
-	public void playerMoveEvent(LodDimension lodDim)
-	{
-		// make sure the dimension is centered
-		RegionPos playerRegionPos = new RegionPos(MC.getPlayerBlockPos());
-		RegionPos worldRegionOffset = new RegionPos(playerRegionPos.x - lodDim.getCenterRegionPosX(), playerRegionPos.z - lodDim.getCenterRegionPosZ());
-		if (worldRegionOffset.x != 0 || worldRegionOffset.z != 0)
-		{
-			ApiShared.lodWorld.saveAllDimensions();
-			lodDim.move(worldRegionOffset);
-			//LOGGER.info("offset: " + worldRegionOffset.x + "," + worldRegionOffset.z + "\t center: " + lodDim.getCenterX() + "," + lodDim.getCenterZ());
-		}
-	}
-	
-	/** Re-sizes all LodDimensions if they need to be. */
-	public void viewDistanceChangedEvent()
-	{
-		// calculate how wide the dimension(s) should be in regions
-		int chunksWide;
-		if (MC.getWrappedClientWorld().getDimensionType().hasCeiling())
-			chunksWide = Math.min(CONFIG.client().graphics().quality().getLodChunkRenderDistance(), LodUtil.CEILED_DIMENSION_MAX_RENDER_DISTANCE) * 2 + 1;
-		else
-			chunksWide = CONFIG.client().graphics().quality().getLodChunkRenderDistance() * 2 + 1;
-		
-		int newWidth = (int) Math.ceil(chunksWide / (float) LodUtil.REGION_WIDTH_IN_CHUNKS);
-		// make sure we have an odd number of regions
-		newWidth += (newWidth & 1) == 0 ? 1 : 2;
-		
-		// do the dimensions need to change in size?
-		if (ApiShared.lodBuilder.defaultDimensionWidthInRegions != newWidth || recalculateWidths)
-		{
-			ApiShared.lodWorld.saveAllDimensions();
-			
-			// update the dimensions to fit the new width
-			ApiShared.lodWorld.resizeDimensionRegionWidth(newWidth);
-			ApiShared.lodBuilder.defaultDimensionWidthInRegions = newWidth;
-			ClientApi.renderer.setupBuffers(ApiShared.lodWorld.getLodDimension(MC.getCurrentDimension()));
-			
-			recalculateWidths = false;
-			//LOGGER.info("new dimension width in regions: " + newWidth + "\t potential: " + newWidth );
-		}
-		DetailDistanceUtil.updateSettings();
-	}
-	
-	
-}

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java

@@ -1,52 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
-
-import java.util.Map;
-
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.enums.rendering.DebugMode;
-import com.seibel.lod.core.objects.VertexOptimizer;
-import com.seibel.lod.core.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-/**
- * This is the abstract class used to create different
- * BufferBuilders.
- * @author James Seibel
- * @version 11-13-2021
- */
-public abstract class AbstractLodTemplate
-{
-	/** Uploads the given LOD to the buffer. */
-	public abstract void addLodToBuffer(LodBufferBuilder buffer, AbstractBlockPosWrapper bufferCenterBlockPos, long data, Map<LodDirection, long[]> adjData,
-			byte detailLevel, int posX, int posZ, VertexOptimizer vertexOptimizer, DebugMode debugging, boolean[] adjShadeDisabled);
-	
-	/** add the given position and color to the buffer */
-	protected void addPosAndColor(LodBufferBuilder buffer,
-			float x, float y, float z,
-			int color)
-	{
-		// TODO re-add transparency by replacing the 255 with "ColorUtil.getAlpha(color)"
-		buffer.vertex(x, y, z).color(ColorUtil.getRed(color), ColorUtil.getGreen(color), ColorUtil.getBlue(color), 255).endVertex();
-	}
-	
-}

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java

@@ -1,142 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
-
-import java.util.Map;
-
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.enums.rendering.DebugMode;
-import com.seibel.lod.core.objects.VertexOptimizer;
-import com.seibel.lod.core.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.util.DataPointUtil;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-/**
- * Builds LODs as rectangular prisms.
- * @author James Seibel
- * @version 11-8-2021
- */
-public class CubicLodTemplate extends AbstractLodTemplate
-{
-	
-	public CubicLodTemplate()
-	{
-	
-	}
-	
-	@Override
-	public void addLodToBuffer(LodBufferBuilder buffer, AbstractBlockPosWrapper bufferCenterBlockPos, long data, Map<LodDirection, long[]> adjData,
-			byte detailLevel, int posX, int posZ, VertexOptimizer vertexOptimizer, DebugMode debugging, boolean[] adjShadeDisabled)
-	{
-		if (vertexOptimizer == null)
-			return;
-		
-		// equivalent to 2^detailLevel
-		int blockWidth = 1 << detailLevel;
-		
-		int color;
-		if (debugging != DebugMode.OFF)
-			color = LodUtil.DEBUG_DETAIL_LEVEL_COLORS[detailLevel].getRGB();
-		else
-			color = DataPointUtil.getColor(data);
-		
-		
-		generateBoundingBox(
-				vertexOptimizer,
-				DataPointUtil.getHeight(data),
-				DataPointUtil.getDepth(data),
-				blockWidth,
-				posX * blockWidth, 0, posZ * blockWidth, // x, y, z offset
-				bufferCenterBlockPos,
-				adjData,
-				color,
-				DataPointUtil.getLightSkyAlt(data),
-				DataPointUtil.getLightBlock(data),
-				adjShadeDisabled);
-		
-		addBoundingBoxToBuffer(buffer, vertexOptimizer);
-	}
-	
-	private void generateBoundingBox(VertexOptimizer vertexOptimizer,
-			int height, int depth, int width,
-			double xOffset, double yOffset, double zOffset,
-			AbstractBlockPosWrapper bufferCenterBlockPos,
-			Map<LodDirection, long[]> adjData,
-			int color,
-			int skyLight,
-			int blockLight,
-			boolean[] adjShadeDisabled)
-	{
-		// don't add an LOD if it is empty
-		if (height == -1 && depth == -1)
-			return;
-		
-		if (depth == height)
-			// if the top and bottom points are at the same height
-			// render this LOD as 1 block thick
-			height++;
-		
-		// offset the AABB by its x/z position in the world since
-		// it uses doubles to specify its location, unlike the model view matrix
-		// which only uses floats
-		double x = -bufferCenterBlockPos.getX();
-		double z = -bufferCenterBlockPos.getZ();
-		vertexOptimizer.reset();
-		vertexOptimizer.setColor(color, adjShadeDisabled);
-		vertexOptimizer.setLights(skyLight, blockLight);
-		vertexOptimizer.setWidth(width, height - depth, width);
-		vertexOptimizer.setOffset((int) (xOffset + x), (int) (depth + yOffset), (int) (zOffset + z));
-		vertexOptimizer.setUpCulling(32, bufferCenterBlockPos);
-		vertexOptimizer.setAdjData(adjData);
-	}
-	
-	private void addBoundingBoxToBuffer(LodBufferBuilder buffer, VertexOptimizer vertexOptimizer)
-	{
-		int color;
-		int skyLight;
-		int blockLight;
-		for (LodDirection lodDirection : VertexOptimizer.DIRECTIONS)
-		{
-			if(vertexOptimizer.isCulled(lodDirection))
-				continue;
-			
-			int verticalFaceIndex = 0;
-			while (vertexOptimizer.shouldRenderFace(lodDirection, verticalFaceIndex))
-			{
-				for (int vertexIndex = 0; vertexIndex < 6; vertexIndex++)
-				{
-					color = vertexOptimizer.getColor(lodDirection);
-					skyLight = vertexOptimizer.getSkyLight(lodDirection, verticalFaceIndex);
-					blockLight = vertexOptimizer.getBlockLight();
-					color = ColorUtil.applyLightValue(color, skyLight, blockLight);
-					addPosAndColor(buffer,
-							vertexOptimizer.getX(lodDirection, vertexIndex),
-							vertexOptimizer.getY(lodDirection, vertexIndex, verticalFaceIndex) + DataPointUtil.VERTICAL_OFFSET,
-							vertexOptimizer.getZ(lodDirection, vertexIndex),
-							color);
-				}
-				verticalFaceIndex++;
-			}
-		}
-	}
-	
-}

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java

@@ -1,48 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
-
-import java.util.Map;
-
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.enums.rendering.DebugMode;
-import com.seibel.lod.core.objects.VertexOptimizer;
-import com.seibel.lod.core.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-/**
- * TODO DynamicLodTemplate
- * Chunks smoothly transition between
- * each other, unless a neighboring chunk
- * is at a significantly different height.
- * @author James Seibel
- * @version 06-16-2021
- */
-public class DynamicLodTemplate extends AbstractLodTemplate
-{
-	@Override
-	public void addLodToBuffer(LodBufferBuilder buffer, AbstractBlockPosWrapper bufferCenterBlockPos, long data, Map<LodDirection, long[]> adjData,
-			byte detailLevel, int posX, int posZ, VertexOptimizer vertexOptimizer, DebugMode debugging, boolean[] adjShadeDisabled)
-	{
-		ClientApi.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!");
-	}
-	
-}

src/main/java/com/seibel/lod/core/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java

@@ -1,46 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.bufferBuilding.lodTemplates;
-
-import java.util.Map;
-
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.enums.rendering.DebugMode;
-import com.seibel.lod.core.objects.VertexOptimizer;
-import com.seibel.lod.core.objects.opengl.LodBufferBuilder;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-
-/**
- * TODO #21 TriangularLodTemplate
- * Builds each LOD chunk as a singular rectangular prism.
- * @author James Seibel
- * @version 06-16-2021
- */
-public class TriangularLodTemplate extends AbstractLodTemplate
-{
-	@Override
-	public void addLodToBuffer(LodBufferBuilder buffer, AbstractBlockPosWrapper bufferCenterBlockPos, long data, Map<LodDirection, long[]> adjData,
-			byte detailLevel, int posX, int posZ, VertexOptimizer vertexOptimizer, DebugMode debugging, boolean[] adjShadeDisabled)
-	{
-		ClientApi.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!");
-	}
-	
-}

src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java

@@ -1,541 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.lodBuilding;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.enums.config.HorizontalResolution;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.objects.lod.LodRegion;
-import com.seibel.lod.core.objects.lod.LodWorld;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.util.DataPointUtil;
-import com.seibel.lod.core.util.DetailDistanceUtil;
-import com.seibel.lod.core.util.LevelPosUtil;
-import com.seibel.lod.core.util.LodThreadFactory;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.util.ThreadMapUtil;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorSingletonWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-
-/**
- * This object is in charge of creating Lod related objects.
- *
- * @author Cola
- * @author Leonardo Amato
- * @author James Seibel
- * @version 10-22-2021
- */
-@SuppressWarnings("GrazieInspection") public class LodBuilder
-{
-	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
-	private static final IBlockColorSingletonWrapper BLOCK_COLOR = SingletonHandler.get(IBlockColorSingletonWrapper.class); 
-	private static final IWrapperFactory FACTORY = SingletonHandler.get(IWrapperFactory.class);
-	
-	/** If no blocks are found in the area in determineBottomPointForArea return this */
-	public static final short DEFAULT_DEPTH = 0;
-	/** If no blocks are found in the area in determineHeightPointForArea return this */
-	public static final short DEFAULT_HEIGHT = 0;
-	/** Minecraft's max light value */
-	public static final short DEFAULT_MAX_LIGHT = 15;
-	
-	
-	private final ExecutorService lodGenThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName()));
-	private final ILodConfigWrapperSingleton config = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	
-	
-	
-	/**
-	 * How wide LodDimensions should be in regions <br>
-	 * Is automatically set before the first frame in ClientProxy.
-	 */
-	public int defaultDimensionWidthInRegions = 0;
-	
-	//public static final boolean useExperimentalLighting = true;
-	
-	
-	
-	
-	public LodBuilder()
-	{
-	
-	}
-	
-	public void generateLodNodeAsync(IChunkWrapper chunk, LodWorld lodWorld, IDimensionTypeWrapper dim)
-	{
-		generateLodNodeAsync(chunk, lodWorld, dim, DistanceGenerationMode.FULL);
-	}
-	
-	public void generateLodNodeAsync(IChunkWrapper chunk, LodWorld lodWorld, IDimensionTypeWrapper dim, DistanceGenerationMode generationMode)
-	{
-		if (lodWorld == null || lodWorld.getIsWorldNotLoaded())
-			return;
-		
-		// don't try to create an LOD object
-		// if for some reason we aren't
-		// given a valid chunk object
-		if (chunk == null)
-			return;
-		
-		Thread thread = new Thread(() ->
-		{
-			//noinspection GrazieInspection
-			try
-			{
-				// we need a loaded client world in order to
-				// get the textures for blocks
-				if (MC.getWrappedClientWorld() == null)
-					return;
-				
-				// don't try to generate LODs if the user isn't in the world anymore
-				// (this happens a lot when the user leaves a world/server)
-				if (!MC.hasSinglePlayerServer() && !MC.connectedToServer())
-					return;
-				
-				// make sure the dimension exists
-				LodDimension lodDim;
-				if (lodWorld.getLodDimension(dim) == null)
-				{
-					lodDim = new LodDimension(dim, lodWorld, defaultDimensionWidthInRegions);
-					lodWorld.addLodDimension(lodDim);
-				}
-				else
-				{
-					lodDim = lodWorld.getLodDimension(dim);
-				}
-				generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(generationMode));
-			}
-			catch (IllegalArgumentException | NullPointerException e)
-			{
-				e.printStackTrace();
-				// if the world changes while LODs are being generated
-				// they will throw errors as they try to access things that no longer
-				// exist.
-			}
-		});
-		lodGenThreadPool.execute(thread);
-	}
-	
-	/**
-	 * Creates a LodNode for a chunk in the given world.
-	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
-	 */
-	public void generateLodNodeFromChunk(LodDimension lodDim, IChunkWrapper chunk) throws IllegalArgumentException
-	{
-		generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig());
-	}
-	
-	/**
-	 * Creates a LodNode for a chunk in the given world.
-	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
-	 */
-	public void generateLodNodeFromChunk(LodDimension lodDim, IChunkWrapper chunk, LodBuilderConfig config)
-			throws IllegalArgumentException
-	{
-		//long executeTime = System.currentTimeMillis();
-		if (chunk == null)
-			throw new IllegalArgumentException("generateLodFromChunk given a null chunk");
-		
-		int startX;
-		int startZ;
-		
-		
-		LodRegion region = lodDim.getRegion(chunk.getPos().getRegionX(), chunk.getPos().getRegionZ());
-		if (region == null)
-			return;
-		
-		// this happens if a LOD is generated after the user leaves the world.
-		if (MC.getWrappedClientWorld() == null)
-			return;
-		
-		// determine how many LODs to generate horizontally
-		byte minDetailLevel = region.getMinDetailLevel();
-		HorizontalResolution detail = DetailDistanceUtil.getLodGenDetail(minDetailLevel);
-		
-		
-		// determine how many LODs to generate vertically
-		//VerticalQuality verticalQuality = LodConfig.CLIENT.graphics.qualityOption.verticalQuality.get();
-		byte detailLevel = detail.detailLevel;
-		
-		
-		// generate the LODs
-		int posX;
-		int posZ;
-		for (int i = 0; i < detail.dataPointLengthCount * detail.dataPointLengthCount; i++)
-		{
-			startX = detail.startX[i];
-			startZ = detail.startZ[i];
-			
-			long[] data;
-			long[] dataToMergeVertical = createVerticalDataToMerge(detail, chunk, config, startX, startZ);
-			data = DataPointUtil.mergeMultiData(dataToMergeVertical, DataPointUtil.WORLD_HEIGHT / 2 + 1, DetailDistanceUtil.getMaxVerticalData(detailLevel));
-			
-			
-			//lodDim.clear(detailLevel, posX, posZ);
-			if (data != null && data.length != 0)
-			{
-				posX = LevelPosUtil.convert((byte) 0, chunk.getPos().getX() * 16 + startX, detail.detailLevel);
-				posZ = LevelPosUtil.convert((byte) 0, chunk.getPos().getZ() * 16 + startZ, detail.detailLevel);
-				lodDim.addVerticalData(detailLevel, posX, posZ, data, false);
-			}
-		}
-		lodDim.updateData(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().getX(), chunk.getPos().getZ());
-		//executeTime = System.currentTimeMillis() - executeTime;
-		//if (executeTime > 0) ClientApi.LOGGER.info("generateLodNodeFromChunk level: " + detailLevel + " time ms: " + executeTime);
-	}
-	
-	/** creates a vertical DataPoint */
-	private long[] createVerticalDataToMerge(HorizontalResolution detail, IChunkWrapper chunk, LodBuilderConfig config, int startX, int startZ)
-	{
-		// equivalent to 2^detailLevel
-		int size = 1 << detail.detailLevel;
-		
-		long[] dataToMerge = ThreadMapUtil.getBuilderVerticalArray(detail.detailLevel);
-		int verticalData = DataPointUtil.WORLD_HEIGHT / 2 + 1;
-		
-		AbstractChunkPosWrapper chunkPos = chunk.getPos();
-		int height;
-		int depth;
-		int color;
-		int light;
-		int lightSky;
-		int lightBlock;
-		int generation = config.distanceGenerationMode.complexity;
-		
-		int xRel;
-		int zRel;
-		int xAbs;
-		int yAbs;
-		int zAbs;
-		boolean hasCeiling = MC.getWrappedClientWorld().getDimensionType().hasCeiling();
-		boolean hasSkyLight = MC.getWrappedClientWorld().getDimensionType().hasSkyLight();
-		boolean isDefault;
-		AbstractBlockPosWrapper blockPos = FACTORY.createBlockPos();
-		int index;
-		
-		for (index = 0; index < size * size; index++)
-		{
-			xRel = startX + index % size;
-			zRel = startZ + index / size;
-			xAbs = chunkPos.getMinBlockX() + xRel;
-			zAbs = chunkPos.getMinBlockZ() + zRel;
-			
-			//Calculate the height of the lod
-			yAbs = DataPointUtil.WORLD_HEIGHT - DataPointUtil.VERTICAL_OFFSET + 1;
-			int count = 0;
-			boolean topBlock = true;
-			while (yAbs > 0)
-			{
-				height = determineHeightPointFrom(chunk, config, xRel, yAbs, zRel, blockPos);
-				
-				// If the lod is at the default height, it must be void data
-				if (height == DEFAULT_HEIGHT)
-				{
-					if (topBlock)
-						dataToMerge[index * verticalData] = DataPointUtil.createVoidDataPoint(generation);
-					break;
-				}
-				
-				yAbs = height - 1;
-				// We search light on above air block
-				depth = determineBottomPointFrom(chunk, config, xRel, yAbs, zRel, blockPos);
-				if (hasCeiling && topBlock)
-				{
-					yAbs = depth;
-					blockPos.set(xAbs, yAbs, zAbs);
-					light = getLightValue(chunk, blockPos, true, hasSkyLight, true);
-					color = generateLodColor(chunk, config, xAbs, yAbs, zAbs, blockPos);
-					blockPos.set(xAbs, yAbs - 1, zAbs);
-				}
-				else
-				{
-					blockPos.set(xAbs, yAbs, zAbs);
-					light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, topBlock);
-					color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
-					blockPos.set(xAbs, yAbs + 1, zAbs);
-				}
-				lightBlock = light & 0b1111;
-				lightSky = (light >> 4) & 0b1111;
-				isDefault = ((light >> 8)) == 1;
-				
-				dataToMerge[index * verticalData + count] = DataPointUtil.createDataPoint(height - DataPointUtil.VERTICAL_OFFSET, depth - DataPointUtil.VERTICAL_OFFSET, color, lightSky, lightBlock, generation, isDefault);
-				topBlock = false;
-				yAbs = depth - 1;
-				count++;
-			}
-		}
-		return dataToMerge;
-	}
-	
-	/**
-	 * Find the lowest valid point from the bottom.
-	 * Used when creating a vertical LOD.
-	 */
-	private short determineBottomPointFrom(IChunkWrapper chunk, LodBuilderConfig config, int xAbs, int yAbs, int zAbs, AbstractBlockPosWrapper blockPos)
-	{
-		short depth = DEFAULT_DEPTH;
-		
-		for (int y = yAbs; y >= 0; y--)
-		{
-			blockPos.set(xAbs, y, zAbs);
-			if (!isLayerValidLodPoint(chunk, blockPos))
-			{
-				depth = (short) (y + 1);
-				break;
-			}
-		}
-		return depth;
-	}
-	
-	/** Find the highest valid point from the Top */
-	private short determineHeightPointFrom(IChunkWrapper chunk, LodBuilderConfig config, int xAbs, int yAbs, int zAbs, AbstractBlockPosWrapper blockPos)
-	{
-		short height = DEFAULT_HEIGHT;
-		if (config.useHeightmap)
-			height = (short) chunk.getHeightMapValue(xAbs, zAbs);
-		else
-		{
-			for (int y = yAbs; y >= 0; y--)
-			{
-				blockPos.set(xAbs, y, zAbs);
-				if (isLayerValidLodPoint(chunk, blockPos))
-				{
-					height = (short) (y + 1);
-					break;
-				}
-			}
-		}
-		return height;
-	}
-	
-	
-	
-	// =====================//
-	// constructor helpers //
-	// =====================//
-	
-	/**
-	 * Generate the color for the given chunk using biome water color, foliage
-	 * color, and grass color.
-	 */
-	private int generateLodColor(IChunkWrapper chunk, LodBuilderConfig builderConfig, int xRel, int yAbs, int zRel, AbstractBlockPosWrapper blockPos)
-	{
-		int colorInt;
-		if (builderConfig.useBiomeColors)
-		{
-			// I have no idea why I need to bit shift to the right, but
-			// if I don't the biomes don't show up correctly.
-			colorInt = chunk.getBiome(xRel, yAbs, zRel).getColorForBiome(xRel, zRel);
-		}
-		else
-		{
-			blockPos.set(chunk.getPos().getMinBlockX() + xRel, yAbs, chunk.getPos().getMinBlockZ() + zRel);
-			colorInt = getColorForBlock(chunk, blockPos);
-			
-			// if we are skipping non-full and non-solid blocks that means we ignore
-			// snow, flowers, etc. Get the above block so we can still get the color
-			// of the snow, flower, etc. that may be above this block
-			int aboveColorInt = 0;
-			if (config.client().worldGenerator().getBlocksToAvoid().nonFull || config.client().worldGenerator().getBlocksToAvoid().noCollision)
-			{
-				blockPos.set(chunk.getPos().getMinBlockX() + xRel, yAbs + 1, chunk.getPos().getMinBlockZ() + zRel);
-				aboveColorInt = getColorForBlock(chunk, blockPos);
-			}
-			
-			//if (colorInt == 0 && yAbs > 0)
-			// if this block is invisible, check the block below it
-			//	colorInt = generateLodColor(chunk, config, xRel, yAbs - 1, zRel, blockPos);
-			
-			// override this block's color if there was a block above this
-			// and we were avoiding non-full/non-solid blocks
-			if (aboveColorInt != 0)
-				colorInt = aboveColorInt;
-		}
-		
-		return colorInt;
-	}
-	
-	/** Gets the light value for the given block position */
-	private int getLightValue(IChunkWrapper chunk, AbstractBlockPosWrapper blockPos, boolean hasCeiling, boolean hasSkyLight, boolean topBlock)
-	{
-		int skyLight = 0;
-		int blockLight;
-		// 1 means the lighting is a guess
-		int isDefault = 0;
-		
-		IWorldWrapper world = MC.getWrappedServerWorld();
-		
-		int blockBrightness = chunk.getEmittedBrightness(blockPos);
-		// get the air block above or below this block
-		if (hasCeiling && topBlock)
-			blockPos.set(blockPos.getX(), blockPos.getY() - 1, blockPos.getZ());
-		else
-			blockPos.set(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ());
-		
-		
-		
-		if (world != null)
-		{
-			// server world sky light (always accurate)
-			blockLight = world.getBlockLight(blockPos);
-			if (topBlock && !hasCeiling && hasSkyLight)
-				skyLight = DEFAULT_MAX_LIGHT;
-			else
-			{
-				if (hasSkyLight)
-					skyLight = world.getSkyLight(blockPos);
-				//else
-				//	skyLight = 0;
-			}
-			if (!topBlock && skyLight == 15)
-			{
-				// we are on predicted terrain, and we don't know what the light here is,
-				// lets just take a guess
-				if (blockPos.getY() >= MC.getWrappedClientWorld().getSeaLevel() - 5)
-				{
-					skyLight = 12;
-					isDefault = 1;
-				}
-				else
-					skyLight = 0;
-			}
-		}
-		else
-		{
-			world = MC.getWrappedClientWorld();
-			if (world==null)
-			{
-				blockLight = 0;
-				skyLight = 12;
-				isDefault = 1;
-			}
-			else
-			{
-				// client world sky light (almost never accurate)
-				blockLight = world.getBlockLight(blockPos);
-				// estimate what the lighting should be
-				if (hasSkyLight || !hasCeiling)
-				{
-					if (topBlock)
-						skyLight = DEFAULT_MAX_LIGHT;
-					else
-					{
-						if (hasSkyLight)
-							skyLight = world.getSkyLight(blockPos);
-						//else
-						//	skyLight = 0;
-						if (!chunk.isLightCorrect() && (skyLight == 0 || skyLight == 15))
-						{
-							// we don't know what the light here is,
-							// lets just take a guess
-							if (blockPos.getY() >= MC.getWrappedClientWorld().getSeaLevel() - 5)
-							{
-								skyLight = 12;
-								isDefault = 1;
-							}
-							else
-								skyLight = 0;
-						}
-					}
-				}
-			}
-		}
-		
-		blockLight = LodUtil.clamp(0, Math.max(blockLight, blockBrightness), DEFAULT_MAX_LIGHT);
-		
-		return blockLight + (skyLight << 4) + (isDefault << 8);
-	}
-	
-	/** Returns a color int for the given block. */
-	private int getColorForBlock(IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
-	{
-		int colorOfBlock;
-		int colorInt;
-		
-		int xRel = blockPos.getX() - chunk.getPos().getMinBlockX();
-		int zRel = blockPos.getZ() - chunk.getPos().getMinBlockZ();
-		//int x = blockPos.getX();
-		int y = blockPos.getY();
-		//int z = blockPos.getZ();
-		
-		IBlockColorWrapper blockColorWrapper;
-		IBlockShapeWrapper blockShapeWrapper = chunk.getBlockShapeWrapper(blockPos);
-		
-		if (chunk.isWaterLogged(blockPos))
-			blockColorWrapper = BLOCK_COLOR.getWaterColor();
-		else
-			blockColorWrapper = chunk.getBlockColorWrapper(blockPos);
-		
-		if (blockShapeWrapper.isToAvoid())
-			return 0;
-		
-		colorOfBlock = blockColorWrapper.getColor();
-		
-		
-		if (blockColorWrapper.hasTint())
-		{
-			IBiomeWrapper biome = chunk.getBiome(xRel, y, zRel);
-			int tintValue;
-			if (blockColorWrapper.hasGrassTint())
-				// grass and green plants
-				tintValue = biome.getGrassTint(0,0);
-			else if (blockColorWrapper.hasFolliageTint())
-				tintValue = biome.getFolliageTint();
-			else
-				//we can reintroduce this with the wrappers
-				tintValue = biome.getWaterTint();
-			
-			colorInt = ColorUtil.multiplyRGBcolors(tintValue | 0xFF000000, colorOfBlock);
-		}
-		else
-			colorInt = colorOfBlock;
-		return colorInt;
-	}
-	
-	
-	/** Is the block at the given blockPos a valid LOD point? */
-	private boolean isLayerValidLodPoint(IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
-	{
-		if (chunk.isWaterLogged(blockPos))
-			return true;
-		
-		boolean nonFullAvoidance = config.client().worldGenerator().getBlocksToAvoid().nonFull;
-		boolean noCollisionAvoidance = config.client().worldGenerator().getBlocksToAvoid().noCollision;
-		
-		IBlockShapeWrapper block = chunk.getBlockShapeWrapper(blockPos);
-		return !block.isToAvoid()
-					   && !(nonFullAvoidance && block.isNonFull())
-					   && !(noCollisionAvoidance && block.hasNoCollision());
-		
-	}
-}

src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilderConfig.java

@@ -1,95 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.lodBuilding;
-
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-
-/**
- * This is used to easily configure how LodChunks are generated.
- * Generally this will only be used if we want to generate a
- * LodChunk using an incomplete Chunk, otherwise the defaults
- * work best for a fully generated chunk (IE has correct surface blocks).
- * @author James Seibel
- * @version 8-14-2021
- */
-public class LodBuilderConfig
-{
-	/** default: false */
-	public boolean useHeightmap;
-	/** default: false */
-	public boolean useBiomeColors;
-	/** default: true */
-	public boolean useSolidBlocksInColorGen;
-	/** default: server */
-	public DistanceGenerationMode distanceGenerationMode;
-	
-	/**
-	 * default settings for a normal chunk <br>
-	 * useHeightmap = false <br>
-	 * useBiomeColors = false <br>
-	 * useSolidBlocksInColorGen = true <br>
-	 * generationMode = Server <br>
-	 */
-	public LodBuilderConfig()
-	{
-		useHeightmap = false;
-		useBiomeColors = false;
-		useSolidBlocksInColorGen = true;
-		distanceGenerationMode = DistanceGenerationMode.FULL;
-	}
-	
-	/**
-	 * @param newUseHeightmap default = false
-	 * @param newUseBiomeColors default = false
-	 * @param newUseSolidBlocksInBiomeColor default = true
-	 * @param newDistanceGenerationMode default = Server
-	 */
-	public LodBuilderConfig(boolean newUseHeightmap, boolean newUseBiomeColors,
-			boolean newUseSolidBlocksInBiomeColor, DistanceGenerationMode newDistanceGenerationMode)
-	{
-		useHeightmap = newUseHeightmap;
-		useBiomeColors = newUseBiomeColors;
-		useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor;
-		distanceGenerationMode = newDistanceGenerationMode;
-	}
-	
-	/**
-	 * @param newUseHeightmap default = false
-	 * @param newUseBiomeColors default = false
-	 * @param newUseSolidBlocksInBiomeColor default = true
-	 */
-	public LodBuilderConfig(boolean newUseHeightmap, boolean newUseBiomeColors, boolean newUseSolidBlocksInBiomeColor)
-	{
-		this();
-		useHeightmap = newUseHeightmap;
-		useBiomeColors = newUseBiomeColors;
-		useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor;
-		distanceGenerationMode = newUseHeightmap ? DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT : DistanceGenerationMode.BIOME_ONLY;
-	}
-	
-	/**
-	 * @param newDistanceGenerationMode default = Server
-	 */
-	public LodBuilderConfig(DistanceGenerationMode newDistanceGenerationMode)
-	{
-		this();
-		distanceGenerationMode = newDistanceGenerationMode;
-	}
-}

src/main/java/com/seibel/lod/core/builders/worldGeneration/LodGenWorker.java

@@ -1,212 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.worldGeneration;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper;
-
-/**
- * This is used to generate a LodChunk at a given ChunkPos.
- * 
- * @author James Seibel
- * @version 11-20-2021
- */
-public class LodGenWorker
-{
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	private static final IWrapperFactory FACTORY = SingletonHandler.get(IWrapperFactory.class);
-	
-	public static ExecutorService genThreads = Executors.newFixedThreadPool(CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
-	
-	private final LodChunkGenThread thread;
-	
-	
-	
-	public LodGenWorker(AbstractChunkPosWrapper newPos, DistanceGenerationMode newGenerationMode,
-			LodBuilder newLodBuilder,
-			LodDimension newLodDimension, IWorldWrapper serverWorld)
-	{
-		// just a few sanity checks
-		if (newPos == null)
-			throw new IllegalArgumentException("LodChunkGenWorker must have a non-null ChunkPos");
-		
-		if (newLodBuilder == null)
-			throw new IllegalArgumentException("LodChunkGenThread requires a non-null LodChunkBuilder");
-		
-		if (newLodDimension == null)
-			throw new IllegalArgumentException("LodChunkGenThread requires a non-null LodDimension");
-		
-		if (serverWorld == null)
-			throw new IllegalArgumentException("LodChunkGenThread requires a non-null ServerWorld");
-		
-		
-		
-		thread = new LodChunkGenThread(newPos, newGenerationMode,
-				newLodBuilder,
-				newLodDimension, serverWorld);
-	}
-	
-	public void queueWork()
-	{
-		if (CONFIG.client().worldGenerator().getDistanceGenerationMode() == DistanceGenerationMode.FULL)
-		{
-			// if we are using FULL generation there is no reason
-			// to queue up a bunch of generation requests,
-			// because MC's internal server (as of 1.16.5) only
-			// responds with a single thread. And we don't
-			// want to cause more lag than necessary or queue up
-			// requests that may end up being unneeded.
-			thread.run();
-		}
-		else
-		{
-			// Every other method can
-			// be done asynchronously
-			genThreads.execute(thread);
-		}
-		
-		// useful for debugging
-//    	ClientProxy.LOGGER.info(thread.lodDim.getNumberOfLods());
-//    	ClientProxy.LOGGER.info(genThreads.toString());
-	}
-	
-	
-	
-	
-	private static class LodChunkGenThread implements Runnable
-	{
-		private final AbstractWorldGeneratorWrapper worldGenWrapper;
-		
-		public final LodDimension lodDim;
-		public final DistanceGenerationMode generationMode;
-		
-		private final AbstractChunkPosWrapper pos;
-		
-		public LodChunkGenThread(AbstractChunkPosWrapper newPos, DistanceGenerationMode newGenerationMode,
-				LodBuilder newLodBuilder,
-				LodDimension newLodDimension, IWorldWrapper worldWrapper)
-		{
-			worldGenWrapper = FACTORY.createWorldGenerator(newLodBuilder, newLodDimension, worldWrapper);
-			
-			pos = newPos;
-			generationMode = newGenerationMode;
-			lodDim = newLodDimension;
-		}
-		
-		@Override
-		public void run()
-		{
-			try
-			{
-				// only generate LodChunks if they can
-				// be added to the current LodDimension
-				
-				if (lodDim.regionIsInRange(pos.getX() / LodUtil.REGION_WIDTH_IN_CHUNKS, pos.getZ() / LodUtil.REGION_WIDTH_IN_CHUNKS))
-				{					
-					switch (generationMode)
-					{
-					case NONE:
-						// don't generate
-						break;
-					case BIOME_ONLY:
-					case BIOME_ONLY_SIMULATE_HEIGHT:
-						// fastest
-						worldGenWrapper.generateBiomesOnly(pos, generationMode);
-						break;
-					case SURFACE:
-						// faster
-						worldGenWrapper.generateSurface(pos);
-						break;
-					case FEATURES:
-						// fast
-						worldGenWrapper.generateFeatures(pos);
-						break;
-					case FULL:
-						// very slow
-						worldGenWrapper.generateFull(pos);
-						break;
-					}
-					
-
-//					boolean dataExistence = lodDim.doesDataExist(new LevelPos((byte) 3, pos.x, pos.z));
-//					if (dataExistence)
-//						ClientProxy.LOGGER.info(pos.x + " " + pos.z + " Success!");
-//					else
-//						ClientProxy.LOGGER.info(pos.x + " " + pos.z);
-
-					// shows the pool size, active threads, queued tasks and completed tasks
-//					ClientProxy.LOGGER.info(genThreads.toString());
-
-//					long endTime = System.currentTimeMillis();
-//					System.out.println(endTime - startTime);
-					
-				}// if in range
-			}
-			catch (Exception e)
-			{
-				ClientApi.LOGGER.error(LodChunkGenThread.class.getSimpleName() + ": ran into an error: " + e.getMessage());
-				e.printStackTrace();
-			}
-			finally
-			{
-				// decrement how many threads are running
-				LodWorldGenerator.INSTANCE.numberOfChunksWaitingToGenerate.addAndGet(-1);
-				
-				// this position is no longer being generated
-				LodWorldGenerator.INSTANCE.positionsWaitingToBeGenerated.remove(pos);
-			}
-		}// run
-		
-		
-	}
-	
-	
-	/**
-	 * Stops the current genThreads if they are running
-	 * and then recreates the Executor service. <br><br>
-	 * <p>
-	 * This is done to clear any outstanding tasks
-	 * that may exist after the player leaves their current world.
-	 * If this isn't done unfinished tasks may be left in the queue
-	 * preventing new LodChunks form being generated.
-	 */
-	public static void restartExecutorService()
-	{
-		if (genThreads != null && !genThreads.isShutdown())
-		{
-			genThreads.shutdownNow();
-		}
-		genThreads = Executors.newFixedThreadPool(CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
-	}
-	
-}

src/main/java/com/seibel/lod/core/builders/worldGeneration/LodWorldGenerator.java

@@ -1,209 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.builders.worldGeneration;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
-import com.seibel.lod.core.enums.config.DistanceGenerationMode;
-import com.seibel.lod.core.objects.PosToGenerateContainer;
-import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.render.LodRenderer;
-import com.seibel.lod.core.util.DetailDistanceUtil;
-import com.seibel.lod.core.util.LevelPosUtil;
-import com.seibel.lod.core.util.LodThreadFactory;
-import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-
-/**
- * A singleton that handles all long distance LOD world generation.
- * @author Leonardo Amato
- * @author James Seibel
- * @version 9-25-2021
- */
-public class LodWorldGenerator
-{
-	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	private static final IWrapperFactory WRAPPER_FACTORY = SingletonHandler.get(IWrapperFactory.class);
-	
-	
-	/** This holds the thread used to create LOD generation requests off the main thread. */
-	private final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator"));
-	
-	/** we only want to queue up one generator thread at a time */
-	private boolean generatorThreadRunning = false;
-	
-	/**
-	 * How many chunks to generate outside the player's view distance at one
-	 * time. (or more specifically how many requests to make at one time). I
-	 * multiply by 8 to make sure there is always a buffer of chunk requests, to
-	 * make sure the CPU is always busy, and we can generate LODs as quickly as
-	 * possible.
-	 */
-	public int maxChunkGenRequests;
-	
-	/**
-	 * This keeps track of how many chunk generation requests are on going. This is
-	 * to limit how many chunks are queued at once. To prevent chunks from being
-	 * generated for a long time in an area the player is no longer in.
-	 */
-	public final AtomicInteger numberOfChunksWaitingToGenerate = new AtomicInteger(0);
-	
-	public final Set<AbstractChunkPosWrapper> positionsWaitingToBeGenerated = new HashSet<>();
-	
-	/**
-	 * Singleton copy of this object
-	 */
-	public static final LodWorldGenerator INSTANCE = new LodWorldGenerator();
-	
-	
-	
-	private LodWorldGenerator()
-	{
-		
-	}
-	
-	/**
-	 * Queues up LodNodeGenWorkers for the given lodDimension.
-	 * @param renderer needed so the LodNodeGenWorkers can flag that the
-	 * buffers need to be rebuilt.
-	 */
-	public void queueGenerationRequests(LodDimension lodDim, LodRenderer renderer, LodBuilder lodBuilder)
-	{
-		if (CONFIG.client().worldGenerator().getDistanceGenerationMode() != DistanceGenerationMode.NONE
-				&& !generatorThreadRunning
-				&& MC.hasSinglePlayerServer())
-		{
-			// the thread is now running, don't queue up another thread
-			generatorThreadRunning = true;
-			
-			// just in case the config changed
-			maxChunkGenRequests = CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads() * 8;
-			
-			Thread generatorThread = new Thread(() ->
-			{
-				try
-				{
-					// round the player's block position down to the nearest chunk BlockPos
-					int playerPosX = MC.getPlayerBlockPos().getX();
-					int playerPosZ = MC.getPlayerBlockPos().getZ();
-					
-					
-					//=======================================//
-					// fill in positionsWaitingToBeGenerated //
-					//=======================================//
-					
-					IWorldWrapper serverWorld = LodUtil.getServerWorldFromDimension(lodDim.dimension);
-					
-					PosToGenerateContainer posToGenerate = lodDim.getPosToGenerate(
-							maxChunkGenRequests,
-							playerPosX,
-							playerPosZ);
-					
-					
-					byte detailLevel;
-					int posX;
-					int posZ;
-					int nearIndex = 0;
-					int farIndex = 0;
-					
-					for (int i = 0; i < posToGenerate.getNumberOfPos(); i++)
-					{
-						// I wish there was a way to compress this code, but I'm not aware of 
-						// an easy way to do so.
-						
-						// add the near positions
-						if (posToGenerate.getNthDetail(nearIndex, true) != 0 && nearIndex < posToGenerate.getNumberOfNearPos())
-						{
-							detailLevel = (byte) (posToGenerate.getNthDetail(nearIndex, true) - 1);
-							posX = posToGenerate.getNthPosX(nearIndex, true);
-							posZ = posToGenerate.getNthPosZ(nearIndex, true);
-							nearIndex++;
-							
-							AbstractChunkPosWrapper chunkPos = WRAPPER_FACTORY.createChunkPos(LevelPosUtil.getChunkPos(detailLevel, posX), LevelPosUtil.getChunkPos(detailLevel, posZ));
-							
-							// prevent generating the same chunk multiple times
-							if (positionsWaitingToBeGenerated.contains(chunkPos))
-								continue;
-							
-							// don't add more to the generation queue then allowed
-							if (numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
-								break;
-							
-							positionsWaitingToBeGenerated.add(chunkPos);
-							numberOfChunksWaitingToGenerate.addAndGet(1);
-							LodGenWorker genWorker = new LodGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
-							genWorker.queueWork();
-						}
-						
-						
-						// add the far positions
-						if (posToGenerate.getNthDetail(farIndex, false) != 0 && farIndex < posToGenerate.getNumberOfFarPos())
-						{
-							detailLevel = (byte) (posToGenerate.getNthDetail(farIndex, false) - 1);
-							posX = posToGenerate.getNthPosX(farIndex, false);
-							posZ = posToGenerate.getNthPosZ(farIndex, false);
-							farIndex++;
-							
-							AbstractChunkPosWrapper chunkPos = WRAPPER_FACTORY.createChunkPos(LevelPosUtil.getChunkPos(detailLevel, posX), LevelPosUtil.getChunkPos(detailLevel, posZ));
-							
-							// don't add more to the generation queue then allowed
-							if (numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
-								continue;
-							//break;
-							
-							// prevent generating the same chunk multiple times
-							if (positionsWaitingToBeGenerated.contains(chunkPos))
-								continue;
-							
-							positionsWaitingToBeGenerated.add(chunkPos);
-							numberOfChunksWaitingToGenerate.addAndGet(1);
-							LodGenWorker genWorker = new LodGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
-							genWorker.queueWork();
-						}
-					}
-					
-				}
-				catch (Exception e)
-				{
-					// this shouldn't ever happen, but just in case
-					e.printStackTrace();
-				}
-				finally
-				{
-					generatorThreadRunning = false;
-				}
-			});
-			
-			mainGenThread.execute(generatorThread);
-		} // if distanceGenerationMode != DistanceGenerationMode.NONE && !generatorThreadRunning
-	} // queueGenerationRequests
-	
-}

src/main/java/com/seibel/lod/core/dataFormat/BlockDataFormat.java

@@ -1,5 +0,0 @@
-package com.seibel.lod.core.dataFormat;
-
-public class BlockDataFormat
-{
-}

src/main/java/com/seibel/lod/core/dataFormat/ColorFormat.java

@@ -1,5 +0,0 @@
-package com.seibel.lod.core.dataFormat;
-
-public class ColorFormat
-{
-}

src/main/java/com/seibel/lod/core/dataFormat/DepthHeightFormat.java

@@ -1,5 +0,0 @@
-package com.seibel.lod.core.dataFormat;
-
-public class DepthHeightFormat
-{
-}

src/main/java/com/seibel/lod/core/dataFormat/LightFormat.java

@@ -1,5 +0,0 @@
-package com.seibel.lod.core.dataFormat;
-
-public class LightFormat
-{
-}

src/main/java/com/seibel/lod/core/dataFormat/PositionDataFormat.java

@@ -1,5 +0,0 @@
-package com.seibel.lod.core.dataFormat;
-
-public class PositionDataFormat
-{
-}

src/main/java/com/seibel/lod/core/enums/LodDirection.java

@@ -1,529 +0,0 @@
-package com.seibel.lod.core.enums;
-
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import com.seibel.lod.core.objects.math.Vec3i;
-
-/**
- * A (almost) exact copy of Minecraft's
- * Direction enum.
- * 
- * @author James Seibel
- * @version 11-13-2021
- */
-public enum LodDirection
-{
-	DOWN(0, 1, -1, "down", LodDirection.AxisDirection.NEGATIVE, LodDirection.Axis.Y, new Vec3i(0, -1, 0)),
-	UP(1, 0, -1, "up", LodDirection.AxisDirection.POSITIVE, LodDirection.Axis.Y, new Vec3i(0, 1, 0)),
-	NORTH(2, 3, 2, "north", LodDirection.AxisDirection.NEGATIVE, LodDirection.Axis.Z, new Vec3i(0, 0, -1)),
-	SOUTH(3, 2, 0, "south", LodDirection.AxisDirection.POSITIVE, LodDirection.Axis.Z, new Vec3i(0, 0, 1)),
-	WEST(4, 5, 1, "west", LodDirection.AxisDirection.NEGATIVE, LodDirection.Axis.X, new Vec3i(-1, 0, 0)),
-	EAST(5, 4, 3, "east", LodDirection.AxisDirection.POSITIVE, LodDirection.Axis.X, new Vec3i(1, 0, 0));
-
-//	private final int data3d;
-//	private final int oppositeIndex;
-//	private final int data2d;
-	
-	private final String name;
-	private final LodDirection.Axis axis;
-	private final LodDirection.AxisDirection axisDirection;
-	private final Vec3i normal;
-	private static final LodDirection[] VALUES = values();
-	
-	private static final Map<String, LodDirection> BY_NAME = Arrays.stream(VALUES).collect(Collectors.toMap(LodDirection::getName, (p_199787_0_) ->
-	{
-		return p_199787_0_;
-	}));
-	
-//	private static final LodDirection[] BY_3D_DATA = Arrays.stream(VALUES).sorted(Comparator.comparingInt((p_199790_0_) ->
-//	{
-//		return p_199790_0_.data3d;
-//	})).toArray((p_199788_0_) ->
-//	{
-//		return new LodDirection[p_199788_0_];
-//	});
-//	
-//	private static final LodDirection[] BY_2D_DATA = Arrays.stream(VALUES).filter((p_199786_0_) ->
-//	{
-//		return p_199786_0_.getAxis().isHorizontal();
-//	}).sorted(Comparator.comparingInt((p_199789_0_) ->
-//	{
-//		return p_199789_0_.data2d;
-//	})).toArray((p_199791_0_) ->
-//	{
-//		return new LodDirection[p_199791_0_];
-//	});
-	
-//	private static final Long2ObjectMap<LodDirection> BY_NORMAL = Arrays.stream(VALUES).collect(Collectors.toMap((p_218385_0_) ->
-//	{
-//		return (new BlockPos(p_218385_0_.getNormal())).asLong();
-//	}, (p_218384_0_) ->
-//	{
-//		return p_218384_0_;
-//	}, (p_218386_0_, p_218386_1_) ->
-//	{
-//		throw new IllegalArgumentException("Duplicate keys");
-//	}, Long2ObjectOpenHashMap::new));
-	
-	
-	
-	LodDirection(int p_i46016_3_, int p_i46016_4_, int p_i46016_5_, String p_i46016_6_, LodDirection.AxisDirection p_i46016_7_, LodDirection.Axis p_i46016_8_, Vec3i p_i46016_9_)
-	{
-//		this.data3d = p_i46016_3_;
-//		this.data2d = p_i46016_5_;
-//		this.oppositeIndex = p_i46016_4_;
-		this.name = p_i46016_6_;
-		this.axis = p_i46016_8_;
-		this.axisDirection = p_i46016_7_;
-		this.normal = p_i46016_9_;
-	}
-	
-	
-	
-	
-//	public static LodDirection[] orderedByNearest(Entity p_196054_0_)
-//	{
-//		float f = p_196054_0_.getViewXRot(1.0F) * ((float) Math.PI / 180F);
-//		float f1 = -p_196054_0_.getViewYRot(1.0F) * ((float) Math.PI / 180F);
-//		float f2 = MathHelper.sin(f);
-//		float f3 = MathHelper.cos(f);
-//		float f4 = MathHelper.sin(f1);
-//		float f5 = MathHelper.cos(f1);
-//		boolean flag = f4 > 0.0F;
-//		boolean flag1 = f2 < 0.0F;
-//		boolean flag2 = f5 > 0.0F;
-//		float f6 = flag ? f4 : -f4;
-//		float f7 = flag1 ? -f2 : f2;
-//		float f8 = flag2 ? f5 : -f5;
-//		float f9 = f6 * f3;
-//		float f10 = f8 * f3;
-//		LodDirection lodDirection = flag ? EAST : WEST;
-//		LodDirection direction1 = flag1 ? UP : DOWN;
-//		LodDirection direction2 = flag2 ? SOUTH : NORTH;
-//		if (f6 > f8)
-//		{
-//			if (f7 > f9)
-//			{
-//				return makeDirectionArray(direction1, lodDirection, direction2);
-//			}
-//			else
-//			{
-//				return f10 > f7 ? makeDirectionArray(lodDirection, direction2, direction1) : makeDirectionArray(lodDirection, direction1, direction2);
-//			}
-//		}
-//		else if (f7 > f10)
-//		{
-//			return makeDirectionArray(direction1, direction2, lodDirection);
-//		}
-//		else
-//		{
-//			return f9 > f7 ? makeDirectionArray(direction2, lodDirection, direction1) : makeDirectionArray(direction2, direction1, lodDirection);
-//		}
-//	}
-	
-//	private static LodDirection[] makeDirectionArray(LodDirection p_196053_0_, LodDirection p_196053_1_, LodDirection p_196053_2_)
-//	{
-//		return new LodDirection[] { p_196053_0_, p_196053_1_, p_196053_2_, p_196053_2_.getOpposite(), p_196053_1_.getOpposite(), p_196053_0_.getOpposite() };
-//	}
-	
-//	public static LodDirection rotate(Mat4f p_229385_0_, LodDirection p_229385_1_)
-//	{
-//		Vec3i Vec3i = p_229385_1_.getNormal();
-//		Vector4f vector4f = new Vector4f(Vec3i.getX(), Vec3i.getY(), Vec3i.getZ(), 0.0F);
-//		vector4f.transform(p_229385_0_);
-//		return getNearest(vector4f.x(), vector4f.y(), vector4f.z());
-//	}
-	
-//	public Quaternion getRotation()
-//	{
-//		Quaternion quaternion = Vector3f.XP.rotationDegrees(90.0F);
-//		switch (this)
-//		{
-//		case DOWN:
-//			return Vector3f.XP.rotationDegrees(180.0F);
-//		case UP:
-//			return Quaternion.ONE.copy();
-//		case NORTH:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(180.0F));
-//			return quaternion;
-//		case SOUTH:
-//			return quaternion;
-//		case WEST:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(90.0F));
-//			return quaternion;
-//		case EAST:
-//		default:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(-90.0F));
-//			return quaternion;
-//		}
-//	}
-	
-//	public int get3DDataValue()
-//	{
-//		return this.data3d;
-//	}
-//	
-//	public int get2DDataValue()
-//	{
-//		return this.data2d;
-//	}
-	
-	public LodDirection.AxisDirection getAxisDirection()
-	{
-		return this.axisDirection;
-	}
-	
-//	public LodDirection getOpposite()
-//	{
-//		return from3DDataValue(this.oppositeIndex);
-//	}
-	
-	public LodDirection getClockWise()
-	{
-		switch (this)
-		{
-		case NORTH:
-			return EAST;
-		case SOUTH:
-			return WEST;
-		case WEST:
-			return NORTH;
-		case EAST:
-			return SOUTH;
-		default:
-			throw new IllegalStateException("Unable to get Y-rotated facing of " + this);
-		}
-	}
-	
-	public LodDirection getCounterClockWise()
-	{
-		switch (this)
-		{
-		case NORTH:
-			return WEST;
-		case SOUTH:
-			return EAST;
-		case WEST:
-			return SOUTH;
-		case EAST:
-			return NORTH;
-		default:
-			throw new IllegalStateException("Unable to get CCW facing of " + this);
-		}
-	}
-	
-	public String getName()
-	{
-		return this.name;
-	}
-	
-	public LodDirection.Axis getAxis()
-	{
-		return this.axis;
-	}
-
-	public static LodDirection byName(String name)
-	{
-		return name == null ? null : BY_NAME.get(name.toLowerCase(Locale.ROOT));
-	}
-	
-//	public static LodDirection from3DDataValue(int p_82600_0_)
-//	{
-//		return BY_3D_DATA[MathHelper.abs(p_82600_0_ % BY_3D_DATA.length)];
-//	}
-//	
-//	public static LodDirection from2DDataValue(int p_176731_0_)
-//	{
-//		return BY_2D_DATA[MathHelper.abs(p_176731_0_ % BY_2D_DATA.length)];
-//	}
-	
-//	@Nullable
-//	public static LodDirection fromNormal(int p_218383_0_, int p_218383_1_, int p_218383_2_)
-//	{
-//		return BY_NORMAL.get(BlockPos.asLong(p_218383_0_, p_218383_1_, p_218383_2_));
-//	}
-	
-//	public static LodDirection fromYRot(double p_176733_0_)
-//	{
-//		return from2DDataValue(MathHelper.floor(p_176733_0_ / 90.0D + 0.5D) & 3);
-//	}
-	
-	public static LodDirection fromAxisAndDirection(LodDirection.Axis p_211699_0_, LodDirection.AxisDirection p_211699_1_)
-	{
-		switch (p_211699_0_)
-		{
-		case X:
-			return p_211699_1_ == LodDirection.AxisDirection.POSITIVE ? EAST : WEST;
-		case Y:
-			return p_211699_1_ == LodDirection.AxisDirection.POSITIVE ? UP : DOWN;
-		case Z:
-		default:
-			return p_211699_1_ == LodDirection.AxisDirection.POSITIVE ? SOUTH : NORTH;
-		}
-	}
-	
-//	public float toYRot()
-//	{
-//		return (this.data2d & 3) * 90;
-//	}
-	
-//	public static LodDirection getRandom(Random p_239631_0_)
-//	{
-//		return Util.getRandom(VALUES, p_239631_0_);
-//	}
-	
-//	public static LodDirection getNearest(double p_210769_0_, double p_210769_2_, double p_210769_4_)
-//	{
-//		return getNearest((float) p_210769_0_, (float) p_210769_2_, (float) p_210769_4_);
-//	}
-	
-//	public static LodDirection getNearest(float p_176737_0_, float p_176737_1_, float p_176737_2_)
-//	{
-//		LodDirection lodDirection = NORTH;
-//		float f = Float.MIN_VALUE;
-//		
-//		for (LodDirection direction1 : VALUES)
-//		{
-//			float f1 = p_176737_0_ * direction1.normal.x + p_176737_1_ * direction1.normal.y + p_176737_2_ * direction1.normal.z;
-//			if (f1 > f)
-//			{
-//				f = f1;
-//				lodDirection = direction1;
-//			}
-//		}
-//		
-//		return lodDirection;
-//	}
-	
-	public static LodDirection get(LodDirection.AxisDirection p_181076_0_, LodDirection.Axis p_181076_1_)
-	{
-		for (LodDirection lodDirection : VALUES)
-		{
-			if (lodDirection.getAxisDirection() == p_181076_0_ && lodDirection.getAxis() == p_181076_1_)
-			{
-				return lodDirection;
-			}
-		}
-		
-		throw new IllegalArgumentException("No such direction: " + p_181076_0_ + " " + p_181076_1_);
-	}
-	
-	public Vec3i getNormal()
-	{
-		return this.normal;
-	}
-	
-//	public boolean isFacingAngle(float p_243532_1_)
-//	{
-//		float f = p_243532_1_ * ((float) Math.PI / 180F);
-//		float f1 = -MathHelper.sin(f);
-//		float f2 = MathHelper.cos(f);
-//		return this.normal.getX() * f1 + this.normal.getZ() * f2 > 0.0F;
-//	}
-	
-	public enum Axis implements Predicate<LodDirection>
-	{
-		X("x")
-		{
-			@Override
-			public int choose(int x, int y, int z)
-			{
-				return x;
-			}
-			
-			@Override
-			public double choose(double x, double y, double z)
-			{
-				return x;
-			}
-		},
-		Y("y")
-		{
-			@Override
-			public int choose(int x, int y, int z)
-			{
-				return y;
-			}
-			
-			@Override
-			public double choose(double x, double y, double z)
-			{
-				return y;
-			}
-		},
-		Z("z")
-		{
-			@Override
-			public int choose(int x, int y, int z)
-			{
-				return z;
-			}
-			
-			@Override
-			public double choose(double x, double y, double z)
-			{
-				return z;
-			}
-		};
-		
-		private static final LodDirection.Axis[] VALUES = values();
-		
-		private static final Map<String, LodDirection.Axis> BY_NAME = Arrays.stream(VALUES).collect(Collectors.toMap(LodDirection.Axis::getName, (p_199785_0_) ->
-		{
-			return p_199785_0_;
-		}));
-		private final String name;
-		
-		Axis(String name)
-		{
-			this.name = name;
-		}
-
-		public static LodDirection.Axis byName(String name)
-		{
-			return BY_NAME.get(name.toLowerCase(Locale.ROOT));
-		}
-		
-		public String getName()
-		{
-			return this.name;
-		}
-		
-		public boolean isVertical()
-		{
-			return this == Y;
-		}
-		
-		public boolean isHorizontal()
-		{
-			return this == X || this == Z;
-		}
-		
-		@Override
-		public String toString()
-		{
-			return this.name;
-		}
-		
-//		public static LodDirection.Axis getRandom(Random p_239634_0_)
-//		{
-//			return Util.getRandom(VALUES, p_239634_0_);
-//		}
-		
-		@Override
-		public boolean test(LodDirection p_test_1_)
-		{
-			return p_test_1_ != null && p_test_1_.getAxis() == this;
-		}
-		
-//		public LodDirection.Plane getPlane()
-//		{
-//			switch (this)
-//			{
-//			case X:
-//			case Z:
-//				return LodDirection.Plane.HORIZONTAL;
-//			case Y:
-//				return LodDirection.Plane.VERTICAL;
-//			default:
-//				throw new Error("Someone's been tampering with the universe!");
-//			}
-//		}
-		
-		public abstract int choose(int p_196052_1_, int p_196052_2_, int p_196052_3_);
-		
-		public abstract double choose(double p_196051_1_, double p_196051_3_, double p_196051_5_);
-	}
-	
-	public enum AxisDirection
-	{
-		POSITIVE(1, "Towards positive"),
-		NEGATIVE(-1, "Towards negative");
-		
-		private final int step;
-		private final String name;
-		
-		AxisDirection(int newStep, String newName)
-		{
-			this.step = newStep;
-			this.name = newName;
-		}
-		
-		public int getStep()
-		{
-			return this.step;
-		}
-		
-		@Override
-		public String toString()
-		{
-			return this.name;
-		}
-		
-		public LodDirection.AxisDirection opposite()
-		{
-			return this == POSITIVE ? NEGATIVE : POSITIVE;
-		}
-	}
-	
-//	public static enum Plane implements Iterable<LodDirection>, Predicate<LodDirection>
-//	{
-//		HORIZONTAL(new LodDirection[] { LodDirection.NORTH, LodDirection.EAST, LodDirection.SOUTH, LodDirection.WEST }, new LodDirection.Axis[] { LodDirection.Axis.X, LodDirection.Axis.Z }),
-//		VERTICAL(new LodDirection[] { LodDirection.UP, LodDirection.DOWN }, new LodDirection.Axis[] { LodDirection.Axis.Y });
-//		
-//		private final LodDirection[] faces;
-//		private final LodDirection.Axis[] axis;
-//		
-//		private Plane(LodDirection[] p_i49393_3_, LodDirection.Axis[] p_i49393_4_)
-//		{
-//			this.faces = p_i49393_3_;
-//			this.axis = p_i49393_4_;
-//		}
-//		
-//		public LodDirection getRandomDirection(Random p_179518_1_)
-//		{
-//			return Util.getRandom(this.faces, p_179518_1_);
-//		}
-//		
-//		public LodDirection.Axis getRandomAxis(Random p_244803_1_)
-//		{
-//			return Util.getRandom(this.axis, p_244803_1_);
-//		}
-//		
-//		@Override
-//		public boolean test(@Nullable LodDirection p_test_1_)
-//		{
-//			return p_test_1_ != null && p_test_1_.getAxis().getPlane() == this;
-//		}
-//		
-//		@Override
-//		public Iterator<LodDirection> iterator()
-//		{
-//			return Iterators.forArray(this.faces);
-//		}
-//		
-//		public Stream<LodDirection> stream()
-//		{
-//			return Arrays.stream(this.faces);
-//		}
-//	}
-	
-	
-	
-	
-	public String getSerializedName()
-	{
-		return this.name;
-	}
-	
-	@Override
-	public String toString()
-	{
-		return this.name;
-	}
-	
-}

src/main/java/com/seibel/lod/core/enums/WorldType.java

@@ -1,33 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums;
-
-/**
- * ServerWorld, ClientWorld, Unknown
- * 
- * @author James Seibel
- * @version 11-12-2021
- */
-public enum WorldType
-{
-	ServerWorld,
-	ClientWorld,
-	Unknown
-}

src/main/java/com/seibel/lod/core/enums/config/BlocksToAvoid.java

@@ -1,47 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * heightmap <br>
- * multi_lod <br>
- * 
- * @author Leonardo Amato
- * @version 11-16-2021
- */
-public enum BlocksToAvoid
-{
-	NONE(false, false),
-	
-	NON_FULL(true, false),
-	
-	NO_COLLISION(false, true),
-	
-	BOTH(true, true);
-	
-	public final boolean nonFull;
-	public final boolean noCollision;
-	
-	BlocksToAvoid(boolean nonFull, boolean noCollision)
-	{
-		this.nonFull = nonFull;
-		this.noCollision = noCollision;
-	}
-}

src/main/java/com/seibel/lod/core/enums/config/BufferRebuildTimes.java

@@ -1,52 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * FREQUENT <br>
- * NORMAL <br>
- * RARE <br>
- * <br>
- * Determines how fast the buffers need to be regenerated
- * 
- * @author Leonardo Amato
- * @version 9-25-2021
- */
-public enum BufferRebuildTimes
-{
-	FREQUENT(1000, 500, 2500, 1),
-	
-	NORMAL(2000, 1000, 5000, 4),
-	
-	RARE(5000, 2000, 10000, 16);
-	
-	public final int playerMoveTimeout;
-	public final int renderedChunkTimeout;
-	public final int chunkChangeTimeout;
-	public final int playerMoveDistance;
-	
-	BufferRebuildTimes(int playerMoveTimeout, int renderedChunkTimeout, int chunkChangeTimeout, int playerMoveDistance)
-	{
-		this.playerMoveTimeout = playerMoveTimeout;
-		this.renderedChunkTimeout = renderedChunkTimeout;
-		this.chunkChangeTimeout = chunkChangeTimeout;
-		this.playerMoveDistance = playerMoveDistance;
-	}
-}

src/main/java/com/seibel/lod/core/enums/config/DistanceGenerationMode.java

@@ -1,95 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * NONE <br>
- * BIOME_ONLY <br>
- * BIOME_ONLY_SIMULATE_HEIGHT <br>
- * SURFACE <br>
- * FEATURES <br>
- * SERVER <br><br>
- * <p>
- * In order of fastest to slowest.
- * 
- * @author James Seibel
- * @author Leonardo Amato
- * @version 8-7-2021
- */
-public enum DistanceGenerationMode
-{
-	/**
-	 * Don't generate anything
-	 */
-	NONE((byte) 0),
-	
-	/**
-	 * Only generate the biomes and use biome
-	 * grass/foliage color, water color, or ice color
-	 * to generate the color.
-	 * Doesn't generate height, everything is shown at sea level.
-	 * Multithreaded - Fastest (2-5 ms)
-	 */
-	BIOME_ONLY((byte) 1),
-	
-	/**
-	 * Same as BIOME_ONLY, except instead
-	 * of always using sea level as the LOD height
-	 * different biome types (mountain, ocean, forest, etc.)
-	 * use predetermined heights to simulate having height data.
-	 */
-	BIOME_ONLY_SIMULATE_HEIGHT((byte) 2),
-	
-	/**
-	 * Generate the world surface,
-	 * this does NOT include caves, trees,
-	 * or structures.
-	 * Multithreaded - Faster (10-20 ms)
-	 */
-	SURFACE((byte) 3),
-	
-	/**
-	 * Generate everything except structures.
-	 * NOTE: This may cause world generation bugs or instability,
-	 * since some features cause concurrentModification exceptions.
-	 * Multithreaded - Fast (15-20 ms)
-	 */
-	FEATURES((byte) 4),
-	
-	/**
-	 * Ask the server to generate/load each chunk.
-	 * This is the most compatible, but causes server/simulation lag.
-	 * This will also show player made structures if you
-	 * are adding the mod on a pre-existing world.
-	 * Singlethreaded - Slow (15-50 ms, with spikes up to 200 ms)
-	 */
-	FULL((byte) 5);
-	
-	
-	/**
-	 * The higher the number the more complete the generation is.
-	 */
-	public final byte complexity;
-	
-	DistanceGenerationMode(byte complexity)
-	{
-		this.complexity = complexity;
-	}
-}

src/main/java/com/seibel/lod/core/enums/config/GenerationPriority.java

@@ -1,41 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * AUTO <br>
- * Near_First <br>
- * Far_First <br>
- * <br>
- * Determines which LODs should have priority when generating
- * outside the normal view distance.
- * 
- * @author Leonardo Amato
- * @version 12-1-2021
- */
-public enum GenerationPriority
-{
-	/** NEAR_FIRST when connected to servers and FAR_FIRST when on single player */
-	AUTO,
-	
-	NEAR_FIRST,
-	
-	FAR_FIRST
-}

src/main/java/com/seibel/lod/core/enums/config/GpuUploadMethod.java

@@ -1,59 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * Auto, Buffer_Storage, Sub_Data, Buffer_Mapping, Data
- * 
- * @author James Seibel
- * @version 12-1-2021
- */
-public enum GpuUploadMethod
-{
-	/** Picks the best option based on the GPU the user has. */
-	AUTO,
-	
-	/**
-	 * Default for NVIDIA if OpenGL 4.5 is supported. <br>
-	 * Fast rendering, no stuttering.
-	 */
-	BUFFER_STORAGE,
-	
-	/**
-	 * Backup option for NVIDIA. <br>
-	 * Fast rendering but may stutter when uploading.
-	 */
-	SUB_DATA,
-
-	/** 
-	 * Default option for AMD/Intel. <br>
-	 * May end up storing buffers in System memory. <br>
-	 * Fast rending if in GPU memory, slow if in system memory, <br>
-	 * but won't stutter when uploading. 
-	 */
-	BUFFER_MAPPING,
-
-	/** 
-	 * Backup option for AMD/Intel. <br>
-	 * Fast rendering but may stutter when uploading. 
-	 */
-	DATA,
-	
-}

src/main/java/com/seibel/lod/core/enums/config/HorizontalQuality.java

@@ -1,53 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * Lowest <br>
- * Low <br>
- * Medium <br>
- * High <br>
- * <br>
- * this indicates the base of the quadratic function we use for the quality drop off
- * 
- * @author Leonardo Amato
- * @version 9-29-2021
- */
-public enum HorizontalQuality
-{
-	/** 1.0 AKA Linear */
-	LOWEST(1.0f),
-	
-	/** exponent 1.5 */
-	LOW(1.5f),
-	
-	/** exponent 2.0 */
-	MEDIUM(2.0f),
-	
-	/** exponent 2.2 */
-	HIGH(2.2f);
-	
-	public final double quadraticBase;
-	
-	HorizontalQuality(double distanceUnit)
-	{
-		this.quadraticBase = distanceUnit;
-	}
-}

src/main/java/com/seibel/lod/core/enums/config/HorizontalResolution.java

@@ -1,175 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import com.seibel.lod.core.util.LodUtil;
-
-/**
- * chunk <Br>
- * half_chunk <Br>
- * four_blocks <br>
- * two_blocks <Br>
- * block <br>
- * 
- * @author James Seibel
- * @author Leonardo Amato
- * @version 9-25-2021
- */
-public enum HorizontalResolution
-{
-	/** render 256 LODs for each chunk */
-	BLOCK(16, 0),
-	
-	/** render 64 LODs for each chunk */
-	TWO_BLOCKS(8, 1),
-	
-	/** render 16 LODs for each chunk */
-	FOUR_BLOCKS(4, 2),
-	
-	/** render 4 LODs for each chunk */
-	HALF_CHUNK(2, 3),
-	
-	/** render 1 LOD for each chunk */
-	CHUNK(1, 4);
-	
-	
-	
-	
-	
-	/**
-	 * How many DataPoints should
-	 * be drawn per side, per LodChunk
-	 */
-	public final int dataPointLengthCount;
-	
-	/** How wide each LOD DataPoint is */
-	public final int dataPointWidth;
-	
-	/**
-	 * This is the same as detailLevel in LodQuadTreeNode,
-	 * lowest is 0 highest is 9
-	 */
-	public final byte detailLevel;
-	
-	/* Start/End X/Z give the block positions
-	 * for each individual dataPoint in a LodChunk */
-	public final int[] startX;
-	public final int[] startZ;
-	
-	public final int[] endX;
-	public final int[] endZ;
-	
-	
-	/**
-	 * 1st dimension: LodDetail.detailLevel <br>
-	 * 2nd dimension: An array of all LodDetails that are less than or <br>
-	 * equal to that detailLevel
-	 */
-	private static HorizontalResolution[][] lowerDetailArrays;
-	
-	
-	
-	
-	HorizontalResolution(int newLengthCount, int newDetailLevel)
-	{
-		detailLevel = (byte) newDetailLevel;
-		dataPointLengthCount = newLengthCount;
-		dataPointWidth = 16 / dataPointLengthCount;
-		
-		startX = new int[dataPointLengthCount * dataPointLengthCount];
-		endX = new int[dataPointLengthCount * dataPointLengthCount];
-		
-		startZ = new int[dataPointLengthCount * dataPointLengthCount];
-		endZ = new int[dataPointLengthCount * dataPointLengthCount];
-		
-		
-		int index = 0;
-		for (int x = 0; x < newLengthCount; x++)
-		{
-			for (int z = 0; z < newLengthCount; z++)
-			{
-				startX[index] = x * dataPointWidth;
-				startZ[index] = z * dataPointWidth;
-				
-				endX[index] = (x * dataPointWidth) + dataPointWidth;
-				endZ[index] = (z * dataPointWidth) + dataPointWidth;
-				
-				index++;
-			}
-		}
-		
-	}// constructor
-	
-	
-	
-	
-	
-	
-	/**
-	 * Returns an array of all LodDetails that have a detail level
-	 * that is less than or equal to the given LodDetail
-	 */
-	public static HorizontalResolution[] getSelfAndLowerDetails(HorizontalResolution detail)
-	{
-		if (lowerDetailArrays == null)
-		{
-			// run first time setup
-			lowerDetailArrays = new HorizontalResolution[HorizontalResolution.values().length][];
-			
-			// go through each LodDetail
-			for (HorizontalResolution currentDetail : HorizontalResolution.values())
-			{
-				ArrayList<HorizontalResolution> lowerDetails = new ArrayList<>();
-				
-				// find the details lower than currentDetail
-				for (HorizontalResolution compareDetail : HorizontalResolution.values())
-				{
-					if (currentDetail.detailLevel <= compareDetail.detailLevel)
-					{
-						lowerDetails.add(compareDetail);
-					}
-				}
-				
-				// have the highest detail item first in the list
-				Collections.sort(lowerDetails);
-				Collections.reverse(lowerDetails);
-				
-				lowerDetailArrays[currentDetail.detailLevel] = lowerDetails.toArray(new HorizontalResolution[lowerDetails.size()]);
-			}
-		}
-		
-		return lowerDetailArrays[detail.detailLevel];
-	}
-	
-	/** Returns what detail level should be used at a given distance and maxDistance. */
-	public static HorizontalResolution getDetailForDistance(HorizontalResolution maxDetailLevel, int distance, int maxDistance)
-	{
-		HorizontalResolution[] lowerDetails = getSelfAndLowerDetails(maxDetailLevel);
-		int distanceBetweenDetails = maxDistance / lowerDetails.length;
-		int index = LodUtil.clamp(0, distance / distanceBetweenDetails, lowerDetails.length - 1);
-		
-		return lowerDetails[index];
-		
-	}
-	
-}

src/main/java/com/seibel/lod/core/enums/config/HorizontalScale.java

@@ -1,49 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * Low <br>
- * Medium <br>
- * High <br>
- * <br>
- * this is a quality scale for the detail drop-off
- * 
- * @author Leonardo Amato
- * @version 9-25-2021
- */
-public enum HorizontalScale
-{
-	/** Lods are 2D with heightMap */
-	LOW(64),
-	
-	/** Lods expand in three dimension */
-	MEDIUM(128),
-	
-	/** Lods expand in three dimension */
-	HIGH(256);
-	
-	public final int distanceUnit;
-	
-	HorizontalScale(int distanceUnit)
-	{
-		this.distanceUnit = distanceUnit;
-	}
-}

src/main/java/com/seibel/lod/core/enums/config/LodTemplate.java

@@ -1,62 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-import com.seibel.lod.core.builders.bufferBuilding.lodTemplates.AbstractLodTemplate;
-import com.seibel.lod.core.builders.bufferBuilding.lodTemplates.CubicLodTemplate;
-import com.seibel.lod.core.builders.bufferBuilding.lodTemplates.DynamicLodTemplate;
-import com.seibel.lod.core.builders.bufferBuilding.lodTemplates.TriangularLodTemplate;
-
-/**
- * Cubic, Triangular, Dynamic
- * 
- * @author James Seibel
- * @version 10-10-2021
- */
-public enum LodTemplate
-{
-	/**
-	 * LODs are rendered as
-	 * rectangular prisms.
-	 */
-	CUBIC(new CubicLodTemplate()),
-	
-	/**
-	 * LODs smoothly transition between
-	 * each other.
-	 */
-	TRIANGULAR(new TriangularLodTemplate()),
-	
-	/**
-	 * LODs smoothly transition between
-	 * each other, unless a neighboring LOD
-	 * is at a significantly different height.
-	 */
-	DYNAMIC(new DynamicLodTemplate());
-	
-	
-	public final AbstractLodTemplate template;
-	
-	LodTemplate(AbstractLodTemplate newTemplate)
-	{
-		template = newTemplate;
-	}
-	
-}

src/main/java/com/seibel/lod/core/enums/config/ShadingMode.java

@@ -1,22 +0,0 @@
-package com.seibel.lod.core.enums.config;
-
-/**
- * NONE, GAME_SHADING
- * 
- * @author James Seibel
- * @version 7-25-2020
- */
-public enum ShadingMode
-{
-	/**
-	 * LODs will have darker sides and bottoms to simulate
-	 * Minecraft's fast lighting.
-	 */
-	GAME_SHADING,
-	
-	/**
-	 * LODs will use ambient occlusion to mimic Minecarft's
-	 * Fancy lighting.
-	 */
-	AMBIENT_OCCLUSION
-}

src/main/java/com/seibel/lod/core/enums/config/VanillaOverdraw.java

@@ -1,45 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * None, Dynamic, Always
- *
- * <p>
- * This represents how far the LODs should overlap with
- * the vanilla Minecraft terrain.
- * 
- * @author James Seibel
- * @version 10-11-2021
- */
-public enum VanillaOverdraw
-{
-	/** Never draw LODs where a minecraft chunk could be. */
-	NEVER,
-	
-	/** Draw LODs over the farther minecraft chunks. */
-	DYNAMIC,
-	
-	/** Draw LODs over all minecraft chunks. */
-	ALWAYS,
-	
-	/** Draw LODs over border chunks. */
-	BORDER,
-}

src/main/java/com/seibel/lod/core/enums/config/VerticalQuality.java

@@ -1,80 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.config;
-
-/**
- * heightmap <br>
- * multi_lod <br>
- * 
- * @author Leonardo Amato
- * @version 10-07-2021
- */
-public enum VerticalQuality
-{
-	LOW(
-			new int[] { 2,
-					2,
-					2,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1 }
-	),
-	
-	MEDIUM(
-			new int[] { 4,
-					4,
-					2,
-					2,
-					2,
-					1,
-					1,
-					1,
-					1,
-					1,
-					1 }
-	),
-	
-	HIGH(
-			new int[] {
-					8,
-					8,
-					4,
-					4,
-					2,
-					2,
-					2,
-					1,
-					1,
-					1,
-					1 }
-	);
-	
-	public final int[] maxVerticalData;
-	
-	VerticalQuality(int[] maxVerticalData)
-	{
-		this.maxVerticalData = maxVerticalData;
-	}
-}

src/main/java/com/seibel/lod/core/enums/rendering/DebugMode.java

@@ -1,54 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.rendering;
-
-/**
- * off, detail, detail wireframe
- * 
- * @author James Seibel
- * @version 8-28-2021
- */
-public enum DebugMode
-{
-	/** LODs are rendered normally */
-	OFF,
-	
-	/** LOD colors are based on their detail */
-	SHOW_DETAIL,
-	
-	/** LOD colors are based on their detail, and draws in wireframe. */
-	SHOW_DETAIL_WIREFRAME;
-	
-	/** used when cycling through the different modes */
-	private DebugMode next;
-	
-	static
-	{
-		OFF.next = SHOW_DETAIL;
-		SHOW_DETAIL.next = SHOW_DETAIL_WIREFRAME;
-		SHOW_DETAIL_WIREFRAME.next = OFF;
-	}
-	
-	/** returns the next debug mode */
-	public DebugMode getNext()
-	{
-		return this.next;
-	}
-}

src/main/java/com/seibel/lod/core/enums/rendering/FogColorMode.java

@@ -1,42 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.rendering;
-
-/**
- * USE_DEFAULT_FOG_COLOR, <br>
- * USE_SKY_COLOR, <br>
- * 
- * @author James Seibel
- * @version 11-27-2021
- */
-public enum FogColorMode
-{
-	/** Fog uses Minecraft's fog color. */
-	USE_WORLD_FOG_COLOR,
-	
-	/**
-	 * Replicates the effect of the clear sky mod.
-	 * Making the fog blend in with the sky better
-	 * https://www.curseforge.com/minecraft/mc-mods/clear-skies
-	 * https://www.curseforge.com/minecraft/mc-mods/clear-skies-forge-port
-	 * For it to look good you need one of those mods
-	 */
-	USE_SKY_COLOR,
-}

src/main/java/com/seibel/lod/core/enums/rendering/FogDistance.java

@@ -1,33 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.core.enums.rendering;
-
-/**
- * NEAR, FAR, or NEAR_AND_FAR.
- * 
- * @author James Seibel
- * @version 11-26-2021
- */
-public enum FogDistance
-{
-	NEAR,
-	FAR,
-	NEAR_AND_FAR
-}