Delete ISpecialFlower interface

This commit is contained in:
Vincent Lee committed 2019-12-05 21:43:53 -06:00
1 parent 9593c82e0e
commit 0a947d806c
9 files changed
+15 -49

No files matched your search

@@ -82,11 +82,6 @@ public class DummyMethodHandler implements IInternalMethodHandler {
return 0;
}
@Override
public boolean isBotaniaFlower(World world, BlockPos pos) {
return false;
}
@Override
public List<IWrappedInventory> wrapInventory(List<InvWithLocation> inventories) {
return null;
@@ -64,8 +64,6 @@ public interface IInternalMethodHandler {
public long getWorldElapsedTicks();
public boolean isBotaniaFlower(World world, BlockPos pos);
/**
* Wrap inventories in the network into wrappers providing compatibility for storage mods.
*/
@@ -1,21 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jan 22, 2014, 7:12:28 PM (GMT)]
*/
package vazkii.botania.api.subtile;
/**
* The special flowers in botania implement this. Used for cases where
* BlockFlower would be checked against, but isn't convenient for
* the special flowers with effects. For Azanor and Lycaon.
*/
// todo 1.14 remove
public interface ISpecialFlower {
}
@@ -28,7 +28,6 @@ import net.minecraft.world.storage.loot.LootContext;
import net.minecraft.world.storage.loot.LootParameters;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
@@ -39,7 +38,7 @@ import java.util.List;
import java.util.Random;
import java.util.function.Supplier;
public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, IWandHUD {
public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements IWandable, IWandHUD {
private final Supplier<? extends TileEntitySpecialFlower> teProvider;
public BlockFloatingSpecialFlower(Properties props, Supplier<? extends TileEntitySpecialFlower> teProvider) {
@@ -35,7 +35,6 @@ import net.minecraft.world.storage.loot.LootParameters;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
@@ -45,7 +44,7 @@ import javax.annotation.Nonnull;
import java.util.List;
import java.util.function.Supplier;
public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, IWandable, IWandHUD {
public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandHUD {
private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8);
private final Supplier<? extends TileEntitySpecialFlower> teProvider;
@@ -11,6 +11,7 @@
package vazkii.botania.common.block.tile;
import com.google.common.base.Predicates;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
@@ -50,6 +51,7 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.ModTags;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -389,17 +391,22 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl
return true;
}
private static boolean isValidFlower(BlockState b) {
return b.isIn(ModTags.Blocks.FLOATING_FLOWERS) || b.isIn(ModTags.Blocks.MYSTICAL_FLOWERS) || b.isIn(ModTags.Blocks.SPECIAL_FLOWERS);
}
public static boolean canEnchanterExist(World world, BlockPos pos, Direction.Axis axis) {
for(BlockPos obsidian : OBSIDIAN_LOCATIONS)
if(world.getBlockState(pos.add(obsidian)).getBlock() != Blocks.OBSIDIAN)
return false;
for(BlockPos pylon : PYLON_LOCATIONS.get(axis))
if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.manaPylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(pylon).down()))
if(world.getBlockState(pos.add(pylon)).getBlock() != ModBlocks.manaPylon
|| !isValidFlower(world.getBlockState(pos.add(pylon).down())))
return false;
for(BlockPos flower : FLOWER_LOCATIONS)
if(!BotaniaAPI.internalHandler.isBotaniaFlower(world, pos.add(flower)))
if(!isValidFlower(world.getBlockState(pos.add(flower))))
return false;
return true;
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.core.handler;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -28,7 +27,6 @@ import vazkii.botania.api.corporea.IWrappedInventory;
import vazkii.botania.api.corporea.InvWithLocation;
import vazkii.botania.api.internal.DummyMethodHandler;
import vazkii.botania.api.internal.IManaNetwork;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.api.subtile.TileEntityFunctionalFlower;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
@@ -36,9 +34,7 @@ import vazkii.botania.client.core.handler.BossBarHandler;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia;
import vazkii.botania.common.integration.corporea.WrappedIInventory;
import vazkii.botania.common.item.ModItems;
@@ -118,12 +114,6 @@ public class InternalMethodHandler extends DummyMethodHandler {
return Botania.proxy.getWorldElapsedTicks();
}
@Override
public boolean isBotaniaFlower(World world, BlockPos pos) {
Block block = world.getBlockState(pos).getBlock();
return block instanceof BlockModFlower || block instanceof BlockFloatingFlower || block instanceof ISpecialFlower;
}
@Override
public List<IWrappedInventory> wrapInventory(List<InvWithLocation> inventories) {
List<IWrappedInventory> arrayList = new ArrayList<IWrappedInventory>();
@@ -29,8 +29,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.item.IHornHarvestable;
import vazkii.botania.api.item.IHornHarvestable.EnumHornType;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.ModTags;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@@ -91,7 +91,7 @@ public class ItemHorn extends ItemMod {
Block block = world.getBlockState(pos).getBlock();
if(block instanceof IHornHarvestable
? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type)
: type == EnumHornType.WILD && block instanceof BushBlock && !(block instanceof ISpecialFlower)
: type == EnumHornType.WILD && block instanceof BushBlock && !block.isIn(ModTags.Blocks.SPECIAL_FLOWERS)
|| type == EnumHornType.CANOPY && BlockTags.LEAVES.contains(block)
|| type == EnumHornType.COVERING && block == Blocks.SNOW)
coords.add(pos.toImmutable());
@@ -32,7 +32,6 @@ import vazkii.botania.api.item.IBlockProvider;
import vazkii.botania.api.item.IManaProficiencyArmor;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.api.subtile.ISpecialFlower;
import vazkii.botania.client.fx.SparkleParticleData;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.item.ItemMod;
@@ -110,7 +109,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP
BlockState state_ = world.getBlockState(pos_);
Block block_ = state_.getBlock();
if(state_.isAir(world, pos_) || state_.getMaterial().isReplaceable()
|| block_ instanceof FlowerBlock && !(block_ instanceof ISpecialFlower)
|| block_ instanceof FlowerBlock && !block_.isIn(ModTags.Blocks.SPECIAL_FLOWERS)
|| block_ instanceof DoublePlantBlock) {
airBlocks.add(pos_);
}
@@ -150,7 +149,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP
private final Block block;
private CoordsWithBlock(BlockPos pos, Block block) {
super(pos.getX(), pos.getY(), pos.getZ());
super(pos);
this.block = block;
}