From 90c50085c0d46a2ff6a3b3297a2938f6946bf547 Mon Sep 17 00:00:00 2001 From: Nightenom <17338378+Nightenom@users.noreply.github.com> Date: Thu, 12 Nov 2020 03:21:40 +0100 Subject: [PATCH] [1.15] Fix possible crash when using rendering regionCache (#7319) --- .../client/MinecraftForgeClient.java | 16 +++++++++++----- .../animation/TileEntityRendererAnimation.java | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java index f73dc7a674..8d6372a75c 100644 --- a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java +++ b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -104,16 +105,16 @@ public class MinecraftForgeClient } } - private static final LoadingCache, ChunkRenderCache> regionCache = CacheBuilder.newBuilder() + private static final LoadingCache, Optional> regionCache = CacheBuilder.newBuilder() .maximumSize(500) .concurrencyLevel(5) .expireAfterAccess(1, TimeUnit.SECONDS) - .build(new CacheLoader, ChunkRenderCache>() + .build(new CacheLoader, Optional>() { @Override - public ChunkRenderCache load(Pair key) + public Optional load(Pair key) { - return ChunkRenderCache.generateCache(key.getLeft(), key.getRight().add(-1, -1, -1), key.getRight().add(16, 16, 16), 1); + return Optional.ofNullable(ChunkRenderCache.generateCache(key.getLeft(), key.getRight().add(-1, -1, -1), key.getRight().add(16, 16, 16), 1)); } }); @@ -122,10 +123,15 @@ public class MinecraftForgeClient if (cache == null) regionCache.invalidate(Pair.of(world, position)); else - regionCache.put(Pair.of(world, position), cache); + regionCache.put(Pair.of(world, position), Optional.of(cache)); } public static ChunkRenderCache getRegionRenderCache(World world, BlockPos pos) + { + return getRegionRenderCacheOptional(world, pos).orElse(null); + } + + public static Optional getRegionRenderCacheOptional(World world, BlockPos pos) { int x = pos.getX() & ~0xF; int y = pos.getY() & ~0xF; diff --git a/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java b/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java index 7f81269335..2a0e0e50d8 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java +++ b/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java @@ -66,7 +66,8 @@ public class TileEntityRendererAnimation extends TileEntit } if(blockRenderer == null) blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher(); BlockPos pos = te.getPos(); - ILightReader world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos); + ILightReader world = MinecraftForgeClient.getRegionRenderCacheOptional(te.getWorld(), pos) + .map(ILightReader.class::cast).orElseGet(() -> te.getWorld()); BlockState state = world.getBlockState(pos); IBakedModel model = blockRenderer.getBlockModelShapes().getModel(state); IModelData data = model.getModelData(world, pos, state, ModelDataManager.getModelData(te.getWorld(), pos));