From 36342f17daa65010b90a0e5f980f38d2086d9602 Mon Sep 17 00:00:00 2001 From: Hubry Date: Wed, 1 Jan 2020 15:36:55 +0100 Subject: [PATCH] Add config option to disable GoG lexicon spawn --- .../vazkii/botania/common/core/handler/ConfigHandler.java | 5 +++++ .../vazkii/botania/common/world/SkyblockWorldEvents.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index bc89d2cb1..e8171086e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -146,6 +146,8 @@ public final class ConfigHandler { public final ForgeConfigSpec.IntValue flowerPatchChance; public final ForgeConfigSpec.DoubleValue flowerTallChance; public final ForgeConfigSpec.IntValue mushroomQuantity; + + public final ForgeConfigSpec.BooleanValue gogSpawnWithLexicon; public Common(ForgeConfigSpec.Builder builder) { blockBreakParticles = builder @@ -217,6 +219,9 @@ public final class ConfigHandler { mushroomQuantity = builder .comment("The quantity of Botania mushrooms to generate underground, in the world, defaults to 40, the lower the number the less patches generate.") .defineInRange("worldgen.mushroom.quantity", 40, 0, Integer.MAX_VALUE); + gogSpawnWithLexicon = builder + .comment("Set this to false to disable spawning with a Lexica Botania in Garden of Glass worlds, if you are modifying the modpack's progression to not start with Botania.") + .define("gardenOfGlass.spawnWithLexicon", true); } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index a9d58744a..e047b6149 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -36,6 +36,7 @@ import net.minecraftforge.items.ItemHandlerHelper; 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.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.ModTags; @@ -156,7 +157,9 @@ public final class SkyblockWorldEvents { ServerPlayerEntity pmp = (ServerPlayerEntity) player; pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); pmp.setSpawnPoint(pos, true, player.world.getDimension().getType()); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); + if (ConfigHandler.COMMON.gogSpawnWithLexicon.get()) { + player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); + } } if(fabricated) {