From 346d5cb741d21dc5a01e2dfa95dc0d9d858407ed Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Sat, 4 Jan 2025 15:03:49 +0100 Subject: [PATCH] enable generation in non-vanilla dimensions --- .../java/de/pilz/plantmegapackfix/PMPFix.java | 3 +- .../PMPFixMixinLoaderLate.java | 1 + .../mixins/late/PMPWorldGeneratorMixin.java | 52 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/pilz/plantmegapackfix/mixins/late/PMPWorldGeneratorMixin.java diff --git a/src/main/java/de/pilz/plantmegapackfix/PMPFix.java b/src/main/java/de/pilz/plantmegapackfix/PMPFix.java index 6d28c63..4ae23f2 100644 --- a/src/main/java/de/pilz/plantmegapackfix/PMPFix.java +++ b/src/main/java/de/pilz/plantmegapackfix/PMPFix.java @@ -10,7 +10,8 @@ version = Tags.VERSION, name = "PlantMegaPack Fixes", acceptedMinecraftVersions = "[1.7.10]", - dependencies = "required-after:plantmegapack") + dependencies = "required-after:plantmegapack", + acceptableRemoteVersions = "*") public class PMPFix { public static final String MODID = "plantmegapackfix"; diff --git a/src/main/java/de/pilz/plantmegapackfix/PMPFixMixinLoaderLate.java b/src/main/java/de/pilz/plantmegapackfix/PMPFixMixinLoaderLate.java index 140d881..d4b1fb7 100644 --- a/src/main/java/de/pilz/plantmegapackfix/PMPFixMixinLoaderLate.java +++ b/src/main/java/de/pilz/plantmegapackfix/PMPFixMixinLoaderLate.java @@ -22,6 +22,7 @@ public List getMixins(Set loadedMods) { // PlantMegaPack if (loadedMods.contains("plantmegapack")) { list.add("PMPGenVineMixin"); + list.add("PMPWorldGeneratorMixin"); } return list; diff --git a/src/main/java/de/pilz/plantmegapackfix/mixins/late/PMPWorldGeneratorMixin.java b/src/main/java/de/pilz/plantmegapackfix/mixins/late/PMPWorldGeneratorMixin.java new file mode 100644 index 0000000..f0bd7cf --- /dev/null +++ b/src/main/java/de/pilz/plantmegapackfix/mixins/late/PMPWorldGeneratorMixin.java @@ -0,0 +1,52 @@ +package de.pilz.plantmegapackfix.mixins.late; + +import java.util.Random; + +import net.minecraft.world.World; +import net.minecraft.world.WorldProviderEnd; +import net.minecraft.world.WorldProviderHell; +import net.minecraft.world.WorldProviderSurface; +import net.minecraft.world.chunk.IChunkProvider; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import plantmegapack.PlantMegaPack; + +@Mixin(plantmegapack.worldgen.PMPWorldGenerator.class) +public abstract class PMPWorldGeneratorMixin { + + @Shadow(remap = false) + private void generateNether(World world, Random random, int chunkX, int chunkZ) {} + + @Shadow(remap = false) + private void generateSurface(World world, Random random, int chunkX, int chunkZ) {} + + @Shadow(remap = false) + private void generateEnd(World world, Random random, int chunkX, int chunkZ) {} + + @Inject(method = "generate", at = @At("RETURN"), cancellable = false, remap = false) + private void pmpfix$$checkWorldProviderSuface(Random random, int chunkX, int chunkZ, World world, + IChunkProvider chunkGenerator, IChunkProvider chunkProvider, CallbackInfo callback) { + if (world.provider.dimensionId == 0 || world.provider.dimensionId == -1 || world.provider.dimensionId == 1) { + // Handled by original already + return; + } + if (world.provider instanceof WorldProviderSurface) { + if (PlantMegaPack.settingsGeneral.worldgenOverworldRate > 0) { + generateSurface(world, random, chunkX * 16, chunkZ * 16); + } + } else if (world.provider instanceof WorldProviderHell) { + if (PlantMegaPack.settingsGeneral.worldgenNetherRate > 0) { + generateNether(world, random, chunkX * 16, chunkZ * 16); + } + } else if (world.provider instanceof WorldProviderEnd) { + if (PlantMegaPack.settingsGeneral.worldgenOverworldRate > 0) { + generateEnd(world, random, chunkX * 16, chunkZ * 16); + } + } + } +}