From 989c91751532dbdf45cd31f15c7c4bb4b9d55d9c Mon Sep 17 00:00:00 2001 From: zangamj Date: Tue, 12 Jul 2016 14:03:40 -0400 Subject: [PATCH] Finished BlockDoorQuartz --- .../dimdoors/blocks/BlockDoorQuartz.java | 25 +++++------- .../dimdoors/blockstates/doorQuartz.json | 36 ++++++++++++++++++ .../models/block/doorQuartz_bottom.json | 7 ++++ .../models/block/doorQuartz_bottom_rh.json | 7 ++++ .../dimdoors/models/block/doorQuartz_top.json | 7 ++++ .../models/block/doorQuartz_top_rh.json | 7 ++++ ...rQuartz_lower.png => doorQuartz_lower.png} | Bin ...rQuartz_upper.png => doorQuartz_upper.png} | Bin 8 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/dimdoors/blockstates/doorQuartz.json create mode 100644 src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom.json create mode 100644 src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom_rh.json create mode 100644 src/main/resources/assets/dimdoors/models/block/doorQuartz_top.json create mode 100644 src/main/resources/assets/dimdoors/models/block/doorQuartz_top_rh.json rename src/main/resources/assets/dimdoors/textures/blocks/{tile.doorQuartz_lower.png => doorQuartz_lower.png} (100%) rename src/main/resources/assets/dimdoors/textures/blocks/{tile.doorQuartz_upper.png => doorQuartz_upper.png} (100%) diff --git a/src/main/java/com/zixiken/dimdoors/blocks/BlockDoorQuartz.java b/src/main/java/com/zixiken/dimdoors/blocks/BlockDoorQuartz.java index 7cc07ef5..57ee89ed 100644 --- a/src/main/java/com/zixiken/dimdoors/blocks/BlockDoorQuartz.java +++ b/src/main/java/com/zixiken/dimdoors/blocks/BlockDoorQuartz.java @@ -3,12 +3,14 @@ package com.zixiken.dimdoors.blocks; import java.util.Random; import com.zixiken.dimdoors.DimDoors; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockDoorQuartz extends BlockDoor { public static final String ID = "doorQuartz"; @@ -18,22 +20,13 @@ public class BlockDoorQuartz extends BlockDoor { setHardness(0.1F); setUnlocalizedName(ID); } - - @SideOnly(Side.CLIENT) - protected String getTextureName() - { - return DimDoors.modid + ":" + this.getUnlocalizedName(); - } - - @Override - public Item getItemDropped(int par1, Random par2Random, int par3) - { - return (par1 & 8) != 0 ? null : DimDoors.itemQuartzDoor; + + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return state.getValue(BlockDoor.HALF) == EnumDoorHalf.LOWER ? DimDoors.itemQuartzDoor : null; } @Override @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) { - return DimDoors.itemQuartzDoor; - } + public Item getItem(World worldIn, BlockPos pos) {return DimDoors.itemQuartzDoor;} } diff --git a/src/main/resources/assets/dimdoors/blockstates/doorQuartz.json b/src/main/resources/assets/dimdoors/blockstates/doorQuartz.json new file mode 100644 index 00000000..6b1cf7a8 --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/doorQuartz.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "doorQuartz_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "doorQuartz_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "doorQuartz_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "doorQuartz_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "doorQuartz_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "doorQuartz_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "doorQuartz_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "doorQuartz_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "doorQuartz_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "doorQuartz_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "doorQuartz_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "doorQuartz_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "doorQuartz_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "doorQuartz_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "doorQuartz_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "doorQuartz_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "doorQuartz_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "doorQuartz_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "doorQuartz_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "doorQuartz_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "doorQuartz_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "doorQuartz_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "doorQuartz_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "doorQuartz_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "doorQuartz_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "doorQuartz_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "doorQuartz_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "doorQuartz_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "doorQuartz_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "doorQuartz_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "doorQuartz_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "doorQuartz_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom.json b/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom.json new file mode 100644 index 00000000..91247d03 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom", + "textures": { + "bottom": "blocks/doorQuartz_lower", + "top": "blocks/doorQuartz_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom_rh.json b/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom_rh.json new file mode 100644 index 00000000..da7cd414 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/doorQuartz_bottom_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_bottom_rh", + "textures": { + "bottom": "blocks/doorQuartz_lower", + "top": "blocks/doorQuartz_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/doorQuartz_top.json b/src/main/resources/assets/dimdoors/models/block/doorQuartz_top.json new file mode 100644 index 00000000..5f7c86cb --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/doorQuartz_top.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top", + "textures": { + "bottom": "blocks/doorQuartz_lower", + "top": "blocks/doorQuartz_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/models/block/doorQuartz_top_rh.json b/src/main/resources/assets/dimdoors/models/block/doorQuartz_top_rh.json new file mode 100644 index 00000000..b75b3ea9 --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/block/doorQuartz_top_rh.json @@ -0,0 +1,7 @@ +{ + "parent": "block/door_top_rh", + "textures": { + "bottom": "blocks/doorQuartz_lower", + "top": "blocks/doorQuartz_upper" + } +} diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.doorQuartz_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/doorQuartz_lower.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/tile.doorQuartz_lower.png rename to src/main/resources/assets/dimdoors/textures/blocks/doorQuartz_lower.png diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.doorQuartz_upper.png b/src/main/resources/assets/dimdoors/textures/blocks/doorQuartz_upper.png similarity index 100% rename from src/main/resources/assets/dimdoors/textures/blocks/tile.doorQuartz_upper.png rename to src/main/resources/assets/dimdoors/textures/blocks/doorQuartz_upper.png