Remove blockfaceshape

This commit is contained in:
Vincent Lee committed 2019-06-08 01:19:50 -07:00
1 parent 7ef12b61d8
commit 0e3c5949a1
31 files changed
+2 -208

No files matched your search

@@ -11,7 +11,6 @@
package vazkii.botania.common.block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.LivingEntity;
@@ -139,12 +138,6 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig
return true;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
@Override
public void onPlayerDestroy(IWorld world, BlockPos pos, BlockState state) {
// TE is already gone so best we can do is just notify everyone
@@ -13,7 +13,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
@@ -117,12 +116,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
return new TileAvatar();
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return LexiconData.avatar;
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity;
@@ -138,11 +137,4 @@ public class BlockCocoon extends BlockMod implements ILexiconable {
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return LexiconData.cocoon;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side.getAxis() == Direction.Axis.Y ? BlockFaceShape.CENTER_BIG : BlockFaceShape.MIDDLE_POLE_THICK;
}
}
@@ -14,7 +14,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -75,12 +74,6 @@ public class BlockEnderEye extends BlockMod implements ILexiconable {
return LexiconData.enderEyeBlock;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
@Override
public void animateTick(BlockState state, World world, BlockPos pos, Random rand) {
if(state.get(BotaniaStateProps.POWERED)) {
@@ -16,7 +16,6 @@ import net.minecraft.block.AirBlock;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.block.Blocks;
@@ -11,7 +11,6 @@
package vazkii.botania.common.block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -73,10 +72,4 @@ public class BlockForestEye extends BlockMod implements ILexiconable {
return LexiconData.forestEye;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
@@ -187,10 +186,4 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
return LexiconData.hourglass;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -134,10 +133,4 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
return LexiconData.incense;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
@@ -105,10 +104,4 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
return LexiconData.luminizerTransport;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -130,10 +129,4 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
return LexiconData.luminizerTransport;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -86,10 +85,4 @@ public class BlockPylon extends BlockMod implements ILexiconable {
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return variant == Variant.MANA ? LexiconData.pylon : variant == Variant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -14,7 +14,6 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -139,10 +138,4 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
return LexiconData.sparkChanger;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.Blocks;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.ItemEntity;
@@ -141,10 +140,4 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
return LexiconData.teruTeruBozu;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -74,10 +73,4 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaColl
public boolean isGhost(BlockState state, World world, BlockPos pos) {
return true;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -14,7 +14,6 @@ import net.minecraft.block.Block;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -113,10 +112,4 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) {
return ((TileCorporeaCrystalCube) world.getTileEntity(pos)).getComparatorValue();
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.decor;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.item.DyeColor;
import net.minecraft.item.Item;
@@ -44,8 +43,8 @@ public class BlockBuriedPetals extends BlockModFlower {
@Nonnull
@Override
@OnlyIn(Dist.CLIENT)
public Block.EnumOffsetType getOffsetType() {
return Block.EnumOffsetType.NONE;
public Block.OffsetType getOffsetType() {
return Block.OffsetType.NONE;
}
@Nonnull
@@ -80,10 +79,4 @@ public class BlockBuriedPetals extends BlockModFlower {
return BlockRenderType.INVISIBLE;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -14,7 +14,6 @@ import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.DyeColor;
@@ -143,10 +142,4 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable {
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return LexiconData.shinyFlowers;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -11,7 +11,6 @@
package vazkii.botania.common.block.decor;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -102,10 +101,4 @@ public class BlockManaFlame extends BlockMod implements ILexiconable {
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return LexiconData.lenses;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -11,7 +11,6 @@
package vazkii.botania.common.block.decor;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -77,10 +76,4 @@ public class BlockStarfield extends BlockMod implements ILexiconable {
return LexiconData.starfield;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.decor;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -157,10 +156,4 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return LexiconData.tinyPotato;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -101,10 +100,4 @@ public class BlockBellows extends BlockMod implements ILexiconable {
return LexiconData.bellows;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -129,10 +128,4 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
((TileBrewery) world.getTileEntity(pos)).renderHUD(mc);
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.entity.MobEntity;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.passive.CowEntity;
@@ -146,10 +145,4 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
}
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
@@ -158,10 +157,4 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
public LexiconEntry getEntry(World world, BlockPos pos, PlayerEntity player, ItemStack lexicon) {
return variant == Variant.FABULOUS ? LexiconData.rainbowRod : LexiconData.pool;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -11,7 +11,6 @@
package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -152,10 +151,4 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable,
public boolean isGhost(BlockState state, World world, BlockPos pos) {
return true;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side.getAxis() == Direction.Axis.Y ? BlockFaceShape.CENTER_BIG : BlockFaceShape.MIDDLE_POLE_THICK;
}
}
@@ -11,7 +11,6 @@
package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -98,10 +97,4 @@ public class BlockPump extends BlockMod implements ILexiconable {
public TileEntity createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) {
return new TilePump();
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -128,10 +127,4 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable
return LexiconData.runicAltar;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.block.mana;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.block.Blocks;
@@ -72,10 +71,4 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable {
return LexiconData.spawnerClaw;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -16,7 +16,6 @@ import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.LivingEntity;
@@ -216,10 +215,4 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
public List<AxisAlignedBB> getWireframeAABB(World world, BlockPos pos) {
return ImmutableList.of(new AxisAlignedBB(pos).shrink(1.0/16.0));
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.mana;
import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.item.ItemEntity;
@@ -117,10 +116,4 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable {
return val;
}
@Nonnull
@Override
public BlockFaceShape getBlockFaceShape(IBlockReader world, BlockState state, BlockPos pos, Direction side) {
return side == Direction.DOWN ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED;
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.item.rod;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;