From 1817e75b5db7cbb8d2499994533dda49c2b497be Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Nov 2015 13:04:23 -0600 Subject: [PATCH] More decor states --- MC18_notes.txt | 4 +- .../botania/api/state/BotaniaStateProps.java | 37 ++++++ .../api/state/enums/CustomBrickVariant.java | 29 +++++ .../api/state/enums/EndBrickVariant.java | 17 +++ .../api/state/enums/FutureStoneVariant.java | 29 +++++ .../api/state/enums/PrismarineVariant.java | 16 +++ .../api/state/enums/QuartzVariant.java | 18 +++ .../render/tile/RenderTileStarfield.java | 1 + .../botania/common/block/BlockModFlower.java | 2 +- .../common/block/decor/Block18Stone.java | 47 ++++---- .../common/block/decor/BlockBlaze.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 35 +++--- .../common/block/decor/BlockCustomBrick.java | 61 +++++----- .../common/block/decor/BlockDirtPath.java | 33 +++--- .../common/block/decor/BlockElfGlass.java | 23 +--- .../block/decor/BlockEndStoneBrick.java | 48 ++++---- .../block/decor/BlockFloatingFlower.java | 32 ++++- .../common/block/decor/BlockManaBeacon.java | 42 ++++--- .../common/block/decor/BlockManaFlame.java | 30 ++--- .../common/block/decor/BlockManaGlass.java | 7 +- .../common/block/decor/BlockModMushroom.java | 79 +++++++------ .../common/block/decor/BlockPavement.java | 75 ++++++++---- .../common/block/decor/BlockPetalBlock.java | 41 +++++-- .../common/block/decor/BlockPrismarine.java | 55 +++++---- .../common/block/decor/BlockReeds.java | 62 +++++----- .../common/block/decor/BlockSeaLamp.java | 4 +- .../common/block/decor/BlockShimmerrock.java | 8 +- .../block/decor/BlockShimmerwoodPlanks.java | 8 +- .../common/block/decor/BlockShinyFlower.java | 49 ++++---- .../common/block/decor/BlockStarfield.java | 16 +-- .../common/block/decor/BlockThatch.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 75 ++++++++---- .../common/block/decor/BlockUnstable.java | 50 +++++--- .../block/decor/panes/BlockBifrostPane.java | 6 - .../block/decor/panes/BlockModPane.java | 40 ++----- .../decor/quartz/BlockSpecialQuartz.java | 110 ++++++++---------- .../block/decor/slabs/BlockModSlab.java | 34 +++--- .../block/decor/walls/BlockVariantWall.java | 1 - .../coloredlights/ColoredLightHelper.java | 20 ++-- .../coloredlights/ILightHelper.java | 4 +- .../coloredlights/LightHelperColored.java | 6 +- .../coloredlights/LightHelperVanilla.java | 4 +- 42 files changed, 753 insertions(+), 509 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java diff --git a/MC18_notes.txt b/MC18_notes.txt index 2a3fb351a..15af37855 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -7,13 +7,15 @@ This can be changed to match vanilla signature, but either would break backward * SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block). Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts +* Multiblock system reworked to use states -- Other -- * Most things left untouched to make patches from upstream easier * Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances since BlockPos'es are immutable and thus can be reused everywhere. * Some really needed fields in EntityItem are private now. Reflection time :( - +* Alfglass just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different. +Unless someone figures out a way to use the old one -- Todo -- * Fix all the block signatures (easy) diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index bfb03d140..628e80965 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -2,6 +2,7 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -18,6 +19,12 @@ public class BotaniaStateProps { /** Common properties to all blocks to use **/ + // Cardinal connection booleans (think fence or wall) + public static final PropertyBool CONNECT_NORTH = PropertyBool.create("north"); + public static final PropertyBool CONNECT_SOUTH = PropertyBool.create("south"); + public static final PropertyBool CONNECT_WEST = PropertyBool.create("west"); + public static final PropertyBool CONNECT_EAST = PropertyBool.create("east"); + // The 16 Minecraft colors public static final PropertyEnum COLOR = PropertyEnum.create("color", EnumDyeColor.class); @@ -34,17 +41,34 @@ public class BotaniaStateProps { // Redstone power - int public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); + /** Properties for certain kinds of blocks **/ + + // The axis directions (think quartz pillars and wood logs) + public static final PropertyEnum AXIS_FACING = BlockRotatedPillar.AXIS; + + // Extra Quartz Blocks + public static final PropertyEnum QUARTZ_VARIANT = PropertyEnum.create("variant", QuartzVariant.class); + /** Properties for individual blocks **/ + // Block18Stone + public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); + // BlockCustomBrick + public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); + // BlockDreamWood, BlockLivingWood public static final PropertyEnum LIVINGWOOD_VARIANT = PropertyEnum.create("variant", LivingWoodVariant.class); // BlockEnchanter public static final PropertyEnum ENCHANTER_DIRECTION = PropertyEnum.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y))); + // BlockEndStoneBrick + public static final PropertyEnum ENDBRICK_VARIANT = PropertyEnum.create("variant", EndBrickVariant.class); + // BlockForestDrum public static final PropertyEnum DRUM_VARIANT = PropertyEnum.create("variant", DrumVariant.class); @@ -54,12 +78,25 @@ public class BotaniaStateProps { // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); + // BlockPavement + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { + @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; + } + }); + // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); // BlockPrism public static final PropertyBool HAS_LENS = PropertyBool.create("has_lens"); + // BlockPrismarine + public static final PropertyEnum PRISMARINE_VARIANT = PropertyEnum.create("variant", PrismarineVariant.class); + // BlockPylon public static final PropertyEnum PYLON_VARIANT = PropertyEnum.create("variant", PylonVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java new file mode 100644 index 000000000..f1aeb6476 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum CustomBrickVariant implements IStringSerializable { + HELLISH_BRICK, + SOUL_BRICK, + FROSTY_BRICK, + ROOF_TILE, + AZULEJO_1, // todo 1.8 must rename these + AZULEJO_2, + AZULEJO_3, + AZULEJO_4, + AZULEJO_5, + AZULEJO_6, + AZULEJO_7, + AZULEJO_8, + AZULEJO_9, + AZULEJO_10, + AZULEJO_11, + AZULEJO_12; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java new file mode 100644 index 000000000..a19544117 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java @@ -0,0 +1,17 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum EndBrickVariant implements IStringSerializable { + END_STONE_BRICKS, + CHISELED_END_STONE_BRICKS, + ENDER_BRICKS, + PILLAR_ENDER_BRICKS; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java new file mode 100644 index 000000000..bf667f908 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java @@ -0,0 +1,29 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum FutureStoneVariant implements IStringSerializable { + ANDESITE, + BASALT, + DIORITE, + GRANITE, + POLISHED_ANDESITE, + POLISHED_BASALT, + POLISHED_DIORITE, + POLISHED_GRANITE, + ANDESITE_BRICK, + BASALT_BRICK, + DIORITE_BRICK, + GRANITE_BRICK, + CHISELED_ANDESITE, + CHISELED_BASALT, + CHISELED_DIORITE, + CHISELED_GRANITE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java new file mode 100644 index 000000000..fa72d6b0c --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum PrismarineVariant implements IStringSerializable { + PRISMARINE, + PRISMARINE_BRICKS, + DARK_PRIMSARINE; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java new file mode 100644 index 000000000..0f5d0a0a8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -0,0 +1,18 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum QuartzVariant implements IStringSerializable { + NORMAL, + CHISELED, + PILLAR_Y, + PILLAR_X, + PILLAR_Z; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 0614b7cd1..a1bfe2528 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -28,6 +28,7 @@ import org.lwjgl.opengl.GL11; // I HAVE NO IDEA WHAT I'M DOING // SO MUCH STUFF I DON'T UNDERSTAND D: // HELP +// todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield public class RenderTileStarfield extends TileEntitySpecialRenderer { private static final ResourceLocation field_147529_c = new ResourceLocation("textures/environment/end_sky.png"); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3a2f8fb4d..c081077a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -59,7 +59,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.RED)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index 37682ea31..78ec915ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; 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.api.state.enums.FutureStoneVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,20 +36,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class Block18Stone extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[16]; - public Block18Stone() { super(Material.rock); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.STONE); + setUnlocalizedName(LibBlockNames.STONE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE)); } @Override - public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < 16; i++) - icons[i] = IconHelper.forBlock(register, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.FUTURESTONE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((FutureStoneVariant) state.getValue(BotaniaStateProps.FUTURESTONE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= FutureStoneVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.values()[meta]); } @Override @@ -56,31 +69,25 @@ public class Block18Stone extends BlockMod implements ILexiconable { list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - return icons[meta]; - } - @Override protected boolean shouldRegisterInNameSet() { return false; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index be934af38..a7e4c39a2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -35,7 +35,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { setResistance(10F); setStepSound(soundTypeMetal); setLightLevel(1F); - setBlockName(LibBlockNames.BLAZE_BLOCK); + setUnlocalizedName(LibBlockNames.BLAZE_BLOCK); GameRegistry.registerFuelHandler(this); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 83d2607d5..8b98081c4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -12,12 +12,15 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; @@ -36,17 +39,21 @@ public class BlockBuriedPetals extends BlockModFlower { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + EnumDyeColor color = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)); + int hex = color.getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); Botania.proxy.setSparkleFXNoClip(true); - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.1 + par5Random.nextFloat() * 0.1, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.1 + par5Random.nextFloat() * 0.1, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); + Botania.proxy.setSparkleFXNoClip(false); } @@ -56,17 +63,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return blockIcon; - } - - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { return ModItems.petal; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 30acb6b76..259518421 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; 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.api.state.enums.CustomBrickVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,15 +36,31 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockCustomBrick extends BlockMod implements ILexiconable { - private static final int TYPES = 16; - IIcon[] icons; - public BlockCustomBrick() { super(Material.rock); setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.CUSTOM_BRICK); + setUnlocalizedName(LibBlockNames.CUSTOM_BRICK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CUSTOMBRICK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((CustomBrickVariant) state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= CustomBrickVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]); } @Override @@ -51,44 +69,31 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for(int i = 0; i < TYPES; i++) + for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - int meta = world.getBlockMetadata(x, y, z); - return meta >= 4 ? LexiconData.azulejo : LexiconData.decorativeBlocks; + CustomBrickVariant variant = ((CustomBrickVariant) world.getBlockState(pos).getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT)); + return variant.getName().contains("azulejo") ? LexiconData.azulejo : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 2aaae3384..fab48555e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -12,16 +12,17 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -36,17 +37,17 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { setLightOpacity(255); setHardness(0.6F); setStepSound(soundTypeGravel); - setBlockName(LibBlockNames.DIRT_PATH); + setUnlocalizedName(LibBlockNames.DIRT_PATH); useNeighborBrightness = true; } @Override - public boolean isToolEffective(String type, int metadata) { + public boolean isToolEffective(String type, IBlockState state) { return type.equals("shovel"); } @Override - public void onEntityWalking(World world, int x, int y, int z, Entity entity) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, Entity entity) { float speed = 2F; float max = 0.4F; @@ -59,26 +60,26 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { - Block blockAbove = world.getBlock(x, y + 1, z); - if(!blockAbove.isAir(world, x, y + 1, z)) + public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos) { + Block blockAbove = world.getBlockState(pos.up()).getBlock(); + if(!blockAbove.isAir(world, pos.up())) setBlockBounds(0F, 0F, 0F, 1F, 1, 1F); else setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F); } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return side == ForgeDirection.DOWN; + public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { + return side == EnumFacing.DOWN; } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { - setBlockBoundsBasedOnState(world, x, y, z); + public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { + setBlockBoundsBasedOnState(world, pos); } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - return new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1); + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { + return new AxisAlignedBB(pos, pos.add(1, 1, 1)); } @Override @@ -87,13 +88,13 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { - return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + public boolean canSustainPlant(IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) { + return plantable.getPlantType(world, pos.down()) == EnumPlantType.Plains; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 7be671bc8..5f07c73af 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -12,11 +12,9 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -28,26 +26,15 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexiconable { - private static final int ICON_COUNT = 4; - IIcon[] icons; - public BlockElfGlass() { super(LibBlockNames.ELF_GLASS); } - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[ICON_COUNT]; - for(int i = 0; i < ICON_COUNT; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - blockIcon = IconHelper.forBlock(par1IconRegister, this); - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { - int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); - return icons[v]; - } +// @Override +// public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { +// int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); +// return icons[v]; +// } // todo 1.8 use randomized states for this @Override public boolean isElvenItem(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 725bce703..93fd8c6f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -14,17 +14,19 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; 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.api.state.enums.EndBrickVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -34,54 +36,58 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockEndStoneBrick extends BlockMod implements ILexiconable { - private static IIcon[] icons = new IIcon[5]; - public BlockEndStoneBrick() { super(Material.rock); setHardness(1.5F); setResistance(10F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.END_STONE_BRICK); + setUnlocalizedName(LibBlockNames.END_STONE_BRICK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS)); } @Override - public void registerBlockIcons(IIconRegister register) { - for(int i = 0; i < icons.length; i++) { - icons[i] = IconHelper.forBlock(register, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ENDBRICK_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EndBrickVariant) state.getValue(BotaniaStateProps.ENDBRICK_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EndBrickVariant.values().length) { + meta = 0; } + return getDefaultState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.values()[meta]); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 4; i++) + for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } - @Override - public IIcon getIcon(int side, int meta) { - return meta == 3 ? icons[side == 0 || side == 1 ? 4 : 3] : icons[Math.min(icons.length - 1, meta)]; - } - @Override protected boolean shouldRegisterInNameSet() { return false; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 3f3151e18..a353e33f1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -15,25 +15,26 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; @@ -65,6 +66,25 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab float f = 0.1F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } // @Override todo 1.8 coloredlights dep @@ -90,11 +110,13 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab @Override public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 14ad125fc..571b2390d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -15,19 +15,21 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; 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.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; @@ -38,8 +40,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockManaBeacon() { super(Material.iron); setHardness(5.0F); @@ -48,18 +48,25 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { float size = 3F / 16F; setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setUnlocalizedName(LibBlockNames.MANA_BEACON); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[2]; - for(int i = 0; i < 2; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 == 1 ? 1 : 0]; + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -80,7 +87,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -90,19 +97,18 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; - return new Color(color[0], color[1], color[2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { + return getRenderColor(par1iBlockAccess.getBlockState(pos)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 16ca21b07..d71d23cc0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -11,16 +11,18 @@ package vazkii.botania.common.block.decor; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.BlockModContainer; @@ -48,13 +50,8 @@ public class BlockManaFlame extends BlockModContainer { @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ((TileManaFlame) world.getTileEntity(x, y, z)).getLightColor(); - } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ((TileManaFlame) world.getTileEntity(pos)).getLightColor(); } @Override @@ -68,22 +65,22 @@ public class BlockManaFlame extends BlockModContainer { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { return true; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBox(World p_149668_1_, BlockPos pos, IBlockState state) { return null; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { @@ -99,12 +96,7 @@ public class BlockManaFlame extends BlockModContainer { } @Override - public IIcon getIcon(int side, int meta) { - return Blocks.fire.getIcon(side, meta); - } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return new ArrayList(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 154f63572..66d7d3b6b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,7 +35,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { setHardness(0.3F); setStepSound(soundTypeGlass); setLightLevel(1.0F); - setBlockName(name); + setUnlocalizedName(name); } @Override @@ -49,8 +50,8 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { + return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); // todo 1.8 wtf } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index f9fc03820..37d04c2af 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -14,23 +14,26 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -47,29 +50,47 @@ import net.minecraftforge.fml.relauncher.SideOnly; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { - public static IIcon[] icons; public int originalLight; public BlockModMushroom() { - setBlockName(LibBlockNames.MUSHROOM); + setUnlocalizedName(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); setStepSound(soundTypeGrass); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + } + + @Override + public void updateTick(World p_149674_1_, BlockPos pos, IBlockState state, Random p_149674_5_) { // NO-OP, to prevent spreading } @Override - public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) { - if(p_149718_3_ >= 0 && p_149718_3_ < 256) { - Block block = p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_); - return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockMetadata(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this); + public boolean canPlaceBlockAt(World p_149718_1_, BlockPos pos) { + if(pos.getY() >= 0 && pos.getY() < 256) { + Block block = p_149718_1_.getBlockState(pos.down()).getBlock(); + return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockState(pos.down()).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL || block.canSustainPlant(p_149718_1_, pos.down(), EnumFacing.UP, this); } return false; @@ -82,18 +103,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[16]; - - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + return super.setUnlocalizedName(par1Str); } @Override @@ -104,31 +116,28 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par2]; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - float[] color = EntitySheep.fleeceColorTable[meta]; + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + int hex = ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + Botania.proxy.sparkleFX(par1World, pos.getX() + 0.3 + par5Random.nextFloat() * 0.5, pos.getY() + 0.5 + par5Random.nextFloat() * 0.5, pos.getZ() + 0.3 + par5Random.nextFloat() * 0.5, r, g, b, par5Random.nextFloat(), 5); } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 00d8f1f8a..8645a56ce 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -14,13 +14,17 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +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.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -32,14 +36,51 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { public static final int TYPES = 6; - IIcon[] icons; public BlockPavement() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.PAVEMENT); + setUnlocalizedName(LibBlockNames.PAVEMENT); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PAVEMENT_COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + switch ((EnumDyeColor) state.getValue(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; + } + } + + @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().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color); } @Override @@ -48,14 +89,14 @@ public class BlockPavement extends BlockMod { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -65,22 +106,8 @@ public class BlockPavement extends BlockMod { } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 8dcc43686..9b7d398c8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -15,9 +15,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -25,6 +28,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.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; @@ -37,7 +41,26 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { super(Material.plants); setHardness(0.4F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.PETAL_BLOCK); + setUnlocalizedName(LibBlockNames.PETAL_BLOCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -52,24 +75,24 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - public int getRenderColor(int meta) { - return new Color(EntitySheep.fleeceColorTable[meta][0], EntitySheep.fleeceColorTable[meta][1], EntitySheep.fleeceColorTable[meta][2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - return getRenderColor(world.getBlockMetadata(x, y, z)); + public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { + return getRenderColor(world.getBlockState(pos)); } @Override - public int damageDropped(int meta) { - return meta; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 48c67f02c..0528e8024 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -14,20 +14,23 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.render.block.InterpolatedIcon; import vazkii.botania.common.block.BlockMod; @@ -42,15 +45,33 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPrismarine extends BlockMod implements ILexiconable { private static final int TYPES = 3; - IIcon[] icons; public BlockPrismarine() { super(Material.rock); setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.PRISMARINE); + setUnlocalizedName(LibBlockNames.PRISMARINE); MinecraftForge.EVENT_BUS.register(this); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.PRISMARINE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((PrismarineVariant) state.getValue(BotaniaStateProps.PRISMARINE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= PrismarineVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]); } @Override @@ -59,14 +80,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -75,14 +96,6 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { par3List.add(new ItemStack(par1, 1, i)); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[TYPES]; - for(int i = 1; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - @SubscribeEvent @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { @@ -94,14 +107,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; - } - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(this, 1, meta); + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos))); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 7df9eabcd..c965be68e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -13,62 +13,68 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.Block; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +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.client.core.helper.IconHelper; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockReeds extends BlockRotatedPillar implements ILexiconable { - IIcon topIcon; - public BlockReeds() { super(Material.wood); setHardness(1.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.REED_BLOCK); + setUnlocalizedName(LibBlockNames.REED_BLOCK); setCreativeTab(BotaniaCreativeTab.INSTANCE); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.AXIS_FACING); + } @Override - public Block setBlockName(String par1Str) { + public int getMetaFromState(IBlockState state) { + switch (((EnumFacing.Axis) state.getValue(BotaniaStateProps.AXIS_FACING))) { + case Z: return 8; + case X: return 4; + case Y: + default: return 0; + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing.Axis axis = null; + switch (meta) { + case 8: axis = EnumFacing.Axis.Z; break; + case 4: axis = EnumFacing.Axis.X; break; + case 0: + default: axis = EnumFacing.Axis.Y; break; + } + return getDefaultState().withProperty(BotaniaStateProps.AXIS_FACING, axis); + } + + @Override + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - topIcon = IconHelper.forBlock(par1IconRegister, this, 1); + return super.setUnlocalizedName(par1Str); } @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } - - @Override - protected IIcon getSideIcon(int p_150163_1_) { - return blockIcon; - } - - @Override - protected IIcon getTopIcon(int p_150161_1_) { - return topIcon; - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 26544a639..8cfeb886a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -31,14 +31,14 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { setHardness(0.3F); setStepSound(soundTypeGlass); setLightLevel(1.0F); - setBlockName(LibBlockNames.SEA_LAMP); + setUnlocalizedName(LibBlockNames.SEA_LAMP); } int coloredLight = -1; @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, BlockPos pos) { return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index f8eb3f701..29021dcab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -36,7 +36,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { setHardness(2.0F); setResistance(10.0F); setStepSound(soundTypeStone); - setBlockName(LibBlockNames.SHIMMERROCK); + setUnlocalizedName(LibBlockNames.SHIMMERROCK); MinecraftForge.EVENT_BUS.register(this); } @@ -50,12 +50,6 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 1a8a91c01..65b1d81a6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -35,7 +35,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { super(Material.wood); setHardness(2.0F); setStepSound(soundTypeWood); - setBlockName(LibBlockNames.SHIMMERWOOD_PLANKS); + setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS); MinecraftForge.EVENT_BUS.register(this); } @@ -49,12 +49,6 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 77bd6a379..0607a547f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -10,16 +10,19 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; @@ -38,27 +41,31 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } - - @Override - public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[16]; - iconsAlt = new IIcon[16]; - for(int i = 0; i < 16; i++) { - icons[i] = IconHelper.forName(register, "flowerGlimmering" + i); - iconsAlt[i] = IconHelper.forName(register, "flowerGlimmering" + i, BlockModFlower.ALT_DIR); - } - } - - @Override - public IIcon getIcon(int par1, int par2) { - return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; + public int getLightValue(IBlockAccess world, BlockPos pos) { + return ColoredLightHelper.getPackedColor(((EnumDyeColor) world.getBlockState(pos).getValue(BotaniaStateProps.COLOR)), originalLight); } @Override @@ -67,12 +74,12 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean fuckifiknow) { return false; } @Override - public boolean canStabaliseInfusion(World world, int x, int y, int z) { + public boolean canStabaliseInfusion(World world, BlockPos pos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 704176854..cea1c87c3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -28,8 +28,6 @@ import vazkii.botania.common.lib.LibBlockNames; public class BlockStarfield extends BlockModContainer implements ILexiconable { - IIcon[] icons; - public BlockStarfield() { super(Material.iron); setHardness(5F); @@ -41,19 +39,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; - for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - } - - @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; - } - - @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java index 16e6815b3..5e00e9611 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -27,7 +27,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { super(Material.grass); setHardness(1.0F); setStepSound(soundTypeGrass); - setBlockName(LibBlockNames.THATCH); + setUnlocalizedName(LibBlockNames.THATCH); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 2591a06b0..3f7f9ee5e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -11,21 +11,26 @@ package vazkii.botania.common.block.decor; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; +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.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; @@ -43,6 +48,38 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { setUnlocalizedName(LibBlockNames.TINY_POTATO); float f = 1F / 16F * 6F; setBlockBounds(f, 0, f, 1F - f, f, 1F - f); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public int getMetaFromState(IBlockState state) { + switch (((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS))) { + case NORTH: return 0; + case WEST: return 3; + case EAST: return 1; + case SOUTH: + default: + return 2; // wai vazkii senpai + } + } + + @Override + public IBlockState getStateFromMeta(int meta) { + EnumFacing side = null; + switch (meta) { + case 3: side = EnumFacing.WEST; break; + case 0: side = EnumFacing.NORTH; break; + case 1: side = EnumFacing.EAST; break; + case 2: + default: + side = EnumFacing.SOUTH; break; + } + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, side); } @Override @@ -57,45 +94,33 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - - @Override - public IIcon getIcon(int side, int meta) { - return Blocks.hardened_clay.getIcon(0, 0); - } - - @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(pos); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + par1World.spawnParticle(EnumParticleTypes.HEART, pos.getX() + minX + Math.random() * (maxX - minX), pos.getY() + maxY, pos.getZ() + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); } return true; } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { - int l1 = MathHelper.floor_double(par5EntityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - par1World.setBlockMetadataWithNotify(par2, par3, par4, l1, 2); + public void onBlockPlacedBy(World par1World, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { + par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, par5EntityLiving.getHorizontalFacing().getOpposite())); if (par6ItemStack.hasDisplayName()) - ((TileTinyPotato) par1World.getTileEntity(par2, par3, par4)).name = par6ItemStack.getDisplayName(); + ((TileTinyPotato) par1World.getTileEntity(pos)).name = par6ItemStack.getDisplayName(); } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { + public void onBlockHarvested(World par1World, BlockPos pos, IBlockState state, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + dropBlockAsItem(par1World, pos, state, 0); } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { ArrayList list = new ArrayList(); - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile != null) { ItemStack stack = new ItemStack(this); @@ -114,7 +139,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 637bb355e..a37883145 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -16,9 +16,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -26,6 +29,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.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; @@ -42,7 +46,26 @@ public class BlockUnstable extends BlockMod implements ILexiconable { setResistance(10.0F); setStepSound(soundTypeMetal); setBlockBounds(0.25F, 0.25F, 0.25F, 0.75F, 0.75F, 0.75F); - setBlockName(LibBlockNames.UNSTABLE_BLOCK); + setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.COLOR); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override @@ -52,9 +75,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -63,7 +86,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public boolean renderAsNormalBlock() { + public boolean isFullCube() { return false; } @@ -73,30 +96,29 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int color = getRenderColor(par1World.getBlockMetadata(par2, par3, par4)); + public void randomDisplayTick(World par1World, BlockPos pos, IBlockState state, Random par5Random) { + int color = getRenderColor(state); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); - Vector3 origVector = new Vector3(par2 + 0.5, par3 + 0.5, par4 + 0.5); + Vector3 origVector = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1); Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright); } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(IBlockState state) { + return getMetaFromState(state); } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; - return new Color(color[0], color[1], color[2]).getRGB(); + public int getRenderColor(IBlockState state) { + return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMapColor().colorValue; } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { + return getRenderColor(par1iBlockAccess.getBlockState(pos)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index b2758f4d2..e916e1416 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -37,10 +37,4 @@ public class BlockBifrostPane extends BlockModPane { } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister reg) { - // NO-OP - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 493a94238..d9103f076 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -13,10 +13,9 @@ package vazkii.botania.common.block.decor.panes; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; @@ -28,12 +27,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { Block source; - public IIcon iconTop; public BlockModPane(Block source) { - super("", "", Material.glass, false); + super(Material.glass, false); this.source = source; - setBlockName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); + setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setStepSound(soundTypeGlass); @@ -41,19 +39,13 @@ public class BlockModPane extends BlockPane { } @Override - public Block setBlockName(String par1Str) { + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister reg) { - iconTop = IconHelper.forBlock(reg, this); - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) { + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) { return false; } @@ -68,21 +60,9 @@ public class BlockModPane extends BlockPane { } @Override - @SideOnly(Side.CLIENT) - public IIcon func_150097_e() { - return source.getIcon(0, 0); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side >= 2 ? iconTop : source.getIcon(side, meta); - } - - @Override - public boolean canPaneConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir) { - Block block = world.getBlock(x, y, z); - return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, x, y, z, dir); + public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir) { + Block block = world.getBlockState(pos).getBlock(); + return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm || super.canPaneConnectTo(world, pos, dir); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index b36c27a8e..d95a8013e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -14,16 +14,20 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; +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.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; @@ -35,26 +39,39 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartz extends BlockMod implements ILexiconable { - private final String[] iconNames; public final String type; - private IIcon[] specialQuartzIcons; - private IIcon chiseledSpecialQuartzIcon; - private IIcon pillarSpecialQuartzIcon; - private IIcon specialQuartzTopIcon; public BlockSpecialQuartz(String type) { super(Material.rock); this.type = type; - iconNames = new String[]{ "block" + type + "Quartz0", "chiseled" + type + "Quartz0", "pillar" + type + "Quartz0", null, null }; setHardness(0.8F); setResistance(10F); - setBlockName("quartzType" + type); + setUnlocalizedName("quartzType" + type); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL)); } @Override - public Block setBlockName(String par1Str) { + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.QUARTZ_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= QuartzVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.values()[meta]); + } + + @Override + public Block setUnlocalizedName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str); - return super.setBlockName(par1Str); + return super.setUnlocalizedName(par1Str); } @Override @@ -71,52 +88,33 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - if (par2 != 2 && par2 != 3 && par2 != 4) { - if (par1 != 1 && (par1 != 0 || par2 != 1)) { - if (par1 == 0) - return specialQuartzTopIcon; - else { - if (par2 < 0 || par2 >= specialQuartzIcons.length) - par2 = 0; - - return specialQuartzIcons[par2]; - } - } else return par2 == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon; - } else - return par2 == 2 && (par1 == 1 || par1 == 0) ? pillarSpecialQuartzIcon : par2 == 3 && (par1 == 5 || par1 == 4) ? pillarSpecialQuartzIcon : par2 == 4 && (par1 == 2 || par1 == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[par2]; - } - - @Override - public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { - if (par9 == 2) { - switch (par5) { - case 0: - case 1: - par9 = 2; - break; - case 2: - case 3: - par9 = 4; - break; - case 4: - case 5: - par9 = 3; + public IBlockState onBlockPlaced(World par1World, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { + if (meta == 2) { // Pillar quartz variant + switch (side.getAxis()) { + case Y: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y); + case Z: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Z); + case X: + return getDefaultState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_X); } } - return par9; + return getStateFromMeta(meta); } @Override - public int damageDropped(int par1) { - return par1 != 3 && par1 != 4 ? par1 : 2; + public int damageDropped(IBlockState state) { + QuartzVariant variant = ((QuartzVariant) state.getValue(BotaniaStateProps.QUARTZ_VARIANT)); + if (variant == QuartzVariant.PILLAR_X || variant == QuartzVariant.PILLAR_Z) { + state = state.withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.PILLAR_Y); + } + return getMetaFromState(state); } @Override - public ItemStack createStackedBlock(int par1) { - return par1 != 3 && par1 != 4 ? super.createStackedBlock(par1) : new ItemStack(this, 1, 2); + public ItemStack createStackedBlock(IBlockState state) { + return new ItemStack(this, 1, damageDropped(state)); } @Override @@ -132,22 +130,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { par3List.add(new ItemStack(this, 1, 2)); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - specialQuartzIcons = new IIcon[iconNames.length]; - - for (int i = 0; i < specialQuartzIcons.length; ++i) { - if (iconNames[i] == null) - specialQuartzIcons[i] = specialQuartzIcons[i - 1]; - else specialQuartzIcons[i] = IconHelper.forName(par1IconRegister, iconNames[i]); - } - - specialQuartzTopIcon = IconHelper.forName(par1IconRegister, "block" + type + "Quartz1"); - chiseledSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "chiseled" + type + "Quartz1"); - pillarSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "pillar" + type + "Quartz1"); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 10ab14fcc..709067452 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -4,7 +4,8 @@ import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,9 +26,9 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; public BlockModSlab(boolean full, Material mat, String name) { - super(full, mat); + super(mat); this.name = name; - setBlockName(name); + setUnlocalizedName(name); if(!full) { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; @@ -39,40 +40,43 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { public abstract BlockSlab getSingleBlock(); @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { return new ItemStack(getSingleBlock()); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { return Item.getItemFromBlock(getSingleBlock()); } @Override - public int quantityDropped(int meta, int fortune, Random random) { - return super.quantityDropped(meta, fortune, random); + public int quantityDropped(IBlockState state, int fortune, Random random) { + return super.quantityDropped(state, fortune, random); } @Override - public ItemStack createStackedBlock(int par1) { + public ItemStack createStackedBlock(IBlockState par1) { return new ItemStack(getSingleBlock()); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } - public void register() { GameRegistry.registerBlock(this, ItemBlockModSlab.class, name); } @Override - public String func_150002_b(int i) { + public String getUnlocalizedName(int i) { return name; } + @Override + public abstract boolean isDouble(); + + @Override + public abstract IProperty getVariantProperty(); + + @Override + public abstract Object getVariant(ItemStack stack); + @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 76ef02052..47467abab 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -16,7 +16,6 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 46786e369..43b13df5d 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -11,6 +11,11 @@ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + +import java.util.EnumMap; +import java.util.Map; + /* * This class is presentto help with the Colored Lights mod without needing to package * the API or hold a dependency, please understand. @@ -48,21 +53,22 @@ public class ColoredLightHelper { } // End API Copypasta + private static Map packedColors = null; - private static int packedColors[][] = null; - - public static int getPackedColor(int meta, int light) { + public static int getPackedColor(EnumDyeColor color, int light) { if(packedColors == null) initPackedColors(); - return packedColors[meta][light]; + return packedColors.get(color)[light]; } private static void initPackedColors() { - packedColors = new int[16][16]; - for(int i = 0; i < 16; i++) + packedColors = new EnumMap(EnumDyeColor.class); + for(EnumDyeColor color : EnumDyeColor.values()) { + packedColors.put(color, new int[16]); for(int j = 0; j < 16; j++) - packedColors[i][j] = makeRGBLightValue(r[15 - i], g[15 - i], b[15 - i], j / 16F); + packedColors.get(color)[j] = makeRGBLightValue(r[15 - color.getMetadata()], g[15 - color.getMetadata()], b[15 - color.getMetadata()], j / 16F); + } } } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java index e813b5132..3ad64401a 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ILightHelper.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This interface is use for wrappers for compatibility with the colored lights mod. * It has one version for colored lights, and one version which leaves the light values unmodified for vanilla @@ -17,5 +19,5 @@ package vazkii.botania.common.integration.coloredlights; public interface ILightHelper { public int makeRGBLightValue(float r, float g, float b, int currentLightValue); - public int getPackedColor(int meta, int light); + public int getPackedColor(EnumDyeColor meta, int light); } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java index 9b9f4580c..51315523a 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperColored.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This is an implementation of ILightHelper for when the colored lights mod is installed */ @@ -21,8 +23,8 @@ public class LightHelperColored implements ILightHelper { } @Override - public int getPackedColor(int meta, int light) { - return ColoredLightHelper.getPackedColor(meta, light); + public int getPackedColor(EnumDyeColor color, int light) { + return ColoredLightHelper.getPackedColor(color, light); } } diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java index 441d0dd57..bb793708f 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/LightHelperVanilla.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.integration.coloredlights; +import net.minecraft.item.EnumDyeColor; + /* * This is an implementation of ILightHelper for when the colored lights mod isn't installed */ @@ -21,7 +23,7 @@ public class LightHelperVanilla implements ILightHelper { } @Override - public int getPackedColor(int meta, int light) { + public int getPackedColor(EnumDyeColor meta, int light) { return light; }