mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-16 01:55:15 +00:00
Get rid of BlockContainer
This commit is contained in:
1 parent
19ed5877df
commit
3c5f588431
57 files changed
+347
-182
No files matched your search
@@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable {
|
||||
public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable {
|
||||
|
||||
public BlockAlfPortal() {
|
||||
super(Material.wood);
|
||||
@@ -59,7 +59,12 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileAlfPortal();
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockAltar extends BlockModContainer implements ILexiconable {
|
||||
public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -259,7 +259,12 @@ public class BlockAltar extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileAltar();
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockAvatar extends BlockModContainer implements ILexiconable {
|
||||
public class BlockAvatar extends BlockMod implements ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -163,7 +163,12 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileAvatar();
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockBifrost extends BlockModContainer implements ILexiconable {
|
||||
public class BlockBifrost extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockBifrost() {
|
||||
super(Material.glass);
|
||||
@@ -81,7 +81,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileBifrost();
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.tile.TileCacophonium;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockCacophonium extends BlockModContainer {
|
||||
public class BlockCacophonium extends BlockMod {
|
||||
|
||||
protected BlockCacophonium() {
|
||||
super(Material.wood);
|
||||
@@ -98,7 +98,12 @@ public class BlockCacophonium extends BlockModContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileCacophonium();
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import vazkii.botania.common.block.tile.TileCamo;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public abstract class BlockCamo extends BlockModContainer<TileCamo> {
|
||||
public abstract class BlockCamo extends BlockMod {
|
||||
|
||||
protected BlockCamo(Material par2Material) {
|
||||
super(par2Material);
|
||||
@@ -102,4 +102,9 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
|
||||
return 0xFFFFFF;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileCell;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockCell extends BlockModContainer implements ILexiconable {
|
||||
public class BlockCell extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockCell() {
|
||||
super(Material.gourd);
|
||||
@@ -41,7 +41,12 @@ public class BlockCell extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileCell();
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import vazkii.botania.common.block.tile.TileCocoon;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockCocoon extends BlockModContainer implements ILexiconable {
|
||||
public class BlockCocoon extends BlockMod implements ILexiconable {
|
||||
|
||||
protected BlockCocoon() {
|
||||
super(Material.cloth);
|
||||
@@ -81,7 +81,12 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileCocoon();
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.TileEnderEye;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockEnderEye extends BlockModContainer implements ILexiconable {
|
||||
public class BlockEnderEye extends BlockMod implements ILexiconable {
|
||||
|
||||
protected BlockEnderEye() {
|
||||
super(Material.iron);
|
||||
@@ -64,7 +64,12 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileEnderEye();
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import vazkii.botania.common.block.tile.TileFakeAir;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockFakeAir extends BlockModContainer {
|
||||
public class BlockFakeAir extends BlockMod {
|
||||
|
||||
public BlockFakeAir() {
|
||||
super(Material.air);
|
||||
@@ -127,7 +127,12 @@ public class BlockFakeAir extends BlockModContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileFakeAir();
|
||||
}
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileFloatingSpecialFlower();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileForestEye;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockForestEye extends BlockModContainer implements ILexiconable {
|
||||
public class BlockForestEye extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockForestEye() {
|
||||
super(Material.iron);
|
||||
@@ -55,7 +56,12 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileForestEye();
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockHourglass extends BlockModContainer implements IManaTrigger, IWandable, IWandHUD, ILexiconable {
|
||||
public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -181,7 +181,12 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileHourglass();
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockIncensePlate extends BlockModContainer implements ILexiconable {
|
||||
public class BlockIncensePlate extends BlockMod implements ILexiconable {
|
||||
|
||||
protected BlockIncensePlate() {
|
||||
super(Material.wood);
|
||||
@@ -136,7 +136,12 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileIncensePlate();
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable {
|
||||
public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable {
|
||||
|
||||
protected BlockLightRelay() {
|
||||
super(Material.glass);
|
||||
@@ -150,7 +150,12 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileLightRelay();
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public class BlockMod extends Block {
|
||||
return super.setLightLevel(p_149715_1_);
|
||||
}
|
||||
|
||||
boolean registerInCreative() {
|
||||
protected boolean registerInCreative() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,61 +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 14, 2014, 5:32:55 PM (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.block.ItemBlockMod;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public abstract class BlockModContainer<T extends TileEntity> extends BlockContainer {
|
||||
|
||||
public int originalLight;
|
||||
|
||||
protected BlockModContainer(Material par2Material) {
|
||||
super(par2Material);
|
||||
if(registerInCreative())
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType() {
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block setUnlocalizedName(String par1Str) {
|
||||
if(shouldRegisterInNameSet())
|
||||
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
|
||||
return super.setUnlocalizedName(par1Str);
|
||||
}
|
||||
|
||||
protected boolean shouldRegisterInNameSet() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block setLightLevel(float p_149715_1_) {
|
||||
originalLight = (int) (p_149715_1_ * 15);
|
||||
return super.setLightLevel(p_149715_1_);
|
||||
}
|
||||
|
||||
public boolean registerInCreative() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public abstract T createNewTileEntity(World world, int meta);
|
||||
|
||||
}
|
||||
@@ -49,7 +49,7 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD {
|
||||
public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -167,8 +167,13 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
return meta == 0 ? new TileOpenCrate() : new TileCraftCrate();
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return state.getValue(BotaniaStateProps.CRATE_VARIANT) == CrateVariant.OPEN ? new TileOpenCrate() : new TileCraftCrate();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,6 +22,7 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
@@ -131,7 +132,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileCamo createNewTileEntity(World world, int meta) {
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TilePlatform();
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ import net.minecraftforge.fml.common.Optional;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
|
||||
public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser {
|
||||
public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser {
|
||||
|
||||
public BlockPylon() {
|
||||
super(Material.iron);
|
||||
@@ -117,7 +117,12 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TilePylon();
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockSparkChanger extends BlockModContainer implements ILexiconable {
|
||||
public class BlockSparkChanger extends BlockMod implements ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -171,7 +171,12 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileSparkChanger();
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD {
|
||||
public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD {
|
||||
|
||||
static {
|
||||
BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] {
|
||||
@@ -257,7 +257,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileSpecialFlower();
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable {
|
||||
public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockTeruTeruBozu() {
|
||||
super(Material.cloth);
|
||||
@@ -112,7 +112,12 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileTeruTeruBozu();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -22,7 +23,7 @@ import vazkii.botania.common.block.tile.TileTinyPlanet;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockTinyPlanet extends BlockModContainer implements ILexiconable {
|
||||
public class BlockTinyPlanet extends BlockMod implements ILexiconable {
|
||||
|
||||
protected BlockTinyPlanet() {
|
||||
super(Material.rock);
|
||||
@@ -45,7 +46,12 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileTinyPlanet();
|
||||
}
|
||||
|
||||
|
||||
@@ -24,11 +24,10 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.common.achievement.ICraftAchievement;
|
||||
import vazkii.botania.common.achievement.ModAchievements;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaBase;
|
||||
|
||||
public abstract class BlockCorporeaBase extends BlockModContainer<TileCorporeaBase> implements ICraftAchievement {
|
||||
public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -82,4 +81,9 @@ public abstract class BlockCorporeaBase extends BlockModContainer<TileCorporeaBa
|
||||
return ModAchievements.corporeaCraft;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -103,7 +103,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileCorporeaBase createNewTileEntity(World world, int meta) {
|
||||
public TileCorporeaBase createTileEntity(World world, IBlockState state) {
|
||||
return new TileCorporeaCrystalCube();
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileCorporeaBase createNewTileEntity(World world, int meta) {
|
||||
public TileCorporeaBase createTileEntity(World world, IBlockState state) {
|
||||
return new TileCorporeaFunnel();
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileCorporeaBase createNewTileEntity(World world, int meta) {
|
||||
public TileCorporeaBase createTileEntity(World world, IBlockState state) {
|
||||
return new TileCorporeaIndex();
|
||||
}
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileCorporeaBase createNewTileEntity(World world, int meta) {
|
||||
public TileCorporeaBase createTileEntity(World world, IBlockState state) {
|
||||
return new TileCorporeaInterceptor();
|
||||
}
|
||||
|
||||
|
||||
@@ -26,12 +26,12 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.achievement.ICraftAchievement;
|
||||
import vazkii.botania.common.achievement.ModAchievements;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockCorporeaRetainer extends BlockModContainer implements ILexiconable, ICraftAchievement {
|
||||
public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement {
|
||||
|
||||
public BlockCorporeaRetainer() {
|
||||
super(Material.iron);
|
||||
@@ -79,7 +79,12 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileCorporeaRetainer();
|
||||
}
|
||||
|
||||
|
||||
@@ -44,8 +44,8 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.api.item.IFloatingFlower.IslandType;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileFloatingFlower;
|
||||
import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -61,7 +61,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
|
||||
public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser {
|
||||
public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfusionStabiliser {
|
||||
|
||||
public BlockFloatingFlower() {
|
||||
this(LibBlockNames.MINI_ISLAND);
|
||||
@@ -232,7 +232,12 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileFloatingFlower();
|
||||
}
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@ import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileManaBeacon;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockManaBeacon extends BlockModContainer implements ILexiconable {
|
||||
public class BlockManaBeacon extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockManaBeacon() {
|
||||
super(Material.iron);
|
||||
@@ -114,7 +114,12 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileManaBeacon();
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileManaFlame;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
@@ -35,7 +35,7 @@ import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.world.WorldTypeSkyblock;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
public class BlockManaFlame extends BlockModContainer implements ILexiconable {
|
||||
public class BlockManaFlame extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockManaFlame() {
|
||||
super(Material.cloth);
|
||||
@@ -104,7 +104,12 @@ public class BlockManaFlame extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileManaFlame();
|
||||
}
|
||||
|
||||
|
||||
@@ -22,12 +22,12 @@ import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileStarfield;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockStarfield extends BlockModContainer implements ILexiconable {
|
||||
public class BlockStarfield extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockStarfield() {
|
||||
super(Material.iron);
|
||||
@@ -70,7 +70,12 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileStarfield();
|
||||
}
|
||||
|
||||
|
||||
@@ -30,14 +30,14 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.achievement.ModAchievements;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileTinyPotato;
|
||||
import vazkii.botania.common.item.block.ItemBlockTinyPotato;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockTinyPotato extends BlockModContainer implements ILexiconable {
|
||||
public class BlockTinyPotato extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockTinyPotato() {
|
||||
super(Material.cloth);
|
||||
@@ -148,7 +148,12 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileTinyPotato();
|
||||
}
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockBellows extends BlockModContainer implements ILexiconable {
|
||||
public class BlockBellows extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockBellows() {
|
||||
super(Material.wood);
|
||||
@@ -88,7 +88,12 @@ public class BlockBellows extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileBellows();
|
||||
}
|
||||
|
||||
|
||||
@@ -29,13 +29,13 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileBrewery;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD {
|
||||
public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -157,7 +157,12 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileBrewery();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -18,12 +19,12 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileDistributor;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockDistributor extends BlockModContainer implements ILexiconable {
|
||||
public class BlockDistributor extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockDistributor() {
|
||||
super(Material.rock);
|
||||
@@ -39,7 +40,12 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileDistributor();
|
||||
}
|
||||
|
||||
|
||||
@@ -34,13 +34,13 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileEnchanter;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD {
|
||||
public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -80,7 +80,12 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileEnchanter();
|
||||
}
|
||||
|
||||
|
||||
@@ -29,12 +29,12 @@ import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileManaDetector;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockManaDetector extends BlockModContainer implements ILexiconable {
|
||||
public class BlockManaDetector extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockManaDetector() {
|
||||
super(Material.rock);
|
||||
@@ -77,7 +77,12 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileManaDetector();
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -24,12 +25,12 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileManaVoid;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider {
|
||||
public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider {
|
||||
|
||||
public BlockManaVoid() {
|
||||
super(Material.rock);
|
||||
@@ -40,7 +41,12 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int id) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileManaVoid();
|
||||
}
|
||||
|
||||
|
||||
@@ -43,14 +43,14 @@ import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.common.achievement.ICraftAchievement;
|
||||
import vazkii.botania.common.achievement.ModAchievements;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.item.block.ItemBlockPool;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable, ICraftAchievement {
|
||||
public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable, ICraftAchievement {
|
||||
|
||||
boolean lastFragile = false;
|
||||
|
||||
@@ -127,7 +127,12 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TilePool();
|
||||
}
|
||||
|
||||
|
||||
@@ -34,13 +34,13 @@ import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.mana.IManaTrigger;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.block.tile.mana.TilePrism;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable {
|
||||
public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -183,7 +183,12 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TilePrism();
|
||||
}
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ import net.minecraftforge.common.property.IUnlistedProperty;
|
||||
import net.minecraftforge.common.property.Properties;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TilePump;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockPump extends BlockModContainer implements ILexiconable {
|
||||
public class BlockPump extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockPump() {
|
||||
super(Material.rock);
|
||||
@@ -112,8 +112,14 @@ public class BlockPump extends BlockModContainer implements ILexiconable {
|
||||
return LexiconData.poolCart;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TilePump();
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -19,13 +20,13 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileRFGenerator;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
|
||||
public class BlockRFGenerator extends BlockModContainer implements ILexiconable {
|
||||
public class BlockRFGenerator extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockRFGenerator() {
|
||||
super(Material.rock);
|
||||
@@ -44,7 +45,12 @@ public class BlockRFGenerator extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileRFGenerator();
|
||||
}
|
||||
|
||||
|
||||
@@ -26,13 +26,13 @@ import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable {
|
||||
public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -123,7 +123,12 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileRuneAltar();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.mana;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -23,12 +24,12 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileSpawnerClaw;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable {
|
||||
public class BlockSpawnerClaw extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockSpawnerClaw() {
|
||||
super(Material.iron);
|
||||
@@ -57,7 +58,12 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileSpawnerClaw();
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ import vazkii.botania.api.state.enums.SpreaderVariant;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.api.wand.IWireframeAABBProvider;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileSpreader;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
|
||||
@@ -49,7 +49,7 @@ import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider {
|
||||
public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider {
|
||||
|
||||
Random random;
|
||||
|
||||
@@ -239,7 +239,12 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileSpreader();
|
||||
}
|
||||
|
||||
|
||||
@@ -24,14 +24,14 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.TileTerraPlate;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
public class BlockTerraPlate extends BlockModContainer implements ILexiconable {
|
||||
public class BlockTerraPlate extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockTerraPlate() {
|
||||
super(Material.iron);
|
||||
@@ -85,7 +85,12 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileTerraPlate();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -23,12 +24,12 @@ import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.wand.IWandHUD;
|
||||
import vazkii.botania.api.wand.IWandable;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.mana.TileTurntable;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable {
|
||||
public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable {
|
||||
|
||||
public BlockTurntable() {
|
||||
super(Material.wood);
|
||||
@@ -38,7 +39,12 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, IBlockState state) {
|
||||
return new TileTurntable();
|
||||
}
|
||||
|
||||
|
||||
@@ -22,12 +22,12 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.ILexiconable;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.common.block.BlockMod;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
|
||||
public abstract class BlockRedString extends BlockModContainer<TileRedString> implements ILexiconable {
|
||||
public abstract class BlockRedString extends BlockMod implements ILexiconable {
|
||||
|
||||
public BlockRedString(String name) {
|
||||
super(Material.rock);
|
||||
@@ -58,6 +58,11 @@ public abstract class BlockRedString extends BlockModContainer<TileRedString> im
|
||||
return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
|
||||
return LexiconData.redString;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
@@ -36,7 +37,7 @@ public class BlockRedStringComparator extends BlockRedString {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState state) {
|
||||
return new TileRedStringComparator();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -25,7 +26,7 @@ public class BlockRedStringContainer extends BlockRedString {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState state) {
|
||||
return new TileRedStringContainer();
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ public class BlockRedStringDispenser extends BlockRedString {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState meta) {
|
||||
return new TileRedStringDispenser();
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState meta) {
|
||||
return new TileRedStringFertilizer();
|
||||
}
|
||||
}
|
||||
@@ -86,7 +86,7 @@ public class BlockRedStringInterceptor extends BlockRedString {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState state) {
|
||||
return new TileRedStringInterceptor();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.string;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -25,7 +26,7 @@ public class BlockRedStringRelay extends BlockRedString {
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(World world, int meta) {
|
||||
public TileRedString createTileEntity(World world, IBlockState state) {
|
||||
return new TileRedStringRelay();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user