diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index e920ce196..fe4dd5eba 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -23,6 +23,7 @@ import mekanism.common.block.BlockPlasticFence.PlasticFenceStateMapper; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateBasic.BasicBlockStateMapper; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; +import mekanism.common.block.states.BlockStateCardboardBox.CardboardBoxStateMapper; import mekanism.common.block.states.BlockStateMachine.MachineBlockStateMapper; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateOre.EnumOreType; @@ -72,6 +73,7 @@ public class MekanismBlocks private static final IStateMapper basicMapper = new BasicBlockStateMapper(); private static final IStateMapper plasticMapper = new PlasticBlockStateMapper(); private static final IStateMapper fenceMapper = new PlasticFenceStateMapper(); + private static final IStateMapper boxMapper = new CardboardBoxStateMapper(); /** * Adds and registers all blocks. @@ -108,9 +110,12 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(ReinforcedPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(RoadPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(PlasticFence, fenceMapper); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); + ModelLoader.setCustomStateMapper(CardboardBox, boxMapper); + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); for(MachineType type : MachineType.values()) { @@ -124,25 +129,25 @@ public class MekanismBlocks for(EnumColor color : EnumColor.DYES) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); } for(EnumOreType ore : EnumOreType.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } for(GasTankTier tier : GasTankTier.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GasTank), tier.ordinal(), new ModelResourceLocation("mekanism:GasTank", "inventory")); //TODO tier states + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GasTank), tier.ordinal(), new ModelResourceLocation("mekanism:GasTank", "inventory")); //TODO tier states } - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(EnergyCube), new ItemMeshDefinition() { + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 69953ffa0..f7d2c351f 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -1,15 +1,18 @@ package mekanism.common.block; +import static mekanism.common.block.states.BlockStateCardboardBox.storageProperty; + import java.util.Random; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.block.states.BlockStateCardboardBox; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; - +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,10 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockCardboardBox extends BlockContainer { @@ -36,30 +36,24 @@ public class BlockCardboardBox extends BlockContainer setHardness(0.5F); setResistance(1F); } - -/* + @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) + protected BlockState createBlockState() { - icons[0] = register.registerIcon("mekanism:CardboardBoxTop"); - icons[1] = register.registerIcon("mekanism:CardboardBoxSide"); - icons[2] = register.registerIcon("mekanism:CardboardBoxSideStorage"); + return new BlockStateCardboardBox(this); } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) + public IBlockState getStateFromMeta(int meta) { - if(side == 0 || side == 1) - { - return icons[0]; - } - else { - return meta == 0 ? icons[1] : icons[2]; - } + return getDefaultState().withProperty(storageProperty, meta == 1); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return state.getValue(storageProperty) == true ? 1 : 0; } -*/ @Override public boolean isReplaceable(World world, BlockPos pos) @@ -107,7 +101,7 @@ public class BlockCardboardBox extends BlockContainer { data.block.onBlockPlacedBy(world, pos, data.block.getStateFromMeta(data.meta), entityplayer, new ItemStack(data.block, 1, data.meta)); } - + float motion = 0.7F; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; @@ -121,6 +115,12 @@ public class BlockCardboardBox extends BlockContainer return false; } + + @Override + public int getRenderType() + { + return 3; + } @Override public TileEntity createNewTileEntity(World world, int meta) diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index fc933f769..187506081 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPlastic extends Block { public PlasticBlockType type; + public BlockPlastic(PlasticBlockType blockType) { super(Material.wood); @@ -50,7 +51,7 @@ public class BlockPlastic extends Block @Override public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(colorProperty, EnumDyeColor.byMetadata(meta)); + return getDefaultState().withProperty(colorProperty, EnumDyeColor.byMetadata(meta)); } @Override @@ -59,34 +60,6 @@ public class BlockPlastic extends Block return state.getValue(colorProperty).getMetadata(); } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) - { - if(this == MekanismBlocks.PlasticBlock) - { - blockIcon = register.registerIcon("mekanism:PlasticBlock"); - } - else if(this == MekanismBlocks.SlickPlasticBlock) - { - blockIcon = register.registerIcon("mekanism:SlickPlasticBlock"); - } - else if(this == MekanismBlocks.GlowPlasticBlock) - { - blockIcon = register.registerIcon("mekanism:GlowPlasticBlock"); - } - else if(this == MekanismBlocks.ReinforcedPlasticBlock) - { - blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock"); - } - else if(this == MekanismBlocks.RoadPlasticBlock) - { - blockIcon = register.registerIcon("mekanism:RoadPlasticBlock"); - } - } -*/ - @Override public Vec3 modifyAcceleration(World world, BlockPos pos, Entity e, Vec3 motion) { @@ -97,6 +70,7 @@ public class BlockPlastic extends Block double a = Math.atan2(motion.xCoord, motion.zCoord); return new Vec3(motion.xCoord + Math.sin(a) * boost * slipperiness, motion.yCoord, motion.zCoord + Math.cos(a) * boost * slipperiness); } + return motion; } diff --git a/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java new file mode 100644 index 000000000..1575f5f7b --- /dev/null +++ b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java @@ -0,0 +1,31 @@ +package mekanism.common.block.states; + +import mekanism.common.block.BlockCardboardBox; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.util.ResourceLocation; + +public class BlockStateCardboardBox extends BlockState +{ + public static PropertyBool storageProperty = PropertyBool.create("storage"); + + public BlockStateCardboardBox(BlockCardboardBox block) + { + super(block, storageProperty); + } + + public static class CardboardBoxStateMapper extends StateMapperBase + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + String property = "storage=" + state.getValue(storageProperty); + + ResourceLocation baseLocation = new ResourceLocation("mekanism", "CardboardBox"); + return new ModelResourceLocation(baseLocation, property); + } + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 162b7c660..a3bb8d126 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -27,14 +27,6 @@ public class ItemBlockPlastic extends ItemBlock return i; } -/* - @Override - public IIcon getIconFromDamage(int i) - { - return metaBlock.getIcon(2, i); - } -*/ - @Override public String getItemStackDisplayName(ItemStack stack) { @@ -61,6 +53,6 @@ public class ItemBlockPlastic extends ItemBlock @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int renderPass) { - return this.metaBlock.getRenderColor(this.metaBlock.getStateFromMeta(stack.getMetadata())); + return metaBlock.getRenderColor(metaBlock.getStateFromMeta(stack.getMetadata())); } } diff --git a/src/main/resources/assets/mekanism/blockstates/CardboardBox.json b/src/main/resources/assets/mekanism/blockstates/CardboardBox.json new file mode 100644 index 000000000..69788e1cd --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/CardboardBox.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/CardboardBoxSide", + "front": "mekanism:blocks/CardboardBoxSide", + "up": "mekanism:blocks/CardboardBoxTop", + "down": "mekanism:blocks/CardboardBoxTop" + } + }, + "variants": { + "storage": { + "true": {"textures": {"sides": "mekanism:blocks/CardboardBoxSideStorage", "front": "mekanism:blocks/CardboardBoxSideStorage"}}, + "false": {} + }, + "inventory": [{}] + } +} +