From d75a4f8d1a4eb5fd458bb1e667b7d83adfea436c Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 10 Jul 2022 17:30:03 -0500 Subject: [PATCH] Fix compiling for MC 18 and below --- .../java/com/seibel/lod/forge/ForgeMain.java | 20 +++++++++++-------- forge/src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) 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 93db64618..19d10edce 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java @@ -34,13 +34,6 @@ import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor; 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; @@ -60,8 +53,19 @@ import net.minecraftforge.fmlclient.ConfigGuiHandler; import net.minecraftforge.client.ConfigGuiHandler; #endif +// these imports change due to forge refactoring classes in 1.19 +#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; +import java.util.Random; +#endif + import java.util.List; + /** * Initialize and setup the Mod.
* If you are looking for the real start of the mod @@ -120,7 +124,7 @@ public class ForgeMain implements LodForgeMethodCaller @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); + return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData); } #else public List getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index ca9582fa9..f90efd146 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -27,6 +27,6 @@ issueTrackerURL="${issues}" [[dependencies.lod]] modId="forge" mandatory=true - versionRange="[41.0.85,)" + versionRange="[41.0.85,)" #// NOTE: this will cause issues for anything using MC 1.18 and lower, this is only here for MC 1.19 ordering="NONE" side="BOTH" \ No newline at end of file