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;