diff --git a/1.19.properties b/1.19.properties index 49bb0ce3e..40e0fa69f 100644 --- a/1.19.properties +++ b/1.19.properties @@ -30,7 +30,7 @@ fabric_api_version=0.55.3+1.19 enable_bclib=0 # Forge loader -forge_version=41.0.19 +forge_version=41.0.85 # Forge mod versions starlight_version_forge=0 terraforged_version= diff --git a/core b/core index e1b2c6285..ca2b09c2c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e1b2c62854d64295e1046e80d6cf1c2d93f30456 +Subproject commit ca2b09c2c866876a9d15db6627f29dda2f14897f diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java index fb3036c29..807f819af 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java @@ -108,7 +108,7 @@ public class ForgeClientProxy } @SubscribeEvent - public void onKeyInput(InputEvent.KeyInputEvent event) + 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; @@ -116,5 +116,4 @@ public class ForgeClientProxy } - } diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java index 3aaad102e..93db64618 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -36,12 +36,15 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; #if POST_MC_1_19 import net.minecraft.util.RandomSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraftforge.client.model.data.ModelData; +#else +import net.minecraftforge.client.model.data.ModelDataMap; #endif import net.minecraft.world.level.ColorResolver; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -58,7 +61,6 @@ import net.minecraftforge.client.ConfigGuiHandler; #endif import java.util.List; -import java.util.Random; /** * Initialize and setup the Mod.
@@ -109,15 +111,21 @@ public class ForgeMain implements LodForgeMethodCaller MinecraftForge.EVENT_BUS.register(forgeClientProxy); } - private final ModelDataMap dataMap = new ModelDataMap.Builder().build(); + #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 public List getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random) { return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap); } #else - public List getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random) { - return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap); + public List 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, RenderType.solid() #endif); } #endif diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index eab67b62a..ca9582fa9 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -24,3 +24,9 @@ issueTrackerURL="${issues}" #// Allow any version to be present (or not) on the server acceptableRemoteVersions="*" +[[dependencies.lod]] + modId="forge" + mandatory=true + versionRange="[41.0.85,)" + ordering="NONE" + side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 394f60901..d508faed3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ maven_group=com.seibel.lod archives_base_name=DistantHorizons # Mod info -mod_version=1.6.5a +mod_version=1.6.6a mod_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"] @@ -20,4 +20,4 @@ enabled_platforms=fabric,forge mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: -mcVer=1.16.5 \ No newline at end of file +mcVer=1.19 \ No newline at end of file