From 85cf7d79816c577505696cfb5bbbca97f8d1c14d Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Fri, 26 Aug 2016 01:40:18 +0200 Subject: [PATCH] Makes quartz fixture resources and class consistent with the registry name. --- ...artzTorch.java => BlockQuartzFixture.java} | 6 ++--- .../core/api/definitions/ApiBlocks.java | 4 +-- .../blockstates/quartz_fixture.json | 24 +++++++++--------- ...ding.json => quartz_fixture_standing.json} | 6 ++--- ....json => quartz_fixture_standing_odd.json} | 6 ++--- ...wall_odd.json => quartz_fixture_wall.json} | 22 ++++++++-------- ...wall.json => quartz_fixture_wall_odd.json} | 22 ++++++++-------- ...{quartz_torch.json => quartz_fixture.json} | 4 +-- .../{quartz_torch.png => quartz_fixture.png} | Bin ...rch_metal.png => quartz_fixture_metal.png} | Bin 10 files changed, 47 insertions(+), 47 deletions(-) rename src/main/java/appeng/block/misc/{BlockQuartzTorch.java => BlockQuartzFixture.java} (96%) rename src/main/resources/assets/appliedenergistics2/models/block/{quartz_torch_standing.json => quartz_fixture_standing.json} (97%) rename src/main/resources/assets/appliedenergistics2/models/block/{quartz_torch_standing_odd.json => quartz_fixture_standing_odd.json} (97%) rename src/main/resources/assets/appliedenergistics2/models/block/{quartz_torch_wall_odd.json => quartz_fixture_wall.json} (96%) rename src/main/resources/assets/appliedenergistics2/models/block/{quartz_torch_wall.json => quartz_fixture_wall_odd.json} (96%) rename src/main/resources/assets/appliedenergistics2/models/item/{quartz_torch.json => quartz_fixture.json} (96%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{quartz_torch.png => quartz_fixture.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/blocks/{quartz_torch_metal.png => quartz_fixture_metal.png} (100%) diff --git a/src/main/java/appeng/block/misc/BlockQuartzTorch.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java similarity index 96% rename from src/main/java/appeng/block/misc/BlockQuartzTorch.java rename to src/main/java/appeng/block/misc/BlockQuartzFixture.java index 562a0c137..95a643dab 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzTorch.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -49,16 +49,16 @@ import appeng.core.CommonHelper; import appeng.helpers.ICustomCollision; import appeng.helpers.MetaRotation; -public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, ICustomCollision +public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock, ICustomCollision { // Cannot use the vanilla FACING property here because it excludes facing DOWN public static final PropertyDirection FACING = PropertyDirection.create( "facing" ); - // Used to alternate between two variants of the torch on adjacent blocks + // Used to alternate between two variants of the fixture on adjacent blocks public static final PropertyBool ODD = PropertyBool.create( "odd" ); - public BlockQuartzTorch() + public BlockQuartzFixture() { super( Material.CIRCUITS ); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index fb6ea2919..05aa3b4ab 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -46,7 +46,7 @@ import appeng.block.misc.BlockInterface; import appeng.block.misc.BlockLightDetector; import appeng.block.misc.BlockPaint; import appeng.block.misc.BlockQuartzGrowthAccelerator; -import appeng.block.misc.BlockQuartzTorch; +import appeng.block.misc.BlockQuartzFixture; import appeng.block.misc.BlockSecurityStation; import appeng.block.misc.BlockSkyCompass; import appeng.block.misc.BlockTinyTNT; @@ -200,7 +200,7 @@ public final class ApiBlocks implements IBlocks this.chiseledQuartzBlock = deco.block( "chiseled_quartz_block", BlockChiseledQuartz::new ).build(); this.quartzGlass = deco.block( "quartz_glass", BlockQuartzGlass::new ).build(); this.quartzVibrantGlass = deco.block( "quartz_vibrant_glass", BlockQuartzLamp::new ).addFeatures( AEFeature.DecorativeLights ).build(); - this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzTorch::new ).features( AEFeature.DecorativeLights ).build(); + this.quartzFixture = registry.block( "quartz_fixture", BlockQuartzFixture::new ).features( AEFeature.DecorativeLights ).build(); this.fluixBlock = deco.block( "fluix_block", BlockFluix::new ).build(); this.skyStoneBlock = deco.block( "sky_stone_block", () -> new BlockSkyStone( SkystoneType.STONE ) ).build(); diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json index 0700ee832..767966baa 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json @@ -1,47 +1,47 @@ { "variants": { "facing=down,odd=false": { - "model": "appliedenergistics2:quartz_torch_standing", + "model": "appliedenergistics2:quartz_fixture_standing", "x": 180 }, "facing=down,odd=true": { - "model": "appliedenergistics2:quartz_torch_standing_odd", + "model": "appliedenergistics2:quartz_fixture_standing_odd", "x": 180 }, "facing=east,odd=false": { - "model": "appliedenergistics2:quartz_torch_wall", + "model": "appliedenergistics2:quartz_fixture_wall", "y": 90 }, "facing=east,odd=true": { - "model": "appliedenergistics2:quartz_torch_wall_odd", + "model": "appliedenergistics2:quartz_fixture_wall_odd", "y": 90 }, "facing=north,odd=false": { - "model": "appliedenergistics2:quartz_torch_wall" + "model": "appliedenergistics2:quartz_fixture_wall" }, "facing=north,odd=true": { - "model": "appliedenergistics2:quartz_torch_wall_odd" + "model": "appliedenergistics2:quartz_fixture_wall_odd" }, "facing=south,odd=false": { - "model": "appliedenergistics2:quartz_torch_wall", + "model": "appliedenergistics2:quartz_fixture_wall", "y": 180 }, "facing=south,odd=true": { - "model": "appliedenergistics2:quartz_torch_wall_odd", + "model": "appliedenergistics2:quartz_fixture_wall_odd", "y": 180 }, "facing=up,odd=false": { - "model": "appliedenergistics2:quartz_torch_standing" + "model": "appliedenergistics2:quartz_fixture_standing" }, "facing=up,odd=true": { - "model": "appliedenergistics2:quartz_torch_standing_odd" + "model": "appliedenergistics2:quartz_fixture_standing_odd" }, "facing=west,odd=false": { - "model": "appliedenergistics2:quartz_torch_wall", + "model": "appliedenergistics2:quartz_fixture_wall", "y": 270 }, "facing=west,odd=true": { - "model": "appliedenergistics2:quartz_torch_wall_odd", + "model": "appliedenergistics2:quartz_fixture_wall_odd", "y": 270 } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json similarity index 97% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json index ca9d34ac0..d0712e042 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json @@ -299,8 +299,8 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_torch", - "metal": "appliedenergistics2:blocks/quartz_torch_metal", - "quartz": "appliedenergistics2:blocks/quartz_torch" + "particle": "appliedenergistics2:blocks/quartz_fixture", + "metal": "appliedenergistics2:blocks/quartz_fixture_metal", + "quartz": "appliedenergistics2:blocks/quartz_fixture" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json similarity index 97% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json index 06933c2cf..72363e7e8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json @@ -299,8 +299,8 @@ } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_torch", - "metal": "appliedenergistics2:blocks/quartz_torch_metal", - "quartz": "appliedenergistics2:blocks/quartz_torch" + "particle": "appliedenergistics2:blocks/quartz_fixture", + "metal": "appliedenergistics2:blocks/quartz_fixture_metal", + "quartz": "appliedenergistics2:blocks/quartz_fixture" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json similarity index 96% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json index b7e93d552..9c2bfa4ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json @@ -122,15 +122,15 @@ } }, "from": [ - 8.0, + 7.0, 4.0, - 12.0 + 11.0 ], "name": "Lower Quartz Tip", "to": [ - 9.0, + 8.0, 5.0, - 13.0 + 12.0 ] }, { @@ -188,21 +188,21 @@ } }, "from": [ - 7.0, + 8.0, 10.0, - 11.0 + 12.0 ], "name": "Upper Quartz Tip", "to": [ - 8.0, + 9.0, 11.0, - 12.0 + 13.0 ] } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_torch", - "metal": "appliedenergistics2:blocks/quartz_torch_metal", - "quartz": "appliedenergistics2:blocks/quartz_torch" + "particle": "appliedenergistics2:blocks/quartz_fixture", + "metal": "appliedenergistics2:blocks/quartz_fixture_metal", + "quartz": "appliedenergistics2:blocks/quartz_fixture" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json similarity index 96% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json index d16fe7f3b..5f0739a93 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json @@ -122,15 +122,15 @@ } }, "from": [ - 7.0, + 8.0, 4.0, - 11.0 + 12.0 ], "name": "Lower Quartz Tip", "to": [ - 8.0, + 9.0, 5.0, - 12.0 + 13.0 ] }, { @@ -188,21 +188,21 @@ } }, "from": [ - 8.0, + 7.0, 10.0, - 12.0 + 11.0 ], "name": "Upper Quartz Tip", "to": [ - 9.0, + 8.0, 11.0, - 13.0 + 12.0 ] } ], "textures": { - "particle": "appliedenergistics2:blocks/quartz_torch", - "metal": "appliedenergistics2:blocks/quartz_torch_metal", - "quartz": "appliedenergistics2:blocks/quartz_torch" + "particle": "appliedenergistics2:blocks/quartz_fixture", + "metal": "appliedenergistics2:blocks/quartz_fixture_metal", + "quartz": "appliedenergistics2:blocks/quartz_fixture" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_torch.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json similarity index 96% rename from src/main/resources/assets/appliedenergistics2/models/item/quartz_torch.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json index 30e6cb3e8..a988a93d7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_torch.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json @@ -168,7 +168,7 @@ ], "parent": "block/block", "textures": { - "metal": "appliedenergistics2:blocks/quartz_torch_metal", - "quartz": "appliedenergistics2:blocks/quartz_torch" + "metal": "appliedenergistics2:blocks/quartz_fixture_metal", + "quartz": "appliedenergistics2:blocks/quartz_fixture" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch_metal.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture_metal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch_metal.png rename to src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture_metal.png