wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'detached' into 'main'

Browse Source 
Make renderingString show correct value if rendering is disabled for this dimension

See merge request distant-horizons-team/distant-horizons-core!100
This commit is contained in:
James Seibel
2026-05-17 00:07:10 +00:00
parent 21136ba1ef baa9b94a5d
commit 1c4908bbc5
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
+6 -2
View File
@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.core.level;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.Config;
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2; import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.enums.MinecraftTextFormat; import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
@@ -333,12 +334,15 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
String o = MinecraftTextFormat.ORANGE; String o = MinecraftTextFormat.ORANGE;
String y = MinecraftTextFormat.YELLOW; String y = MinecraftTextFormat.YELLOW;
String g = MinecraftTextFormat.GREEN; String g = MinecraftTextFormat.GREEN;
String r = MinecraftTextFormat.RED;
String cf = MinecraftTextFormat.CLEAR_FORMATTING; String cf = MinecraftTextFormat.CLEAR_FORMATTING;
String dimName = this.levelWrapper.getDhIdentifier(); String dimName = this.levelWrapper.getDhIdentifier();
boolean rendering = this.clientside.isRendering(); boolean rendering =
String renderingString = rendering ? (g+"yes"+cf) : (o+"no"+cf); this.clientside.isRendering()
&& !IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName);
String renderingString = rendering ? (g+"yes"+cf) : (r+"no"+cf);
messageList.add("["+y+dimName+cf+"] rendering: "+renderingString); messageList.add("["+y+dimName+cf+"] rendering: "+renderingString);
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
+6 -2
View File
@@ -19,6 +19,7 @@
package com.seibel.distanthorizons.core.level; package com.seibel.distanthorizons.core.level;
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
import com.seibel.distanthorizons.core.enums.MinecraftTextFormat; import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
import com.seibel.distanthorizons.core.file.structure.ISaveStructure; import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
@@ -121,12 +122,15 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
String o = MinecraftTextFormat.ORANGE; String o = MinecraftTextFormat.ORANGE;
String y = MinecraftTextFormat.YELLOW; String y = MinecraftTextFormat.YELLOW;
String g = MinecraftTextFormat.GREEN; String g = MinecraftTextFormat.GREEN;
String r = MinecraftTextFormat.RED;
String cf = MinecraftTextFormat.CLEAR_FORMATTING; String cf = MinecraftTextFormat.CLEAR_FORMATTING;
String dimName = this.serverLevelWrapper.getDhIdentifier(); String dimName = this.serverLevelWrapper.getDhIdentifier();
boolean rendering = this.clientside.isRendering(); boolean rendering =
String renderingString = rendering ? (g+"yes"+cf) : (o+"no"+cf); this.clientside.isRendering()
&& !IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName);
String renderingString = rendering ? (g+"yes"+cf) : (r+"no"+cf);
messageList.add("["+y+dimName+cf+"] rendering: "+renderingString); messageList.add("["+y+dimName+cf+"] rendering: "+renderingString);
super.addDebugMenuStringsToList(messageList); super.addDebugMenuStringsToList(messageList);
core/src/main/resources/assets/distanthorizons/lang/en_us.json
+1 -1
View File
@@ -394,7 +394,7 @@
"distanthorizons.config.client.advanced.graphics.experimental.ignoredDimensionCsv": "distanthorizons.config.client.advanced.graphics.experimental.ignoredDimensionCsv":
"Ignored Dimension CSV", "Ignored Dimension CSV",
"distanthorizons.config.client.advanced.graphics.experimental.ignoredDimensionCsv.@tooltip": "distanthorizons.config.client.advanced.graphics.experimental.ignoredDimensionCsv.@tooltip":
"A comma separated list of dimension resource locations where DH won't render. Example: \"minecraft:the_nether,minecraft:the_end\" \n\nNote: \nSome DH settings will be disabled and/or changed to improve \nvisuals when DH rendering is disabled.", "A comma separated list of dimension resource locations where DH won't render. Example: \"minecraft:the_nether,minecraft:the_end\" \n\nFor Minecraft 1.12.2 and older:\nOpen the F3 screen and copy the dimension name shown in yellow.\n\nNote: \nSome DH settings will be disabled and/or changed to improve \nvisuals when DH rendering is disabled.",
"distanthorizons.config.client.advanced.graphics.experimental.renderingApi": "distanthorizons.config.client.advanced.graphics.experimental.renderingApi":
"Rendering API", "Rendering API",
"distanthorizons.config.client.advanced.graphics.experimental.renderingApi.@tooltip": "distanthorizons.config.client.advanced.graphics.experimental.renderingApi.@tooltip":