diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 890b09918..6af2131f8 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -21,7 +21,11 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.decor.BlockManaBeacon; +import vazkii.botania.common.block.decor.BlockMiniIsland; +import vazkii.botania.common.block.decor.BlockPrismarine; +import vazkii.botania.common.block.decor.BlockSeaLamp; import vazkii.botania.common.block.decor.BlockShinyFlower; +import vazkii.botania.common.block.decor.BlockTinyPotato; import vazkii.botania.common.block.decor.BlockUnstable; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; diff --git a/MODSRC/vazkii/botania/common/block/BlockMiniIsland.java b/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java similarity index 97% rename from MODSRC/vazkii/botania/common/block/BlockMiniIsland.java rename to MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java index e24f69cd2..849bbc5fe 100644 --- a/MODSRC/vazkii/botania/common/block/BlockMiniIsland.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockMiniIsland.java @@ -9,7 +9,7 @@ * * File Created @ [Jul 8, 2014, 10:16:53 PM (GMT)] */ -package vazkii.botania.common.block; +package vazkii.botania.common.block.decor; import java.util.List; import java.util.Random; @@ -30,6 +30,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileMiniIsland; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; diff --git a/MODSRC/vazkii/botania/common/block/BlockPrismarine.java b/MODSRC/vazkii/botania/common/block/decor/BlockPrismarine.java similarity index 96% rename from MODSRC/vazkii/botania/common/block/BlockPrismarine.java rename to MODSRC/vazkii/botania/common/block/decor/BlockPrismarine.java index a89b72f5b..965003068 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPrismarine.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -9,7 +9,7 @@ * * File Created @ [Jun 28, 2014, 8:25:39 PM (GMT)] */ -package vazkii.botania.common.block; +package vazkii.botania.common.block.decor; import java.util.List; @@ -26,6 +26,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockSeaLamp.java b/MODSRC/vazkii/botania/common/block/decor/BlockSeaLamp.java similarity index 92% rename from MODSRC/vazkii/botania/common/block/BlockSeaLamp.java rename to MODSRC/vazkii/botania/common/block/decor/BlockSeaLamp.java index 53c625f85..88de1e092 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSeaLamp.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -9,7 +9,7 @@ * * File Created @ [Jun 28, 2014, 9:24:43 PM (GMT)] */ -package vazkii.botania.common.block; +package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockTinyPotato.java b/MODSRC/vazkii/botania/common/block/decor/BlockTinyPotato.java similarity index 95% rename from MODSRC/vazkii/botania/common/block/BlockTinyPotato.java rename to MODSRC/vazkii/botania/common/block/decor/BlockTinyPotato.java index 4e3c52eab..4e34c5cb1 100644 --- a/MODSRC/vazkii/botania/common/block/BlockTinyPotato.java +++ b/MODSRC/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -9,7 +9,7 @@ * * File Created @ [Jul 18, 2014, 7:58:08 PM (GMT)] */ -package vazkii.botania.common.block; +package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,13 +24,14 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; public class BlockTinyPotato extends BlockModContainer implements ILexiconable { - protected BlockTinyPotato() { + public BlockTinyPotato() { super(Material.cloth); setHardness(0.25F); setBlockName(LibBlockNames.TINY_POTATO);