From dad9192a8d3da3e79171ace2c0cb302354ebbbbe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 27 Aug 2019 19:12:49 -0500 Subject: [PATCH] Couple of multiblocks --- .../java/vazkii/botania/common/Botania.java | 33 +++++++++++++++++++ .../en_us/entries/alfhomancy/intro.json | 6 ++-- .../en_us/entries/basics/terrasteel.json | 4 ++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 02f9a44d3..c489af0b5 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -11,6 +11,7 @@ package vazkii.botania.common; import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.Blocks; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.common.MinecraftForge; @@ -65,6 +66,9 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.ModFeatures; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; +import vazkii.patchouli.api.IMultiblock; +import vazkii.patchouli.api.PatchouliAPI; +import vazkii.patchouli.common.multiblock.Multiblock; @Mod(LibMisc.MOD_ID) public class Botania { @@ -134,6 +138,35 @@ public class Botania { ModBanners.init(); + // todo 1.14 make these canonical and move to where they belong + String[][] pat = new String[][] { + { "_", "W", "G", "W", "_" }, + { "W", "_", "_", "_", "W" }, + { "G", "_", "_", "_", "G" }, + { "W", "_", "_", "_", "W" }, + { "_", "W", "0", "W", "_" } + }; + IMultiblock mb = PatchouliAPI.instance.makeMultiblock( + pat, + 'W', ModBlocks.livingwood, + 'G', ModBlocks.livingwoodGlimmering, + '0', ModBlocks.alfPortal + ); + PatchouliAPI.instance.registerMultiblock(ModBlocks.alfPortal.getRegistryName(), mb); + + pat = new String[][] { + { "_", "P", "_" }, + { "RLR", "L0L", "RLR" } + }; + mb = PatchouliAPI.instance.makeMultiblock( + pat, + 'P', ModBlocks.terraPlate, + 'R', ModBlocks.livingrock, + '0', ModBlocks.livingrock, + 'L', Blocks.LAPIS_BLOCK + ); + PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), mb); + LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); LootConditionManager.registerCondition(new EnableRelics.Serializer()); LootFunctionManager.registerFunction(new BindUuid.Serializer()); diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/intro.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/intro.json index 991a6cc69..482d43670 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/intro.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/intro.json @@ -23,8 +23,10 @@ "recipe": "botania:natura_pylon" }, { - "type": "tmp_multiblock", - "text": "botania.page.aIntro4" + "type": "multiblock", + "multiblock_id": "botania:alfheim_portal", + "text": "botania.page.aIntro4", + "symmetrical": true }, { "type": "text", diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json index 3dba9bf6e..9a951f7c4 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/basics/terrasteel.json @@ -17,7 +17,9 @@ "text": "botania.page.terrasteel2" }, { - "type": "tmp_multiblock", + "type": "multiblock", + "multiblock_id": "botania:terra_plate", + "symmetrical": true, "text": "botania.page.terrasteel4" }, {