diff --git a/api/src/main/java/com/seibel/lod/api/DhApiMain.java b/api/src/main/java/com/seibel/lod/api/DhApiMain.java index 34f302183..b558af934 100644 --- a/api/src/main/java/com/seibel/lod/api/DhApiMain.java +++ b/api/src/main/java/com/seibel/lod/api/DhApiMain.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java index 0428c2c4a..3ef21a849 100644 --- a/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java +++ b/api/src/main/java/com/seibel/lod/api/enums/config/EHorizontalResolution.java @@ -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
diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java index 5e9193725..ff9cbe300 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/config/IDhApiConfigGroup.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java b/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java index 7744a3a21..26e984055 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/events/IDhApiEventInjector.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java b/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java index 56fd42ca3..292a789be 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/override/IDhApiOverrideable.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java b/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java index 3541a5df5..ba19a9c6a 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/DhApiEventRegister.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java index 0891a8384..0e6d619c8 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterDhInitEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java index afcb8ecb9..11b88fede 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiAfterRenderEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java index ddbd8ab6d..d4c21e303 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeDhInitEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java index 0df7904e3..d0f839618 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiBeforeRenderEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java index 93064ce09..e0b6c03df 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelLoadEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java index b3d76ccdd..7748cc2a9 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelSaveEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java index bfeff4258..2e61b766a 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/abstractEvents/DhApiLevelUnloadEvent.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java b/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java index aa875d326..bbbd1e2df 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/interfaces/IDhApiEvent.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java b/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java index db5d29545..b2d3d33bf 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java +++ b/api/src/main/java/com/seibel/lod/api/methods/events/sharedParameterObjects/DhApiRenderParam.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java b/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java index b823251bb..5986f484c 100644 --- a/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java +++ b/api/src/main/java/com/seibel/lod/api/methods/override/DhApiWorldGeneratorOverrideRegister.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java b/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java index 363077b1c..9e952841e 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java +++ b/api/src/main/java/com/seibel/lod/api/objects/config/DhApiConfigValue.java @@ -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.

diff --git a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java b/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java index cd7f8a4a1..56cb3e03b 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java +++ b/api/src/main/java/com/seibel/lod/api/objects/data/DhApiRaycastResult.java @@ -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 diff --git a/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java b/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java index 4f6d5b022..92c6de7c6 100644 --- a/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java +++ b/api/src/main/java/com/seibel/lod/api/objects/math/DhApiVec3i.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/ApiEventInjector.java b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java similarity index 96% rename from api/src/main/java/com/seibel/lod/core/DependencyInjection/ApiEventInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java index 33773b41a..78d45b486 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/ApiEventInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/ApiEventInjector.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -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; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/DependencyInjector.java b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/DependencyInjection/DependencyInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java index df3c4523b..2bd3b4381 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/DependencyInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/DependencyInjector.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -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; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java similarity index 96% rename from api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java index 5efe4216f..4399a5646 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverrideInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverrideInjector.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -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; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java similarity index 95% rename from api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java rename to api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java index 2a2e533b3..77602f3a4 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/OverridePriorityListContainer.java +++ b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/OverridePriorityListContainer.java @@ -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; diff --git a/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java similarity index 96% rename from api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java index 62f31130c..4c861aac1 100644 --- a/api/src/main/java/com/seibel/lod/core/DependencyInjection/WorldGeneratorInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/DependencyInjection/WorldGeneratorInjector.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -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; diff --git a/api/src/main/java/com/seibel/lod/core/ModInfo.java b/api/src/main/java/com/seibel/lod/coreapi/ModInfo.java similarity index 98% rename from api/src/main/java/com/seibel/lod/core/ModInfo.java rename to api/src/main/java/com/seibel/lod/coreapi/ModInfo.java index 796a0ae71..a3e8037ec 100644 --- a/api/src/main/java/com/seibel/lod/core/ModInfo.java +++ b/api/src/main/java/com/seibel/lod/coreapi/ModInfo.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core; +package com.seibel.lod.coreapi; /** * This file is similar to mcmod.info diff --git a/api/src/main/java/com/seibel/lod/core/events/ApiEventDefinitionHandler.java b/api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java similarity index 98% rename from api/src/main/java/com/seibel/lod/core/events/ApiEventDefinitionHandler.java rename to api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java index 2aa3dcf62..eddfa05db 100644 --- a/api/src/main/java/com/seibel/lod/core/events/ApiEventDefinitionHandler.java +++ b/api/src/main/java/com/seibel/lod/coreapi/events/ApiEventDefinitionHandler.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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; diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/config/IConfigEntry.java b/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java similarity index 96% rename from api/src/main/java/com/seibel/lod/core/interfaces/config/IConfigEntry.java rename to api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java index 35f361e88..1d70c9041 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/config/IConfigEntry.java +++ b/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConfigEntry.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.interfaces.config; +package com.seibel.lod.coreapi.interfaces.config; /** diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/config/IConverter.java b/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java similarity index 89% rename from api/src/main/java/com/seibel/lod/core/interfaces/config/IConverter.java rename to api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java index ec72c638e..eda3541cd 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/config/IConverter.java +++ b/api/src/main/java/com/seibel/lod/coreapi/interfaces/config/IConverter.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.interfaces.config; +package com.seibel.lod.coreapi.interfaces.config; /** diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IBindable.java b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java similarity index 96% rename from api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IBindable.java rename to api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java index f72eceb28..62c9e4dbe 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IBindable.java +++ b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IBindable.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.interfaces.dependencyInjection; +package com.seibel.lod.coreapi.interfaces.dependencyInjection; /** * Necessary for all singletons that can be dependency injected. diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IDependencyInjector.java b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IDependencyInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java index ff779b375..02196528c 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IDependencyInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IDependencyInjector.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.interfaces.dependencyInjection; +package com.seibel.lod.coreapi.interfaces.dependencyInjection; import java.util.ArrayList; diff --git a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java rename to api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java index 88972abd1..212eee03f 100644 --- a/api/src/main/java/com/seibel/lod/core/interfaces/dependencyInjection/IOverrideInjector.java +++ b/api/src/main/java/com/seibel/lod/coreapi/interfaces/dependencyInjection/IOverrideInjector.java @@ -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; diff --git a/api/src/main/java/com/seibel/lod/core/util/BitShiftUtil.java b/api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java similarity index 98% rename from api/src/main/java/com/seibel/lod/core/util/BitShiftUtil.java rename to api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java index 1bcbce7b3..1a08205c9 100644 --- a/api/src/main/java/com/seibel/lod/core/util/BitShiftUtil.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/BitShiftUtil.java @@ -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.
diff --git a/api/src/main/java/com/seibel/lod/core/util/MathUtil.java b/api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/util/MathUtil.java rename to api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java index 9ccdb1b47..f6707354d 100644 --- a/api/src/main/java/com/seibel/lod/core/util/MathUtil.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/MathUtil.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.util; +package com.seibel.lod.coreapi.util; public class MathUtil { diff --git a/api/src/main/java/com/seibel/lod/core/util/StringUtil.java b/api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/util/StringUtil.java rename to api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java index 976c7fe16..6887f8b62 100644 --- a/api/src/main/java/com/seibel/lod/core/util/StringUtil.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/StringUtil.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util; +package com.seibel.lod.coreapi.util; /** * Miscellaneous string helper functions. diff --git a/api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java b/api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java similarity index 78% rename from api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java rename to api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java index 0d939746d..7caf4df0b 100644 --- a/api/src/main/java/com/seibel/lod/core/util/converters/DefaultConverter.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/converters/DefaultConverter.java @@ -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; /** diff --git a/api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java b/api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java similarity index 83% rename from api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java rename to api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java index ccd040321..b28ef3c44 100644 --- a/api/src/main/java/com/seibel/lod/core/util/converters/RenderModeEnabledConverter.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/converters/RenderModeEnabledConverter.java @@ -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. diff --git a/api/src/main/java/com/seibel/lod/core/util/math/Mat4f.java b/api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java similarity index 99% rename from api/src/main/java/com/seibel/lod/core/util/math/Mat4f.java rename to api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java index 030a88cd4..e27112c41 100644 --- a/api/src/main/java/com/seibel/lod/core/util/math/Mat4f.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/math/Mat4f.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.util.math; +package com.seibel.lod.coreapi.util.math; import java.nio.FloatBuffer; diff --git a/api/src/main/java/com/seibel/lod/core/util/math/Vec3d.java b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java similarity index 98% rename from api/src/main/java/com/seibel/lod/core/util/math/Vec3d.java rename to api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java index 992d35264..e9d245692 100644 --- a/api/src/main/java/com/seibel/lod/core/util/math/Vec3d.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3d.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -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 diff --git a/api/src/main/java/com/seibel/lod/core/util/math/Vec3f.java b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java similarity index 98% rename from api/src/main/java/com/seibel/lod/core/util/math/Vec3f.java rename to api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java index 063f84515..8f1e0de9a 100644 --- a/api/src/main/java/com/seibel/lod/core/util/math/Vec3f.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3f.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -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 diff --git a/api/src/main/java/com/seibel/lod/core/util/math/Vec3i.java b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java similarity index 97% rename from api/src/main/java/com/seibel/lod/core/util/math/Vec3i.java rename to api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java index ebcf05439..86e76708a 100644 --- a/api/src/main/java/com/seibel/lod/core/util/math/Vec3i.java +++ b/api/src/main/java/com/seibel/lod/coreapi/util/math/Vec3i.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -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 diff --git a/api/src/test/java/tests/EventInjectorTest.java b/api/src/test/java/tests/EventInjectorTest.java index 77bd37769..aeef222ee 100644 --- a/api/src/test/java/tests/EventInjectorTest.java +++ b/api/src/test/java/tests/EventInjectorTest.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java b/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java index 6a281ad6b..4b8dbb5af 100644 --- a/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java +++ b/core/src/main/java/com/seibel/lod/core/IReflectionHandler.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java index a88e3bb02..ef9cc6e9f 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/config/client/DhApiGraphicsConfig.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java index 4934e5ee4..d9d400120 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java index 8bee74461..ceba3f4f7 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java index 282b6d3e8..d045bfc15 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java b/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java index 012c06d02..d2657a4e9 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java index b5d1a9f38..be2e9b7ac 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java index 29a8c7164..710a1a10a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java index 89a78a0c5..49869e5b7 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java index 5cd1f77de..79a703cc9 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderSource.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java index 640b1e325..7f5380592 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/ColumnBox.java @@ -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 { diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java index b541ae7ef..c5abeed17 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/CubicLodTemplate.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java index d82142ad8..9308c7e8f 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java b/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java index aa3befbcb..12f125dd3 100644 --- a/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java +++ b/core/src/main/java/com/seibel/lod/core/dependencyInjection/ModAccessorInjector.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java b/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java index 70f0385df..5c1391f88 100644 --- a/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java +++ b/core/src/main/java/com/seibel/lod/core/dependencyInjection/SingletonInjector.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java b/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java index 9da16ace9..e01e0c752 100644 --- a/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java +++ b/core/src/main/java/com/seibel/lod/core/enums/ELodDirection.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java index 171ae5d87..bfe6b03a4 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java +++ b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/jar/JarMain.java b/core/src/main/java/com/seibel/lod/core/jar/JarMain.java index 4deb8ba5a..cb15f82b8 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/JarMain.java +++ b/core/src/main/java/com/seibel/lod/core/jar/JarMain.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java b/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java index 9f2ece7d0..240e28699 100644 --- a/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java +++ b/core/src/main/java/com/seibel/lod/core/jar/updater/SelfUpdater.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/level/AbstractDhClientLevel.java b/core/src/main/java/com/seibel/lod/core/level/AbstractDhClientLevel.java index d5cc5ff7b..df7a67347 100644 --- a/core/src/main/java/com/seibel/lod/core/level/AbstractDhClientLevel.java +++ b/core/src/main/java/com/seibel/lod/core/level/AbstractDhClientLevel.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java index c118f1766..cffa6f40f 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java +++ b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java b/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java index a9a54a11e..264dcaa3c 100644 --- a/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java +++ b/core/src/main/java/com/seibel/lod/core/level/IDhClientLevel.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java b/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java index 3fa786163..49e384373 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/logging/DhLoggerBuilder.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java b/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java index 8ea3c2ad2..f8f56a9a4 100644 --- a/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java +++ b/core/src/main/java/com/seibel/lod/core/logging/f3/F3Screen.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java b/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java index d7df42bb5..6334c9ab5 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java +++ b/core/src/main/java/com/seibel/lod/core/pos/DhBlockPos2D.java @@ -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); diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java b/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java index f41102070..0b591d6ad 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java +++ b/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java b/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java index c177b268f..efb906d24 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java +++ b/core/src/main/java/com/seibel/lod/core/pos/DhLodUnit.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java b/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java index 18722da06..cff4424a4 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java +++ b/core/src/main/java/com/seibel/lod/core/pos/DhSectionPos.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java b/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java index 577e74fec..77a2a18ca 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java +++ b/core/src/main/java/com/seibel/lod/core/pos/Pos2D.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java index 0ae8ccc8b..9dfe1e4ef 100644 --- a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java +++ b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java b/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java index e8dbb4799..9c855dc65 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/GLProxy.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java b/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java index 2f4799788..b683a9704 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/shader/ShaderProgram.java @@ -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; /** diff --git a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java b/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java index 534f1f3bb..ea5d24b76 100644 --- a/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java +++ b/core/src/main/java/com/seibel/lod/core/render/glObject/vertexAttribute/VertexAttribute.java @@ -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 { diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java index 676980392..5d4caab47 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java +++ b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderProgram.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java index 38f6354b7..b4f360c3c 100644 --- a/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java +++ b/core/src/main/java/com/seibel/lod/core/render/renderer/LodRenderer.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java b/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java index d1717cabc..782501a95 100644 --- a/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/DetailDistanceUtil.java @@ -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; /** * diff --git a/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java b/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java index f695ed0fc..8fb0d7c62 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/RayCastUtil.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java b/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java index 357617a85..65efb4c62 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java b/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java index a1aba5206..44a053d18 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java +++ b/core/src/main/java/com/seibel/lod/core/util/objects/EventLoop.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java b/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java index 55c21c1fa..b2a42e246 100644 --- a/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java +++ b/core/src/main/java/com/seibel/lod/core/util/objects/quadTree/QuadTree.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java index 585a985ca..f51454f2c 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IVersionConstants.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java index 245dd191d..b596e1098 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java index e1b57d76c..5e8d7bfde 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/chunk/IChunkWrapper.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java index 63fe0c984..c96c094f8 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILangWrapper.java @@ -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 { diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java index 7ecbcc1e7..27dc8a4c6 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftClientWrapper.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java index 77971e118..86e81ec63 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java index cc49eeaab..f2e594cd9 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IMinecraftSharedWrapper.java @@ -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; diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java index 9abdae7ad..85815fd35 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/minecraft/IProfilerWrapper.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java index 484daccb8..933590292 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/misc/ILightMapWrapper.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java index f718545a9..c5d64d23f 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModAccessor.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java index 7c38fd0b1..7eb11d9a6 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/modAccessor/IModChecker.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java index ba0c7fdd5..00f01f46f 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IBiomeWrapper.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java index 9f5515d57..b46e8be08 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java @@ -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 diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java index a593d49fc..2bec7d2e7 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java @@ -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; diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java index 93d7cf74e..1a1dc137b 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestAssembly.java @@ -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. diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java index 9f76831a4..6cd830856 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestCore.java @@ -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; /** diff --git a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java index 9cadf4041..5e9b8a591 100644 --- a/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java +++ b/core/src/test/java/testItems/overrideInjection/objects/OverrideTestPrimary.java @@ -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; /** diff --git a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java index cbe385b63..87802a599 100644 --- a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java +++ b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestOne.java @@ -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. diff --git a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java index d1bfafd98..f47898a69 100644 --- a/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java +++ b/core/src/test/java/testItems/singletonInjection/interfaces/ISingletonTestTwo.java @@ -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. diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java index 547cba870..7448c0199 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestBoth.java @@ -1,6 +1,6 @@ package testItems.singletonInjection.objects; -import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; +import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; import testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java index 90e3cc156..d079c021f 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestOne.java @@ -1,7 +1,7 @@ package testItems.singletonInjection.objects; -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 testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java index 667891290..fcea7b58e 100644 --- a/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java +++ b/core/src/test/java/testItems/singletonInjection/objects/ConcreteSingletonTestTwo.java @@ -1,7 +1,7 @@ package testItems.singletonInjection.objects; -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 testItems.singletonInjection.interfaces.ISingletonTestOne; import testItems.singletonInjection.interfaces.ISingletonTestTwo; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java index a99dbd8ac..e285c4bdc 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/TestWorldGenerator.java @@ -3,7 +3,7 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.core.DependencyInjection.OverrideInjector; +import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; import com.seibel.lod.core.util.LodUtil; import java.util.concurrent.CompletableFuture; diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java index eb4f702e3..9833bd440 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestAssembly.java @@ -1,6 +1,6 @@ package testItems.worldGeneratorInjection.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. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java index 368e8d2a7..8a06f1560 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestCore.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.core.DependencyInjection.OverrideInjector; +import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. * diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java index d023530f5..041843b8a 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.core.DependencyInjection.OverrideInjector; +import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java index 6e65da758..16ccc79bb 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java @@ -1,7 +1,7 @@ package testItems.worldGeneratorInjection.objects; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; -import com.seibel.lod.core.DependencyInjection.OverrideInjector; +import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; /** * Dummy test implementation object for world generator injection unit tests. diff --git a/core/src/test/java/tests/DependencyInjectorTest.java b/core/src/test/java/tests/DependencyInjectorTest.java index 6191fd056..57ae927e9 100644 --- a/core/src/test/java/tests/DependencyInjectorTest.java +++ b/core/src/test/java/tests/DependencyInjectorTest.java @@ -1,12 +1,11 @@ package tests; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode; import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; -import com.seibel.lod.core.DependencyInjection.DependencyInjector; -import com.seibel.lod.core.interfaces.dependencyInjection.IBindable; -import com.seibel.lod.core.DependencyInjection.OverrideInjector; -import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector; +import com.seibel.lod.coreapi.DependencyInjection.DependencyInjector; +import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; +import com.seibel.lod.coreapi.DependencyInjection.OverrideInjector; +import com.seibel.lod.coreapi.DependencyInjection.WorldGeneratorInjector; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/tests/DhSectionPosTest.java b/core/src/test/java/tests/DhSectionPosTest.java index a25368b10..f4e27ab49 100644 --- a/core/src/test/java/tests/DhSectionPosTest.java +++ b/core/src/test/java/tests/DhSectionPosTest.java @@ -19,21 +19,11 @@ package tests; -import com.seibel.lod.core.logging.DhLoggerBuilder; -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.util.BitShiftUtil; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.objects.quadTree.QuadTree; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.Configurator; import org.junit.Assert; import org.junit.Test; -import java.util.concurrent.atomic.AtomicInteger; - public class DhSectionPosTest { @Test diff --git a/core/src/test/java/tests/QuadTreeTest.java b/core/src/test/java/tests/QuadTreeTest.java index bb2cd546c..c90937d5b 100644 --- a/core/src/test/java/tests/QuadTreeTest.java +++ b/core/src/test/java/tests/QuadTreeTest.java @@ -22,9 +22,9 @@ package tests; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhBlockPos2D; 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.LodUtil; -import com.seibel.lod.core.util.MathUtil; +import com.seibel.lod.coreapi.util.MathUtil; import com.seibel.lod.core.util.objects.quadTree.QuadNode; import com.seibel.lod.core.util.objects.quadTree.QuadTree; import org.apache.logging.log4j.Level; diff --git a/core/src/test/java/tests/RaycastingTest.java b/core/src/test/java/tests/RaycastingTest.java index 3fb8486c9..4a9e19098 100644 --- a/core/src/test/java/tests/RaycastingTest.java +++ b/core/src/test/java/tests/RaycastingTest.java @@ -19,11 +19,7 @@ package tests; -import com.seibel.lod.core.api.external.methods.data.DhApiTerrainDataRepo; import com.seibel.lod.core.util.RayCastUtil; -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 org.junit.Assert; import org.junit.Test;