From 98d2b0db3f6620c0418249ee3220f826111b5d9b Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 5 Aug 2023 11:15:48 -0500 Subject: [PATCH] Fix several mixins for 1.16 --- .../fabric/mixins/server/unsafe/MixinThreadingDetector.java | 5 ++++- .../fabric/wrappers/modAccessor/SodiumAccessor.java | 4 ++-- .../forge/mixins/server/unsafe/MixinThreadingDetector.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java index dd05d29f4..92f66121d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java @@ -48,6 +48,9 @@ public class MixinThreadingDetector { } } #else + +import net.minecraft.server.level.ServerLevel; + @Mixin(ServerLevel.class) - public class MixinThreadingDectector {} //FIXME: Is there some way to make this file just not be added? +public class MixinThreadingDetector { } //FIXME: Is there some way to make this file just not be added? #endif diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java index f3b4c1e55..6726a69d9 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -81,11 +81,11 @@ public class SodiumAccessor implements ISodiumAccessor { } #else @Override - public HashSet getNormalRenderedChunks() { + public HashSet getNormalRenderedChunks() { SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance(); LevelAccessor height = Minecraft.getInstance().level; // TODO: Maybe use a mixin to make this more efficient - return MC_RENDER.getMaximumRenderedChunks().stream().filter((DHChunkPos chunk) -> { + return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> { FakeChunkEntity AABB = new FakeChunkEntity(chunk.getX(), chunk.getZ(), height.getMaxBuildHeight()); return (renderer.isEntityVisible(AABB)); }).collect(Collectors.toCollection(HashSet::new)); diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java index 4f25ddfb1..0834505ef 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java @@ -47,6 +47,7 @@ public class MixinThreadingDetector { } #else + +import net.minecraft.world.level.chunk.ChunkGenerator; @Mixin(ChunkGenerator.class) -public class MixinThreadingDectector {} #endif \ No newline at end of file