From 99852fded667c49efc4444ec98307e8170423a38 Mon Sep 17 00:00:00 2001 From: coolGi Date: Thu, 28 Jul 2022 21:00:29 +0930 Subject: [PATCH] Fixed gitlab ci and updated readme to say it now supports 1.19.1 --- .gitlab-ci.yml | 26 +++++++++++ 1.19.1.properties | 2 +- 1.19.properties | 43 +++++++++++++++++++ Readme.md | 11 ++++- build.gradle | 2 +- common/build.gradle | 2 +- .../common/forge/LodForgeMethodCaller.java | 4 +- .../wrappers/block/BlockDetailWrapper.java | 4 +- .../lod/common/wrappers/config/ConfigGui.java | 26 +++++------ .../minecraft/MinecraftClientWrapper.java | 4 +- .../minecraft/MinecraftRenderWrapper.java | 2 +- .../common/wrappers/world/BiomeWrapper.java | 4 +- .../BatchGenerationEnvironment.java | 2 +- .../worldGeneration/GlobalParameters.java | 6 +-- .../worldGeneration/ThreadedParameters.java | 2 +- .../mimicObject/ChunkLoader.java | 10 ++--- .../mimicObject/LightedWorldGenRegion.java | 4 +- .../WorldGenStructFeatManager.java | 6 +-- .../worldGeneration/step/StepBiomes.java | 4 +- .../worldGeneration/step/StepNoise.java | 4 +- .../step/StepStructureReference.java | 2 +- .../step/StepStructureStart.java | 8 ++-- .../worldGeneration/step/StepSurface.java | 2 +- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- gradle.properties | 2 +- 26 files changed, 132 insertions(+), 54 deletions(-) create mode 100644 1.19.properties diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51d95c759..ce93ba762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: gradle:eclipse-temurin # all stages need to be defined here stages: + - build_19_1 - build_19 - build_18_2 - build_18_1 @@ -149,6 +150,31 @@ build_19: - cache/ allow_failure: true +# 1.19.1 build +build_19_1: + stage: build_19_1 + script: + - echo "Building 1.19.1..." + - ./gradlew deleteMerged -PmcVer="1.19.1" --gradle-user-home cache/; + - ./gradlew clean -PmcVer="1.19.1" --gradle-user-home cache/; + - ./gradlew core:build -PmcVer="1.19.1" --gradle-user-home cache/; + - ./gradlew build -PmcVer="1.19.1" --gradle-user-home cache/; + - ./gradlew mergeJars -PmcVer="1.19.1" --gradle-user-home cache/; + image: eclipse-temurin:17 + artifacts: + name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + paths: + - Merged + expire_in: 1 day + when: always + cache: + key: "gradleCache" + policy: pull-push + paths: + - .gradle + - cache/ + allow_failure: true + # unused deployment stage #deploy: diff --git a/1.19.1.properties b/1.19.1.properties index 81fa57f34..9e75b81b6 100644 --- a/1.19.1.properties +++ b/1.19.1.properties @@ -3,7 +3,7 @@ java_version = 17 minecraft_version=1.19.1 parchment_version=2022.03.13 -compatible_minecraft_versions=["1.19", "1.19.1"] +compatible_minecraft_versions=["1.19.1"] # Fabric loader fabric_loader_version=0.14.8 diff --git a/1.19.properties b/1.19.properties new file mode 100644 index 000000000..21992fab3 --- /dev/null +++ b/1.19.properties @@ -0,0 +1,43 @@ +# 1.18.2 version based stuff + +java_version = 17 +minecraft_version=1.19 +parchment_version=2022.03.13 +compatible_minecraft_versions=["1.19"] + +# Fabric loader +fabric_loader_version=0.14.8 +fabric_api_version=0.57.0+1.19 + # Fabric mod versions + modmenu_version=4.0.0 + starlight_version_fabric=0 + phosphor_version_fabric=0 + lithium_version=0 + sodium_version=3820973 + iris_version=1.19.x-v1.2.6 + immersive_portals_version = 0 + bclib_version=0 + + # 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=0 + enable_bclib=0 + +# Forge loader +forge_version=41.0.94 + # Forge mod versions + starlight_version_forge=0 + terraforged_version= + + # 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 diff --git a/Readme.md b/Readme.md index a50121fc1..9ebe426f8 100644 --- a/Readme.md +++ b/Readme.md @@ -16,6 +16,7 @@ If you want to see a quick demo, check out a video covering the mod here: ### Versions This branch is for these versions of Minecraft +- 1.19.1 - 1.19 - 1.18.2 - 1.18.1 & 1.18 @@ -26,6 +27,12 @@ Architectury version: 3.4-SNAPSHOT\ Architectury loom version: 0.12.0-SNAPSHOT\ Java Compiler plugin: Manifold Preprocessor +#### 1.19.1 mods +Forge version: 42.0.0\ +Fabric version: 0.14.8\ +Fabric API version: 0.58.5+1.19.1\ +Modmenu version: 4.0.0 + #### 1.19 mods Forge version: 41.0.94\ Fabric version: 0.14.8\ @@ -66,6 +73,7 @@ This version has been confirmed to work in IDE and Retail Minecraft with ether t #### Nightlly builds This mod has an autobuild system to automatically build the mod on each commit +- 1.19.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19_1 - 1.19: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19 - 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_2 - 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_1 @@ -93,7 +101,8 @@ https://fabricmc.net/wiki/tutorial:setup 4. Import the project into eclipse ## Switching Versions -This branch support 5 built versions: +This branch support 6 built versions: + - 1.19.1 - 1.19 - 1.18.2 - 1.18.1 (which also runs on 1.18) diff --git a/build.gradle b/build.gradle index 52f5d64eb..4874ddc48 100644 --- a/build.gradle +++ b/build.gradle @@ -239,7 +239,7 @@ subprojects { p -> // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) - if (rootProject.minecraft_version != "1.19.1") + if (rootProject.minecraft_version != "1.19" && rootProject.minecraft_version != "1.19.1") parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") else parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19.x or higher doesnt have parchment mappings yet, we use 1.18.2 mapping diff --git a/common/build.gradle b/common/build.gradle index 92dc0bb94..6f70b98eb 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -33,7 +33,7 @@ dependencies { // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) - if (rootProject.minecraft_version != "1.19.1") + if (rootProject.minecraft_version != "1.19" && rootProject.minecraft_version != "1.19.1") parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") else parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping diff --git a/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java b/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java index f5a8fd881..21f49f0eb 100644 --- a/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java +++ b/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java @@ -22,7 +22,7 @@ package com.seibel.lod.common.forge; import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; -#if POST_MC_1_19_1 +#if POST_MC_1_19 import net.minecraft.util.RandomSource; #endif import net.minecraft.world.level.ColorResolver; @@ -39,7 +39,7 @@ import java.util.Random; * @author Ran */ public interface LodForgeMethodCaller { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 List getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random); // FIXME: For 1.19 #else List getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random); // FIXME: For 1.19 diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java index f0595e88b..9f9ed03ec 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java @@ -68,7 +68,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -#if POST_MC_1_19_1 +#if POST_MC_1_19 import net.minecraft.util.RandomSource; #endif @@ -80,7 +80,7 @@ public class BlockDetailWrapper extends IBlockDetailWrapper public static final int FLOWER_COLOR_SCALE = 5; - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 public static final Random random = new Random(0); #else public static final RandomSource random = RandomSource.create(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java index a2bec9322..a7f6736af 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java @@ -47,7 +47,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; #endif @@ -111,7 +111,7 @@ public abstract class ConfigGui Object value; String tempValue; boolean inLimits = true; - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 TranslatableComponent name; #else Component name; @@ -212,7 +212,7 @@ public abstract class ConfigGui if (entry != null) { if (!entry.name().equals("")) - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 info.name = new TranslatableComponent(entry.name()); #else info.name = Component.translatable(entry.name()); @@ -237,7 +237,7 @@ public abstract class ConfigGui else if (fieldClass == boolean.class) { // For boolean - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 Function func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED); #else Function func = value -> Component.translatable((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED); @@ -251,7 +251,7 @@ public abstract class ConfigGui { // For enum List values = Arrays.asList(field.getType().getEnumConstants()); - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 Function func = value -> new TranslatableComponent(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString()); #else Function func = value -> Component.translatable(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString()); @@ -266,7 +266,7 @@ public abstract class ConfigGui else if (screenEntry != null) { if (!screenEntry.name().equals("")) - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 info.name = new TranslatableComponent(screenEntry.name()); #else info.name = Component.translatable(screenEntry.name()); @@ -299,7 +299,7 @@ public abstract class ConfigGui { value = func.apply(stringValue); inLimits = value.doubleValue() >= minValue && value.doubleValue() <= maxValue; - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, new TextComponent(value.doubleValue() < minValue ? #else info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, Component.translatable(value.doubleValue() < minValue ? @@ -515,7 +515,7 @@ public abstract class ConfigGui { protected ConfigScreen(Screen parent, String category) { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 super(new TranslatableComponent( #else super(Component.translatable( @@ -586,7 +586,7 @@ public abstract class ConfigGui { if (info.category.matches(category) && !info.hideOption) { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 TranslatableComponent name = (info.name == null ? new TranslatableComponent(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name); Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, new TextComponent("Reset").withStyle(ChatFormatting.RED), (button -> { #else @@ -604,7 +604,7 @@ public abstract class ConfigGui { Map.Entry> widget = (Map.Entry>) info.widget; if (info.field.getType().isEnum()) - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 widget.setValue(value -> new TranslatableComponent(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString())); #else widget.setValue(value -> Component.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString())); @@ -624,7 +624,7 @@ public abstract class ConfigGui Predicate processor = ((BiFunction>) info.widget).apply(widget, done); widget.setFilter(processor); resetButton.setWidth(20); - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED)); Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> { #else @@ -679,7 +679,7 @@ public abstract class ConfigGui if (list.getHoveredButton(mouseX,mouseY).isPresent()) { AbstractWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get(); Component text = ButtonEntry.buttonsWithText.get(buttonWidget); - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 TranslatableComponent name = new TranslatableComponent(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName()); #else Component name = Component.translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName()); @@ -690,7 +690,7 @@ public abstract class ConfigGui else if (I18n.exists(key) && (text != null && text.equals(name))) { List list = new ArrayList<>(); for (String str : I18n.get(key).split("\n")) - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 list.add(new TextComponent(str)); #else list.add(Component.translatable(str)); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java index f165edbbb..195eb56f2 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -55,7 +55,7 @@ import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.server.IntegratedServer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.network.chat.TextComponent; #endif import net.minecraft.network.chat.Component; @@ -368,7 +368,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper @Override public void sendChatMessage(String string) { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 getPlayer().sendMessage(new TextComponent(string), getPlayer().getUUID()); #else getPlayer().sendSystemMessage(Component.translatable(string)); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 168cc2625..5dfdad34e 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -133,7 +133,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public double getGamma() { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 return MC.options.gamma; #else return MC.options.gamma().get(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java index c294cb8c9..659d7df45 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java @@ -33,7 +33,7 @@ import com.seibel.lod.core.util.LodUtil; import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; import net.minecraft.data.BuiltinRegistries; -#if POST_MC_1_19_1 +#if POST_MC_1_19 import net.minecraft.data.worldgen.biome.EndBiomes; import net.minecraft.data.worldgen.biome.NetherBiomes; #endif @@ -71,7 +71,7 @@ public class BiomeWrapper implements IBiomeWrapper } /** Returns a color int for the given biome. */ - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 @Override public int getColorForBiome(int x, int z) { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index e4344672d..d99287776 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -367,7 +367,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv CompoundTag chunkData = null; try { - #if POST_MC_1_19_1 + #if POST_MC_1_19 chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos).get().orElse(null); #else chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java index 56aa7eb6b..a87b83a93 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java @@ -35,7 +35,7 @@ import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.storage.ChunkScanAccess; #endif import net.minecraft.world.level.levelgen.WorldGenSettings; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager; #else import net.minecraft.world.level.levelgen.RandomState; @@ -46,7 +46,7 @@ import net.minecraft.world.level.storage.WorldData; public final class GlobalParameters { public final ChunkGenerator generator; - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 public final StructureManager structures; #else public final StructureTemplateManager structures; @@ -85,7 +85,7 @@ public final class GlobalParameters structures = server.getStructureManager(); generator = level.getChunkSource().getGenerator(); fixerUpper = server.getFixerUpper(); - #if POST_MC_1_19_1 + #if POST_MC_1_19 randomState = level.getChunkSource().randomState(); #endif } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java index 1ce277e70..5e84aec39 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java @@ -60,7 +60,7 @@ public final class ThreadedParameters level = param.level; #if PRE_MC_1_18_1 structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level); - #elif PRE_MC_1_19_1 + #elif PRE_MC_1_19 structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures, param.level.dimension(), param.generator, level, param.generator.getBiomeSource(), param.worldSeed, param.fixerUpper); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index faf85c1c4..30e4bb2bf 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -52,7 +52,7 @@ import net.minecraft.world.level.chunk.storage.ChunkSerializer; import net.minecraft.world.level.levelgen.Heightmap; #if POST_MC_1_18_1 import net.minecraft.world.level.levelgen.blending.BlendingData; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.levelgen.feature.StructureFeature; #endif import net.minecraft.world.level.levelgen.structure.StructureStart; @@ -62,7 +62,7 @@ import net.minecraft.world.ticks.LevelChunkTicks; #if POST_MC_1_18_2 import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; #endif #endif @@ -74,7 +74,7 @@ import org.apache.logging.log4j.Logger; public class ChunkLoader { - #if POST_MC_1_19_1 + #if POST_MC_1_19 private static final Codec> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState()); #elif POST_MC_1_18_1 private static final Codec> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState()); @@ -107,7 +107,7 @@ public class ChunkLoader #if PRE_MC_1_18_2 Codec> biomeCodec = PalettedContainer.codec( biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS)); - #elif PRE_MC_1_19_1 + #elif PRE_MC_1_19 Codec>> biomeCodec = PalettedContainer.codec( biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS)); #else @@ -231,7 +231,7 @@ public class ChunkLoader return null; #else BlendingData blendingData = readBlendingData(tagLevel); - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise())) return null; #else diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java index 057fe08a1..9ffdc149f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java @@ -46,7 +46,7 @@ import net.minecraft.world.level.ColorResolver; import net.minecraft.world.level.LevelHeightAccessor; #endif import net.minecraft.world.level.LightLayer; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.StructureFeatureManager; import net.minecraft.world.level.levelgen.feature.StructureFeature; #endif @@ -292,7 +292,7 @@ public class LightedWorldGenRegion extends WorldGenRegion { public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver) { - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 int i = (Minecraft.getInstance()).options.biomeBlendRadius; #else int i = (Minecraft.getInstance()).options.biomeBlendRadius().get(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java index a5b5a586c..3f07909a4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java @@ -41,7 +41,7 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.levelgen.WorldGenSettings; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.StructureFeatureManager; @@ -55,7 +55,7 @@ import net.minecraft.world.level.levelgen.structure.StructureCheck; #endif import net.minecraft.world.level.levelgen.structure.StructureStart; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 public class WorldGenStructFeatManager extends StructureFeatureManager { #else public class WorldGenStructFeatManager extends StructureManager { @@ -132,7 +132,7 @@ public class WorldGenStructFeatManager extends StructureManager { return builder.build(); } #else - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 @Override public List startsForFeature(SectionPos sectionPos, Predicate> predicate) { ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java index e3c9b64fa..d68f9bc9c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java @@ -27,7 +27,7 @@ import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; import net.minecraft.core.Registry; import net.minecraft.server.level.WorldGenRegion; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.StructureFeatureManager; #endif import net.minecraft.world.level.biome.Biome; @@ -73,7 +73,7 @@ public final class StepBiomes { // System.out.println("StepBiomes: "+chunk.getPos()); #if PRE_MC_1_18_1 environment.params.generator.createBiomes(environment.params.biomes, chunk); - #elif PRE_MC_1_19_1 + #elif PRE_MC_1_19 chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion), tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); #else diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java index d7552aa31..07bf9471c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java @@ -34,7 +34,7 @@ import net.minecraft.util.Mth; #if POST_MC_1_17_1 import net.minecraft.world.level.LevelHeightAccessor; #endif -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.StructureFeatureManager; #endif import net.minecraft.world.level.chunk.ChunkAccess; @@ -81,7 +81,7 @@ public final class StepNoise { #elif PRE_MC_1_18_1 chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); - #elif PRE_MC_1_19_1 + #elif PRE_MC_1_19 chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); #else diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java index 214f5586d..76f69e56b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -32,7 +32,7 @@ import net.minecraft.core.Registry; import net.minecraft.core.SectionPos; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.ChunkPos; -#if PRE_MC_1_19_1 +#if PRE_MC_1_19 import net.minecraft.world.level.StructureFeatureManager; #endif import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java index 3835f90bf..cb88c2d9a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -67,17 +67,17 @@ public final class StepStructureStart { chunksToDo.add(chunk); } - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 if (environment.params.worldGenSettings.generateFeatures()) { - #elif POST_MC_1_19_1 + #elif POST_MC_1_19 if (environment.params.worldGenSettings.generateStructures()) { #endif for (ChunkAccess chunk : chunksToDo) { // System.out.println("StepStructureStart: "+chunk.getPos()); - #if PRE_MC_1_19_1 + #if PRE_MC_1_19 environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures, environment.params.worldSeed); - #elif POST_MC_1_19_1 + #elif POST_MC_1_19 environment.params.generator.createStructures(environment.params.registry, environment.params.randomState, tParams.structFeat, chunk, environment.params.structures, environment.params.worldSeed); #endif diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java index 4a81c0d28..92c10645b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java @@ -60,7 +60,7 @@ public final class StepSurface { // System.out.println("StepSurface: "+chunk.getPos()); #if PRE_MC_1_18_1 environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk); - #elif PRE_MC_1_19_1 + #elif PRE_MC_1_19 environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk); #else environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), environment.params.randomState, chunk); diff --git a/fabric/build.gradle b/fabric/build.gradle index b59cbcc0d..b840bfa79 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -107,7 +107,7 @@ dependencies { // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) - if (rootProject.minecraft_version != "1.19.1") + if (rootProject.minecraft_version != "1.19" && rootProject.minecraft_version != "1.19.1") parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") else parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping diff --git a/forge/build.gradle b/forge/build.gradle index fa03f1ddd..5f1f20288 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -61,7 +61,7 @@ dependencies { // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) - if (rootProject.minecraft_version != "1.19.1") + if (rootProject.minecraft_version != "1.19" && rootProject.minecraft_version != "1.19.1") parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") else parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping diff --git a/gradle.properties b/gradle.properties index a51a9e519..4c5d30bf2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues toml_version=3.6.4 manifold_version=2022.1.18 enabled_platforms=fabric,forge -mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19.1 +mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19,1.19.1 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: mcVer=1.19.1 \ No newline at end of file