diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f2f24548f..a96545ac2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,14 +76,14 @@ build: - fabric/build/libs - forge/build/libs exclude: - - fabric/*-dev.jar - - fabric/*-dev-shadow.jar - - fabric/*-sources-dev.jar - - fabric/*-sources.jar - - forge/*-dev.jar - - forge/*-dev-shadow.jar - - forge/*-sources-dev.jar - - forge/*-sources.jar + - fabric/**/*-dev.jar + - fabric/**/*-dev-shadow.jar + - fabric/**/*-sources-dev.jar + - fabric/**/*-sources.jar + - forge/**/*-dev.jar + - forge/**/*-dev-shadow.jar + - forge/**/*-sources-dev.jar + - forge/**/*-sources.jar reports: # To ensure we've access to these files in the next stage dotenv: generate_jars.env diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 807c9fe0c..ed9a6e63e 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -145,28 +145,32 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper * is going to render this frame.

*

*/ - - @Override - public HashSet getVanillaRenderedChunks() { + + @Override + public HashSet getVanillaRenderedChunks() + { ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class); - if (sodium != null) { + if (sodium != null) + { return sodium.getNormalRenderedChunks(); } IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class); - if (optifine != null) { + if (optifine != null) + { HashSet pos = optifine.getNormalRenderedChunks(); - if (pos==null) pos = getMaximumRenderedChunks(); + if (pos == null) + pos = getMaximumRenderedChunks(); return pos; } - - LevelRenderer levelRenderer = MC.levelRenderer; - LinkedHashSet chunks = levelRenderer.renderChunkStorage.get().renderChunks; - return (chunks.stream().map((chunk) -> { - AABB chunkBoundingBox = chunk.chunk.bb; - return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16), - Math.floorDiv((int) chunkBoundingBox.minZ, 16)); - }).collect(Collectors.toCollection(HashSet::new))); - } + + LevelRenderer levelRenderer = MC.levelRenderer; + LinkedHashSet chunks = levelRenderer.renderChunkStorage.get().renderChunks; + return (chunks.stream().map((chunk) -> { + AABB chunkBoundingBox = chunk.chunk.bb; + return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16), + Math.floorDiv((int) chunkBoundingBox.minZ, 16)); + }).collect(Collectors.toCollection(HashSet::new))); + } @Override public HashSet getMaximumRenderedChunks()