diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index c489af0b5..08d80b258 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -11,7 +11,11 @@ package vazkii.botania.common; import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.common.MinecraftForge; @@ -67,8 +71,10 @@ 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.IStateMatcher; import vazkii.patchouli.api.PatchouliAPI; import vazkii.patchouli.common.multiblock.Multiblock; +import vazkii.patchouli.common.multiblock.StateMatcher; @Mod(LibMisc.MOD_ID) public class Botania { @@ -155,8 +161,16 @@ public class Botania { PatchouliAPI.instance.registerMultiblock(ModBlocks.alfPortal.getRegistryName(), mb); pat = new String[][] { - { "_", "P", "_" }, - { "RLR", "L0L", "RLR" } + { + "___", + "_P_", + "___" + }, + { + "RLR", + "L0L", + "RLR" + } }; mb = PatchouliAPI.instance.makeMultiblock( pat, @@ -167,6 +181,98 @@ public class Botania { ); PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), mb); + pat = new String[][] { + { + "_P_______P_", + "___________", + "___________", + "P_________P", + "___________", + "___________", + "_P_______P_", + }, + { + "_F_______F_", + "___________", + "____F_F____", + "F____L____F", + "____F_F____", + "___________", + "_F_______F_", + }, + { + "___________", + "____BBB____", + "___B_B_B___", + "___BB0BB___", + "___B_B_B___", + "____BBB____", + "___________", + } + }; + Tag mysticalFlowers = new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "mystical_flowers")); + mb = PatchouliAPI.instance.makeMultiblock( + pat, + 'P', ModBlocks.manaPylon, + 'L', Blocks.LAPIS_BLOCK, + 'B', Blocks.OBSIDIAN, + '0', Blocks.OBSIDIAN, + 'F', StateMatcher.fromPredicate(ModBlocks.whiteFlower, state -> state.getBlock().isIn(mysticalFlowers)) + ); + PatchouliAPI.instance.registerMultiblock(ModBlocks.enchanter.getRegistryName(), mb); + + pat = new String[][] { + { + "P_______P", + "_________", + "_________", + "_________", + "_________", + "_________", + "_________", + "_________", + "P_______P", + }, + { + "_________", + "_________", + "_________", + "_________", + "____B____", + "_________", + "_________", + "_________", + "_________", + }, + { + "_________", + "_________", + "_________", + "___III___", + "___I0I___", + "___III___", + "_________", + "_________", + "_________", + } + }; + IStateMatcher sm = StateMatcher.fromPredicate(Blocks.IRON_BLOCK, state -> { + try { + // No world to pass here, so just fall back to false if it errors + return state.isBeaconBase(null, null, null); + } catch (Exception ignored) { + return false; + } + }); + mb = PatchouliAPI.instance.makeMultiblock( + pat, + 'P', ModBlocks.gaiaPylon, + 'B', Blocks.BEACON, + 'I', sm, + '0', sm + ); + PatchouliAPI.instance.registerMultiblock(new ResourceLocation(LibMisc.MOD_ID, "gaia_ritual"), 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/gaia_ritual.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/gaia_ritual.json index 6a9297a34..49618830d 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/gaia_ritual.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/alfhomancy/gaia_ritual.json @@ -13,7 +13,8 @@ "recipe": "botania:gaia_pylon" }, { - "type": "tmp_multiblock", + "type": "multiblock", + "multiblock_id": "botania:gaia_ritual", "text": "botania.page.gaiaRitual2" }, { diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json index 40bdfc86b..e23359b9a 100644 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json +++ b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/entries/devices/mana_enchanting.json @@ -12,7 +12,8 @@ "text": "botania.page.manaEnchanting1" }, { - "type": "tmp_multiblock", + "type": "multiblock", + "multiblock_id": "botania:enchanter", "text": "botania.page.manaEnchanting2" }, { diff --git a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_multiblock.json b/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_multiblock.json deleted file mode 100644 index e61f5e9dd..000000000 --- a/src/main/resources/data/botania/patchouli_books/lexicon/en_us/templates/tmp_multiblock.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "components": [ - { - "type": "text", - "text": "Hello this is a test of the template system!", - "x": 20, - "y": 30 - } - ] -} \ No newline at end of file