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

Fix compiling for MC 18 and below

Browse Source
This commit is contained in:
James Seibel
2022-07-10 17:30:03 -05:00
parent 7f69809345
commit d75a4f8d1a
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
forge/src/main/java/com/seibel/lod/forge/ForgeMain.java
+12 -8
View File
@@ -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. <br>
* 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<BakedQuad> 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<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random)
forge/src/main/resources/META-INF/mods.toml
+1 -1
View File
@@ -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"