diff --git a/build.gradle b/build.gradle index eb25b6432..508e00fa8 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" // Plugin to put dependencies inside our final jar - id "com.github.johnrengelman.shadow" version '7.1.2' apply false + id "com.github.johnrengelman.shadow" version '8.1.1' apply false // Plugin to create merged jars id "io.github.pacifistmc.forgix" version "1.2.6" 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 5ee0bab21..9271a9637 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 @@ -279,8 +279,11 @@ public class ClassicConfigGUI })); this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, 32, 25); + + #if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+ if (this.minecraft != null && this.minecraft.level != null) this.list.setRenderBackground(false); + #endif this.addWidget(this.list); 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 1b3c1298c..2efa317c1 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 @@ -60,8 +60,12 @@ public class MinecraftScreen screen.init(); // Init our own config screen this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint + + #if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+ if (this.minecraft != null && this.minecraft.level != null) // Check if in game this.list.setRenderBackground(false); // Disable from rendering + #endif + this.addWidget(this.list); // Add the tint to the things to be rendered } 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 16fbac5cd..5c6ef0fa1 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 @@ -76,6 +76,11 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; import net.minecraft.world.level.material.Fluids; #endif +#if MC_VER == MC_1_20_6 +import net.minecraft.world.level.chunk.status.ChunkStatus; +import net.minecraft.world.level.chunk.status.ChunkType; +#endif + import net.minecraft.world.level.material.Fluid; @@ -164,7 +169,8 @@ public class ChunkLoader #endif blockStateContainer = tagSection.contains("block_states", 10) - ? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error) + ? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)) + #if MC_VER < MC_1_20_6 .getOrThrow(false, LOGGER::error) #else .getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null)) #endif : new PalettedContainer(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES); #if MC_VER < MC_1_18_2 @@ -172,10 +178,13 @@ public class ChunkLoader ? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error) : new PalettedContainer(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES); #else + biomeContainer = tagSection.contains("biomes", 10) - ? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, i, (String) string)).getOrThrow(false, LOGGER::error) + ? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, i, (String) string)) + #if MC_VER < MC_1_20_6 .getOrThrow(false, LOGGER::error) #else .getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null)) #endif : new PalettedContainer>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES); #endif + #if MC_VER < MC_1_20_1 chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer); #else @@ -213,14 +222,15 @@ public class ChunkLoader } } - public static ChunkStatus.ChunkType readChunkType(CompoundTag tagLevel) + public static #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType #else ChunkType #endif readChunkType(CompoundTag tagLevel) { ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("Status")); if (chunkStatus != null) { return chunkStatus.getChunkType(); } - return ChunkStatus.ChunkType.PROTOCHUNK; + + return #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType.PROTOCHUNK; #else ChunkType.PROTOCHUNK; #endif } public static LevelChunk read(WorldGenLevel level, ChunkPos chunkPos, CompoundTag chunkData) @@ -262,19 +272,27 @@ public class ChunkLoader } } - ChunkStatus.ChunkType chunkType = readChunkType(tagLevel); - #if MC_VER < MC_1_18_2 - if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK) - return null; + #if MC_VER < MC_1_20_6 + ChunkStatus.ChunkType chunkType; #else - BlendingData blendingData = readBlendingData(tagLevel); - #if MC_VER < MC_1_19_2 - if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise())) - return null; - #else - if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && blendingData == null) - return null; + ChunkType chunkType; #endif + chunkType = readChunkType(tagLevel); + + #if MC_VER < MC_1_18_2 + if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK) + return null; + #else + + BlendingData blendingData = readBlendingData(tagLevel); + #if MC_VER < MC_1_19_2 + if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise())) + return null; + #else + if (chunkType == #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType.PROTOCHUNK #else ChunkType.PROTOCHUNK #endif && blendingData == null) + return null; + #endif + #endif long inhabitedTime = tagLevel.getLong("InhabitedTime"); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java index 628f52cad..ff6283b64 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java @@ -17,6 +17,10 @@ import java.nio.file.Path; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.locks.ReentrantLock; +#if MC_VER >= MC_1_20_6 +import net.minecraft.world.level.chunk.storage.RegionStorageInfo; +#endif + /** * @deprecated should be replaced with net.minecraft.world.level.chunk.storage.IOWorker to * prevent potential file corruption and issues with the C2ME mod. @@ -180,8 +184,10 @@ public class RegionFileStorageExternalCache implements AutoCloseable Path regionFilePath = storageFolderPath.resolve("r." + pos.getRegionX() + "." + pos.getRegionZ() + ".mca"); #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 rFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false); - #else + #elif MC_VER <= MC_1_20_4 rFile = new RegionFile(regionFilePath, storageFolderPath, false); + #else + rFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false); #endif this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()), rFile)); diff --git a/coreSubProjects b/coreSubProjects index fabe5d77e..9cebd7ee5 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit fabe5d77ea80f907894d27db341b7b9002367268 +Subproject commit 9cebd7ee5485e31c617e375468d892b1348a3e8d diff --git a/fabric/build.gradle b/fabric/build.gradle index fa1fabb62..accf863fc 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -69,14 +69,14 @@ dependencies { addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version)) addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy) addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version)) + + // used by mod menu in MC 1.20.6+ + addModJar(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version)) + addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.fabric_api_version)) // Mod Menu - if (rootProject.modmenu_version != "") { - modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") - } - - + modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") // Starlight addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight) @@ -91,22 +91,23 @@ dependencies { modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version)) modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version)) } - + // Lithium addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium) - + // Iris addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris) - + // BCLib addMod("com.github.quiqueck:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib) - + // Canvas addMod("io.vram:canvas-fabric-${project.canvas_version}", rootProject.enable_canvas) - + // Immersive Portals - if (rootProject.enable_immersive_portals == "1") - modCompileOnly ("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") + if (rootProject.enable_immersive_portals == "1") { + modCompileOnly("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") + } else if (rootProject.enable_immersive_portals == "2") { modImplementation ("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") { exclude(group: "net.fabricmc.fabric-api") 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 74d1c262c..48010d55d 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -19,6 +19,8 @@ package com.seibel.distanthorizons.fabric; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; import com.seibel.distanthorizons.common.AbstractModInitializer; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; @@ -36,6 +38,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor; //import io.netty.buffer.ByteBuf; import net.fabricmc.api.EnvType; @@ -58,6 +61,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.phys.HitResult; import org.apache.logging.log4j.Logger; +import org.joml.Matrix4f; import org.lwjgl.glfw.GLFW; /** @@ -192,9 +196,18 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy WorldRenderEvents.AFTER_SETUP.register((renderContext) -> { + Matrix4f projectionMatrix = renderContext.projectionMatrix(); + + Matrix4f modelViewMatrix; + #if MC_VER < MC_1_20_4 + modelViewMatrix = matrixStack.last().pose(); + #else + modelViewMatrix = renderContext.positionMatrix(); + #endif + this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()), - McObjectConverter.Convert(renderContext.matrixStack().last().pose()), - McObjectConverter.Convert(renderContext.projectionMatrix()), + McObjectConverter.Convert(modelViewMatrix), + McObjectConverter.Convert(projectionMatrix), renderContext.tickDelta()); }); 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 75bb8c02b..c884e10ae 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 @@ -84,11 +84,16 @@ public class MixinLevelRenderer method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", cancellable = true) private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback) - #else + #elif MC_VER < MC_1_20_6 @Inject(at = @At("HEAD"), method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", cancellable = true) private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback) + #else + @Inject(at = @At("HEAD"), + 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) #endif { #if MC_VER == MC_1_16_5 @@ -100,10 +105,15 @@ public class MixinLevelRenderer Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose()); - #else + #elif MC_VER <= MC_1_20_4 // get the matrices directly from MC Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose()); Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix); + #else + // get the matrices directly from MC + Mat4f mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix); //frustumMatrix); + Mat4f mcProjectionMatrix = new Mat4f();// McObjectConverter.Convert(projectionMatrix); + mcProjectionMatrix.setIdentity(); #endif if (renderType.equals(RenderType.translucent())) { @@ -126,9 +136,12 @@ public class MixinLevelRenderer #elif MC_VER < MC_1_20_1 @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel") public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + #elif MC_VER < MC_1_20_6 + @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel") + private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) #else @Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel") - private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci) + private void callAfterRunUpdates(CallbackInfo ci) #endif { ChunkWrapper.syncedUpdateClientLightStatus(); 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 93934f15e..ed9c55488 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 @@ -1,7 +1,7 @@ package com.seibel.distanthorizons.fabric.wrappers.modAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IBCLibAccessor; -#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4 // These versions either don't have BCLib, or the implementation is different +#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4 || MC_VER == MC_1_20_6 // These versions either don't have BCLib, or the implementation is different #elif MC_VER == MC_1_18_2 import ru.bclib.config.ClientConfig; import ru.bclib.config.Configs; @@ -17,7 +17,7 @@ public class BCLibAccessor implements IBCLibAccessor public void setRenderCustomFog(boolean newValue) { - #if !(MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4) // These versions either don't have BCLib, or the implementation is different + #if !(MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4 || MC_VER == MC_1_20_6) // These versions either don't have BCLib, or the implementation is different // Change the value of CUSTOM_FOG_RENDERING in the bclib client config // This disabled fog from rendering within bclib diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java index cc0a7216a..90753eee3 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java @@ -22,7 +22,11 @@ package com.seibel.distanthorizons.fabric.wrappers.modAccessor; #if MC_VER >= MC_1_19_4 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor; +#if MC_VER <= MC_1_20_4 import net.coderbot.iris.Iris; +#else +import net.irisshaders.iris.Iris; +#endif import net.irisshaders.iris.api.v0.IrisApi; public class IrisAccessor implements IIrisAccessor diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index a04df23bd..53fd70051 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -111,11 +111,16 @@ public class MixinLevelRenderer method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", cancellable = true) private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback) - #else + #elif MC_VER < MC_1_20_4 @Inject(at = @At("HEAD"), method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", cancellable = true) private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback) + #else + @Inject(at = @At("HEAD"), + method = "renderSectionLayer", + cancellable = true) + private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback) #endif { // get MC's model view and projection matrices diff --git a/gradle.properties b/gradle.properties index 6b7dd552b..9bc3bd8e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues mod_discord=https://discord.gg/xAB8G4cENx # Global Plugin Versions -manifold_version=2024.1.13 +manifold_version=2024.1.15 # 2023.1.17 can be used if there are mystery Java compiler issues nightconfig_version=3.6.6 lz4_version=1.8.0 @@ -50,7 +50,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.20.4 +mcVer=1.20.6 # Defines the maximum amount of memory Minecraft is allowed when run in a developement environment #minecraftMemoryJavaArg="-Xmx4G" diff --git a/versionProperties/1.20.6.properties b/versionProperties/1.20.6.properties index f7d546e14..8118a9001 100644 --- a/versionProperties/1.20.6.properties +++ b/versionProperties/1.20.6.properties @@ -1,7 +1,7 @@ # 1.20.6 version java_version=21 minecraft_version=1.20.6 -parchment_version=1.20.4:2024.04.14 +parchment_version=1.20.6:2024.05.01 compatible_minecraft_versions=["1.20.6"] accessWidenerVersion=1_20_2 builds_for=fabric @@ -11,7 +11,7 @@ builds_for=fabric fabric_loader_version=0.15.10 fabric_api_version=0.97.8+1.20.6 # Fabric mod versions - modmenu_version= + modmenu_version=10.0.0-beta.1 starlight_version_fabric= phosphor_version_fabric= lithium_version= @@ -39,7 +39,7 @@ fabric_api_version=0.97.8+1.20.6 # (Neo)Forge loader forge_version=50.0.0 -neoforge_version=20.6.16-beta +neoforge_version=20.6.70-beta # (Neo)Forge mod versions starlight_version_forge= terraforged_version=