Fixed 1.19 building

1.16.5.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.42.0+1.16
     starlight_version_fabric=
     phosphor_version_fabric=
     lithium_version=mc1.16.5-0.6.6
-    sodium_version=3488820
+    sodium_version=mc1.16.5-0.2.0
     iris_version=1.16.x-v1.1.4
     bclib_version=
     immersive_portals_version =

1.17.1.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.46.1+1.17
     starlight_version_fabric=3442770
     phosphor_version_fabric=
     lithium_version=mc1.17.1-0.7.5
-    sodium_version=3605275
+    sodium_version=mc1.17.1-0.3.4
     iris_version=1.17.x-v1.1.4
     bclib_version=
     immersive_portals_version = 0.14-1.17

1.18.1.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.46.6+1.18
     starlight_version_fabric=3554912
     phosphor_version_fabric=3573395
     lithium_version=mc1.18.1-0.7.7
-    sodium_version=3605309
+    sodium_version=mc1.18.1-0.4.0-alpha6
     iris_version=1.18.x-v1.1.4
     bclib_version=1.2.5
     immersive_portals_version = v1.0.4-1.18

1.18.2.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.48.0+1.18.2
     starlight_version_fabric=3667443
     phosphor_version_fabric=3573395
     lithium_version=mc1.18.2-0.7.9
-    sodium_version=3669187
+    sodium_version=mc1.18.2-0.4.1
     iris_version=1.18.x-v1.2.2
     immersive_portals_version = v1.0.4-1.18
     bclib_version=0

1.19.1.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.58.5+1.19.1
     starlight_version_fabric=0
     phosphor_version_fabric=0
     lithium_version=0
-    sodium_version=3820973
+    sodium_version=mc1.19.2-0.4.4
     iris_version=1.19.x-v1.2.6
     immersive_portals_version = 0
     bclib_version=0

1.19.2.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.58.5+1.19.1
     starlight_version_fabric=0
     phosphor_version_fabric=0
     lithium_version=0
-    sodium_version=3820973
+    sodium_version=mc1.19.2-0.4.4
     iris_version=1.19.x-v1.2.6
     immersive_portals_version = 0
     bclib_version=0

1.19.3.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.68.1+1.19.3
     starlight_version_fabric=0
     phosphor_version_fabric=0
     lithium_version=0
-    sodium_version=4145281
+    sodium_version=mc1.19.3-0.4.11
     iris_version=1.19.x-v1.2.6
     immersive_portals_version = 0
     bclib_version=0

1.19.4.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.75.3+1.19.4
     starlight_version_fabric=0
     phosphor_version_fabric=0
     lithium_version=0
-    sodium_version=4145281
+    sodium_version=mc1.19.4-0.4.11
     iris_version=1.19.x-v1.2.6
     immersive_portals_version = 0
     bclib_version=0

1.19.properties

@@ -13,7 +13,7 @@ fabric_api_version=0.57.0+1.19
     starlight_version_fabric=0
     phosphor_version_fabric=0
     lithium_version=0
-    sodium_version=3820973
+    sodium_version=mc1.19.2-0.4.4
     iris_version=1.19.x-v1.2.6
     immersive_portals_version = 0
     bclib_version=0

Readme.md

@@ -2,6 +2,8 @@
 
 > A mod that adds a Level of Detail System to Minecraft
 
+## Please move to main branch, this branch is mainly used for porting to newer versions of Minecraft until main becomes stable
+
 # What is Distant Horizons?
 
 This mod adds a Level Of Detail (LOD) system to Minecraft.\
@@ -29,6 +31,12 @@ Architectury loom version: 0.12.0-SNAPSHOT\
 Java Compiler plugin: Manifold Preprocessor
 
 
+#### 1.19.4 mods
+Forge version: 45.0.0\
+Fabric version: 0.14.17\
+Fabric API version: 0.75.3+1.19.4\
+Modmenu version: 6.1.0-rc.1
+
 #### 1.19.3 mods
 Forge version: 44.0.6\
 Fabric version: 0.14.11\
@@ -81,12 +89,15 @@ This version has been confirmed to work in IDE and Retail Minecraft with ether t
 
 #### Nightlly builds
 This mod has an autobuild system to automatically build the mod on each commit
-- 1.19.1:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19_1
-- 1.19:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19
-- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_2
-- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_1
-- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_17_1
-- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_16_5
+- 1.19.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_19_4
+- 1.19.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_19_3
+- 1.19.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_19_2
+- 1.19.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_19_1
+- 1.19:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_19
+- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_18_2
+- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_18_1
+- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_17_1
+- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/stable/download?job=build_16_5
 
 See the Fabric Documentation online for more detailed instructions:\
 https://fabricmc.net/wiki/tutorial:setup
@@ -109,7 +120,10 @@ https://fabricmc.net/wiki/tutorial:setup
 4. Import the project into eclipse
 
 ## Switching Versions
-This branch support 6 built versions:
+This branch support 9 built versions:
+ - 1.19.4
+ - 1.19.3
+ - 1.19.2
  - 1.19.1
  - 1.19
  - 1.18.2
@@ -133,7 +147,7 @@ If running on IDE, to ensure IDE pickup the changed versions, you will need to r
 6. The compiled jar file will be in the folder `Merged`
 
 **If in terminal:**
-1. `git clone -b 1.6.4a_dev --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+1. `git clone -b stable --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
 2. `cd minecraft-lod-mod`
 3. `./gradlew assemble`
 4. `./gradlew mergeJars`

fabric/build.gradle

@@ -153,7 +153,7 @@ dependencies {
     addMod("curse.maven:phosphor-372124:${rootProject.phosphor_version_fabric}", rootProject.enable_phosphor)
 
     // Sodium
-    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
+    addMod("maven.modrinth:sodium:${rootProject.sodium_version}", rootProject.enable_sodium)
     implementation "org.joml:joml:1.10.2"
     modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version))
     modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version))

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java

@@ -27,7 +27,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-#if PRE_MC_1_19_1
+#if PRE_MC_1_19
 import net.minecraft.network.chat.TranslatableComponent;
 #endif
 import net.minecraft.resources.ResourceLocation;
@@ -69,7 +69,7 @@ public class MixinOptionsScreen extends Screen {
                 // For now it goes to the client option by default
                 (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
                 // Add a title to the screen
-                #if PRE_MC_1_19_1
+                #if PRE_MC_1_19
                 new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
                 #else
                 Component.translatable("text.autoconfig." + ModInfo.ID + ".title")));

forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java

@@ -35,7 +35,7 @@ import com.seibel.lod.common.wrappers.world.WorldWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;
-#if PRE_MC_1_19_1
+#if PRE_MC_1_19
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
@@ -70,7 +70,7 @@ public class ForgeClientProxy
 	@SubscribeEvent
 	public void chunkLoadEvent(ChunkEvent.Load event)
 	{
-		#if PRE_MC_1_19_1
+		#if PRE_MC_1_19
 		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getWorld()), WorldWrapper.getWorldWrapper(event.getWorld()));
 		#else
 		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getLevel()), WorldWrapper.getWorldWrapper(event.getLevel()));
@@ -78,7 +78,7 @@ public class ForgeClientProxy
 	}
 	
 	@SubscribeEvent
-	#if PRE_MC_1_19_1
+	#if PRE_MC_1_19
 	public void worldSaveEvent(WorldEvent.Save event)
 	#else
 	public void worldSaveEvent(LevelEvent.Save event)
@@ -89,7 +89,7 @@ public class ForgeClientProxy
 	
 	/** This is also called when a new dimension loads */
 	@SubscribeEvent
-	#if PRE_MC_1_19_1
+	#if PRE_MC_1_19
 	public void worldLoadEvent(WorldEvent.Load event)
 	#else
 	public void worldLoadEvent(LevelEvent.Load event)
@@ -97,7 +97,7 @@ public class ForgeClientProxy
 	{
 		if (Minecraft.getInstance().screen instanceof TitleScreen) return;
 		if (Minecraft.getInstance().getConnection() == null) return; // In 1.19.3, the multiplayer world load is called twice. The first time is before it actually connects to the multiplayer server (so stuff like ip and name arent sent out yet)
-		#if PRE_MC_1_19_1
+		#if PRE_MC_1_19
 		if (event.getWorld() != null) {
 			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 		}
@@ -109,7 +109,7 @@ public class ForgeClientProxy
 	}
 	
 	@SubscribeEvent
-	#if PRE_MC_1_19_1
+	#if PRE_MC_1_19
 	public void worldUnloadEvent(WorldEvent.Unload event)
 	{
 		eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
@@ -131,7 +131,7 @@ public class ForgeClientProxy
 				event.getClass() == BlockEvent.FluidPlaceBlockEvent.class ||
 				event.getClass() == BlockEvent.PortalSpawnEvent.class)
 		{
-			#if PRE_MC_1_19_1
+			#if PRE_MC_1_19
 			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()), event.getWorld());
 			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
 			#else
@@ -145,7 +145,7 @@ public class ForgeClientProxy
 	}
 	
 	@SubscribeEvent
-	public void onKeyInput(#if PRE_MC_1_19_1 InputEvent.KeyInputEvent event #else InputEvent.Key event #endif)
+	public void onKeyInput(#if PRE_MC_1_19 InputEvent.KeyInputEvent event #else InputEvent.Key event #endif)
 	{
 		if (Minecraft.getInstance().player == null) return;
 		if (event.getAction() != GLFW.GLFW_PRESS) return;

forge/src/main/java/com/seibel/lod/forge/ForgeMain.java

@@ -49,14 +49,14 @@ import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.ExtensionPoint;
 #elif MC_1_17_1
 import net.minecraftforge.fmlclient.ConfigGuiHandler;
-#elif POST_MC_1_19_1
+#elif POST_MC_1_19
 import net.minecraftforge.client.ConfigScreenHandler;
 #else // 1.18+ untill 1.19
 import net.minecraftforge.client.ConfigGuiHandler;
 #endif
 
 // these imports change due to forge refactoring classes in 1.19
-#if POST_MC_1_19_1
+#if POST_MC_1_19
 import net.minecraft.util.RandomSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraftforge.client.model.data.ModelData;
@@ -109,7 +109,7 @@ public class ForgeMain implements LodForgeMethodCaller
 		#if PRE_MC_1_17_1
 		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
 				() -> (client, parent) -> ConfigGui.getScreen(parent, ""));
-		#elif POST_MC_1_19_1
+		#elif POST_MC_1_19
 		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,
 				() -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> ConfigGui.getScreen(parent, "")));
 		#else
@@ -120,21 +120,21 @@ public class ForgeMain implements LodForgeMethodCaller
 		MinecraftForge.EVENT_BUS.register(forgeClientProxy);
 	}
 
-	#if PRE_MC_1_19_1
+	#if PRE_MC_1_19_
 	private final ModelDataMap modelData = new ModelDataMap.Builder().build();
 	#else
 	private final ModelData modelData = ModelData.EMPTY;
 	#endif
 	
 	@Override
-	#if PRE_MC_1_19_1
+	#if PRE_MC_1_19
 	public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
 		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData);
 	}
 	#else
 	public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random)
 	{
-		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData #if POST_MC_1_19_1, RenderType.solid() #endif);
+		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData #if POST_MC_1_19, RenderType.solid() #endif);
 	}
 	#endif
 

forge/src/main/java/com/seibel/lod/forge/mixins/MixinOptionsScreen.java

@@ -27,7 +27,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-#if PRE_MC_1_19_1
+#if PRE_MC_1_19
 import net.minecraft.network.chat.TranslatableComponent;
 #endif
 import net.minecraft.resources.ResourceLocation;
@@ -69,7 +69,7 @@ public class MixinOptionsScreen extends Screen {
                             // For now it goes to the client option by default
                             (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
                             // Add a title to the screen
-                            #if PRE_MC_1_19_1
+                            #if PRE_MC_1_19
                             new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
                             #else
                             Component.translatable("text.autoconfig." + ModInfo.ID + ".title")));