diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index 94c253ef6..adeef991f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -41,7 +41,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; import net.minecraft.client.renderer.FogRenderer; import com.mojang.blaze3d.systems.RenderSystem; #else -import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import net.minecraft.client.renderer.fog.FogData; import net.minecraft.client.renderer.fog.FogRenderer; #endif @@ -59,6 +58,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.distanthorizons.core.util.math.Vec3d; import com.seibel.distanthorizons.core.util.math.Vec3f; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; diff --git a/coreSubProjects b/coreSubProjects index 89804f1ba..b4e0687e2 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 89804f1ba1848e7a4c2e0c1a8f7ff9ef4c22c7f4 +Subproject commit b4e0687e2a22dc6d7f94ead602d2bd154b9b42af diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 371b041cc..4fe893927 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -50,7 +50,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; #elif MC_VER <= MC_1_21_11 import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.resource.GraphicsResourceAllocator; -import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import net.minecraft.client.Camera; import net.minecraft.client.DeltaTracker; import net.minecraft.client.renderer.chunk.ChunkSectionsToRender; @@ -62,7 +61,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; #else import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.resource.GraphicsResourceAllocator; -import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import net.minecraft.client.DeltaTracker; import net.minecraft.client.renderer.chunk.ChunkSectionsToRender; import org.joml.Matrix4fc; @@ -73,6 +71,7 @@ import net.minecraft.client.renderer.state.level.CameraRenderState; #endif +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.api.internal.ClientApi; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinSharedConstants.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinSharedConstants.java index b95804274..eff393c7f 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinSharedConstants.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinSharedConstants.java @@ -1,5 +1,14 @@ package com.seibel.distanthorizons.fabric.mixins.client; +#if MC_VER <= MC_1_21_10 +import net.minecraft.world.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(Entity.class) +public class MixinSharedConstants +{ /* not present in older MC versions */ } +#else + import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.coreapi.ModInfo; @@ -49,3 +58,4 @@ public abstract class MixinSharedConstants } } +#endif