diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/client/core/WorldTypeSkyblock.java similarity index 62% rename from src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java rename to src/main/java/vazkii/botania/client/core/WorldTypeSkyblock.java index 95d4ddd07..33dedbe76 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/client/core/WorldTypeSkyblock.java @@ -6,33 +6,30 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.common.world; +package vazkii.botania.client.core; import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens; -import net.minecraft.world.World; import net.minecraft.world.biome.provider.OverworldBiomeProvider; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.DimensionSettings; -import net.minecraft.world.server.ServerChunkProvider; + +import vazkii.botania.common.world.SkyblockChunkGenerator; public class WorldTypeSkyblock extends BiomeGeneratorTypeScreens { + public static final BiomeGeneratorTypeScreens INSTANCE = new WorldTypeSkyblock(); - public WorldTypeSkyblock() { + private WorldTypeSkyblock() { super("botania-skyblock"); } - public static boolean isWorldSkyblock(World world) { - return world.getChunkProvider() instanceof ServerChunkProvider - && ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator; - } - - /* todo 1.16 impossible now? + /* todo 1.16 these have moved elsewhere + moved to DimensionRenderInfo @Override public float getCloudHeight() { return 260f; } + moved to ClientWorldInfo // In skyblock worlds, do not darken the sky until player hits y=0 @Override public double getHorizon(World world) { @@ -47,6 +44,6 @@ public class WorldTypeSkyblock extends BiomeGeneratorTypeScreens { @Override protected ChunkGenerator func_230484_a_(long seed) { - return new SkyblockChunkGenerator(new OverworldBiomeProvider(seed, false, false), DimensionSettings.Preset.field_236122_b_.func_236137_b_().func_236108_a_()); + return new SkyblockChunkGenerator(new OverworldBiomeProvider(seed, false, false), seed, SkyblockChunkGenerator.dimSettingsPreset.func_236137_b_()); } } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index e5cd3621b..02cff6a06 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.block.FlowerBlock; import net.minecraft.block.TallFlowerBlock; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screen.BiomeGeneratorTypeScreens; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeBuffers; @@ -43,6 +44,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.lwjgl.glfw.GLFW; +import vazkii.botania.client.core.WorldTypeSkyblock; import vazkii.botania.client.core.handler.*; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; @@ -81,6 +83,7 @@ import java.io.IOException; import java.lang.invoke.MethodHandle; import java.time.LocalDateTime; import java.time.Month; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.SortedMap; @@ -156,6 +159,15 @@ public class ClientProxy implements IProxy { registerRenderTypes(); DeferredWorkQueue.runLater(() -> { + MethodHandle worldTypesGetter = LibObfuscation.getGetter(BiomeGeneratorTypeScreens.class, "field_239068_c_"); + try { + @SuppressWarnings("unchecked") + List worldTypes = (List) worldTypesGetter.invokeExact(); + worldTypes.add(WorldTypeSkyblock.INSTANCE); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } + CORPOREA_REQUEST = new KeyBinding("key.botania_corporea_request", KeyConflictContext.GUI, InputMappings.getInputByCode(GLFW.GLFW_KEY_C, 0), LibMisc.MOD_NAME); ClientRegistry.registerKeyBinding(ClientProxy.CORPOREA_REQUEST); registerPropertyGetters(); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 4aaf2c1c1..534239066 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.world.WorldTypeSkyblock; +import vazkii.botania.common.world.SkyblockChunkGenerator; public final class SkyblockRenderEvents { @@ -22,7 +22,7 @@ public final class SkyblockRenderEvents { if (ConfigHandler.CLIENT.enableFancySkybox.get() && world.func_234923_W_() == World.field_234918_g_ && (ConfigHandler.CLIENT.enableFancySkyboxInNormalWorlds.get() - || WorldTypeSkyblock.isWorldSkyblock(world))) { + || SkyblockChunkGenerator.isWorldSkyblock(world))) { /* todo 1.16 if (!(world.getDimension().getSkyRenderer() instanceof SkyblockSkyRenderer)) { world.getDimension().setSkyRenderer(new SkyblockSkyRenderer()); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index b0dae579a..3658eb824 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -105,8 +105,8 @@ import vazkii.botania.common.item.relic.ItemOdinRing; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.ModFeatures; +import vazkii.botania.common.world.SkyblockChunkGenerator; import vazkii.botania.common.world.SkyblockWorldEvents; -import vazkii.botania.common.world.WorldTypeSkyblock; import vazkii.botania.data.DataGenerators; import vazkii.patchouli.api.IMultiblock; import vazkii.patchouli.api.IStateMatcher; @@ -211,9 +211,7 @@ public class Botania { } DeferredWorkQueue.runLater(() -> { - if (Botania.gardenOfGlassLoaded) { - new WorldTypeSkyblock(); - } + SkyblockChunkGenerator.init(); GlobalEntityTypeAttributes.put(ModEntities.DOPPLEGANGER, MobEntity.func_233666_p_() .func_233815_a_(Attributes.MOVEMENT_SPEED, 0.4) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java index d0d4afbd9..4d6bf5d60 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -12,28 +12,64 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.registry.Registry; import net.minecraft.world.Blockreader; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeManager; import net.minecraft.world.biome.provider.BiomeProvider; import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.Heightmap; -import net.minecraft.world.gen.WorldGenRegion; +import net.minecraft.world.gen.*; import net.minecraft.world.gen.feature.structure.StructureManager; import net.minecraft.world.gen.settings.DimensionStructuresSettings; +import net.minecraft.world.gen.settings.NoiseSettings; +import net.minecraft.world.gen.settings.ScalingSettings; +import net.minecraft.world.gen.settings.SlideSettings; +import net.minecraft.world.server.ServerChunkProvider; + +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibObfuscation; + +import java.lang.invoke.MethodHandle; +import java.util.Optional; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class SkyblockChunkGenerator extends ChunkGenerator { - private static final Codec CODEC = RecordCodecBuilder.create( - instance -> instance.group( - BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter(scg -> scg.biomeProvider), - DimensionStructuresSettings.field_236190_a_.fieldOf("structures").forGetter(ChunkGenerator::func_235957_b_) - ).apply(instance, instance.stable(SkyblockChunkGenerator::new))); + // [VanillaCopy] overworld chunk generator codec + public static final Codec CODEC = RecordCodecBuilder.create((instance) -> instance.group(BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter((gen) -> gen.biomeProvider), + Codec.LONG.fieldOf("seed").stable().forGetter((gen) -> gen.seed), + DimensionSettings.field_236098_b_.fieldOf("settings").forGetter((gen) -> gen.settings)) + .apply(instance, instance.stable(SkyblockChunkGenerator::new))); + public static DimensionSettings.Preset dimSettingsPreset; - public SkyblockChunkGenerator(BiomeProvider provider, DimensionStructuresSettings settings) { - super(provider, settings); + public static void init() { + Registry.register(Registry.field_239690_aB_, prefix("skyblock"), SkyblockChunkGenerator.CODEC); + MethodHandle createOverWorldPreset = LibObfuscation.getMethod(DimensionSettings.Preset.class, "func_236135_a_", DimensionStructuresSettings.class, boolean.class, DimensionSettings.Preset.class); + dimSettingsPreset = new DimensionSettings.Preset(LibResources.PREFIX_MOD + "skyblock", preset -> { + // [VanillaCopy] overworld preset creation + try { + return (DimensionSettings) createOverWorldPreset.invokeExact(new DimensionStructuresSettings(true), false, preset); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } + }); + } + + private final long seed; + private final DimensionSettings settings; + + public SkyblockChunkGenerator(BiomeProvider provider, long seed, DimensionSettings settings) { + super(provider, provider, settings.func_236108_a_(), seed); + this.seed = seed; + this.settings = settings; + } + + public static boolean isWorldSkyblock(World world) { + return world.getChunkProvider() instanceof ServerChunkProvider + && ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator; } @Override @@ -43,7 +79,7 @@ public class SkyblockChunkGenerator extends ChunkGenerator { @Override public ChunkGenerator func_230349_a_(long newSeed) { - return new SkyblockChunkGenerator(this.biomeProvider.func_230320_a_(newSeed), func_235957_b_()); + return new SkyblockChunkGenerator(this.biomeProvider.func_230320_a_(newSeed), newSeed, settings); } @Override diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 6163c5484..8f9e33db7 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -19,13 +19,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; @@ -34,7 +32,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.loot.LootHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.ModTags; @@ -61,7 +58,7 @@ public final class SkyblockWorldEvents { if (player.ticksExisted > 3 && !persist.getBoolean(TAG_MADE_ISLAND)) { World overworld = ServerLifecycleHooks.getCurrentServer().getWorld(World.field_234918_g_); ServerWorld world = (ServerWorld) player.world; - if (WorldTypeSkyblock.isWorldSkyblock(world)) { + if (SkyblockChunkGenerator.isWorldSkyblock(world)) { BlockPos coords = world.func_241135_u_(); if (coords.getY() <= 0) { coords = new BlockPos(coords.getX(), 64, coords.getZ());