From 733666b440bf4bcb6db9fb6d9089a1367d92d8fc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Dec 2019 11:19:26 -0600 Subject: [PATCH] same for alf portal --- .../java/vazkii/botania/common/Botania.java | 19 +-- .../common/block/tile/TileAlfPortal.java | 128 +++++++----------- 2 files changed, 50 insertions(+), 97 deletions(-) diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 5cfea65af..b3927bdf1 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.TileAlfPortal; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; @@ -141,21 +142,9 @@ 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); - + String[][] pat; + IMultiblock mb; + PatchouliAPI.instance.registerMultiblock(ModBlocks.alfPortal.getRegistryName(), TileAlfPortal.MULTIBLOCK.getValue()); PatchouliAPI.instance.registerMultiblock(ModBlocks.terraPlate.getRegistryName(), TileTerraPlate.MULTIBLOCK.getValue()); pat = new String[][] { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 853545cd3..4550bbb18 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -21,6 +21,8 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.LazyLoadBase; +import net.minecraft.util.Rotation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -41,6 +43,8 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import vazkii.patchouli.api.IMultiblock; +import vazkii.patchouli.api.PatchouliAPI; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -53,21 +57,18 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { @ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.ALF_PORTAL) public static TileEntityType TYPE; - private static final BlockPos[] LIVINGWOOD_POSITIONS = { - new BlockPos(-1, 0, 0), new BlockPos(1, 0, 0), new BlockPos(-2, 1, 0), - new BlockPos(2, 1, 0), new BlockPos(-2, 3, 0), new BlockPos(2, 3, 0), - new BlockPos(-1, 4, 0), new BlockPos(1, 4, 0) - }; - - private static final BlockPos[] GLIMMERING_LIVINGWOOD_POSITIONS = { - new BlockPos(-2, 2, 0), new BlockPos(2, 2, 0), new BlockPos(0, 4, 0) - }; - - private static final BlockPos[] AIR_POSITIONS = { - new BlockPos(-1, 1, 0), new BlockPos(0, 1, 0), new BlockPos(1, 1, 0), - new BlockPos(-1, 2, 0), new BlockPos(0, 2, 0), new BlockPos(1, 2, 0), - new BlockPos(-1, 3, 0), new BlockPos(0, 3, 0), new BlockPos(1, 3, 0) - }; + public static final LazyLoadBase MULTIBLOCK = new LazyLoadBase<>(() -> PatchouliAPI.instance.makeMultiblock( + new String[][] { + { "_", "W", "G", "W", "_" }, + { "W", " ", " ", " ", "W" }, + { "G", " ", " ", " ", "G" }, + { "W", " ", " ", " ", "W" }, + { "_", "W", "0", "W", "_" } + }, + 'W', ModBlocks.livingwood, + 'G', ModBlocks.livingwoodGlimmering, + '0', ModBlocks.alfPortal + )); private static final String TAG_TICKS_OPEN = "ticksOpen"; private static final String TAG_TICKS_SINCE_LAST_ITEM = "ticksSinceLastItem"; @@ -82,12 +83,6 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { private boolean closeNow = false; private boolean explode = false; - private static final Function CONVERTER_X_Z = input -> new BlockPos(input.getZ(), input.getY(), input.getX()); - - private static final Function CONVERTER_X_Z_FP = input -> new double[] { input[2], input[1], input[0] }; - - private static final Function CONVERTER_Z_SWAP = input -> new BlockPos(input.getX(), input.getY(), -input.getZ()); - public TileAlfPortal() { super(TYPE); } @@ -181,17 +176,28 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { } private void blockParticle(AlfPortalState state) { - int i = world.rand.nextInt(AIR_POSITIONS.length); - double[] pos = new double[] { - AIR_POSITIONS[i].getX() + 0.5F, AIR_POSITIONS[i].getY() + 0.5F, AIR_POSITIONS[i].getZ() + 0.5F - }; - if(state == AlfPortalState.ON_X) - pos = CONVERTER_X_Z_FP.apply(pos); + double dh, dy; + + // Pick one of the inner positions + switch (world.rand.nextInt(9)) { + default: + case 0: dh = 0; dy = 1; break; + case 1: dh = 0; dy = 2; break; + case 2: dh = 0; dy = 3; break; + case 3: dh = -1; dy = 1; break; + case 4: dh = -1; dy = 2; break; + case 5: dh = -1; dy = 3; break; + case 6: dh = 1; dy = 1; break; + case 7: dh = 1; dy = 2; break; + case 8: dh = 1; dy = 3; break; + } + double dx = state == AlfPortalState.ON_X ? 0 : dh; + double dz = state == AlfPortalState.ON_Z ? 0 : dh; float motionMul = 0.2F; - WispParticleData data = WispParticleData.wisp((float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F)); - world.addParticle(data, getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); - } + WispParticleData data = WispParticleData.wisp((float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F)); + world.addParticle(data, getPos().getX() + dx, getPos().getY() + dy, getPos().getZ() + dz, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); + } public boolean onWanded() { AlfPortalState state = world.getBlockState(getPos()).get(BotaniaStateProps.ALFPORTAL_STATE); @@ -297,34 +303,18 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { } private AlfPortalState getValidState() { - if(checkConverter(null)) - return AlfPortalState.ON_Z; - - if(checkConverter(CONVERTER_X_Z)) - return AlfPortalState.ON_X; - - return AlfPortalState.OFF; - } - - private boolean checkConverter(Function baseConverter) { - return checkMultipleConverters(baseConverter) || checkMultipleConverters(CONVERTER_Z_SWAP, baseConverter); - } - - @SafeVarargs - private final boolean checkMultipleConverters(Function... converters) { - if(!check2DArray(AIR_POSITIONS, Blocks.AIR.getDefaultState(), true, converters)) - return false; - if(!check2DArray(LIVINGWOOD_POSITIONS, ModBlocks.livingwood.getDefaultState(), false, converters)) - return false; - if(!check2DArray(GLIMMERING_LIVINGWOOD_POSITIONS, ModBlocks.livingwoodGlimmering.getDefaultState(), false, converters)) - return false; - // if(!check2DArray(PYLON_POSITIONS, ModBlocks.pylon.getDefaultState().with(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA), false, converters)) - // return false; - // if(!check2DArray(POOL_POSITIONS, ModBlocks.pool.getDefaultState(), true, converters)) - // return false; + Rotation rot = MULTIBLOCK.getValue().validate(world, getPos()); + if (rot == null) + return AlfPortalState.OFF; lightPylons(); - return true; + switch (rot) { + default: + case NONE: + case CLOCKWISE_180: return AlfPortalState.ON_Z; + case CLOCKWISE_90: + case COUNTERCLOCKWISE_90: return AlfPortalState.ON_X; + } } public List locatePylons() { @@ -405,32 +395,6 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { return false; } - @SafeVarargs - private final boolean check2DArray(BlockPos[] positions, BlockState state, boolean onlyCheckBlock, Function... converters) { - for(BlockPos pos : positions) { - for(Function f : converters) - if(f != null) - pos = f.apply(pos); - - if(!checkPosition(pos, state, onlyCheckBlock)) - return false; - } - - return true; - } - - private boolean checkPosition(BlockPos pos, BlockState state, boolean onlyCheckBlock) { - BlockPos pos_ = getPos().add(pos); - - BlockState stateat = world.getBlockState(pos_); - Block blockat = stateat.getBlock(); - - if(state.getBlock() == Blocks.AIR ? blockat.isAir(stateat, world, pos_) : blockat == state.getBlock()) - return onlyCheckBlock || stateat == state; - - return false; - } - @Nonnull @Override public AxisAlignedBB getRenderBoundingBox() {