tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Makes quartz fixture resources and class consistent with the registry name.

This commit is contained in:
Sebastian Hartte 2016-08-26 01:40:18 +02:00
parent c0b0687fd3
commit 85cf7d7981
10 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/appeng/block/misc/BlockQuartzTorch.java → src/main/java/appeng/block/misc/BlockQuartzFixture.java
View File

@ -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 );

4
src/main/java/appeng/core/api/definitions/ApiBlocks.java
View File

@ -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();

24
src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json
View File

@ -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
}
}

6
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json → src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json
View File

@ -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"
}
}

6
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json → src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json
View File

@ -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"
}
}

22
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json → src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json
View File

@ -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"
}
}

22
src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json → src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json
View File

@ -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"
}
}

4
src/main/resources/assets/appliedenergistics2/models/item/quartz_torch.json → src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json
View File

@ -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"
}
}

0
src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch.png → src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 824 B

0
src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_torch_metal.png → src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_fixture_metal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 622 B

After

Width:  |  Height:  |  Size: 622 B