diff --git a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java index 2aba1483a..99a475a34 100644 --- a/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java +++ b/api/src/main/java/com/seibel/lod/api/items/interfaces/override/IDhApiOverrideable.java @@ -1,6 +1,6 @@ package com.seibel.lod.api.items.interfaces.override; -import com.seibel.lod.core.api.external.coreInterfaces.ICoreDhApiOverrideable; +import com.seibel.lod.core.api.external.coreImplementations.interfaces.override.ICoreDhApiOverrideable; import com.seibel.lod.core.api.external.items.enums.override.EDhApiOverridePriority; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; diff --git a/api/src/main/java/com/seibel/lod/api/items/objects/events/DhApiRenderParam.java b/api/src/main/java/com/seibel/lod/api/items/objects/events/DhApiRenderParam.java new file mode 100644 index 000000000..c00b8b9cc --- /dev/null +++ b/api/src/main/java/com/seibel/lod/api/items/objects/events/DhApiRenderParam.java @@ -0,0 +1,40 @@ +package com.seibel.lod.api.items.objects.events; + +import com.seibel.lod.api.items.objects.math.DhApiMat4f; +import com.seibel.lod.core.api.external.coreImplementations.objects.events.CoreDhApiRenderParam; + +/** + * Parameter passed into Render events. + * + * @author James Seibel + * @version 2022-9-5 + */ +public class DhApiRenderParam +{ + /** The projection matrix Minecraft is using to render this frame. */ + public final DhApiMat4f mcProjectionMatrix; + /** The model view matrix Minecraft is using to render this frame. */ + public final DhApiMat4f mcModelViewMatrix; + + /** The projection matrix Distant Horizons is using to render this frame. */ + public final DhApiMat4f dhProjectionMatrix; + /** The model view matrix Distant Horizons is using to render this frame. */ + public final DhApiMat4f dhModelViewMatrix; + + /** Indicates how far into this tick the frame is. */ + public final float partialTicks; + + + + public DhApiRenderParam(CoreDhApiRenderParam param) + { + this.mcProjectionMatrix = new DhApiMat4f(param.mcProjectionMatrix); + this.mcModelViewMatrix = new DhApiMat4f(param.mcModelViewMatrix); + + this.dhProjectionMatrix = new DhApiMat4f(param.dhProjectionMatrix); + this.dhModelViewMatrix = new DhApiMat4f(param.dhModelViewMatrix); + + this.partialTicks = param.partialTicks; + } + +} diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java index ca5806b49..55b5ba556 100644 --- a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java +++ b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java @@ -22,7 +22,7 @@ package com.seibel.lod.core.api.internal.a7; import com.seibel.lod.core.a7.level.IClientLevel; import com.seibel.lod.core.a7.world.*; import com.seibel.lod.core.api.external.methods.events.abstractEvents.*; -import com.seibel.lod.core.api.external.methods.events.sharedParameterObjects.DhApiRenderParam; +import com.seibel.lod.core.api.external.coreImplementations.objects.events.CoreDhApiRenderParam; import com.seibel.lod.core.api.implementation.wrappers.DhApiLevelWrapper; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.ModInfo; @@ -258,8 +258,8 @@ public class ClientApi { if (Config.Client.Advanced.Debugging.rendererMode.get() == ERendererMode.DEFAULT) { - DhApiRenderParam renderEventParam = - new DhApiRenderParam(mcProjectionMatrix, mcModelViewMatrix, + CoreDhApiRenderParam renderEventParam = + new CoreDhApiRenderParam(mcProjectionMatrix, mcModelViewMatrix, RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks), RenderUtil.createLodModelViewMatrix(mcModelViewMatrix), partialTicks); diff --git a/core/src/main/java/com/seibel/lod/core/api/external/coreInterfaces/ICoreDhApiOverrideable.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/override/ICoreDhApiOverrideable.java similarity index 86% rename from core/src/main/java/com/seibel/lod/core/api/external/coreInterfaces/ICoreDhApiOverrideable.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/override/ICoreDhApiOverrideable.java index de3752681..ba52144d0 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/coreInterfaces/ICoreDhApiOverrideable.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/interfaces/override/ICoreDhApiOverrideable.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.api.external.coreInterfaces; +package com.seibel.lod.core.api.external.coreImplementations.interfaces.override; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; import com.seibel.lod.core.handlers.dependencyInjection.OverrideInjector; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/CoreDhApiRenderParam.java similarity index 53% rename from core/src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java rename to core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/CoreDhApiRenderParam.java index b7f84547b..7dde711cf 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/sharedParameterObjects/DhApiRenderParam.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/coreImplementations/objects/events/CoreDhApiRenderParam.java @@ -1,45 +1,34 @@ -package com.seibel.lod.core.api.external.methods.events.sharedParameterObjects; +package com.seibel.lod.core.api.external.coreImplementations.objects.events; -import com.seibel.lod.api.items.objects.math.DhApiMat4f; import com.seibel.lod.core.objects.math.Mat4f; /** * Parameter passed into Render events. * * @author James Seibel - * @version 2022-8-21 + * @version 2022-9-5 */ -public class DhApiRenderParam +public class CoreDhApiRenderParam { /** The projection matrix Minecraft is using to render this frame. */ - public final DhApiMat4f mcProjectionMatrix; + public final Mat4f mcProjectionMatrix; /** The model view matrix Minecraft is using to render this frame. */ - public final DhApiMat4f mcModelViewMatrix; + public final Mat4f mcModelViewMatrix; /** The projection matrix Distant Horizons is using to render this frame. */ - public final DhApiMat4f dhProjectionMatrix; + public final Mat4f dhProjectionMatrix; /** The model view matrix Distant Horizons is using to render this frame. */ - public final DhApiMat4f dhModelViewMatrix; + public final Mat4f dhModelViewMatrix; /** Indicates how far into this tick the frame is. */ public final float partialTicks; - public DhApiRenderParam( + public CoreDhApiRenderParam( Mat4f newMcProjectionMatrix, Mat4f newMcModelViewMatrix, Mat4f newDhProjectionMatrix, Mat4f newDhModelViewMatrix, float newPartialTicks) - { - this(newMcProjectionMatrix.createApiObject(), newMcModelViewMatrix.createApiObject(), - newDhProjectionMatrix.createApiObject(), newDhModelViewMatrix.createApiObject(), - newPartialTicks); - } - - public DhApiRenderParam( - DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix, - DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix, - float newPartialTicks) { this.mcProjectionMatrix = newMcProjectionMatrix; this.mcModelViewMatrix = newMcModelViewMatrix; @@ -50,5 +39,4 @@ public class DhApiRenderParam this.partialTicks = newPartialTicks; } - } diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java index da569b69c..e1890f6c4 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/events/abstractEvents/DhApiAfterRenderEvent.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.api.external.methods.events.abstractEvents; -import com.seibel.lod.core.api.external.methods.events.sharedParameterObjects.DhApiRenderParam; +import com.seibel.lod.core.api.external.coreImplementations.objects.events.CoreDhApiRenderParam; import com.seibel.lod.core.api.implementation.interfaces.events.IDhApiEvent; /** @@ -32,9 +32,9 @@ public abstract class DhApiAfterRenderEvent implements IDhApiEvent