rename lod.core.api -> lod.coreapi.api to file compiler issues

This commit is contained in:
James Seibel
2023-05-02 07:33:22 -05:00
parent 09dfa5477d
commit 250ace6f28
112 changed files with 149 additions and 187 deletions
@@ -6,12 +6,12 @@ import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerato
import com.seibel.lod.api.interfaces.render.IDhApiRenderProxy;
import com.seibel.lod.api.interfaces.world.IDhApiWorldProxy;
import com.seibel.lod.api.methods.override.DhApiWorldGeneratorOverrideRegister;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.core.DependencyInjection.OverrideInjector;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector;
import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.api.interfaces.data.IDhApiTerrainDataRepo;
import com.seibel.lod.api.interfaces.events.IDhApiEventInjector;
import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector;
/**
* This is the masthead of the API, almost everything you could want to do
@@ -22,7 +22,7 @@ package com.seibel.lod.api.enums.config;
import java.util.ArrayList;
import java.util.Collections;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
/**
* BLOCK <Br>
@@ -1,6 +1,6 @@
package com.seibel.lod.api.interfaces.config;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* This interface is just used to organize API config groups so
@@ -20,7 +20,7 @@
package com.seibel.lod.api.interfaces.events;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.core.interfaces.dependencyInjection.IDependencyInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IDependencyInjector;
/**
* This class takes care of dependency injection for API events.
@@ -1,7 +1,7 @@
package com.seibel.lod.api.interfaces.override;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector;
/**
* Implemented by all DhApi objects that can be overridden.
@@ -2,7 +2,7 @@ package com.seibel.lod.api.methods.events;
import com.seibel.lod.api.objects.DhApiResult;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector;
/**
* Handles adding/removing event handlers.
@@ -2,7 +2,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -3,7 +3,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -4,7 +4,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -3,7 +3,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -3,7 +3,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -3,7 +3,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -3,7 +3,6 @@ package com.seibel.lod.api.methods.events.abstractEvents;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
/**
* @author James Seibel
@@ -1,7 +1,7 @@
package com.seibel.lod.api.methods.events.interfaces;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* The interface used by all DH Api events.
@@ -1,6 +1,6 @@
package com.seibel.lod.api.methods.events.sharedParameterObjects;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Mat4f;
/**
* Parameter passed into Render events.
@@ -4,7 +4,7 @@ import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerato
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGeneratorOverrideRegister;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.api.objects.DhApiResult;
import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector;
import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector;
/**
* Handles adding world generator overrides.
@@ -1,9 +1,9 @@
package com.seibel.lod.api.objects.config;
import com.seibel.lod.api.interfaces.config.IDhApiConfigValue;
import com.seibel.lod.core.interfaces.config.IConfigEntry;
import com.seibel.lod.core.interfaces.config.IConverter;
import com.seibel.lod.core.util.converters.DefaultConverter;
import com.seibel.lod.coreapi.interfaces.config.IConfigEntry;
import com.seibel.lod.coreapi.interfaces.config.IConverter;
import com.seibel.lod.coreapi.util.converters.DefaultConverter;
/**
* A wrapper used to interface with Distant Horizon's Config. <br> <br>
@@ -1,7 +1,7 @@
package com.seibel.lod.api.objects.data;
import com.seibel.lod.api.objects.math.DhApiVec3i;
import com.seibel.lod.core.util.math.Vec3i;
import com.seibel.lod.coreapi.util.math.Vec3i;
/**
* Holds a single datapoint of terrain data
@@ -19,8 +19,6 @@
package com.seibel.lod.api.objects.math;
import com.seibel.lod.core.util.MathUtil;
/**
* Often used to store block positions or any other
* position in 3D space.
@@ -17,11 +17,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.DependencyInjection;
package com.seibel.lod.coreapi.DependencyInjection;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.events.ApiEventDefinitionHandler;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.api.interfaces.events.IDhApiEventInjector;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -17,10 +17,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.DependencyInjection;
package com.seibel.lod.coreapi.DependencyInjection;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.interfaces.dependencyInjection.IDependencyInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IDependencyInjector;
import java.util.ArrayList;
import java.util.HashMap;
@@ -17,11 +17,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.DependencyInjection;
package com.seibel.lod.coreapi.DependencyInjection;
import com.seibel.lod.api.interfaces.override.IDhApiOverrideable;
import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.core.util.StringUtil;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.coreapi.util.StringUtil;
import java.util.HashMap;
@@ -1,7 +1,7 @@
package com.seibel.lod.core.DependencyInjection;
package com.seibel.lod.coreapi.DependencyInjection;
import com.seibel.lod.api.interfaces.override.IDhApiOverrideable;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import java.util.ArrayList;
@@ -17,12 +17,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.DependencyInjection;
package com.seibel.lod.coreapi.DependencyInjection;
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.util.StringUtil;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.util.StringUtil;
import java.util.HashMap;
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core;
package com.seibel.lod.coreapi;
/**
* This file is similar to mcmod.info
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.events;
package com.seibel.lod.coreapi.events;
import com.seibel.lod.api.methods.events.abstractEvents.*;
import com.seibel.lod.api.methods.events.interfaces.IDhApiEvent;
@@ -1,4 +1,4 @@
package com.seibel.lod.core.interfaces.config;
package com.seibel.lod.coreapi.interfaces.config;
/**
@@ -1,4 +1,4 @@
package com.seibel.lod.core.interfaces.config;
package com.seibel.lod.coreapi.interfaces.config;
/**
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.interfaces.dependencyInjection;
package com.seibel.lod.coreapi.interfaces.dependencyInjection;
/**
* Necessary for all singletons that can be dependency injected.
@@ -1,4 +1,4 @@
package com.seibel.lod.core.interfaces.dependencyInjection;
package com.seibel.lod.coreapi.interfaces.dependencyInjection;
import java.util.ArrayList;
@@ -1,4 +1,4 @@
package com.seibel.lod.core.interfaces.dependencyInjection;
package com.seibel.lod.coreapi.interfaces.dependencyInjection;
import com.seibel.lod.api.interfaces.override.IDhApiOverrideable;
@@ -1,4 +1,4 @@
package com.seibel.lod.core.util;
package com.seibel.lod.coreapi.util;
/**
* A list of helper methods to make code easier to read. <br>
@@ -1,4 +1,4 @@
package com.seibel.lod.core.util;
package com.seibel.lod.coreapi.util;
public class MathUtil
{
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.util;
package com.seibel.lod.coreapi.util;
/**
* Miscellaneous string helper functions.
@@ -1,6 +1,6 @@
package com.seibel.lod.core.util.converters;
package com.seibel.lod.coreapi.util.converters;
import com.seibel.lod.core.interfaces.config.IConverter;
import com.seibel.lod.coreapi.interfaces.config.IConverter;
/**
@@ -1,7 +1,7 @@
package com.seibel.lod.core.util.converters;
package com.seibel.lod.coreapi.util.converters;
import com.seibel.lod.api.enums.rendering.ERendererMode;
import com.seibel.lod.core.interfaces.config.IConverter;
import com.seibel.lod.coreapi.interfaces.config.IConverter;
/**
* Used for simplifying the fake chunk rendering on/off setting.
@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.util.math;
package com.seibel.lod.coreapi.util.math;
import java.nio.FloatBuffer;
@@ -17,9 +17,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.util.math;
package com.seibel.lod.coreapi.util.math;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
/**
* This is closer to MC's implementation of a
@@ -17,9 +17,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.util.math;
package com.seibel.lod.coreapi.util.math;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
/**
* A (almost) exact copy of Minecraft's 1.16.5
@@ -17,10 +17,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.seibel.lod.core.util.math;
package com.seibel.lod.coreapi.util.math;
import com.seibel.lod.api.objects.math.DhApiVec3i;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
/**
* A (almost) exact copy of Minecraft's 1.16.5
@@ -2,8 +2,8 @@ package tests;
import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
import com.seibel.lod.api.objects.events.DhApiEventDefinition;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.core.events.ApiEventDefinitionHandler;
import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector;
import com.seibel.lod.coreapi.events.ApiEventDefinitionHandler;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -19,8 +19,7 @@
package com.seibel.lod.core;
import com.seibel.lod.api.enums.rendering.EFogDrawMode;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* A singleton used to get variables from methods
@@ -23,7 +23,7 @@ import com.seibel.lod.api.enums.config.*;
import com.seibel.lod.api.interfaces.config.IDhApiConfigValue;
import com.seibel.lod.api.interfaces.config.client.IDhApiGraphicsConfig;
import com.seibel.lod.api.objects.config.DhApiConfigValue;
import com.seibel.lod.core.util.converters.RenderModeEnabledConverter;
import com.seibel.lod.coreapi.util.converters.RenderModeEnabledConverter;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.api.enums.rendering.ERendererMode;
import com.seibel.lod.core.config.Config.Client.Graphics.Quality;
@@ -15,9 +15,10 @@ import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.util.*;
import com.seibel.lod.core.util.math.Vec3d;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.core.util.math.Vec3i;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.math.Vec3d;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Vec3i;
import com.seibel.lod.core.world.AbstractDhWorld;
import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper;
import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
@@ -21,10 +21,10 @@ package com.seibel.lod.core.api.internal;
import com.seibel.lod.api.methods.events.abstractEvents.*;
import com.seibel.lod.api.methods.events.sharedParameterObjects.DhApiRenderParam;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.api.enums.rendering.EDebugMode;
import com.seibel.lod.api.enums.rendering.ERendererMode;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
@@ -32,7 +32,7 @@ import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.logging.ConfigBasedLogger;
import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
import com.seibel.lod.core.logging.SpamReducedLogger;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.core.render.glObject.GLProxy;
import com.seibel.lod.core.render.renderer.TestRenderer;
import com.seibel.lod.core.util.RenderUtil;
@@ -22,7 +22,7 @@ package com.seibel.lod.core.api.internal;
import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelSaveEvent;
import com.seibel.lod.api.methods.events.abstractEvents.DhApiLevelUnloadEvent;
import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.world.AbstractDhWorld;
import com.seibel.lod.core.world.DhClientServerWorld;
@@ -1,7 +1,7 @@
package com.seibel.lod.core.config.types;
import com.seibel.lod.core.interfaces.config.IConfigEntry;
import com.seibel.lod.coreapi.interfaces.config.IConfigEntry;
import java.util.ArrayList;
import java.util.Arrays;
@@ -12,7 +12,7 @@ import com.seibel.lod.core.pos.DhBlockPos2D;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.util.FullDataPointUtil;
import com.seibel.lod.core.util.LodUtil;
@@ -13,7 +13,7 @@ import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.FullDataPointUtil;
import com.seibel.lod.core.util.LodUtil;
import org.apache.logging.log4j.Logger;
@@ -13,7 +13,7 @@ import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.FullDataPointUtil;
import com.seibel.lod.core.util.LodUtil;
import org.apache.logging.log4j.Logger;
@@ -1,7 +1,7 @@
package com.seibel.lod.core.dataObjects.render;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor;
import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView;
import com.seibel.lod.core.dataObjects.render.columnViews.ColumnQuadView;
@@ -13,7 +13,7 @@ import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.enums.ELodDirection;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.RenderDataPointUtil;
import com.seibel.lod.core.util.objects.Reference;
@@ -25,7 +25,7 @@ import com.seibel.lod.core.render.renderer.LodRenderer;
import com.seibel.lod.core.enums.ELodDirection;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
public class ColumnBox {
@@ -25,7 +25,7 @@ import com.seibel.lod.core.util.RenderDataPointUtil;
import com.seibel.lod.api.enums.rendering.EDebugMode;
import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.LodUtil;
@@ -33,7 +33,7 @@ import com.seibel.lod.api.enums.config.EGpuUploadMethod;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer;
import com.seibel.lod.core.util.ColorUtil;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
import org.apache.logging.log4j.Logger;
//TODO: Recheck this class for refactoring
@@ -19,8 +19,8 @@
package com.seibel.lod.core.dependencyInjection;
import com.seibel.lod.core.DependencyInjection.DependencyInjector;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModAccessor;
import org.apache.logging.log4j.Logger;
@@ -19,8 +19,8 @@
package com.seibel.lod.core.dependencyInjection;
import com.seibel.lod.core.DependencyInjection.DependencyInjector;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* This class takes care of dependency injection
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.seibel.lod.core.util.math.Vec3i;
import com.seibel.lod.coreapi.util.math.Vec3i;
/**
* An (almost) exact copy of Minecraft's
@@ -22,13 +22,13 @@ package com.seibel.lod.core.generation;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode;
import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.core.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IOverrideInjector;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -1,17 +1,10 @@
package com.seibel.lod.core.jar;
import com.formdev.flatlaf.FlatDarkLaf;
import com.formdev.flatlaf.FlatLightLaf;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.core.config.ConfigBase;
import com.seibel.lod.core.jar.DarkModeDetector;
import com.seibel.lod.core.jar.JarUtils;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.core.jar.gui.BaseJFrame;
import com.seibel.lod.core.jar.gui.cusomJObject.JBox;
import com.seibel.lod.core.jar.installer.ModrinthGetter;
import com.seibel.lod.core.jar.installer.WebDownloader;
import com.seibel.lod.core.jar.JarDependencySetup;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.jar.updater;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.jar.JarUtils;
@@ -16,7 +16,7 @@ import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.util.FileScanUtil;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
@@ -1,7 +1,7 @@
package com.seibel.lod.core.level;
import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector;
import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector;
import com.seibel.lod.core.config.AppliedConfigState;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.file.fullDatafile.FullDataFileHandler;
@@ -1,7 +1,7 @@
package com.seibel.lod.core.level;
import com.seibel.lod.core.pos.DhBlockPos;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.logging;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.logging.f3;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import java.lang.ref.WeakReference;
import java.util.Arrays;
@@ -1,7 +1,6 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
public class DhBlockPos2D {
public static final DhBlockPos2D ZERO = new DhBlockPos2D(0, 0);
@@ -1,7 +1,7 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.LodUtil;
import org.jetbrains.annotations.NotNull;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
/**
* Often used to measure LOD widths
@@ -1,7 +1,7 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.enums.ELodDirection;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.LodUtil;
import java.util.function.Consumer;
@@ -19,8 +19,7 @@
package com.seibel.lod.core.pos;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
import java.util.Objects;
@@ -6,7 +6,7 @@ import com.seibel.lod.core.logging.DhLoggerBuilder;
import com.seibel.lod.core.pos.Pos2D;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.render.renderer.LodRenderer;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.core.util.objects.SortedArraySet;
import com.seibel.lod.core.util.objects.quadTree.QuadNode;
import org.apache.logging.log4j.Logger;
@@ -38,7 +38,7 @@ import org.lwjgl.opengl.GLCapabilities;
import org.lwjgl.opengl.GLUtil;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.api.enums.config.EGpuUploadMethod;
import com.seibel.lod.api.enums.rendering.EGLProxyContext;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
@@ -29,9 +29,9 @@ import java.util.function.Supplier;
import org.lwjgl.opengl.GL32;
import org.lwjgl.system.MemoryStack;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.core.util.math.Vec3d;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3d;
import com.seibel.lod.coreapi.util.math.Vec3f;
/**
@@ -20,11 +20,9 @@
package com.seibel.lod.core.render.glObject.vertexAttribute;
import com.seibel.lod.core.render.glObject.GLProxy;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
import org.lwjgl.opengl.GL32;
import com.seibel.lod.core.util.LodUtil;
public abstract class VertexAttribute {
public static final class VertexPointer {
@@ -29,8 +29,8 @@ import com.seibel.lod.core.render.glObject.shader.ShaderProgram;
import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttribute;
import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttributePostGL43;
import com.seibel.lod.core.render.glObject.vertexAttribute.VertexAttributePreGL43;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
@@ -32,9 +32,9 @@ import com.seibel.lod.core.render.RenderBufferHandler;
import com.seibel.lod.core.util.RenderUtil;
import com.seibel.lod.core.render.fog.LodFogConfig;
import com.seibel.lod.core.render.glObject.GLProxy;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.core.util.math.Vec3d;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3d;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.core.render.glObject.GLState;
import com.seibel.lod.core.render.glObject.buffer.GLVertexBuffer;
import com.seibel.lod.core.render.glObject.buffer.QuadElementBuffer;
@@ -21,6 +21,7 @@ package com.seibel.lod.core.util;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.api.enums.config.EHorizontalQuality;
import com.seibel.lod.coreapi.util.MathUtil;
/**
*
@@ -19,10 +19,6 @@
package com.seibel.lod.core.util;
import com.seibel.lod.core.util.math.Vec3d;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.core.util.math.Vec3i;
/**
* @author James Seibel
* @version 2022-11-19
@@ -20,15 +20,15 @@
package com.seibel.lod.core.util;
import com.seibel.lod.core.level.IDhClientLevel;
import com.seibel.lod.core.world.AbstractDhWorld;
import com.seibel.lod.core.world.IDhClientWorld;
import com.seibel.lod.core.api.internal.SharedApi;
import com.seibel.lod.core.config.Config;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.pos.DhBlockPos;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.MathUtil;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.util.objects;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.core.logging.DhLoggerBuilder;
import org.apache.logging.log4j.Logger;
@@ -5,10 +5,10 @@ import com.seibel.lod.core.pos.DhBlockPos2D;
import com.seibel.lod.core.pos.DhLodPos;
import com.seibel.lod.core.pos.DhSectionPos;
import com.seibel.lod.core.pos.Pos2D;
import com.seibel.lod.core.util.BitShiftUtil;
import com.seibel.lod.coreapi.util.BitShiftUtil;
import com.seibel.lod.core.util.DetailDistanceUtil;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.util.MathUtil;
import com.seibel.lod.coreapi.util.MathUtil;
import com.seibel.lod.core.util.gridList.MovableGridRingList;
import org.apache.logging.log4j.Logger;
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* A singleton that contains variables specific to each version of Minecraft
@@ -20,7 +20,7 @@
package com.seibel.lod.core.wrapperInterfaces;
import com.seibel.lod.core.level.IDhLevel;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces.chunk;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.wrapperInterfaces.config;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
public interface ILangWrapper extends IBindable {
@@ -22,9 +22,9 @@ package com.seibel.lod.core.wrapperInterfaces.minecraft;
import java.io.File;
import java.util.ArrayList;
import com.seibel.lod.core.ModInfo;
import com.seibel.lod.coreapi.ModInfo;
import com.seibel.lod.core.enums.ELodDirection;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.pos.DhBlockPos;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper;
@@ -22,14 +22,14 @@ package com.seibel.lod.core.wrapperInterfaces.minecraft;
import java.awt.Color;
import java.util.HashSet;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
import com.seibel.lod.core.dependencyInjection.SingletonInjector;
import com.seibel.lod.core.pos.DhBlockPos;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.util.math.Mat4f;
import com.seibel.lod.core.util.math.Vec3d;
import com.seibel.lod.core.util.math.Vec3f;
import com.seibel.lod.coreapi.util.math.Mat4f;
import com.seibel.lod.coreapi.util.math.Vec3d;
import com.seibel.lod.coreapi.util.math.Vec3f;
import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
@@ -1,6 +1,6 @@
package com.seibel.lod.core.wrapperInterfaces.minecraft;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import java.io.File;
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces.minecraft;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* @author James Seibel
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces.misc;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* @author James Seibel
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces.modAccessor;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* @author Leetom
@@ -19,7 +19,7 @@
package com.seibel.lod.core.wrapperInterfaces.modAccessor;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* Checks if a mod is loaded
@@ -20,7 +20,7 @@
package com.seibel.lod.core.wrapperInterfaces.world;
import com.seibel.lod.api.interfaces.block.IDhApiBiomeWrapper;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* @author James Seibel
@@ -20,7 +20,7 @@
package com.seibel.lod.core.wrapperInterfaces.world;
import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* @author James Seibel
@@ -21,7 +21,7 @@ package com.seibel.lod.core.wrapperInterfaces.world;
import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper;
import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.core.pos.DhBlockPos;
import com.seibel.lod.core.pos.DhChunkPos;
import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -1,6 +1,6 @@
package testItems.overrideInjection.objects;
import com.seibel.lod.core.util.StringUtil;
import com.seibel.lod.coreapi.util.StringUtil;
/**
* assembly classes are used to reference the package they are in.
@@ -1,6 +1,6 @@
package testItems.overrideInjection.objects;
import com.seibel.lod.core.DependencyInjection.OverrideInjector;
import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector;
import testItems.overrideInjection.interfaces.IOverrideTest;
/**
@@ -1,6 +1,6 @@
package testItems.overrideInjection.objects;
import com.seibel.lod.core.DependencyInjection.OverrideInjector;
import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector;
import testItems.overrideInjection.interfaces.IOverrideTest;
/**
@@ -1,6 +1,6 @@
package testItems.singletonInjection.interfaces;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* Dummy test interface for dependency unit tests.
@@ -1,6 +1,6 @@
package testItems.singletonInjection.interfaces;
import com.seibel.lod.core.interfaces.dependencyInjection.IBindable;
import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable;
/**
* Dummy test interface for dependency unit tests.

Some files were not shown because too many files have changed in this diff Show More