Skip to content

Use heuristic to determine custom nether dimension types #3276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TehBrian wants to merge 1 commit into
base: 26.2
Choose a base branch
from
+40 −21
Open

Use heuristic to determine custom nether dimension types #3276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 40 additions & 21 deletions common/src/main/java/net/irisshaders/iris/Iris.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

import com.google.common.base.Throwables;
import com.mojang.blaze3d.opengl.GlDebug;
import com.mojang.blaze3d.opengl.GlDevice;
import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import net.caffeinemc.mods.sodium.api.vertex.serializer.VertexSerializerRegistry;
import net.irisshaders.iris.compat.dh.DHCompat;
Expand Down Expand Up @@ -40,15 +38,15 @@
import net.irisshaders.iris.vertices.sodium.ModelToEntityVertexSerializer;
import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants;
import net.minecraft.client.input.KeyEvent;
import net.minecraft.util.Util;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.input.KeyEvent;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.HoverEvent;
import net.minecraft.resources.Identifier;
import net.minecraft.util.Util;
import net.minecraft.world.level.CardinalLighting;
import net.minecraft.world.level.dimension.DimensionType;
import org.jetbrains.annotations.NotNull;
import org.lwjgl.glfw.GLFW;
Expand Down Expand Up @@ -608,6 +606,19 @@ private static void destroyEverything() {
}
}

/**
* Gets the dimension of the level that the player is currently in.
* <p>
* If the player is not in a level, this will return their last dimension
* to avoid unnecessary shaderpack reloads.
* <p>
* The returned dimension may differ from the actual dimension depending
* on the dimension type's properties to ensure that the appropriate
* effects are applied in custom dimension types that are based on the
* standard overworld, nether, or end.
*
* @return the player's current dimension or an override
*/
public static NamespacedId getCurrentDimension() {
ClientLevel level = Minecraft.getInstance().level;

Expand Down Expand Up @@ -636,6 +647,14 @@ public static NamespacedId getCurrentDimension() {
return DimensionId.OVERWORLD;
}

// If the skybox is NONE, the dimension type may be nether-like. However, to avoid falsely overriding custom
// dimension types that are not intending to imitate the nether, we'll check the cardinal lighting property
// as a heuristic and return the nether only if it matches that of the nether.
if (skybox == DimensionType.Skybox.NONE
&& level.dimensionType().cardinalLightType() == CardinalLighting.Type.NETHER) {
return DimensionId.NETHER;
}

return dimensionId;
} else {
// This prevents us from reloading the shaderpack unless we need to. Otherwise, if the player is in the
Expand Down Expand Up @@ -773,28 +792,28 @@ public static String getVersionSimple() {
return getVersion().split("\\+")[0];
}

public static boolean handleDebugKeys(KeyEvent event) {
if (reloadKeybind.matches(event)) {
try {
reload();
public static boolean handleDebugKeys(KeyEvent event) {
if (reloadKeybind.matches(event)) {
try {
reload();

if (Minecraft.getInstance().player != null) {
Minecraft.getInstance().player.sendSystemMessage(Component.translatable("iris.shaders.reloaded"));
}
if (Minecraft.getInstance().player != null) {
Minecraft.getInstance().player.sendSystemMessage(Component.translatable("iris.shaders.reloaded"));
}

} catch (Exception e) {
logger.error("Error while reloading Shaders for Iris!", e);
} catch (Exception e) {
logger.error("Error while reloading Shaders for Iris!", e);

if (Minecraft.getInstance().player != null) {
Minecraft.getInstance().player.sendSystemMessage(Component.translatable("iris.shaders.reloaded.failure", Throwables.getRootCause(e).getMessage()).withStyle(ChatFormatting.RED));
}
}
if (Minecraft.getInstance().player != null) {
Minecraft.getInstance().player.sendSystemMessage(Component.translatable("iris.shaders.reloaded.failure", Throwables.getRootCause(e).getMessage()).withStyle(ChatFormatting.RED));
}
}
return true;
}
}
return false;
}
}

/**
/**
* Called very early on in Minecraft initialization. At this point we *cannot* safely access OpenGL, but we can do
* some very basic setup, config loading, and environment checks.
*
Expand Down