diff --git a/1.16.5.properties b/1.16.5.properties index 7088d9248..bc4c10e68 100644 --- a/1.16.5.properties +++ b/1.16.5.properties @@ -2,7 +2,7 @@ java_version=8 minecraft_version=1.16.5 -#parchment_version=2022.03.06 +parchment_version=2022.03.06 compatible_minecraft_versions=["1.16.4", "1.16.5"] # Fabric loader diff --git a/1.17.1.properties b/1.17.1.properties index 6e70a3d0c..175e060e1 100644 --- a/1.17.1.properties +++ b/1.17.1.properties @@ -2,7 +2,7 @@ java_version=16 minecraft_version=1.17.1 -#parchment_version=2021.12.12 +parchment_version=2021.12.12 compatible_minecraft_versions=["1.17", "1.17.1"] # Fabric loader diff --git a/1.18.1.properties b/1.18.1.properties index 3e94919bf..62c2fcedb 100644 --- a/1.18.1.properties +++ b/1.18.1.properties @@ -2,7 +2,7 @@ java_version = 17 minecraft_version=1.18.1 -#parchment_version=2022.03.06 +parchment_version=2022.03.06 compatible_minecraft_versions=["1.18", "1.18.1"] # Fabric loader diff --git a/1.18.2.properties b/1.18.2.properties index d9f336b8f..606c4dc57 100644 --- a/1.18.2.properties +++ b/1.18.2.properties @@ -2,7 +2,7 @@ java_version = 17 minecraft_version=1.18.2 -#parchment_version=2022.03.13 +parchment_version=2022.03.13 compatible_minecraft_versions=["1.18.2"] # Fabric loader diff --git a/1.19.properties b/1.19.properties index c8c8694b2..08c74643f 100644 --- a/1.19.properties +++ b/1.19.properties @@ -2,7 +2,7 @@ java_version = 17 minecraft_version=1.19 -#parchment_version=2022.03.13 +parchment_version=2022.03.13 compatible_minecraft_versions=["1.19"] # Fabric loader diff --git a/build.gradle b/build.gradle index bfe86f627..06a20b327 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,10 @@ subprojects { p -> // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) -// parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") + if (rootProject.minecraft_version != "1.19") + 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") } //Manifold @@ -115,7 +118,6 @@ subprojects { p -> // Toml implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") - implementation("com.googlecode.json-simple:json-simple:1.1.1") if (p != project(":forge")) { // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies @@ -125,9 +127,8 @@ subprojects { p -> if (p != project(":core")) common(project(":core")) { transitive false } - if (p == project(":common")) { + if (p == project(":common")) shadowMe(project(":core")) { transitive false } - } } // Allows the jar to run standalone 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 1f65b91d9..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 @@ -34,11 +34,11 @@ import net.minecraft.world.level.chunk.ChunkGenerator; #if POST_MC_1_18_1 import net.minecraft.world.level.chunk.storage.ChunkScanAccess; #endif -import net.minecraft.world.level.levelgen.RandomState; import net.minecraft.world.level.levelgen.WorldGenSettings; #if PRE_MC_1_19 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager; #else +import net.minecraft.world.level.levelgen.RandomState; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager; #endif import net.minecraft.world.level.storage.WorldData;