A bunch of decorative blocks

This commit is contained in:
Vincent Lee committed 2019-02-27 00:18:58 -06:00
1 parent a5625750b7
commit 5cc374eaaf
37 files changed
+203 -1040

No files matched your search

@@ -120,16 +120,6 @@ public final class BotaniaStateProps {
// BlockCraftyCrate
public static final EnumProperty<CratePattern> CRATE_PATTERN = EnumProperty.create("pattern", CratePattern.class);
// BlockPavement
public static final EnumProperty<EnumDyeColor> PAVEMENT_COLOR = EnumProperty.create("color", EnumDyeColor.class, new Predicate<EnumDyeColor>() {
@Override
public boolean apply(EnumDyeColor color) {
return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK
|| color == EnumDyeColor.BLUE || color == EnumDyeColor.RED
|| color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN;
}
});
// BlockPrism
public static final BooleanProperty HAS_LENS = BooleanProperty.create("has_lens");
@@ -24,7 +24,7 @@ import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lib.LibMisc;
public abstract class BlockMod extends Block {
public class BlockMod extends Block {
public BlockMod(Block.Properties builder) {
super(builder);
@@ -761,7 +761,7 @@ public final class ModBlocks {
initOreDict();
}
private static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, String name) {
public static <V extends IForgeRegistryEntry<V>> void register(IForgeRegistry<V> reg, IForgeRegistryEntry<V> thing, String name) {
reg.register(thing.setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)));
}
@@ -955,4 +955,26 @@ public final class ModBlocks {
}
}
public static Block getBuriedPetal(EnumDyeColor color) {
switch (color) {
default:
case WHITE: return whiteBuriedPetals;
case ORANGE: return orangeBuriedPetals;
case MAGENTA: return magentaBuriedPetals;
case LIGHT_BLUE: return lightBlueBuriedPetals;
case YELLOW: return yellowBuriedPetals;
case LIME: return limeBuriedPetals;
case PINK: return pinkBuriedPetals;
case GRAY: return grayBuriedPetals;
case LIGHT_GRAY: return lightGrayBuriedPetals;
case CYAN: return cyanBuriedPetals;
case PURPLE: return purpleBuriedPetals;
case BLUE: return blueBuriedPetals;
case BROWN: return brownBuriedPetals;
case GREEN: return greenBuriedPetals;
case RED: return redBuriedPetals;
case BLACK: return blackBuriedPetals;
}
}
}
@@ -12,53 +12,34 @@ package vazkii.botania.common.block;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeBrickVariant;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.common.block.decor.BlockPavement;
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA;
import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB;
import vazkii.botania.common.block.decor.panes.BlockAlfglassPane;
import vazkii.botania.common.block.decor.panes.BlockBifrostPane;
import vazkii.botania.common.block.decor.panes.BlockManaglassPane;
import vazkii.botania.common.block.decor.panes.BlockModPane;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab;
import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs;
import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab;
import vazkii.botania.common.block.decor.slabs.BlockModSlab;
import vazkii.botania.common.block.decor.slabs.BlockPavementSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodPlankSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockDreamwoodSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockBrickSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingrockSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodPlankSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab;
import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab;
import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs;
import vazkii.botania.common.block.decor.stairs.BlockModStairs;
import vazkii.botania.common.block.decor.stairs.BlockPavementStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodPlankStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockBrickStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingrockStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodPlankStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockLivingwoodStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerrockStairs;
import vazkii.botania.common.block.decor.stairs.living.BlockShimmerwoodPlankStairs;
import vazkii.botania.common.block.decor.walls.BlockBiomeStoneWall;
import vazkii.botania.common.block.decor.walls.living.BlockDreamwoodWall;
import vazkii.botania.common.block.decor.walls.living.BlockLivingrockWall;
import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.block.decor.walls.BlockModWall;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.item.block.ItemBlockSpecialQuartz;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
@@ -67,27 +48,29 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import static vazkii.botania.common.block.ModBlocks.register;
import static vazkii.botania.common.lib.LibBlockNames.STAIR_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.SLAB_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.WALL_SUFFIX;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
public final class ModFluffBlocks {
public static List<Block> slabsToRegister = new ArrayList<>();
public static final Block livingwoodStairs = new BlockModStairs(ModBlocks.livingwood.getDefaultState(), Block.Builder.from(ModBlocks.livingwood));
public static final Block livingwoodSlab = new BlockLivingwoodSlab(false);
public static final Block livingwoodWall = new BlockLivingwoodWall();
public static final Block livingwoodPlankStairs = new BlockLivingwoodPlankStairs();
public static final Block livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false);
public static final Block livingrockStairs = new BlockLivingrockStairs();
public static final Block livingrockSlab = new BlockLivingrockSlab(false);
public static final Block livingrockSlabFull = new BlockLivingrockSlab(true);
public static final Block livingrockWall = new BlockLivingrockWall();
public static final Block livingrockBrickStairs = new BlockLivingrockBrickStairs();
public static final Block livingrockBrickSlab = new BlockLivingrockBrickSlab(false);
public static final Block dreamwoodStairs = new BlockDreamwoodStairs();
public static final Block dreamwoodSlab = new BlockDreamwoodSlab(false);
public static final Block dreamwoodWall = new BlockDreamwoodWall();
public static final Block dreamwoodPlankStairs = new BlockDreamwoodPlankStairs();
public static final Block dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false);
@ObjectHolder(LibBlockNames.LIVING_WOOD + STAIR_SUFFIX) public static Block livingwoodStairs;
@ObjectHolder(LibBlockNames.LIVING_WOOD + SLAB_SUFFIX) public static Block livingwoodSlab;
@ObjectHolder(LibBlockNames.LIVING_WOOD + WALL_SUFFIX) public static Block livingwoodWall;
@ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX) public static Block livingwoodPlankStairs;
@ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX) public static Block livingwoodPlankSlab;
@ObjectHolder(LibBlockNames.LIVING_ROCK + STAIR_SUFFIX) public static Block livingrockStairs;
@ObjectHolder(LibBlockNames.LIVING_ROCK + SLAB_SUFFIX) public static Block livingrockSlab;
@ObjectHolder(LibBlockNames.LIVING_ROCK + WALL_SUFFIX) public static Block livingrockWall;
@ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX) public static Block livingrockBrickStairs;
@ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX) public static Block livingrockBrickSlab;
@ObjectHolder(LibBlockNames.DREAM_WOOD + STAIR_SUFFIX) public static Block dreamwoodStairs;
@ObjectHolder(LibBlockNames.DREAM_WOOD + SLAB_SUFFIX) public static Block dreamwoodSlab;
@ObjectHolder(LibBlockNames.DREAM_WOOD + WALL_SUFFIX) public static Block dreamwoodWall;
@ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX) public static Block dreamwoodPlankStairs;
@ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX) public static Block dreamwoodPlankSlab;
public static final Block darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK);
public static final Block darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false);
@@ -113,48 +96,70 @@ public final class ModFluffBlocks {
public static final Block biomeStoneA = new BlockBiomeStoneA();
public static final Block biomeStoneB = new BlockBiomeStoneB();
public static final Block pavement = new BlockPavement();
@ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX) public static Block whitePavement;
@ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX) public static Block blackPavement;
@ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX) public static Block bluePavement;
@ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX) public static Block yellowPavement;
@ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX) public static Block redPavement;
@ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX) public static Block greenPavement;
@ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block whitePavementSlab;
@ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block blackPavementSlab;
@ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block bluePavementSlab;
@ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block yellowPavementSlab;
@ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block redPavementSlab;
@ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX) public static Block greenPavementSlab;
@ObjectHolder("white" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block whitePavementStair;
@ObjectHolder("black" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block blackPavementStair;
@ObjectHolder("blue" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block bluePavementStair;
@ObjectHolder("yellow" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block yellowPavementStair;
@ObjectHolder("red" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block redPavementStair;
@ObjectHolder("green" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX) public static Block greenPavementStair;
public static final Block[] biomeStoneStairs = new Block[24];
public static final Block[] biomeStoneSlabs = new Block[24];
public static final Block biomeStoneWall = new BlockBiomeStoneWall();
public static final Block[] pavementStairs = new Block[BlockPavement.TYPES];
public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES];
@ObjectHolder(LibBlockNames.SHIMMERROCK + SLAB_SUFFIX) public static Block shimmerrockSlab;
@ObjectHolder(LibBlockNames.SHIMMERROCK + STAIR_SUFFIX) public static Block shimmerrockStairs;
@ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS + SLAB_SUFFIX) public static Block shimmerwoodPlankSlab;
@ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS + STAIR_SUFFIX) public static Block shimmerwoodPlankStairs;
public static final Block shimmerrockSlab = new BlockShimmerrockSlab(false);
public static final Block shimmerrockStairs = new BlockShimmerrockStairs();
public static final Block shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false);
public static final Block shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs();
public static final Block managlassPane = new BlockManaglassPane();
public static final Block alfglassPane = new BlockAlfglassPane();
public static final Block bifrostPane = new BlockBifrostPane();
@ObjectHolder(LibBlockNames.MANA_GLASS + "_pane") public static Block managlassPane;
@ObjectHolder(LibBlockNames.ELF_GLASS + "_pane") public static Block alfglassPane;
@ObjectHolder(LibBlockNames.BIFROST + "_pane") public static Block bifrostPane;
@SubscribeEvent
public static void register(RegistryEvent.Register<Block> evt) {
public static void registerBlocks(RegistryEvent.Register<Block> evt) {
IForgeRegistry<Block> r = evt.getRegistry();
r.register(livingwoodStairs);
r.register(livingwoodSlab);
r.register(livingwoodWall);
r.register(livingwoodPlankStairs);
r.register(livingwoodPlankSlab);
r.register(livingrockStairs);
r.register(livingrockSlab);
r.register(livingrockSlabFull);
r.register(livingrockWall);
r.register(livingrockBrickStairs);
r.register(livingrockBrickSlab);
Block livingwood = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD));
register(r, new BlockModStairs(livingwood.getDefaultState(), Block.Properties.from(livingwood)), LibBlockNames.LIVING_WOOD + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(livingwood)), LibBlockNames.LIVING_WOOD + SLAB_SUFFIX);
register(r, new BlockModWall(Block.Properties.from(livingwood)), LibBlockNames.LIVING_WOOD + WALL_SUFFIX);
r.register(dreamwoodStairs);
r.register(dreamwoodSlab);
r.register(dreamwoodWall);
Block livingwoodPlank = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_PLANKS));
register(r, new BlockModStairs(livingwoodPlank.getDefaultState(), Block.Properties.from(livingwoodPlank)), LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(livingwoodPlank)), LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX);
Block livingrock = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK));
register(r, new BlockModStairs(livingrock.getDefaultState(), Block.Properties.from(livingrock)), LibBlockNames.LIVING_ROCK + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(livingrock)), LibBlockNames.LIVING_ROCK + SLAB_SUFFIX);
register(r, new BlockModWall(Block.Properties.from(livingrock)), LibBlockNames.LIVING_ROCK + WALL_SUFFIX);
r.register(dreamwoodPlankStairs);
r.register(dreamwoodPlankSlab);
Block livingrockBrick = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK_BRICK));
register(r, new BlockModStairs(livingrockBrick.getDefaultState(), Block.Properties.from(livingrockBrick)), LibBlockNames.LIVING_ROCK_BRICK + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(livingrockBrick)), LibBlockNames.LIVING_ROCK_BRICK + SLAB_SUFFIX);
Block dreamwood = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD));
register(r, new BlockModStairs(dreamwood.getDefaultState(), Block.Properties.from(dreamwood)), LibBlockNames.DREAM_WOOD + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(dreamwood)), LibBlockNames.DREAM_WOOD + SLAB_SUFFIX);
register(r, new BlockModWall(Block.Properties.from(dreamwood)), LibBlockNames.DREAM_WOOD + WALL_SUFFIX);
Block dreamwoodPlank = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_PLANKS));
register(r, new BlockModStairs(dreamwoodPlank.getDefaultState(), Block.Properties.from(dreamwoodPlank)), LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX);
register(r, new BlockModSlab(Block.Properties.from(dreamwoodPlank)), LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX);
r.register(darkQuartz);
r.register(darkQuartzSlab);
@@ -186,7 +191,38 @@ public final class ModFluffBlocks {
r.register(biomeStoneA);
r.register(biomeStoneB);
r.register(pavement);
Block.Properties props = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE);
Block block = new BlockMod(props);
register(r, block, "white" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "white" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "white" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
block = new BlockMod(props);
register(r, block, "black" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "black" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "black" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
block = new BlockMod(props);
register(r, block, "blue" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "blue" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
block = new BlockMod(props);
register(r, block, "red" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "red" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "red" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
block = new BlockMod(props);
register(r, block, "yellow" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "yellow" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
block = new BlockMod(props);
register(r, block, "green" + LibBlockNames.PAVEMENT_SUFFIX);
register(r, new BlockPavementStairs(block.getDefaultState(), props), "green" + LibBlockNames.PAVEMENT_SUFFIX + STAIR_SUFFIX);
register(r, new BlockPavementSlab(props), "green" + LibBlockNames.PAVEMENT_SUFFIX + SLAB_SUFFIX);
int count = 0;
for (BiomeStoneVariant variant : BiomeStoneVariant.values()) {
@@ -211,25 +247,22 @@ public final class ModFluffBlocks {
r.register(biomeStoneWall);
count = 0;
for (EnumDyeColor color : ImmutableList.of(EnumDyeColor.WHITE, EnumDyeColor.BLACK, EnumDyeColor.BLUE,
EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) {
pavementStairs[count] = new BlockPavementStairs(color);
pavementSlabs[count] = new BlockPavementSlab(false, color, count);
r.register(pavementStairs[count]);
r.register(pavementSlabs[count]);
count++;
}
Block shimmerrock = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SHIMMERROCK));
register(r, new BlockModSlab(Block.Properties.from(shimmerrock)), LibBlockNames.SHIMMERROCK + SLAB_SUFFIX);
register(r, new BlockModStairs(shimmerrock.getDefaultState(), Block.Properties.from(shimmerrock)), LibBlockNames.SHIMMERROCK + STAIR_SUFFIX);
r.register(shimmerrockSlab);
r.register(shimmerrockStairs);
r.register(shimmerwoodPlankSlab);
r.register(shimmerwoodPlankStairs);
Block shimmerwood = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SHIMMERWOOD_PLANKS));
register(r, new BlockModSlab(Block.Properties.from(shimmerwood)), LibBlockNames.SHIMMERWOOD_PLANKS + SLAB_SUFFIX);
register(r, new BlockModStairs(shimmerwood.getDefaultState(), Block.Properties.from(shimmerwood)), LibBlockNames.SHIMMERWOOD_PLANKS + STAIR_SUFFIX);
r.register(managlassPane);
r.register(alfglassPane);
r.register(bifrostPane);
Block manaGlass = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MANA_GLASS));
register(r, new BlockModPane(Block.Properties.from(manaGlass)), LibBlockNames.MANA_GLASS + "_pane");
Block elfGlass = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.ELF_GLASS));
register(r, new BlockModPane(Block.Properties.from(elfGlass)), LibBlockNames.ELF_GLASS + "_pane");
Block bifrost = r.getValue(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.BIFROST));
register(r, new BlockModPane(Block.Properties.from(bifrost)), LibBlockNames.BIFROST + "_pane");
}
@SubscribeEvent
@@ -1,108 +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 @ [Sep 1, 2015, 6:35:06 PM (GMT)]
*/
package vazkii.botania.common.block.decor;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
public class BlockPavement extends BlockMod {
public static final int TYPES = 6;
public BlockPavement() {
super(Material.ROCK, LibBlockNames.PAVEMENT);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().with(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR);
}
@Override
public int getMetaFromState(IBlockState state) {
switch (state.get(BotaniaStateProps.PAVEMENT_COLOR)) {
case GREEN: return 5;
case YELLOW: return 4;
case RED: return 3;
case BLUE: return 2;
case BLACK: return 1;
case WHITE:
default: return 0;
}
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta >= TYPES) {
meta = 0;
}
EnumDyeColor color;
switch (meta) {
case 5: color = EnumDyeColor.GREEN; break;
case 4: color = EnumDyeColor.YELLOW; break;
case 3: color = EnumDyeColor.RED; break;
case 2: color = EnumDyeColor.BLUE; break;
case 1: color = EnumDyeColor.BLACK; break;
case 0:
default: color = EnumDyeColor.WHITE; break;
}
return getDefaultState().with(BotaniaStateProps.PAVEMENT_COLOR, color);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> stacks) {
for(int i = 0; i < TYPES; i++)
stacks.add(new ItemStack(this, 1, i));
}
@Nonnull
@Override
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) {
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerBlockToState(this, BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues().size());
}
}
@@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.fluid.IFluidState;
import net.minecraft.init.Particles;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
@@ -77,17 +78,20 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
if(tile instanceof TileTinyPotato) {
((TileTinyPotato) tile).interact(player, hand, player.getHeldItem(hand), par6);
AxisAlignedBB box = SHAPE.getBoundingBox();
world.spawnParticle(Particles.HEART, pos.getX() + box.minX + Math.random() * (box.maxX - box.minX), pos.getY() + box.maxY, pos.getZ() + box.minZ + Math.random() * (box.maxZ - box.minZ), 0, 0 ,0);
world.addParticle(Particles.HEART, pos.getX() + box.minX + Math.random() * (box.maxX - box.minX), pos.getY() + box.maxY, pos.getZ() + box.minZ + Math.random() * (box.maxZ - box.minZ), 0, 0 ,0);
}
return true;
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) {
// todo 1.13 move to getstateforplacement
world.setBlockState(pos, state.with(BotaniaStateProps.CARDINALS, par5EntityLiving.getHorizontalFacing().getOpposite()));
if (par6ItemStack.hasDisplayName())
((TileTinyPotato) world.getTileEntity(pos)).name = par6ItemStack.getDisplayName();
public IBlockState getStateForPlacement(BlockItemUseContext ctx) {
return getDefaultState().with(BotaniaStateProps.CARDINALS, ctx.getNearestLookingDirection().getOpposite());
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack stack) {
if (stack.hasDisplayName())
((TileTinyPotato) world.getTileEntity(pos)).name = stack.getDisplayName();
}
@Override
@@ -1,40 +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 @ [Sep 30, 2015, 10:17:02 PM (GMT)]
*/
package vazkii.botania.common.block.decor.panes;
import net.minecraft.util.BlockRenderLayer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import javax.annotation.Nonnull;
public class BlockAlfglassPane extends BlockModPane {
public BlockAlfglassPane() {
super(ModBlocks.elfGlass);
}
@OnlyIn(Dist.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "alfglass_pane");
}
}
@@ -1,40 +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 @ [Sep 30, 2015, 10:18:50 PM (GMT)]
*/
package vazkii.botania.common.block.decor.panes;
import net.minecraft.util.BlockRenderLayer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import javax.annotation.Nonnull;
public class BlockBifrostPane extends BlockModPane {
public BlockBifrostPane() {
super(ModBlocks.bifrostPerm);
}
@OnlyIn(Dist.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "bifrost_pane");
}
}
@@ -1,41 +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 @ [Sep 30, 2015, 10:16:46 PM (GMT)]
*/
package vazkii.botania.common.block.decor.panes;
import net.minecraft.util.BlockRenderLayer;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import javax.annotation.Nonnull;
public class BlockManaglassPane extends BlockModPane {
public BlockManaglassPane() {
super(ModBlocks.manaGlass);
}
@OnlyIn(Dist.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "managlass_pane");
}
}
@@ -14,10 +14,14 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockPane;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.render.IModelRegister;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
@@ -25,32 +29,23 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
public class BlockModPane extends BlockPane implements IModelRegister {
public class BlockModPane extends BlockPane {
public BlockModPane(Block source) {
super(Material.GLASS, false);
// Backward compat don't kill me
String name = source.getTranslationKey().replaceAll("tile.", "") + "Pane";
setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name));
setTranslationKey(name);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
setLightLevel(1.0F);
useNeighborBrightness = true;
}
/*@Override
public boolean shouldSideBeRendered(IBlockState state, IBlockReader iblockaccess, BlockPos pos, EnumFacing side) {
return false;
}*/
@Override
public boolean canPaneConnectTo(IBlockReader world, BlockPos pos, @Nonnull EnumFacing dir) {
Block block = world.getBlockState(pos).getBlock();
return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir);
public BlockModPane(Properties props) {
super(props);
}
@Override
public void registerModels() {}
public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
Block block = world.getBlockState(pos.offset(facing)).getBlock();
return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm
|| super.canBeConnectedTo(state, world, pos, facing);
}
@OnlyIn(Dist.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}
}
@@ -1,15 +0,0 @@
package vazkii.botania.common.block.decor.slabs;
import net.minecraft.block.state.IBlockState;
public abstract class BlockLivingSlab extends BlockModSlab {
final IBlockState sourceState;
public BlockLivingSlab(boolean full, IBlockState state) {
super(full, state.getMaterial(), state.getBlock().getTranslationKey().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : ""));
setSoundType(state.getBlock().getSoundType());
sourceState = state;
}
}
@@ -2,11 +2,7 @@ package vazkii.botania.common.block.decor.slabs;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -31,95 +27,9 @@ import javax.annotation.Nonnull;
import java.util.Locale;
import java.util.Random;
public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister {
private final String name;
private final boolean doubleSlab;
private static final PropertyEnum<DummyEnum> DUMMY = PropertyEnum.create("dummy", DummyEnum.class);
public BlockModSlab(boolean full, Material mat, String name) {
super(mat);
this.name = name;
setTranslationKey(name);
setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name));
doubleSlab = full;
if(!full) {
setCreativeTab(BotaniaCreativeTab.INSTANCE);
useNeighborBrightness = true;
}
setDefaultState(blockState.getBaseState().with(HALF, EnumBlockHalf.BOTTOM).with(DUMMY, DummyEnum.SINGLETON));
if(!isDouble())
ModFluffBlocks.slabsToRegister.add(this);
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, HALF, getVariantProperty());
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
if (doubleSlab) {
return getDefaultState();
} else {
return getDefaultState().with(HALF, meta == 8 ? EnumBlockHalf.TOP : EnumBlockHalf.BOTTOM);
}
}
@Override
public int getMetaFromState(IBlockState state) {
if (doubleSlab) {
return 0;
} else {
return state.get(HALF) == EnumBlockHalf.TOP ? 8 : 0;
}
}
public abstract BlockSlab getFullBlock();
public abstract BlockSlab getSingleBlock();
@Nonnull
@Override
public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) {
return new ItemStack(getSingleBlock());
}
@Nonnull
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(getSingleBlock());
}
@Nonnull
@Override
public ItemStack getSilkTouchDrop(@Nonnull IBlockState par1) {
return new ItemStack(getSingleBlock());
}
@Nonnull
@Override
public String getTranslationKey(int i) {
return name;
}
@Override
public final boolean isDouble() {
return doubleSlab;
}
@Nonnull
@Override
public final IProperty getVariantProperty() {
return DUMMY; // Vanilla expects us to store different kinds of slabs into one block ID. Except we don't. We need this dummy property and dummy value to satisfy it.
}
@Nonnull
@Override
public final Comparable<?> getTypeForItem(@Nonnull ItemStack stack) {
return DummyEnum.SINGLETON;
public class BlockModSlab extends BlockSlab implements ILexiconable {
public BlockModSlab(Properties props) {
super(props);
}
@Override
@@ -127,25 +37,4 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM
return LexiconData.decorativeBlocks;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
if(!doubleSlab) {
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockModSlab.DUMMY).build());
ModelHandler.registerBlockToState(this, 0, getDefaultState());
} else {
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build());
}
}
private enum DummyEnum implements IStringSerializable {
SINGLETON {
@Nonnull
@Override
public String getName() {
return name().toLowerCase(Locale.ROOT);
}
}
}
}
@@ -21,25 +21,10 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockPavementSlab extends BlockLivingSlab {
public class BlockPavementSlab extends BlockModSlab {
final int index;
public BlockPavementSlab(boolean full, EnumDyeColor color, int index) {
super(full, ModFluffBlocks.pavement.getDefaultState().with(BotaniaStateProps.PAVEMENT_COLOR, color));
this.index = index;
setHardness(2F);
setResistance(10F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.pavementFullSlabs[index];
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.pavementSlabs[index];
public BlockPavementSlab(Properties props) {
super(props);
}
@Override
@@ -47,5 +32,4 @@ public class BlockPavementSlab extends BlockLivingSlab {
return LexiconData.pavement;
}
}
@@ -1,27 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingWoodVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockDreamwoodPlankSlab extends BlockLivingSlab {
public BlockDreamwoodPlankSlab(boolean full) {
super(full, ModBlocks.dreamwood.getDefaultState().with(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS));
setHardness(2.0F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.dreamwoodPlankSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.dreamwoodPlankSlab;
}
}
@@ -1,25 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockDreamwoodSlab extends BlockLivingSlab {
public BlockDreamwoodSlab(boolean full) {
super(full, ModBlocks.dreamwood.getDefaultState());
setHardness(2.0F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.dreamwoodSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.dreamwoodSlab;
}
}
@@ -1,30 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SoundType;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingRockVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockLivingrockBrickSlab extends BlockLivingSlab {
public BlockLivingrockBrickSlab(boolean full) {
super(full, ModBlocks.livingrock.getDefaultState().with(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK));
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.livingrockBrickSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.livingrockBrickSlab;
}
}
@@ -1,28 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SoundType;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockLivingrockSlab extends BlockLivingSlab {
public BlockLivingrockSlab(boolean full) {
super(full, ModBlocks.livingrock.getDefaultState());
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.livingrockSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.livingrockSlab;
}
}
@@ -1,27 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingWoodVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockLivingwoodPlankSlab extends BlockLivingSlab {
public BlockLivingwoodPlankSlab(boolean full) {
super(full, ModBlocks.livingwood.getDefaultState().with(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS));
setHardness(2.0F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.livingwoodPlankSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.livingwoodPlankSlab;
}
}
@@ -1,25 +0,0 @@
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockLivingwoodSlab extends BlockLivingSlab {
public BlockLivingwoodSlab(boolean full) {
super(full, ModBlocks.livingwood.getDefaultState());
setHardness(2.0F);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.livingwoodSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.livingwoodSlab;
}
}
@@ -1,38 +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 @ [Oct 11, 2015, 3:47:24 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SoundType;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockShimmerrockSlab extends BlockLivingSlab {
public BlockShimmerrockSlab(boolean full) {
super(full, ModBlocks.shimmerrock.getDefaultState());
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.shimmerrockSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.shimmerrockSlab;
}
}
@@ -1,37 +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 @ [Oct 11, 2015, 3:47:47 PM (GMT)]
*/
package vazkii.botania.common.block.decor.slabs.living;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.SoundType;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.block.decor.slabs.BlockLivingSlab;
public class BlockShimmerwoodPlankSlab extends BlockLivingSlab {
public BlockShimmerwoodPlankSlab(boolean full) {
super(full, ModBlocks.shimmerwoodPlanks.getDefaultState());
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.WOOD);
}
@Override
public BlockSlab getFullBlock() {
return (BlockSlab) ModFluffBlocks.shimmerwoodPlankSlabFull;
}
@Override
public BlockSlab getSingleBlock() {
return (BlockSlab) ModFluffBlocks.shimmerwoodPlankSlab;
}
}
@@ -18,10 +18,10 @@ import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockBiomeStoneStairs extends BlockLivingStairs {
public class BlockBiomeStoneStairs extends BlockModStairs {
public BlockBiomeStoneStairs(IBlockState state) {
super(state);
public BlockBiomeStoneStairs(IBlockState state, Properties props) {
super(state, props);
}
@Override
@@ -3,7 +3,6 @@ package vazkii.botania.common.block.decor.stairs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -20,21 +19,14 @@ import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister {
public class BlockModStairs extends BlockStairs implements ILexiconable {
public BlockModStairs(IBlockState state, Block.Properties builder) {
super(state, builder);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory"));
}
}
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.block.decor.stairs;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
@@ -20,10 +21,10 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockPavementStairs extends BlockLivingStairs {
public class BlockPavementStairs extends BlockModStairs {
public BlockPavementStairs(EnumDyeColor color) {
super(ModFluffBlocks.pavement.getDefaultState().with(BotaniaStateProps.PAVEMENT_COLOR, color));
public BlockPavementStairs(IBlockState state, Properties props) {
super(state, props);
}
@Override
@@ -1,14 +0,0 @@
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingWoodVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockDreamwoodPlankStairs extends BlockLivingStairs {
public BlockDreamwoodPlankStairs() {
super(ModBlocks.dreamwood.getDefaultState().with(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS));
}
}
@@ -1,12 +0,0 @@
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockDreamwoodStairs extends BlockLivingStairs {
public BlockDreamwoodStairs() {
super(ModBlocks.dreamwood.getDefaultState());
}
}
@@ -1,14 +0,0 @@
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingRockVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockLivingrockBrickStairs extends BlockLivingStairs {
public BlockLivingrockBrickStairs() {
super(ModBlocks.livingrock.getDefaultState().with(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.BRICK));
}
}
@@ -1,12 +0,0 @@
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockLivingrockStairs extends BlockLivingStairs {
public BlockLivingrockStairs() {
super(ModBlocks.livingrock.getDefaultState());
}
}
@@ -1,14 +0,0 @@
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.LivingWoodVariant;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockLivingwoodPlankStairs extends BlockLivingStairs {
public BlockLivingwoodPlankStairs() {
super(ModBlocks.livingwood.getDefaultState().with(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.PLANKS));
}
}
@@ -1,22 +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 @ [Oct 11, 2015, 3:46:12 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockShimmerrockStairs extends BlockLivingStairs {
public BlockShimmerrockStairs() {
super(ModBlocks.shimmerrock.getDefaultState());
}
}
@@ -1,22 +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 @ [Oct 11, 2015, 3:45:02 PM (GMT)]
*/
package vazkii.botania.common.block.decor.stairs.living;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.stairs.BlockLivingStairs;
public class BlockShimmerwoodPlankStairs extends BlockLivingStairs {
public BlockShimmerwoodPlankStairs() {
super(ModBlocks.shimmerwoodPlanks.getDefaultState());
}
}
@@ -12,15 +12,13 @@ package vazkii.botania.common.block.decor.walls;
import net.minecraft.block.Block;
import net.minecraft.block.BlockWall;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReaderBase;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.api.distmarker.Dist;
@@ -33,75 +31,20 @@ import vazkii.botania.common.lexicon.LexiconData;
import javax.annotation.Nonnull;
public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister {
public class BlockModWall extends BlockWall implements ILexiconable {
public BlockModWall(Block block, int meta) {
super(block);
// For backward compat don't kill me
String name = block.getTranslationKey().replaceAll("tile.", "") + meta + "Wall";
setRegistryName(name);
setTranslationKey(name);
setDefaultState(pickDefaultState());
setCreativeTab(BotaniaCreativeTab.INSTANCE);
}
@Nonnull
@Override
public IBlockState getActualState(IBlockState state, IBlockReader world, BlockPos pos) {
return super.getActualState(state, world, pos).with(VARIANT, EnumType.NORMAL);
public BlockModWall(Properties props) {
super(props);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new BlockStateContainer(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST);
}
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.with(UP, false)
.with(NORTH, false)
.with(SOUTH, false)
.with(WEST, false)
.with(EAST, false)
.with(VARIANT, EnumType.NORMAL);
}
@Override
public int getMetaFromState(IBlockState state) {
return 0;
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
return getDefaultState();
}
@Override
public boolean canPlaceTorchOnTop(IBlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos) {
public boolean canPlaceTorchOnTop(IBlockState state, IWorldReaderBase world, BlockPos pos) {
return true;
}
@Override
public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list) {
list.add(new ItemStack(this));
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BlockWall.VARIANT).build());
}
}
@@ -1,34 +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 @ [Jul 18, 2015, 8:29:16 PM (GMT)]
*/
package vazkii.botania.common.block.decor.walls.living;
import net.minecraft.block.SoundType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.walls.BlockModWall;
public class BlockDreamwoodWall extends BlockModWall {
public BlockDreamwoodWall() {
super(ModBlocks.dreamwood, 0);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "dreamwood_wall");
}
}
@@ -1,35 +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 @ [Jul 18, 2015, 8:25:54 PM (GMT)]
*/
package vazkii.botania.common.block.decor.walls.living;
import net.minecraft.block.SoundType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.walls.BlockModWall;
public class BlockLivingrockWall extends BlockModWall {
public BlockLivingrockWall() {
super(ModBlocks.livingrock, 0);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "livingrock_wall");
}
}
@@ -1,34 +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 @ [Jul 18, 2015, 8:28:06 PM (GMT)]
*/
package vazkii.botania.common.block.decor.walls.living;
import net.minecraft.block.SoundType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.walls.BlockModWall;
public class BlockLivingwoodWall extends BlockModWall {
public BlockLivingwoodWall() {
super(ModBlocks.livingwood, 0);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
}
@OnlyIn(Dist.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerCustomItemblock(this, "livingwood_wall");
}
}
@@ -26,6 +26,7 @@ import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.mana.spark.SparkUpgradeType;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.item.brew.*;
@@ -113,7 +114,7 @@ public final class ModItems {
public static final Map<EnumDyeColor, Item> dyes = new EnumMap<>(EnumDyeColor.class);
static {
for(EnumDyeColor color : EnumDyeColor.values()) {
petals.put(color, new ItemPetal(, color, defaultBuilder()));
petals.put(color, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder()));
dyes.put(color, new ItemDye(color, defaultBuilder()));
}
}
@@ -125,7 +125,7 @@ public final class LibBlockNames {
public static final String CACOPHONIUM = "cacophonium_block";
public static final String BELLOWS = "bellows";
public static final String BIFROST_PERM = "bifrost_perm";
public static final String PAVEMENT = "pavement";
public static final String PAVEMENT_SUFFIX = "_pavement";
public static final String CELL_BLOCK = "cell_block";
public static final String GAIA_HEAD = "gaia_head";
public static final String CORPOREA_RETAINER = "corporea_retainer";
@@ -135,6 +135,9 @@ public final class LibBlockNames {
public static final String AVATAR = "avatar";
public static final String ALT_GRASS_SUFFIX = "_grass";
public static final String ANIMATED_TORCH = "animated_torch";
public static final String SLAB_SUFFIX = "_slab";
public static final String STAIR_SUFFIX = "_stair";
public static final String WALL_SUFFIX = "_wall";
public static final ResourceLocation SUBTILE_PUREDAISY = prefix("puredaisy");
public static final ResourceLocation SUBTILE_MANASTAR = prefix("manastar");