diff --git a/build.gradle b/build.gradle index 751d5e5f9..ffd26df89 100644 --- a/build.gradle +++ b/build.gradle @@ -122,10 +122,10 @@ subprojects { p -> modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" } - if (p == project(":common")) { + if (p != project(":core")) common(project(":core")) { transitive false } + 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/block/BlockDetailWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockDetailWrapper.java index dffb5358d..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 @@ -50,7 +50,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.Cursor3D; import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; import net.minecraft.world.level.*; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; @@ -69,6 +68,9 @@ 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 +import net.minecraft.util.RandomSource; +#endif /*-- WARN: This class should NEVER hold reference to anything large, as this is never dealloc until the end of runtime!! --*/ 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 dfcbab3fb..fa531ef6d 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,10 +60,14 @@ public final class ThreadedParameters level = param.level; #if PRE_MC_1_18_1 structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level); + #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); #else structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures, - param.level.dimension(), param.generator, /*FIXME[1.19]*/, level, param.generator.getBiomeSource(), param.worldSeed, - param.fixerUpper); + param.level.dimension(), param.generator, /*FIXME[1.19]*/, level, param.generator.getBiomeSource(), param.worldSeed, + param.fixerUpper); #endif } 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 ef0146499..1fa7dfb43 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 @@ -81,6 +81,9 @@ 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 + chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), + tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk)); #else chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), /*FIXME[1.19]*/, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));