Add proof-of-concept dynamic fade

Done to fix a forge limitation where logos can't contain a file pathhttps://github.com/MinecraftForge/MinecraftForge/issues/7348

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -14,6 +14,7 @@ import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -26,7 +27,6 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
-import java.lang.invoke.MethodHandles;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -240,8 +240,7 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-						// orange text
+					MinecraftTextFormat.ORANGE + "Distant Horizons: Alex's Cave detected." + MinecraftTextFormat.CLEAR_FORMATTING +
-						"\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" +
 								"You may have to change Alex's config for DH to render. ";
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}
@@ -263,8 +262,7 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-						// orange text
+					MinecraftTextFormat.ORANGE + "Distant Horizons: WWOO detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-						"\u00A76" + "Distant Horizons: WWOO detected." + "\u00A7r\n" +
 								wwooWarning;
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}
@@ -294,8 +292,7 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-						// orange text
+					MinecraftTextFormat.ORANGE + "Distant Horizons: Chunky detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-						"\u00A76" + "Distant Horizons: Chunky detected." + "\u00A7r\n" +
 								chunkyWarning;
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -49,12 +50,14 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.EmptyBlockGetter;
 #elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
+import net.minecraft.tags.TagKey;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.EmptyBlockGetter;
 #else
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -88,6 +91,15 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public static final String DIRT_RESOURCE_LOCATION_STRING = "minecraft:dirt";
 	public static final String WATER_RESOURCE_LOCATION_STRING = "minecraft:water";
 	
+	/** Used to handle older MC versions that don't have an simple way of getting the block's tags */
+	public static final List<String> OLD_BEACON_BASE_BLOCK_NAME_LIST = Arrays.asList(
+		"iron_block",
+		"gold_block",
+		"diamond_block",
+		"emerald_block",
+		"netherite_block"
+	);
+	
 	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;
 	
@@ -176,11 +188,14 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		String lowercaseSerial = this.serialString.toLowerCase();
 		
 		
-		// beacon blocks
+		
+		// beacon base blocks
+		#if MC_VER <= MC_1_18_2
+		// Older MC versions are harder to get block tags, so just use a static list to determine beacon blocks
 		boolean isBeaconBaseBlock = false;
-		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
+		for (int i = 0; i < OLD_BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
 		{
-			String baseBlockName = LodUtil.BEACON_BASE_BLOCK_NAME_LIST.get(i);
+			String baseBlockName = OLD_BEACON_BASE_BLOCK_NAME_LIST.get(i);
 			if (lowercaseSerial.contains(baseBlockName))
 			{
 				isBeaconBaseBlock = true;
@@ -188,8 +203,23 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			}
 		}
 		this.isBeaconBaseBlock = isBeaconBaseBlock;
+		#else
+		if (blockState != null)
+		{
+			// check if this block has any tags 
+			Stream<TagKey<Block>> tags = blockState.getTags();
+			this.isBeaconBaseBlock = tags.anyMatch((TagKey<Block> tag) -> tag.location().getPath().toLowerCase().contains("beacon_base_blocks"));
+		}
+		else
+		{
+			this.isBeaconBaseBlock = false;
+		}
+		#endif
+		
+		// beacon block
 		this.isBeaconBlock = lowercaseSerial.contains("minecraft:beacon");
 		
+		
 		// beacon tint color
 		Color beaconTintColor = null;
 		if (this.blockState != null
@@ -225,6 +255,12 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				// bedrock is a special case fully opaque block that does allow beacons through
 				allowsBeaconBeamPassage = true;
 			}
+			else if (lowercaseSerial.contains("minecraft:tinted_glass"))
+			{
+				// tinted glass is a special case where it isn't fully opaque,
+				// but should block beacons
+				allowsBeaconBeamPassage = false;
+			}
 			else if (propagatesSkyLightDown || !canOcclude)
 			{
 				// stairs, cake, fences, etc.

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java

@@ -30,10 +30,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.RotatedPillarBlock;
 #if MC_VER >= MC_1_19_2
 import net.minecraft.util.RandomSource;
 #else
@@ -41,6 +38,7 @@ import java.util.Random;
 #endif
 import net.minecraft.world.level.block.state.BlockState;
 import com.seibel.distanthorizons.core.logging.DhLogger;
+import net.minecraft.world.level.block.state.properties.SlabType;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -64,6 +62,8 @@ public class ClientBlockStateColorCache
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final Minecraft MC = Minecraft.getInstance();
+	
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
 	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
 	
@@ -79,7 +79,16 @@ public class ClientBlockStateColorCache
 	
 	
 	/** This is the order each direction on a block is processed when attempting to get the texture/color */
-	private static final Direction[] COLOR_RESOLUTION_DIRECTION_ORDER = { Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN };
+	private static final @Nullable Direction[] COLOR_RESOLUTION_DIRECTION_ORDER = 
+		{ 
+			Direction.UP,
+			null, // null represents "unculled" faces, IE the top of farmland
+			Direction.NORTH, 
+			Direction.EAST, 
+			Direction.WEST, 
+			Direction.SOUTH, 
+			Direction.DOWN 
+		};
 	
 	private static final int FLOWER_COLOR_SCALE = 5;
 	
@@ -281,14 +290,23 @@ public class ClientBlockStateColorCache
 	@Nullable
 	private List<BakedQuad> getQuadsForDirection(@Nullable Direction direction)
 	{
-		List<BakedQuad> quads = null;
+		BlockState effectiveBlockState = this.blockState;
+		
+		// if this block is a slab, use it's double variant so we can get the top face,
+		// otherwise the color will use the side, which isn't as accurate
+		if (this.blockState.getBlock() instanceof SlabBlock)
+		{
+			effectiveBlockState = this.blockState.setValue( SlabBlock.TYPE, SlabType.DOUBLE );
+		}
+		
+		List<BakedQuad> quads;
 		
 		#if MC_VER < MC_1_21_5
-		quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+		quads = MC.getModelManager().getBlockModelShaper().
-				getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
+			getBlockModel(effectiveBlockState).getQuads(effectiveBlockState, direction, RANDOM);
 		#else
-		List<BlockModelPart> blockModelPartList = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+		List<BlockModelPart> blockModelPartList = MC.getModelManager().getBlockModelShaper().
-				getBlockModel(this.blockState).collectParts(RANDOM);
+			getBlockModel(effectiveBlockState).collectParts(RANDOM);
 		
 		quads = new ArrayList<>();
 		if (blockModelPartList != null)
@@ -558,10 +576,22 @@ public class ClientBlockStateColorCache
 		
 		static EColorMode getColorMode(Block block)
 		{
-			if (block instanceof LeavesBlock) return Leaves;
+			if (block instanceof LeavesBlock)
-			if (block instanceof FlowerBlock) return Flower;
+			{
-			if (block.toString().contains("glass")) return Glass;
+				return Leaves;
-			if (block.toString().equals("Block{chiselsandbits:chiseled}")) return Chisel;
+			}
+			if (block instanceof FlowerBlock)
+			{
+				return Flower;
+			}
+			if (block.toString().contains("glass"))
+			{
+				return Glass;
+			}
+			if (block.toString().equals("Block{chiselsandbits:chiseled}"))
+			{
+				return Chisel;
+			}
 			return Default;
 		}
 	}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverride.java

@@ -51,10 +51,10 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	
 	public TintGetterOverride() { }
 	
-	public void update(LevelReader parent, BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
+	public void update(BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
 	{
 		super.update(biomeWrapper, blockStateWrapper, fullDataSource, clientLevelWrapper);
-		this.parent = parent;
+		this.parent = (LevelReader)this.clientLevelWrapper.getWrappedMcObject();
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java

@@ -13,6 +13,7 @@ import java.util.regex.Pattern;
 
 import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui;
 import com.seibel.distanthorizons.common.wrappers.gui.config.ConfigGuiInfo;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.types.*;
@@ -26,6 +27,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.AnnotationUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -59,6 +61,9 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.resources.Identifier;
 #endif
 
+import org.lwjgl.glfw.GLFW;
+import com.mojang.blaze3d.platform.InputConstants;
+
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.Translatable;
 
@@ -84,6 +89,8 @@ public class ClassicConfigGUI
 	
 	public static final ConfigCoreInterface CONFIG_CORE_INTERFACE = new ConfigCoreInterface();
 	
+	private static final MinecraftClientWrapper MC_CLIENT = MinecraftClientWrapper.INSTANCE;
+	
 	
 	
 	//==============//
@@ -423,9 +430,17 @@ public class ClassicConfigGUI
 				int startingIndex = enumList.indexOf(enumConfigEntry.get());
 				Enum<?> enumValue = enumList.get(startingIndex);
 				
-				// search for the next enum that is selectable
+				boolean shiftPressed = 
-				int index = startingIndex + 1;
+					InputConstants.isKeyDown(MC_CLIENT.getGlfwWindowId(), GLFW.GLFW_KEY_LEFT_SHIFT)
+					|| InputConstants.isKeyDown(MC_CLIENT.getGlfwWindowId(), GLFW.GLFW_KEY_RIGHT_SHIFT);
+				
+				
+				
+				// move forward or backwards depending on if the shift key is pressed
+				int index = shiftPressed ? startingIndex-1 : startingIndex+1;
 				index = (index >= enumList.size()) ? 0 : index;
+				
+				// walk through the enums to find the next selectable one
 				while (index != startingIndex)
 				{
 					enumValue = enumList.get(index);
@@ -436,13 +451,24 @@ public class ClassicConfigGUI
 						break;
 					}
 					
-					index++;
+					// move forward or backwards depending on if the shift key is pressed
-					index = (index >= enumList.size()) ? 0 : index;
+					index = shiftPressed ? index-1 : index+1;
+					
+					// wrap around to the other side of the array when necessary
+					if (index >= enumList.size())
+					{
+						index = 0;
 					}
+					else if (index < 0)
+					{
+						index = enumList.size() - 1;
+					}
+				}
+				
 				
 				if (index == startingIndex)
 				{
-					// none of the enums should be selectable, this is a programmer error
+					// one of the enums should be selectable, this is a programmer error
 					enumValue = enumList.get(startingIndex);
 					LOGGER.warn("Enum [" + enumValue.getClass() + "] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value [" + enumValue + "].");
 				}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 import java.io.File;
 
+import com.mojang.blaze3d.platform.Window;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
 import com.seibel.distanthorizons.core.render.glObject.GLProxy;
@@ -262,6 +263,24 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	// misc //
 	//======//
 	
+	/** 
+	 * no override and not included in {@link IMinecraftClientWrapper}
+	 * since this would only be used in common/client, not core.
+	 */
+	public 
+		#if MC_VER < MC_1_21_9 long
+		#else Window 
+		#endif
+		getGlfwWindowId()
+	{
+		#if MC_VER < MC_1_21_9
+		long glfwWindowId = MINECRAFT.getWindow().getWindow();
+		return glfwWindowId;
+		#else
+		return MINECRAFT.getWindow();
+		#endif
+	}
+	
 	@Override
 	public IProfilerWrapper getProfiler()
 	{

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -362,7 +362,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			if (glTexture == null)
 			{
 				// shouldn't happen, but just in case
-				return 0;
+				return -1;
 			}
 
 			return glTexture.glId();
@@ -376,7 +376,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				this.depthTextureCastFailLogged = true;
 				LOGGER.error("Unable to cast render Target depth texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
 			}
-			return 0;
+			return -1;
 		}
 		#endif
 	}
@@ -392,7 +392,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			if (glTexture == null)
 			{
 				// shouldn't happen, but just in case
-				return 0;
+				return -1;
 			}
 			
 			return glTexture.glId();
@@ -405,7 +405,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				this.colorTextureCastFailLogged = true;
 				LOGGER.error("Unable to cast render Target color texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
 			}
-			return 0;
+			return -1;
 		}
 		#endif
 	}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -77,6 +77,8 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private final Function<BlockState, ClientBlockStateColorCache> createCachedBlockColorCacheFunc = (blockState) -> new ClientBlockStateColorCache(blockState, this);
 	
 	
+	private boolean cloudColorFailLogged = false;
+	
 	private BlockStateWrapper dirtBlockWrapper;
 	private IDhLevel dhLevel;
 	
@@ -343,14 +345,68 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public Color getCloudColor(float tickDelta)
 	{
 		#if MC_VER < MC_1_21_3
-		Vec3 colorVec3 = this.level.getCloudColor(tickDelta);
+		Vec3 colorVec3 = null;
+		try
+		{
+			colorVec3 = this.level.getCloudColor(tickDelta);
 			return new Color((float)colorVec3.x, (float)colorVec3.y, (float)colorVec3.z);
+		}
+		catch (Exception e)
+		{
+			// extra logging is due to some mods returning weird values, this way we can track down the issue better
+			if (!this.cloudColorFailLogged)
+			{
+				this.cloudColorFailLogged = true;
+				
+				String colorString = "NULL";
+				if (colorVec3 != null)
+				{
+					colorString = "r["+(float)colorVec3.x+"] g["+(float)colorVec3.y+"] b["+(float)colorVec3.z+"]";
+				}
+				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. vec3 ["+colorString+"], error: ["+e.getMessage()+"].", e);
+			}
+			
+			// default to white if there's an issue
+			return Color.WHITE;
+		}
 		#elif MC_VER <= MC_1_21_10
-		int argbColor = this.level.getCloudColor(tickDelta);
+		int argbColor = 0;
+		try
+		{
+			argbColor = this.level.getCloudColor(tickDelta);
 			return ColorUtil.toColorObjARGB(argbColor);
+		}
+		catch (Exception e)
+		{
+			// extra logging is due to some mods returning weird values, this way we can track down the issue better
+			if (!this.cloudColorFailLogged)
+			{
+				this.cloudColorFailLogged = true;
+				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. Int ["+argbColor+"], col ["+ColorUtil.toString(argbColor)+"], error: ["+e.getMessage()+"].", e);
+			}
+			
+			// default to white if there's an issue
+			return Color.WHITE;
+		}
 		#else
-		int argbColor = this.level.environmentAttributes().getValue(EnvironmentAttributes.CLOUD_COLOR, BlockPos.ZERO);
+		int argbColor = 0;
+		try
+		{
+			argbColor = this.level.environmentAttributes().getValue(EnvironmentAttributes.CLOUD_COLOR, BlockPos.ZERO);
 			return new Color(ColorUtil.getRed(argbColor), ColorUtil.getGreen(argbColor), ColorUtil.getBlue(argbColor), 255 /* ignore alpha since DH clouds don't render correctly with transparency */);
+		}
+		catch (Exception e)
+		{
+			// extra logging is due to some mods returning weird values, this way we can track down the issue better
+			if (!this.cloudColorFailLogged)
+			{
+				this.cloudColorFailLogged = true;
+				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. Int ["+argbColor+"], col ["+ColorUtil.toString(argbColor)+"], error: ["+e.getMessage()+"].", e);
+			}
+			
+			// default to white if there's an issue
+			return Color.WHITE;
+		}
 		#endif
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/InternalServerGenerator.java

@@ -7,6 +7,7 @@ import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.IDhServerLevel;
 import com.seibel.distanthorizons.core.logging.DhLogger;
@@ -218,8 +219,7 @@ public class InternalServerGenerator
 			if (Config.Common.Logging.Warning.showSlowWorldGenSettingWarnings.get())
 			{
 				String message =
-					// orange text
+					MinecraftTextFormat.ORANGE + "Distant Horizons: slow world gen." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-					"\u00A76" + "Distant Horizons: slow world gen." + "\u00A7r\n" +
 						c2meWarning;
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java

@@ -22,8 +22,10 @@ package com.seibel.distanthorizons.fabric;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
@@ -64,11 +66,13 @@ import java.util.concurrent.AbstractExecutorService;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 #endif
 
+import com.mojang.blaze3d.platform.InputConstants;
+
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.phys.HitResult;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -82,13 +86,12 @@ import org.lwjgl.glfw.GLFW;
 @Environment(EnvType.CLIENT)
 public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 {
-	private final ClientApi clientApi = ClientApi.INSTANCE;
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	// TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi
+	private static final MinecraftClientWrapper MC = MinecraftClientWrapper.INSTANCE;
-	private static final int[] KEY_TO_CHECK_FOR = { GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8, GLFW.GLFW_KEY_P};
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
+	
+	private static final ClientApi clientApi = ClientApi.INSTANCE;
 	
 	HashSet<Integer> previouslyPressKeyCodes = new HashSet<>();
 	
@@ -336,23 +339,13 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 	{
 		HashSet<Integer> currentKeyDown = new HashSet<>();
 		
-		// Note: Minecraft's InputConstants is same as GLFW Key values
+		// Note: Minecraft's InputConstants are the same as GLFW Key values
-		//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
+		for (int keyCode = GLFW.GLFW_KEY_0; keyCode <= GLFW.GLFW_KEY_LAST; keyCode++)
-		// Check all keys we need
-		for (int keyCode = GLFW.GLFW_KEY_A; keyCode <= GLFW.GLFW_KEY_Z; keyCode++)
 		{
-			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
+			if (InputConstants.isKeyDown(MC.getGlfwWindowId(), keyCode))
-			//{
+			{
-			//	currentKeyDown.add(keyCode);
+				currentKeyDown.add(keyCode);
-			//}
 			}
-		
-		for (int keyCode : KEY_TO_CHECK_FOR)
-		{
-			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			//{
-			//	currentKeyDown.add(keyCode);
-			//}
 		}
 		
 		// Diff and trigger events

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java

@@ -57,6 +57,7 @@ public class MixinOptionsScreen extends Screen
 	private void lodconfig$init(CallbackInfo ci)
 	{
 		if (Config.Client.showDhOptionsButtonInMinecraftUi.get())
+		{
 			this. #if MC_VER < MC_1_17_1 addButton #else addRenderableWidget #endif
 				(new TexturedButtonWidget(
 					// Where the button is on the screen
@@ -77,5 +78,6 @@ public class MixinOptionsScreen extends Screen
 					Component.translatable(ModInfo.ID + ".title")));
                     #endif
 		}
+	}
 	
 }

forge/src/main/resources/META-INF/mods.toml

@@ -12,14 +12,13 @@ issueTrackerURL = "${issues}"
     #//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
     displayURL = "${homepage}"
     description = "${description}" #//mandatory. The description text for the mod
-    logoFile = "assets/distanthorizons/logo.png"
+    logoFile = "dh_forge_logo.png" #// can't contain a file path due to an old forge limitation https://github.com/MinecraftForge/MinecraftForge/issues/7348
-    catalogueImageIcon = "assets/distanthorizons/icon.png"
+    catalogueImageIcon = "dh_forge_icon.png" #// can't contain a file path due to an old forge limitation https://github.com/MinecraftForge/MinecraftForge/issues/7348
     credits = "Massive thanks to all the developers for their hard work to bring Distant Horizons to where it is today. - James"
     #// if not set defaults to "false"
     clientSideOnly = "true"
     #// if not set side defaults to "BOTH"
-    #// TODO change to "BOTH" when we add server support
+    side = "BOTH"
-    side = "CLIENT"
     #// Allow any version to be present (or not) on the server
     acceptableRemoteVersions = "*"
 

forge/src/main/resources/pack.mcmeta

@@ -1,10 +0,0 @@
-{
-    "pack": {
-        "pack_format": 7,
-        "supported_formats": {
-            "min_inclusive": 7,
-            "max_inclusive": 90000
-        },
-        "description": "Distant Horizons"
-    }
-}

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.4.4-b
+mod_version=2.4.6-b-dev
 api_version=5.1.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java

@@ -45,7 +45,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
 				this.depthTextureCastFailLogged = true;
 				LOGGER.error("Unable to cast render Target depth texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
 			}
-			return 0;
+			return -1;
 		}
 		#endif
 	}
@@ -72,7 +72,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
 				this.colorTextureCastFailLogged = true;
 				LOGGER.error("Unable to cast render Target color texture to ValidationGpuTexture or GlTexture. MC, Neoforge, or a rendering mod may have changed the object type.", e);
 			}
-			return 0;
+			return -1;
 		}
 		#endif
 	}

neoforge/src/main/resources/pack.mcmeta

@@ -1,10 +0,0 @@
-{
-    "pack": {
-        "pack_format": 7,
-        "supported_formats": {
-            "min_inclusive": 7,
-            "max_inclusive": 90000
-        },
-        "description": "Distant Horizons"
-    }
-}

versionProperties/1.20.1.properties

@@ -10,8 +10,8 @@ builds_for=fabric,forge
 netty_version=4.1.82.Final
 
 # Fabric loader
-fabric_loader_version=0.15.6
+fabric_loader_version=0.16.10
-fabric_api_version=0.90.4+1.20.1
+fabric_api_version=0.92.6+1.20.1
     # Fabric mod versions
     modmenu_version=7.2.2
     starlight_version_fabric=