From eee165556a2d4e5ff839dc281efa8954986ac4e9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Dec 2019 10:53:13 -0600 Subject: [PATCH] terraplate now checks using patchouli multiblock --- .../java/vazkii/botania/common/Botania.java | 22 +-------- .../common/block/tile/TileTerraPlate.java | 46 +++++++++---------- 2 files changed, 24 insertions(+), 44 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 4b5cc5af7..5cfea65af 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -43,6 +43,7 @@ import vazkii.botania.common.advancements.RelicBindTrigger; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.command.CommandSkyblockSpread; @@ -155,26 +156,7 @@ public class Botania { ); 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); + PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), TileTerraPlate.MULTIBLOCK.getValue()); pat = new String[][] { { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 3951e0e5b..a00f7b682 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.LazyLoadBase; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -36,6 +37,8 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import vazkii.patchouli.api.IMultiblock; +import vazkii.patchouli.api.PatchouliAPI; import java.util.List; @@ -44,16 +47,24 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab public static TileEntityType TYPE; public static final int MAX_MANA = TilePool.MAX_MANA / 2; - private static final BlockPos[] LAPIS_BLOCKS = { - new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), - new BlockPos(0, 0, 1), new BlockPos(0, 0, -1) - }; - - private static final BlockPos[] LIVINGROCK_BLOCKS = { - new BlockPos(0, 0, 0), new BlockPos(1, 0, 1), - new BlockPos(1, 0, -1), new BlockPos(-1, 0, 1), - new BlockPos(-1, 0, -1) - }; + public static final LazyLoadBase MULTIBLOCK = new LazyLoadBase<>(() -> PatchouliAPI.instance.makeMultiblock( + new String[][] { + { + "___", + "_P_", + "___" + }, + { + "RLR", + "L0L", + "RLR" + } + }, + 'P', ModBlocks.terraPlate, + 'R', ModBlocks.livingrock, + '0', ModBlocks.livingrock, + 'L', Blocks.LAPIS_BLOCK + )); private static final String TAG_MANA = "mana"; @@ -133,20 +144,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab } private boolean hasValidPlatform() { - return checkAll(LAPIS_BLOCKS, Blocks.LAPIS_BLOCK) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); - } - - private boolean checkAll(BlockPos[] relPositions, Block block) { - for (BlockPos position : relPositions) { - if(!checkPlatform(position.getX(), position.getZ(), block)) - return false; - } - - return true; - } - - private boolean checkPlatform(int xOff, int zOff, Block block) { - return world.getBlockState(pos.add(xOff, -1, zOff)).getBlock() == block; + return MULTIBLOCK.getValue().validate(world, getPos().down()) != null; } @Override