From 881ead8acf043c726e592f3cf2efe3976ab3e2a2 Mon Sep 17 00:00:00 2001 From: zangamj Date: Wed, 13 Jul 2016 11:35:47 -0400 Subject: [PATCH] Finished BlockGoldDimDoor. Removed gold dim door textures since they are identical to gold door textures. --- .../dimdoors/blocks/BlockGoldDimDoor.java | 14 +++---- .../dimdoors/blockstates/dimDoorGold.json | 36 ++++++++++++++++++ .../blocks/tile.dimDoorGold_lower.png | Bin 3403 -> 0 bytes .../blocks/tile.dimDoorGold_upper.png | Bin 3325 -> 0 bytes 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/dimdoors/blockstates/dimDoorGold.json delete mode 100644 src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_lower.png delete mode 100644 src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_upper.png diff --git a/src/main/java/com/zixiken/dimdoors/blocks/BlockGoldDimDoor.java b/src/main/java/com/zixiken/dimdoors/blocks/BlockGoldDimDoor.java index a33ef729..8689490b 100644 --- a/src/main/java/com/zixiken/dimdoors/blocks/BlockGoldDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/blocks/BlockGoldDimDoor.java @@ -7,9 +7,11 @@ import com.zixiken.dimdoors.core.NewDimData; import com.zixiken.dimdoors.core.PocketManager; import com.zixiken.dimdoors.tileentities.TileEntityDimDoorGold; +import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public class BlockGoldDimDoor extends BaseDimDoor { @@ -22,16 +24,12 @@ public class BlockGoldDimDoor extends BaseDimDoor { } @Override - public void placeLink(World world, int x, int y, int z) - { - if (!world.isRemote && world.getBlock(x, y - 1, z) == this) - { + public void placeLink(World world, BlockPos pos) { + if (!world.isRemote && world.getBlockState(pos.down()).getBlock() == this) { NewDimData dimension = PocketManager.createDimensionData(world); - DimLink link = dimension.getLink(x, y, z); + DimLink link = dimension.getLink(pos); if (link == null) - { - dimension.createLink(x, y, z, LinkType.POCKET,world.getBlockMetadata(x, y - 1, z)); - } + dimension.createLink(pos, LinkType.POCKET, world.getBlockState(pos.down()).getValue(BlockDoor.FACING)); } } diff --git a/src/main/resources/assets/dimdoors/blockstates/dimDoorGold.json b/src/main/resources/assets/dimdoors/blockstates/dimDoorGold.json new file mode 100644 index 00000000..a2451a9e --- /dev/null +++ b/src/main/resources/assets/dimdoors/blockstates/dimDoorGold.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "doorGold_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "doorGold_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "doorGold_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "doorGold_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "doorGold_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "doorGold_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "doorGold_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "doorGold_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "doorGold_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "doorGold_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "doorGold_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "doorGold_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "doorGold_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "doorGold_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "doorGold_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "doorGold_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "doorGold_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "doorGold_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "doorGold_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "doorGold_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "doorGold_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "doorGold_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "doorGold_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "doorGold_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "doorGold_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "doorGold_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "doorGold_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "doorGold_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "doorGold_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "doorGold_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "doorGold_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "doorGold_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_lower.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_lower.png deleted file mode 100644 index 9e00119f429afe8e11e891daecd142c1ac4c8861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3403 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