diff --git a/common/src/main/java/com/seibel/distanthorizons/common/commands/CommandInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/commands/CommandInitializer.java index 45c02ad50..dc29975a9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/commands/CommandInitializer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/commands/CommandInitializer.java @@ -3,13 +3,17 @@ package com.seibel.distanthorizons.common.commands; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.permissions.PermissionCheck; -import net.minecraft.server.permissions.Permissions; import org.jetbrains.annotations.Nullable; import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE; import static net.minecraft.commands.Commands.literal; +#if MC_VER <= MC_1_21_10 +#else +import net.minecraft.server.permissions.PermissionCheck; +import net.minecraft.server.permissions.Permissions; +#endif + public class CommandInitializer { private boolean serverReady = false; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index b16111fdc..d445e72d4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -92,7 +92,7 @@ public class BlockStateWrapper implements IBlockStateWrapper public static HashSet rendererIgnoredCaveBlocks = null; /** keep track of broken blocks so we don't log every time */ - #if MC_VER < MC_1_21_10 + #if MC_VER <= MC_1_21_10 private static final HashSet BROKEN_RESOURCE_LOCATIONS = new HashSet<>(); #else private static final HashSet BROKEN_RESOURCE_LOCATIONS = new HashSet<>(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index e6d592d7b..de4518d50 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -185,7 +185,7 @@ public class ClassicConfigGUI 0, #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), - #elif MC_VER < MC_1_21_10 + #elif MC_VER <= MC_1_21_10 ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"), #else Identifier.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"), 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 b009b6f11..1ba03dde4 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 @@ -59,7 +59,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAc import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; -import net.minecraft.world.attribute.EnvironmentAttributes; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.phys.Vec3; @@ -81,6 +80,11 @@ import com.mojang.blaze3d.opengl.GlTexture; #else #endif +#if MC_VER <= MC_1_21_10 +#else +import net.minecraft.world.attribute.EnvironmentAttributes; +#endif + /** * A singleton that contains everything * related to rendering in Minecraft. diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java index 50101cd79..8a77a092e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java @@ -75,7 +75,12 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper // create the missing wrapper + #if MC_VER <= MC_1_21_10 + DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType); + #else DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType, dimName); + #endif + DIMENSION_WRAPPER_BY_NAME.put(dimName, dimensionTypeWrapper); return dimensionTypeWrapper; } diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinChunkSectionsToRender.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinChunkSectionsToRender.java index fbdfa1419..47b63caef 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinChunkSectionsToRender.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinChunkSectionsToRender.java @@ -27,8 +27,7 @@ import org.spongepowered.asm.mixin.Mixin; public class MixinChunkSectionsToRender { /* rendering before was handled via Fabric API events */ } #else - -import com.mojang.blaze3d.textures.GpuSampler; + import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.Minecraft; @@ -39,6 +38,11 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +#if MC_VER <= MC_1_21_10 +#else +import com.mojang.blaze3d.textures.GpuSampler; +#endif + @Mixin(ChunkSectionsToRender.class) public class MixinChunkSectionsToRender {