Add Various Features (#1209) (#1277)

Co-authored-by: Eclipse-Sol <[email protected]>
This commit is contained in:
Jason MitchellandEclipse-Sol authored and GitHub committed 2026-01-19 13:03:56 -08:00
1 parent ea4a3cdf0b
commit 362724610c
22 files changed
+785 -96

No files matched your search

+6 -4
View File
@@ -9,7 +9,9 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import lombok.Getter;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
@@ -860,14 +862,14 @@ public class Iris {
private static int getShaderMaterialOverrideId(Block block, int meta) {
if (contextHolder == null) {
final Object2IntMap<Block> blockMatches = BlockRenderingSettings.INSTANCE.getBlockMatches();
if (blockMatches == null) {
final Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches();
if (blockMetaMatches == null) {
return -1;
}
contextHolder = new BlockContextHolder(blockMatches);
contextHolder = new BlockContextHolder(blockMetaMatches);
}
contextHolder.set(block, (short) block.getRenderType());
contextHolder.set(block, meta, (short) block.getRenderType());
return contextHolder.blockId;
}