From 634df3ba06598e7ef70431ee9dfe5e56a86a376d Mon Sep 17 00:00:00 2001 From: AquaticLava Date: Sat, 23 Sep 2023 23:33:24 -0600 Subject: [PATCH 01/11] Fix vivecraft incompatibility --- .../mixins/client/MixinLevelRenderer.java | 63 +++++++------------ 1 file changed, 22 insertions(+), 41 deletions(-) diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 682555f4b..3a880b31e 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -23,17 +23,18 @@ import com.mojang.blaze3d.vertex.PoseStack; #if PRE_MC_1_19_4 import com.mojang.math.Matrix4f; #else -import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw; -import com.seibel.distanthorizons.common.wrappers.McObjectConverter; -import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; -import com.seibel.distanthorizons.core.api.internal.ClientApi; -import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import net.minecraft.client.Camera; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.LightTexture; import org.joml.Matrix4f; #endif import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; import com.seibel.distanthorizons.core.config.Config; +import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; +import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.level.lighting.LevelLightEngine; import org.spongepowered.asm.mixin.Mixin; @@ -41,7 +42,6 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** @@ -107,39 +107,20 @@ public class MixinLevelRenderer callback.cancel(); } } - - @Redirect(method = - "Lnet/minecraft/client/renderer/LevelRenderer;" + - "renderLevel(Lcom/mojang/blaze3d/vertex/PoseStack;" + - "FJZLnet/minecraft/client/Camera;" + - "Lnet/minecraft/client/renderer/GameRenderer;" + - "Lnet/minecraft/client/renderer/LightTexture;" + - #if PRE_MC_1_19_4 - "Lcom/mojang/math/Matrix4f;)V" - #else - "Lorg/joml/Matrix4f;)V" - #endif - , - at = @At( - value = "INVOKE", - #if PRE_MC_1_20_1 - target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I" - #else - target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I" - #endif - )) - private int callAfterRunUpdates(LevelLightEngine light #if PRE_MC_1_20_1 , int pos, boolean isQueueEmpty, boolean updateBlockLight #endif) - { - #if PRE_MC_1_20_1 - int r = light.runUpdates(pos, isQueueEmpty, updateBlockLight); - #else - int r = light.runLightUpdates(); - #endif - ChunkWrapper.syncedUpdateClientLightStatus(); - return r; - } - - - - + + #if PRE_MC_1_19_4 + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel") + public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #elif PRE_MC_1_20_1 + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel") + public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #else + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel") + public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #endif + { + ChunkWrapper.syncedUpdateClientLightStatus(); + } + + } From d4ba61e34168790b023fa3300d311dde6498e776 Mon Sep 17 00:00:00 2001 From: AquaticLava Date: Sun, 24 Sep 2023 12:56:22 -0600 Subject: [PATCH 02/11] Fix vivecraft incompatibility - forge --- .../mixins/client/MixinLevelRenderer.java | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index fb2f176e0..baa5ead3d 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -23,6 +23,9 @@ import com.mojang.blaze3d.vertex.PoseStack; #if PRE_MC_1_19_4 import com.mojang.math.Matrix4f; #else +import net.minecraft.client.Camera; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.LightTexture; import org.joml.Matrix4f; #endif import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw; @@ -154,35 +157,18 @@ public class MixinLevelRenderer } } - @Redirect(method = - "Lnet/minecraft/client/renderer/LevelRenderer;" + - "renderLevel(Lcom/mojang/blaze3d/vertex/PoseStack;" + - "FJZLnet/minecraft/client/Camera;" + - "Lnet/minecraft/client/renderer/GameRenderer;" + - "Lnet/minecraft/client/renderer/LightTexture;" + - #if PRE_MC_1_19_4 - "Lcom/mojang/math/Matrix4f;)V" - #else - "Lorg/joml/Matrix4f;)V" - #endif - , - at = @At( - value = "INVOKE", - #if PRE_MC_1_20_1 - target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I" - #else - target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I" - #endif - )) - private int callAfterRunUpdates(LevelLightEngine light #if PRE_MC_1_20_1 , int pos, boolean isQueueEmpty, boolean updateBlockLight #endif ) + #if PRE_MC_1_19_4 + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel") + public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #elif PRE_MC_1_20_1 + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel") + public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #else + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel") + private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #endif { - #if PRE_MC_1_20_1 - int r = light.runUpdates(pos, isQueueEmpty, updateBlockLight); - #else - int r = light.runLightUpdates(); - #endif ChunkWrapper.syncedUpdateClientLightStatus(); - return r; } } From 8b4c647fd232c85023f8410a7fe9d8bc4915b5a5 Mon Sep 17 00:00:00 2001 From: AquaticLava Date: Sun, 24 Sep 2023 12:56:39 -0600 Subject: [PATCH 03/11] change method to private --- .../fabric/mixins/client/MixinLevelRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 3a880b31e..12bc8d7b6 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -116,7 +116,7 @@ public class MixinLevelRenderer public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) #else @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel") - public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) #endif { ChunkWrapper.syncedUpdateClientLightStatus(); From 3a80c6f59ef8430bf8642f8a1b80d321deabe623 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 26 Sep 2023 22:53:12 +0930 Subject: [PATCH 04/11] Added nightly to be auto-updated --- .../wrappers/gui/updater/UpdateModScreen.java | 53 +++++++++++++------ .../fabric/mixins/client/MixinMinecraft.java | 4 +- .../forge/mixins/client/MixinMinecraft.java | 4 +- 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index 1b9aa8c1a..ed5235405 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -2,8 +2,11 @@ package com.seibel.distanthorizons.common.wrappers.gui.updater; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.vertex.PoseStack; +import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.DhScreen; import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; +import com.seibel.distanthorizons.core.jar.ModGitInfo; +import com.seibel.distanthorizons.core.jar.installer.GitlabGetter; import com.seibel.distanthorizons.coreapi.ModInfo; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.jar.JarUtils; @@ -34,12 +37,26 @@ public class UpdateModScreen extends DhScreen private Screen parent; private String newVersionID; + private String currentVer; + private String nextVer; + public UpdateModScreen(Screen parent, String newVersionID) { super(Translatable(ModInfo.ID + ".updater.title")); this.parent = parent; this.newVersionID = newVersionID; + + switch (Config.Client.Advanced.AutoUpdater.updateBranch.get()) { + case STABLE -> { + currentVer = ModInfo.VERSION; + nextVer = ModrinthGetter.releaseNames.get(this.newVersionID); + } + case NIGHTLY -> { + currentVer = ModGitInfo.Git_Main_Commit; + nextVer = this.newVersionID; + } + } } @Override @@ -81,21 +98,23 @@ public class UpdateModScreen extends DhScreen e.printStackTrace(); } - - this.addBtn(new TexturedButtonWidget( - // Where the button is on the screen - this.width / 2 - 97, this.height / 2 + 8, - // Width and height of the button - 20, 20, - // Offset - 0, 0, - // Some textuary stuff - 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20, - // Create the button and tell it where to go - (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti) - // Add a title to the button - Translatable(ModInfo.ID + ".updater.title") - )); + if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE) + { + this.addBtn(new TexturedButtonWidget( + // Where the button is on the screen + this.width / 2 - 97, this.height / 2 + 8, + // Width and height of the button + 20, 20, + // Offset + 0, 0, + // Some textuary stuff + 0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20, + // Create the button and tell it where to go + (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti) + // Add a title to the button + Translatable(ModInfo.ID + ".updater.title") + )); + } this.addBtn( // Update @@ -137,7 +156,9 @@ public class UpdateModScreen extends DhScreen // Render the text's DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF); - DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text2", ModInfo.VERSION, ModrinthGetter.releaseNames.get(this.newVersionID)), this.width / 2, this.height / 2 - 20, 0x52FD52); + DhDrawCenteredString(matrices, this.font, + Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), + this.width / 2, this.height / 2 - 20, 0x52FD52); // TODO: add the tooltips for the buttons super.render(matrices, mouseX, mouseY, delta); // Render the buttons diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index 570c147f7..72e46737d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -1,8 +1,10 @@ package com.seibel.distanthorizons.fabric.mixins.client; +import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.installer.GitlabGetter; import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; @@ -48,7 +50,7 @@ public class MixinMinecraft { instance.setScreen(new UpdateModScreen( new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) + (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); } else diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index 91c270201..40c17ce04 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -1,8 +1,10 @@ package com.seibel.distanthorizons.forge.mixins.client; +import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.installer.GitlabGetter; import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; @@ -48,7 +50,7 @@ public class MixinMinecraft { instance.setScreen(new UpdateModScreen( new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) + (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); } else From db2cdbaecd5de953edd5872e91c2ab3aacd72c40 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 26 Sep 2023 22:58:05 +0930 Subject: [PATCH 05/11] Updated core submodule --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 37acd4a13..181232c18 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 37acd4a13085dce5813951c01e2c866a90f3b578 +Subproject commit 181232c18e8c6603de28904c4262c8956ffa39ca From 85203847d50fc7afc9fcd2c5221f4d1a83005b94 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 26 Sep 2023 23:01:03 +0930 Subject: [PATCH 06/11] Updated core sub-project (again) --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 181232c18..312b32cd6 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 181232c18e8c6603de28904c4262c8956ffa39ca +Subproject commit 312b32cd630563ccd36e248c3ae64a97a3a22866 From ca2914d3a90f9f3001af2113a8e4216b00ea1e45 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 26 Sep 2023 23:11:31 +0930 Subject: [PATCH 07/11] Changed update screen to use short sha --- .../common/wrappers/gui/updater/UpdateModScreen.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index ed5235405..8c126027d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -48,14 +48,14 @@ public class UpdateModScreen extends DhScreen this.newVersionID = newVersionID; switch (Config.Client.Advanced.AutoUpdater.updateBranch.get()) { - case STABLE -> { + case STABLE: currentVer = ModInfo.VERSION; nextVer = ModrinthGetter.releaseNames.get(this.newVersionID); - } - case NIGHTLY -> { - currentVer = ModGitInfo.Git_Main_Commit; - nextVer = this.newVersionID; - } + break; + case NIGHTLY: + currentVer = ModGitInfo.Git_Main_Commit.substring(0,7); + nextVer = this.newVersionID.substring(0,7); + break; } } From 225dad9d84359ea4866eb4df893906f0ada68692 Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 26 Sep 2023 23:11:54 +0930 Subject: [PATCH 08/11] Disabled changelog button if using nightly --- .../distanthorizons/common/wrappers/gui/ClassicConfigGUI.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index 4d7711fd3..cfb82ae09 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -16,6 +16,7 @@ import java.util.regex.Pattern; // Logger (for debug stuff) import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; +import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.ConfigBase; import com.seibel.distanthorizons.core.config.types.*; @@ -245,7 +246,7 @@ public class ClassicConfigGUI } // Changelog button - if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) + if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE) { this.addBtn(new TexturedButtonWidget( // Where the button is on the screen From ba014fc5814022acd7ccc062f5e956070784fe8d Mon Sep 17 00:00:00 2001 From: coolGi Date: Wed, 27 Sep 2023 00:00:19 +0930 Subject: [PATCH 09/11] Updated core subproject --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 312b32cd6..42a875ed8 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 312b32cd630563ccd36e248c3ae64a97a3a22866 +Subproject commit 42a875ed8d36421ba9d296d6ca1de5f615482dd9 From 46e5bf24ca1ca69122b10438384652686258c2b2 Mon Sep 17 00:00:00 2001 From: coolGi Date: Wed, 27 Sep 2023 00:02:15 +0930 Subject: [PATCH 10/11] Close IO steams when done using them --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 42a875ed8..f0575d0bc 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 42a875ed8d36421ba9d296d6ca1de5f615482dd9 +Subproject commit f0575d0bc2902c2a8ccebd821c99d8b3ccaf6e20 From f4d6e63c471fc39c53b9df3dc71491b0b0da801d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 26 Sep 2023 19:03:55 -0500 Subject: [PATCH 11/11] Fix MixinLevelRenderer compling for 1.19.2 and lower MC versions --- coreSubProjects | 2 +- .../forge/mixins/client/MixinLevelRenderer.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index f0575d0bc..bf17a72a7 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit f0575d0bc2902c2a8ccebd821c99d8b3ccaf6e20 +Subproject commit bf17a72a7aadc4909a979a46e2f8c526e7426662 diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index baa5ead3d..41b02909c 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -35,8 +35,11 @@ import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.api.internal.ClientApi; import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.LevelRenderer; +import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.level.lighting.LevelLightEngine; import org.spongepowered.asm.mixin.Mixin;