From f6df5ac832361acd1856371f12fa7eeb9e45cc61 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 3 Mar 2022 22:55:01 -0600 Subject: [PATCH] Fix some compiler errors --- .../lod/common/wrappers/config/ConfigGui.java | 11 ++++++----- .../wrappers/config/TexturedButtonWidget.java | 2 +- .../minecraft/MinecraftRenderWrapper.java | 14 ++++++++------ .../wrappers/minecraft/MinecraftWrapper.java | 2 +- core | 2 +- .../lod/fabric/mixins/MixinFogRenderer.java | 16 +++++++++------- .../lod/forge/mixins/MixinFogRenderer.java | 18 ++++++++---------- 7 files changed, 34 insertions(+), 31 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java index f129d1fa5..0b9b31ad8 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java @@ -44,6 +44,7 @@ import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -752,10 +753,10 @@ public abstract class ConfigGui // Only for 1.17 and over // Remove in 1.16 and below -// @Override -// public List narratables() -// { -// return children; -// } + @Override + public List narratables() + { + return children; + } } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java index a2fa2516c..cced34b84 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/TexturedButtonWidget.java @@ -31,7 +31,7 @@ public class TexturedButtonWidget extends ImageButton { public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) { Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION); - RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha); int i = getYImage(isHovered()); RenderSystem.enableBlend(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index c754c9b1d..c53fc3287 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -41,6 +41,7 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.FogType; import net.minecraft.world.phys.Vec3; @@ -115,7 +116,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public Color getSkyColor() { if (MC.level.dimensionType().hasSkyLight()) { - Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime()); + Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime()); return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z); } else return new Color(0, 0, 0); @@ -293,12 +294,13 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public boolean isFogStateSpecial() { Camera camera = GAME_RENDERER.getMainCamera(); - FluidState fluidState = camera.getFluidInCamera(); + FogType fogType = camera.getFluidInCamera(); Entity entity = camera.getEntity(); - boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); - isUnderWater |= fluidState.is(FluidTags.WATER); - isUnderWater |= fluidState.is(FluidTags.LAVA); - return isUnderWater; + boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); + enableFog |= fogType.equals(FogType.WATER); + enableFog |= fogType.equals(FogType.LAVA); + enableFog |= fogType.equals(FogType.POWDER_SNOW); + return enableFog; } @Override diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftWrapper.java index 8b7624f07..1f7704779 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftWrapper.java @@ -241,7 +241,7 @@ public class MinecraftWrapper implements IMinecraftWrapper @Override public ChunkPosWrapper getPlayerChunkPos() { - return new ChunkPosWrapper(getPlayer().xChunk, getPlayer().zChunk); + return new ChunkPosWrapper(getPlayer().chunkPosition().x, getPlayer().chunkPosition().z); } public Options getOptions() diff --git a/core b/core index d84d53589..2149da59d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d84d535896a911340cc661e349a7f813ce0b0c9b +Subproject commit 2149da59df12c2aa55a69c3e93bfcbc19e2f26ae diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java index 13f85962a..51dddec0b 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java @@ -18,6 +18,7 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.FogType; @Mixin(FogRenderer.class) public class MixinFogRenderer { @@ -29,16 +30,17 @@ public class MixinFogRenderer { @Inject(at = @At("RETURN"), method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZ)V") private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) { - FluidState fluidState = camera.getFluidInCamera(); + FogType fogType = camera.getFluidInCamera(); Entity entity = camera.getEntity(); - boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); - isUnderWater |= fluidState.is(FluidTags.WATER); - isUnderWater |= fluidState.is(FluidTags.LAVA); + boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); + enableFog |= fogType.equals(FogType.WATER); + enableFog |= fogType.equals(FogType.LAVA); + enableFog |= fogType.equals(FogType.POWDER_SNOW); - if (!isUnderWater) { + if (!enableFog) { if (fogMode == FogMode.FOG_TERRAIN && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) { - RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE); - RenderSystem.fogEnd(A_EVEN_LARGER_VALUE); + RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE); + RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE); } } } diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java index 604db0a85..6124a96cf 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java @@ -5,20 +5,18 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.api.ClientApi; +import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import net.minecraft.client.Camera; import net.minecraft.client.renderer.FogRenderer; import net.minecraft.client.renderer.FogRenderer.FogMode; -import net.minecraft.tags.FluidTags; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.FogType; @Mixin(FogRenderer.class) public class MixinFogRenderer { @@ -36,17 +34,17 @@ public class MixinFogRenderer { } catch (NullPointerException e) { return; // Can happen due to forge calling this before setting up the mod } - ClientApi.LOGGER.debug("LOD: MixinSetupFog called!"); - FluidState fluidState = camera.getFluidInCamera(); + ApiShared.LOGGER.debug("LOD: MixinSetupFog called!"); + FogType fogType = camera.getFluidInCamera(); Entity entity = camera.getEntity(); boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS); - isUnderWater |= fluidState.is(FluidTags.WATER); - isUnderWater |= fluidState.is(FluidTags.LAVA); + isUnderWater |= fogType.equals(FogType.WATER); + isUnderWater |= fogType.equals(FogType.LAVA); if (!isUnderWater) { if (fogMode == FogMode.FOG_TERRAIN && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) { - RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE); - RenderSystem.fogEnd(A_EVEN_LARGER_VALUE); + RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE); + RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE); } } }