From 2a9136b56f0310e283a51f93d2f91cf9917bfd8f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 15 Aug 2024 07:21:19 -0500 Subject: [PATCH] Merge 1.21.1 and 1.21 --- .../common/wrappers/block/BiomeWrapper.java | 2 +- .../wrappers/block/BlockStateWrapper.java | 2 +- .../common/wrappers/chunk/ChunkWrapper.java | 2 +- .../common/wrappers/gui/ClassicConfigGUI.java | 2 +- .../wrappers/gui/updater/UpdateModScreen.java | 4 +- .../MinecraftDedicatedServerWrapper.java | 2 +- .../minecraft/MinecraftRenderWrapper.java | 2 +- .../mimicObject/ChunkLoader.java | 4 +- .../mimicObject/DhGenerationChunkHolder.java | 2 +- .../mimicObject/DhLitWorldGenRegion.java | 4 +- .../worldGeneration/step/StepBiomes.java | 4 +- .../worldGeneration/step/StepFeatures.java | 2 +- .../worldGeneration/step/StepNoise.java | 4 +- .../step/StepStructureReference.java | 2 +- .../step/StepStructureStart.java | 2 +- .../worldGeneration/step/StepSurface.java | 2 +- .../fabric/FabricClientProxy.java | 2 +- .../mixins/client/MixinLevelRenderer.java | 2 +- .../mixins/client/MixinOptionsScreen.java | 4 +- .../wrappers/modAccessor/BCLibAccessor.java | 2 +- .../mixins/client/MixinLevelRenderer.java | 2 +- .../mixins/client/MixinOptionsScreen.java | 4 +- versionProperties/1.21.1.properties | 2 +- versionProperties/1.21.properties | 53 ------------------- 24 files changed, 30 insertions(+), 83 deletions(-) delete mode 100644 versionProperties/1.21.properties diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index 5f1b205b0..a6ce51072 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -293,7 +293,7 @@ public class BiomeWrapper implements IBiomeWrapper ResourceLocation resourceLocation; try { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1)); #else resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1)); 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 427386891..126818de9 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 @@ -498,7 +498,7 @@ public class BlockStateWrapper implements IBlockStateWrapper ResourceLocation resourceLocation; try { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 resourceLocation = new ResourceLocation(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1)); #else resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1)); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java index efad9cc73..26a4124c9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java @@ -305,7 +305,7 @@ public class ChunkWrapper implements IChunkWrapper public ChunkStatus getStatus() { return getStatus(this.getChunk()); } public static ChunkStatus getStatus(ChunkAccess chunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 return chunk.getStatus(); #else return chunk.getPersistedStatus(); 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 2ca6c27a0..ae0ac876a 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 @@ -259,7 +259,7 @@ public class ClassicConfigGUI 0, 0, // Some textuary stuff 0, - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), #else ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"), diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index f4d52e9d6..198efe1a8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -76,7 +76,7 @@ public class UpdateModScreen extends DhScreen 0, 0, // Some textuary stuff 0, - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "logo.png"), #else ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"), @@ -107,7 +107,7 @@ public class UpdateModScreen extends DhScreen 0, 0, // Some textuary stuff 0, - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), #else ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"), diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java index bf09dc1bd..3439c34fc 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java @@ -21,7 +21,7 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!"); } - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 return this.dedicatedServer.getServerDirectory(); #else return this.dedicatedServer.getServerDirectory().toFile(); 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 5d0ada3d8..defdf0103 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 @@ -165,7 +165,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper if (MC.level.dimensionType().hasSkyLight()) { float frameTime; - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 frameTime = MC.getFrameTime(); #else frameTime = MC.getTimer().getRealtimeDeltaTicks(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index 6e98738a6..1a3f77e3f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -85,7 +85,7 @@ import net.minecraft.world.level.material.Fluids; #if MC_VER == MC_1_20_6 import net.minecraft.world.level.chunk.status.ChunkStatus; import net.minecraft.world.level.chunk.status.ChunkType; -#elif MC_VER >= MC_1_21 +#elif MC_VER >= MC_1_21_1 import net.minecraft.world.level.chunk.status.ChunkStatus; import net.minecraft.world.level.chunk.status.ChunkType; #endif @@ -325,7 +325,7 @@ public class ChunkLoader } private static #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType - #elif MC_VER < MC_1_21 ChunkType + #elif MC_VER < MC_1_21_1 ChunkType #else ChunkType #endif readChunkType(CompoundTag tagLevel) { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhGenerationChunkHolder.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhGenerationChunkHolder.java index 519938ce8..62e3bec7d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhGenerationChunkHolder.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhGenerationChunkHolder.java @@ -1,6 +1,6 @@ package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; -#if MC_VER >= MC_1_21 +#if MC_VER >= MC_1_21_1 import net.minecraft.server.level.GenerationChunkHolder; import net.minecraft.world.level.ChunkPos; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java index 48b5a3fb7..1d9c76676 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java @@ -63,7 +63,7 @@ import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.status.*; #endif -#if MC_VER >= MC_1_21 +#if MC_VER >= MC_1_21_1 import net.minecraft.util.StaticCache2D; import com.google.common.collect.ImmutableList; import net.minecraft.server.level.GenerationChunkHolder; @@ -127,7 +127,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion { #if MC_VER == MC_1_16_5 super(serverLevel, chunkList); - #elif MC_VER < MC_1_21 + #elif MC_VER < MC_1_21_1 super(serverLevel, chunkList, chunkStatus, writeRadius); #else super(serverLevel, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java index f3cf3302f..16d633031 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java @@ -68,7 +68,7 @@ public final class StepBiomes } else if (chunk instanceof ProtoChunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); @@ -89,7 +89,7 @@ public final class StepBiomes #elif MC_VER < MC_1_19_4 chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(this.environment.params.biomes, Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion), tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); - #elif MC_VER < MC_1_21 + #elif MC_VER < MC_1_21_1 chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion), tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); #else diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index 8d8bfb182..962dd8e15 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -66,7 +66,7 @@ public final class StepFeatures } else if (chunk instanceof ProtoChunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java index 47b524cd5..a9c8d1a1e 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java @@ -68,7 +68,7 @@ public final class StepNoise continue; } - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); @@ -87,7 +87,7 @@ public final class StepNoise #elif MC_VER < MC_1_19_2 chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); - #elif MC_VER < MC_1_21 + #elif MC_VER < MC_1_21_1 chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), this.environment.params.randomState, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); #else diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java index c5dc640e8..f0479e3b3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -66,7 +66,7 @@ public final class StepStructureReference } else if (chunk instanceof ProtoChunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index 5dcb57468..96f58c730 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -83,7 +83,7 @@ public final class StepStructureStart } else if (chunk instanceof ProtoChunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java index 56b247783..f557fe124 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java @@ -65,7 +65,7 @@ public final class StepSurface } else if (chunk instanceof ProtoChunk) { - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 ((ProtoChunk) chunk).setStatus(STATUS); #else ((ProtoChunk) chunk).setPersistedStatus(STATUS); 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 fef9f927c..792992a09 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -227,7 +227,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()), modelViewMatrix, projectionMatrix, - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 renderContext.tickDelta() #else renderContext.tickCounter().getGameTimeDeltaTicks() 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 8b729e082..7ffc97bda 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 @@ -116,7 +116,7 @@ public class MixinLevelRenderer ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 Minecraft.getInstance().getFrameTime() #else Minecraft.getInstance().getTimer().getRealtimeDeltaTicks() diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java index d638536f7..55f0368c4 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java @@ -45,7 +45,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Shadow; #endif -#if MC_VER < MC_1_21 +#if MC_VER < MC_1_21_1 import net.minecraft.client.gui.screens.OptionsScreen; #else import net.minecraft.client.gui.screens.options.OptionsScreen; @@ -64,7 +64,7 @@ public class MixinOptionsScreen extends Screen /** Texture used for the config opening button */ @Unique private static final ResourceLocation ICON_TEXTURE = - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "textures/gui/button.png"); #else ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png"); diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java index 06efa7741..6d4c2cc17 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java @@ -5,7 +5,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IBCLibAcces #elif MC_VER == MC_1_18_2 import ru.bclib.config.ClientConfig; import ru.bclib.config.Configs; -#elif MC_VER < MC_1_21 +#elif MC_VER < MC_1_21_1 import org.betterx.bclib.config.ClientConfig; import org.betterx.bclib.config.Configs; #endif 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 93e1a06a7..51042d645 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 @@ -120,7 +120,7 @@ public class MixinLevelRenderer float frameTime; - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 frameTime = Minecraft.getInstance().getFrameTime(); #else frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(); diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java index b1a661e78..488984f06 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java @@ -45,7 +45,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Shadow; #endif -#if MC_VER < MC_1_21 +#if MC_VER < MC_1_21_1 import net.minecraft.client.gui.screens.OptionsScreen; #else import net.minecraft.client.gui.screens.options.OptionsScreen; @@ -64,7 +64,7 @@ public class MixinOptionsScreen extends Screen /** Texture used for the config opening button */ @Unique private static final ResourceLocation ICON_TEXTURE = - #if MC_VER < MC_1_21 + #if MC_VER < MC_1_21_1 new ResourceLocation(ModInfo.ID, "textures/gui/button.png"); #else ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png"); diff --git a/versionProperties/1.21.1.properties b/versionProperties/1.21.1.properties index 9a4da88c7..b8dc67fee 100644 --- a/versionProperties/1.21.1.properties +++ b/versionProperties/1.21.1.properties @@ -2,7 +2,7 @@ java_version=21 minecraft_version=1.21.1 parchment_version=1.20.6:2024.05.01 -compatible_minecraft_versions=["1.21.1"] +compatible_minecraft_versions=["1.21", "1.21.1"] accessWidenerVersion=1_20_6 builds_for=fabric,neoforge # forge is broken due to gradle/build script issues diff --git a/versionProperties/1.21.properties b/versionProperties/1.21.properties deleted file mode 100644 index c2c73633b..000000000 --- a/versionProperties/1.21.properties +++ /dev/null @@ -1,53 +0,0 @@ -# 1.21 version -java_version=21 -minecraft_version=1.21 -parchment_version=1.20.6:2024.05.01 -compatible_minecraft_versions=["1.21"] -accessWidenerVersion=1_20_6 -builds_for=fabric,neoforge -# forge is broken due to gradle/build script issues - -# Fabric loader -fabric_loader_version=0.15.11 -fabric_api_version=0.100.1+1.21 - # Fabric mod versions - modmenu_version=11.0.0-beta.1 - starlight_version_fabric= - phosphor_version_fabric= - lithium_version= - sodium_version=mc1.21-0.5.9 - iris_version=1.7.1+1.21 - bclib_version= - immersive_portals_version= - canvas_version= - - fabric_incompatibility_list={ "iris": "<=1.7.4" } - fabric_recommend_list={} - - # Fabric mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight=0 - enable_phosphor=0 - enable_sodium=1 - enable_lithium=0 - enable_iris=1 - enable_bclib=0 - enable_immersive_portals=0 - enable_canvas=0 - -# (Neo)Forge loader -forge_version=50.0.19 -neoforge_version=21.0.4-beta - # (Neo)Forge mod versions - starlight_version_forge= - terraforged_version= - - # (Neo)Forge mod run - # 0 = Don't enable and don't run - # 1 = Can be referenced in code but doesn't run - # 2 = Can be referenced in code and runs in client - enable_starlight_forge=0 - enable_terraforged=0 - enable_terrafirmacraft=0