From 68ce113c5b32a01812949f3f86c70950a31ff289 Mon Sep 17 00:00:00 2001 From: Brennan Ward Date: Wed, 22 Jan 2020 14:23:42 -0500 Subject: [PATCH] Fixed RenderTypeLookup loosing mappings for registry replacements. (#6452) --- .../client/renderer/RenderTypeLookup.java.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderTypeLookup.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderTypeLookup.java.patch index 408c61d0f7..fe8b0e71bc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderTypeLookup.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderTypeLookup.java.patch @@ -46,8 +46,8 @@ + // FORGE START + -+ private static final Map> blockRenderChecks = Maps.newHashMap(); -+ private static final Map> fluidRenderChecks = Maps.newHashMap(); ++ private static final Map, java.util.function.Predicate> blockRenderChecks = Maps.newHashMap(); ++ private static final Map, java.util.function.Predicate> fluidRenderChecks = Maps.newHashMap(); + static { + field_228386_a_.forEach(RenderTypeLookup::setRenderLayer); + field_228387_b_.forEach(RenderTypeLookup::setRenderLayer); @@ -60,7 +60,7 @@ + } else { + java.util.function.Predicate rendertype; + synchronized (RenderTypeLookup.class) { -+ rendertype = blockRenderChecks.get(block); ++ rendertype = blockRenderChecks.get(block.delegate); + } + return rendertype != null ? rendertype.test(type) : type == RenderType.func_228639_c_(); + } @@ -69,7 +69,7 @@ + public static boolean canRenderInLayer(IFluidState fluid, RenderType type) { + java.util.function.Predicate rendertype; + synchronized (RenderTypeLookup.class) { -+ rendertype = fluidRenderChecks.get(fluid.func_206886_c()); ++ rendertype = fluidRenderChecks.get(fluid.func_206886_c().delegate); + } + return rendertype != null ? rendertype.test(type) : type == RenderType.func_228639_c_(); + } @@ -80,7 +80,7 @@ + } + + public static synchronized void setRenderLayer(Block block, java.util.function.Predicate predicate) { -+ blockRenderChecks.put(block, predicate); ++ blockRenderChecks.put(block.delegate, predicate); + } + + public static void setRenderLayer(Fluid fluid, RenderType type) { @@ -89,7 +89,7 @@ + } + + public static synchronized void setRenderLayer(Fluid fluid, java.util.function.Predicate predicate) { -+ fluidRenderChecks.put(fluid, predicate); ++ fluidRenderChecks.put(fluid.delegate, predicate); + } + public static void func_228393_a_(boolean p_228393_0_) {