From 7b0a9d484358b6f739ea491c4179283c179d74f9 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 10 Oct 2025 07:35:37 -0500 Subject: [PATCH] Replace 1.21.9 with 1.21.10 --- .gitlab-ci.yml | 2 +- build.gradle | 4 +- .../common/AbstractModInitializer.java | 2 +- .../common/wrappers/VersionConstants.java | 2 +- .../common/wrappers/gui/ClassicConfigGUI.java | 4 +- .../wrappers/gui/DhDebugScreenEntry.java | 4 +- .../common/wrappers/gui/MinecraftScreen.java | 2 +- .../wrappers/gui/updater/ChangelogScreen.java | 2 +- .../minecraft/MinecraftClientWrapper.java | 2 +- .../minecraft/MinecraftGLWrapper.java | 2 +- .../minecraft/MinecraftRenderWrapper.java | 4 +- .../BatchGenerationEnvironment.java | 4 +- .../mimicObject/ChunkFileReader.java | 10 ++-- ... => 1_21_10.distanthorizons.accesswidener} | 0 .../fabric/FabricClientProxy.java | 4 +- .../client/MixinChunkSectionsToRender.java | 2 +- .../client/MixinDebugScreenOverlay.java | 2 +- .../mixins/client/MixinLevelRenderer.java | 6 +-- gradle.properties | 2 +- .../neoforge/NeoforgeClientProxy.java | 6 +-- .../neoforge/NeoforgeServerProxy.java | 2 +- .../client/MixinDebugScreenOverlay.java | 4 +- .../mixins/client/MixinLevelRenderer.java | 2 +- .../mixins/client/MixinLightTexture.java | 4 +- .../NeoforgeMinecraftRenderWrapper.java | 6 +-- .../wrappers/NeoforgeTextureUnwrapper.java | 2 +- settings.gradle | 48 ++++++++++++++++--- .../{1.21.9.properties => 1.21.10.properties} | 20 ++++---- 28 files changed, 95 insertions(+), 59 deletions(-) rename common/src/main/resources/{1_21_9.distanthorizons.accesswidener => 1_21_10.distanthorizons.accesswidener} (100%) rename versionProperties/{1.21.9.properties => 1.21.10.properties} (72%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4093242a7..0a9566fad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ build: parallel: matrix: - MC_VER: [ - "1.21.9", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", + "1.21.10", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", "1.20.6", "1.20.4", "1.20.2", "1.20.1", "1.19.4", "1.19.2", "1.18.2", diff --git a/build.gradle b/build.gradle index 43d17b64f..0b216fbce 100644 --- a/build.gradle +++ b/build.gradle @@ -42,8 +42,10 @@ def writeBuildGradlePredefine(List mcVers, int mcIndex) String verStr = mcVers[i].replace(".", "_"); sb.append("MC_" + verStr + "=" + i.toString() + "\n"); - if (mcIndex == i) + if (mcIndex == i) + { sb.append("MC_VER=" + i.toString() + "\n"); + } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java index 8dff9bf6c..2732edc48 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java @@ -84,7 +84,7 @@ public abstract class AbstractModInitializer LOGGER.info(ModInfo.READABLE_NAME + " client Initialized."); - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 // debug screen rendering handled via a mixin #else DhDebugScreenEntry.register(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 2fdd1fbec..a5fc11f24 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -79,7 +79,7 @@ public class VersionConstants implements IVersionConstants #elif MC_VER == MC_1_21_8 return "1.21.8"; - #elif MC_VER == MC_1_21_9 + #elif MC_VER == MC_1_21_10 return "1.21.9"; #else ERROR MC version constant missing 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 c1df86c5d..c185d59db 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 @@ -920,7 +920,7 @@ public class ClassicConfigGUI @Override #if MC_VER < MC_1_20_1 public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) #else public void renderContent(GuiGraphics matrices, int mouseX, int mouseY, boolean hovered, float tickDelta) @@ -928,7 +928,7 @@ public class ClassicConfigGUI { try { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 #else int y = this.getY(); // TODO why is the Y value being set during render? #endif diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhDebugScreenEntry.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhDebugScreenEntry.java index e5c643e4f..64fefbd11 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhDebugScreenEntry.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhDebugScreenEntry.java @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.common.wrappers.gui; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 // not supported for older MC versions #else import com.seibel.distanthorizons.core.logging.f3.F3Screen; @@ -19,7 +19,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.LevelChunk; #endif -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 // not supported for older MC versions public class DhDebugScreenEntry {} diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java index fc2f7cb44..3a247ed8b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java @@ -39,7 +39,7 @@ public class MinecraftScreen protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName) { super(translate(translationName)); - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow(); #else screen.minecraftWindow = Minecraft.getInstance().getWindow().handle(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java index 9d6bc5b51..d3acea477 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java @@ -262,7 +262,7 @@ public class ChangelogScreen extends DhScreen @Override public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF); } - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 @Override public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF); } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index 09b6faad8..4e19e60e8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -315,7 +315,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra #if MC_VER < MC_1_19_2 player.sendMessage(new TextComponent(string), getPlayer().getUUID()); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false); #else diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java index 52da8310f..e044ad564 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java @@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft; #if MC_VER < MC_1_21_5 import com.mojang.blaze3d.platform.GlStateManager; -#elif MC_VER >= MC_1_21_5 +#else import com.mojang.blaze3d.opengl.GlStateManager; #endif 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 16a40130c..416919aaf 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 @@ -401,7 +401,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public int getTargetFrameBufferViewportWidth() { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 return this.getRenderTarget().viewWidth; #else return this.getRenderTarget().width; @@ -411,7 +411,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public int getTargetFrameBufferViewportHeight() { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 return this.getRenderTarget().viewHeight; #else return this.getRenderTarget().height; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index ac6351a15..6f0f1941e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -113,7 +113,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv #if MC_VER < MC_1_21_5 private static final TicketType DH_SERVER_GEN_TICKET = TicketType.create("dh_server_gen_ticket", Comparator.comparingLong(ChunkPos::toLong)); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* persist */ false, TicketType.TicketUse.LOADING); #else private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* flags */0); @@ -744,7 +744,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null); #elif MC_VER < MC_1_21_3 return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().lookupOrThrow(Registries.BIOME), null); #else return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, PalettedContainerFactory.create(level.registryAccess()), null); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java index d17e58ead..1db8455d5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java @@ -94,7 +94,7 @@ public class ChunkFileReader private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false); - #if MC_VER >= MC_1_21_9 + #if MC_VER >= MC_1_21_10 // BLOCK_STATE_CODEC can no longer be statically created since // it needs a level reference #elif MC_VER >= MC_1_19_2 @@ -263,7 +263,7 @@ public class ChunkFileReader } private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData) { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 // BLOCK_STATE_CODEC is created statically // TODO clean up this code separation #else @@ -288,7 +288,7 @@ public class ChunkFileReader #elif MC_VER < MC_1_21_3 Codec>> biomeCodec = PalettedContainer.codecRW( biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS)); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 Codec>> biomeCodec = PalettedContainer.codecRW( biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS)); #else @@ -363,7 +363,7 @@ public class ChunkFileReader } else { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 blockStateContainer = new PalettedContainer(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES); #else blockStateContainer = PalettedContainerFactory.create(level.registryAccess()).createForBlockStates(); @@ -403,7 +403,7 @@ public class ChunkFileReader biomeContainer = new PalettedContainer>( biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 biomeContainer = new PalettedContainer>(biomes.asHolderIdMap(), biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES); diff --git a/common/src/main/resources/1_21_9.distanthorizons.accesswidener b/common/src/main/resources/1_21_10.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_21_9.distanthorizons.accesswidener rename to common/src/main/resources/1_21_10.distanthorizons.accesswidener diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index d5fd618c8..3d03c0132 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -60,7 +60,7 @@ import java.nio.FloatBuffer; import java.util.HashSet; import java.util.concurrent.AbstractExecutorService; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; #endif @@ -220,7 +220,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy //==============// // TODO wait for fabric to re-add their rendering API - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 WorldRenderEvents.AFTER_SETUP.register((renderContext) -> { ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix()); 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 cefa53e84..de9848e3b 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 @@ -19,7 +19,7 @@ package com.seibel.distanthorizons.fabric.mixins.client; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java index 8693548e7..62dd16879 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java @@ -12,7 +12,7 @@ import java.util.List; @Mixin(DebugScreenOverlay.class) public class MixinDebugScreenOverlay { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 @Inject(method = "getSystemInformation", at = @At("RETURN")) private void addCustomF3(CallbackInfoReturnable> cir) { 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 2baad0235..cb7982b14 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 @@ -102,7 +102,7 @@ public class MixinLevelRenderer method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V", cancellable = true) private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback) - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 @Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true) private void prepareChunkRenders(Matrix4fc projectionMatrix, double d, double e, double f, CallbackInfoReturnable callback) #else @@ -127,7 +127,7 @@ public class MixinLevelRenderer // get the matrices directly from MC ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose()); ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 // MC combined the model view and projection matricies ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix); ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f(); @@ -155,7 +155,7 @@ public class MixinLevelRenderer { ClientApi.INSTANCE.renderDeferredLodsForShaders(); } - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 // rendering handled via Fabric Api render event #else // handled here and in MixinChunkSectionsToRender diff --git a/gradle.properties b/gradle.properties index 08b2f5416..4dedb7031 100644 --- a/gradle.properties +++ b/gradle.properties @@ -54,7 +54,7 @@ versionStr= # This defines what MC version Intellij will use for the preprocessor # and what version is used automatically by build and run commands -mcVer=1.21.9 +mcVer=1.21.10 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment #minecraftMemoryJavaArg="-Xmx4G" diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java index b1fb05bc0..934cdc109 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java @@ -250,7 +250,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy @SubscribeEvent public void afterLevelEntityRenderEvent(RenderLevelStageEvent.AfterEntities event) { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel()); #else ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level); @@ -263,7 +263,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy @SubscribeEvent public void afterLevelTranslucentRenderEvent(RenderLevelStageEvent.AfterTranslucentBlocks event) { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel()); #else ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level); @@ -275,7 +275,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy @SubscribeEvent public void afterLevelRenderEvent(RenderLevelStageEvent.AfterLevel event) { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel()); #else ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java index 9bd630767..b3737f0cb 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java @@ -152,7 +152,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); } private static ServerLevelWrapper getServerLevelWrapper(ResourceKey resourceKey, PlayerEvent event) { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 //noinspection DataFlowIssue (possible NPE after getServer()) return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey)); #else diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java index 7c8a946b3..ed9d5be4a 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.neoforge.mixins.client; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 import com.seibel.distanthorizons.core.logging.f3.F3Screen; import net.minecraft.client.gui.components.DebugScreenOverlay; import org.spongepowered.asm.mixin.Mixin; @@ -18,7 +18,7 @@ import net.minecraft.client.gui.components.DebugScreenOverlay; public class MixinDebugScreenOverlay { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 @Inject(method = "getSystemInformation", at = @At("RETURN")) private void addCustomF3(CallbackInfoReturnable> cir) { diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java index c3a4395d9..399c859c6 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java @@ -83,7 +83,7 @@ public class MixinLevelRenderer #if MC_VER < MC_1_21_6 @Inject(at = @At("HEAD"), method = "renderSectionLayer") private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, CallbackInfo callback) - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 @Inject(at = @At("HEAD"), method = "renderLevel") private void onRenderLevel( GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java index aec713f00..334ba9da1 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java @@ -38,7 +38,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.mojang.blaze3d.platform.NativeImage; #elif MC_VER < MC_1_21_5 import com.mojang.blaze3d.pipeline.TextureTarget; -#elif MC_VER < MC_1_21_9 +#elif MC_VER < MC_1_21_10 import com.mojang.blaze3d.opengl.GlTexture; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.GpuTexture; @@ -82,7 +82,7 @@ public class MixinLightTexture renderWrapper.updateLightmap(this.lightPixels, clientLevel); #elif MC_VER < MC_1_21_5 renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel); - #elif MC_VER < MC_1_21_9 + #elif MC_VER < MC_1_21_10 GlTexture glTexture = (GlTexture) this.texture; renderWrapper.setLightmapId(glTexture.glId(), clientLevel); #else diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java index ffe3d2235..5243cc1be 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java @@ -5,7 +5,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.client.Minecraft; import org.apache.logging.log4j.Logger; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 #else import com.mojang.blaze3d.opengl.GlTexture; import com.mojang.blaze3d.textures.GpuTexture; @@ -26,7 +26,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper @Override public int getDepthTextureId() { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 // no special handling required, // both neo/fabric uses the same back end objects return super.getDepthTextureId(); @@ -53,7 +53,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper @Override public int getColorTextureId() { - #if MC_VER < MC_1_21_9 + #if MC_VER < MC_1_21_10 // no special handling required, // both neo/fabric uses the same back end objects return super.getColorTextureId(); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java index 6e0a23bd1..55fbeeed8 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.neoforge.wrappers; -#if MC_VER < MC_1_21_9 +#if MC_VER < MC_1_21_10 public class NeoforgeTextureUnwrapper { /* not needed for older MC versions */ } #else diff --git a/settings.gradle b/settings.gradle index 878df8621..cc07022c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -59,24 +59,31 @@ If you still need help with compiling, please read the Readme.md /** Loads the VersionProperties fiel for the currently selected Minecraft version. */ -def loadProperties() { +def loadProperties() +{ def defaultMcVersion = "1.20.1" // 1.20.1 is our current most stable version so we use that if no version was defined def mcVersion = "" def mcVers = fileTree("versionProperties").files.name // Get all the files in "versionProperties" - for (int i = 0; i < mcVers.size(); i++) { - mcVers[i] = mcVers[i].replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions + for (int i = 0; i < mcVers.size(); i++) + { + String version = mcVers[i]; + version = version.replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions + mcVers[i] = version; } - mcVers.sort() // Sort so it always goes from oldest to newest + mcVers.sort((a,b) -> sortSemanticVersionOldestToNewest(a,b)) // Sort so it always goes from oldest to newest int mcIndex = -1 println "Avalible MC versions: ${mcVers}" - if (hasProperty("mcVer")) { + if (hasProperty("mcVer")) + { mcVersion = mcVer mcIndex = mcVers.indexOf(mcVer) } - if (mcIndex == -1) { + + if (mcIndex == -1) + { println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}." println "Tip: Use -PmcVer=\"${defaultMcVersion}\" in cmd arg to set mcVer." mcVersion = defaultMcVersion @@ -95,6 +102,35 @@ def loadProperties() { gradle.ext.mcVers = mcVers gradle.ext.mcIndex = mcIndex } +/** + * input format: "major.minor.patch" + * needed so we can sort versions with different length strings + * IE: 1.21.1 should come before 1.21.10 + */ +private static int sortSemanticVersionOldestToNewest(String version1, String version2) +{ + String[] parts1 = version1.split("\\."); + String[] parts2 = version2.split("\\."); + + int major1 = Integer.parseInt(parts1[0]); + int major2 = Integer.parseInt(parts2[0]); + if (major1 != major2) + { + return Integer.compare(major1, major2); + } + + int minor1 = Integer.parseInt(parts1[1]); + int minor2 = Integer.parseInt(parts2[1]); + if (minor1 != minor2) + { + return Integer.compare(minor1, minor2); + } + + int patch1 = Integer.parseInt(parts1[2]); + int patch2 = Integer.parseInt(parts2[2]); + return Integer.compare(patch1, patch2); +} + loadProperties() diff --git a/versionProperties/1.21.9.properties b/versionProperties/1.21.10.properties similarity index 72% rename from versionProperties/1.21.9.properties rename to versionProperties/1.21.10.properties index cf250a53f..239ae84be 100644 --- a/versionProperties/1.21.9.properties +++ b/versionProperties/1.21.10.properties @@ -1,9 +1,9 @@ -# 1.21.9 version +# 1.21.10 version java_version=21 -minecraft_version=1.21.9 +minecraft_version=1.21.10 parchment_version=1.21:2024.07.28 -compatible_minecraft_versions=["1.21.9"] -accessWidenerVersion=1_21_9 +compatible_minecraft_versions=["1.21.10"] +accessWidenerVersion=1_21_10 builds_for=fabric,neoforge # forge is broken due to gradle/build script issues @@ -12,13 +12,13 @@ netty_version=4.1.97.Final # Fabric loader fabric_loader_version=0.17.2 -fabric_api_version=0.134.0+1.21.9 +fabric_api_version=0.135.0+1.21.10 modmenu_version=16.0.0-rc.1 starlight_version_fabric= phosphor_version_fabric= lithium_version= - sodium_version=mc1.21.9-0.7.0-fabric - iris_version=1.9.3+1.21.9-fabric + sodium_version=mc1.21.10-0.7.2-fabric + iris_version=1.9.6+1.21.10-fabric bclib_version= immersive_portals_version= canvas_version= @@ -41,10 +41,8 @@ fabric_api_version=0.134.0+1.21.9 # (Neo)Forge loader forge_version= -neoforge_version=21.9.15-beta - # sometime before 21.9.15-beta Neoforge changed how their rendering API events handle levels - # so we can't support both versions at once - neoforge_version_range=[21.9.15-beta,) +neoforge_version=21.10.6-beta + neoforge_version_range=[21.10.6-beta,) # (Neo)Forge mod versions starlight_version_forge=