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

Controller Model (#33)

Browse source 
* Implemented the controller models (using the UVL model loader to make the lights be fullbright at night).
This commit is contained in:
shartte 2016-08-15 10:28:45 +02:00 committed by Elix_x
parent a422de6adb
commit 24ddc0e574
24 changed files with 359 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/main/java/appeng/block/networking/BlockController.java
View file

@ -27,8 +27,10 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
@ -39,7 +41,7 @@ import appeng.tile.networking.TileController;
public class BlockController extends AEBaseTileBlock
{
public static enum ControllerBlockState implements IStringSerializable
public enum ControllerBlockState implements IStringSerializable
{
offline, online, conflicted;
@ -49,26 +51,106 @@ public class BlockController extends AEBaseTileBlock
return this.name();
}
};
}
public static final PropertyEnum CONTROLLER_STATE = PropertyEnum.create( "state", ControllerBlockState.class );
/**
* Controls the rendering of the controller block (connected texture style).
* inside_a and inside_b are alternating patterns for a controller that is enclosed by other controllers,
* and since they are always offline, they do not have the usual sub-states.
*/
public enum ControllerRenderType implements IStringSerializable
{
block, column, inside_a, inside_b;
@Override
public String getName()
{
return this.name();
}
}
public static final PropertyEnum<ControllerBlockState> CONTROLLER_STATE = PropertyEnum.create( "state", ControllerBlockState.class );
public static final PropertyEnum<ControllerRenderType> CONTROLLER_TYPE = PropertyEnum.create( "type", ControllerRenderType.class );
@Override
protected IProperty[] getAEStates()
{
return new IProperty[] { AE_BLOCK_FORWARD, AE_BLOCK_UP, CONTROLLER_STATE };
return new IProperty[] { AE_BLOCK_FORWARD, AE_BLOCK_UP, CONTROLLER_STATE, CONTROLLER_TYPE };
}
/**
* This will compute the AE_BLOCK_FORWARD, AE_BLOCK_UP and CONTROLLER_TYPE block states based on adjacent
* controllers and the network state of this controller (offline, online, conflicted). This is used to
* get a rudimentary connected texture feel for the controller based on how it is placed.
*/
@Override
public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
{
// Only used for columns, really
EnumFacing up = EnumFacing.UP;
EnumFacing forward = EnumFacing.NORTH;
ControllerRenderType type = ControllerRenderType.block;
int x = pos.getX();
int y = pos.getY();
int z = pos.getZ();
// Detect whether controllers are on both sides of the x, y, and z axes
final boolean xx = this.getTileEntity( world, x - 1, y, z ) instanceof TileController && this.getTileEntity( world, x + 1, y, z ) instanceof TileController;
final boolean yy = this.getTileEntity( world, x, y - 1, z ) instanceof TileController && this.getTileEntity( world, x, y + 1, z ) instanceof TileController;
final boolean zz = this.getTileEntity( world, x, y, z - 1 ) instanceof TileController && this.getTileEntity( world, x, y, z + 1 ) instanceof TileController;
if( xx && !yy && !zz )
{
up = EnumFacing.EAST;
forward = EnumFacing.UP;
type = ControllerRenderType.column;
}
else if( !xx && yy && !zz )
{
up = EnumFacing.UP;
forward = EnumFacing.NORTH;
type = ControllerRenderType.column;
}
else if( !xx && !yy && zz )
{
up = EnumFacing.NORTH;
forward = EnumFacing.UP;
type = ControllerRenderType.column;
}
else if( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) >= 2 )
{
final int v = ( Math.abs( x ) + Math.abs( y ) + Math.abs( z ) ) % 2;
// While i'd like this to be based on the blockstate randomization feature, this generates
// an alternating pattern based on world position, so this is not 100% doable with blockstates.
if( v == 0 )
{
type = ControllerRenderType.inside_a;
}
else
{
type = ControllerRenderType.inside_b;
}
}
return state.withProperty( AE_BLOCK_FORWARD, forward ).withProperty( AE_BLOCK_UP, up ).withProperty( CONTROLLER_TYPE, type );
}
@Override
public int getMetaFromState( final IBlockState state )
{
return ( (ControllerBlockState) state.getValue( CONTROLLER_STATE ) ).ordinal();
return state.getValue( CONTROLLER_STATE ).ordinal();
}
@Override
public IBlockState getStateFromMeta( final int meta )
{
return this.getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.offline );
ControllerBlockState state = ControllerBlockState.values()[meta];
return this.getDefaultState().withProperty( CONTROLLER_STATE, state );
}
@Override
@ -83,6 +165,7 @@ public class BlockController extends AEBaseTileBlock
this.setTileEntity( TileController.class );
this.setHardness( 6 );
this.setFeature( EnumSet.of( AEFeature.Channels ) );
this.setDefaultState( getDefaultState().withProperty( CONTROLLER_STATE, ControllerBlockState.offline ).withProperty( CONTROLLER_TYPE, ControllerRenderType.block ) );
}
@Override

1
src/main/java/appeng/client/render/model/UVLModelLoader.java
View file

@ -309,6 +309,7 @@ public enum UVLModelLoader implements ICustomModelLoader
};
trans.setParent( builder );
quad.pipe( trans );
builder.setQuadOrientation( quad.getFace() );
return builder.build();
}
else

36
src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockController.json Normal file
View file

@ -0,0 +1,36 @@
{
"multipart": [
{
"when": { "type": "block", "state": "offline" },
"apply": { "model": "appliedenergistics2:controller/controller_block_offline" }
},
{
"when": { "type": "block", "state": "online" },
"apply": { "model": "appliedenergistics2:controller/controller_block_online.uvl" }
},
{
"when": { "type": "block", "state": "conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_block_conflicted.uvl" }
},
{
"when": { "type": "column", "state": "offline" },
"apply": { "model": "appliedenergistics2:controller/controller_column_offline" }
},
{
"when": { "type": "column", "state": "online" },
"apply": { "model": "appliedenergistics2:controller/controller_column_online.uvl" }
},
{
"when": { "type": "column", "state": "conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_column_conflicted.uvl" }
},
{
"when": { "type": "inside_a", "state": "offline|online|conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_inside_a" }
},
{
"when": { "type": "inside_b", "state": "offline|online|conflicted" },
"apply": { "model": "appliedenergistics2:controller/controller_inside_b" }
}
]
}

42
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.uvl.json Normal file
View file

@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerPowered",
"lights": "appliedenergistics2:blocks/BlockControllerConflict"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}

6
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockController"
}
}

42
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.uvl.json Normal file
View file

@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerPowered",
"lights": "appliedenergistics2:blocks/BlockControllerLights"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}

42
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.uvl.json Normal file
View file

@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerColumnPowered",
"lights": "appliedenergistics2:blocks/BlockControllerColumnConflict"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}

6
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerColumn"
}
}

42
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.uvl.json Normal file
View file

@ -0,0 +1,42 @@
{
"parent": "block/block",
"display": {
"firstperson_righthand": {
"rotation": [ 0, 135, 0 ],
"translation": [ 0, 0, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"particle": "#block",
"block": "appliedenergistics2:blocks/BlockControllerColumnPowered",
"lights": "appliedenergistics2:blocks/BlockControllerColumnLights"
},
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"shade": false,
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#lights", "uvlightmap": { "sky": 0.007, "block": 0.007 }}
}
},
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"},
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#block"}
}
}
]
}

6
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerInsideA"
}
}

6
src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "appliedenergistics2:blocks/BlockControllerInsideB"
}
}

3
src/main/resources/assets/appliedenergistics2/models/item/tile.BlockController.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "appliedenergistics2:block/controller/controller_block_offline"
}

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockController.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 307 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumn.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 268 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnConflict.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 264 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

19
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnLights.png.mcmeta Normal file
View file

@ -0,0 +1,19 @@
{
"animation": {
"frametime": 3,
"frames": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
0
]
}
}

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerColumnPowered.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 254 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerConflict.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 275 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideA.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 294 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerInsideB.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 298 B

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

19
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerLights.png.mcmeta Normal file
View file

@ -0,0 +1,19 @@
{
"animation": {
"frametime": 3,
"frames": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
]
}
}

BIN
src/main/resources/assets/appliedenergistics2/textures/blocks/BlockControllerPowered.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 279 B