dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added CTM integration for Detector

Browse Source
This commit is contained in:
raoulvdberge
2017-07-30 16:43:27 +02:00
parent 75bd05e75e
commit 8938fc8e67
5 changed files with 398 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
View File

@@ -206,7 +206,6 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.READER), 0, new ModelResourceLocation("refinedstorage:reader", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.READER), 0, new ModelResourceLocation("refinedstorage:reader", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WRITER), 0, new ModelResourceLocation("refinedstorage:writer", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WRITER), 0, new ModelResourceLocation("refinedstorage:writer", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory"));
@@ -272,6 +271,14 @@ public class ProxyClient extends ProxyCommon {
} }
}); });
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory"));
ModelLoader.setCustomStateMapper(RSBlocks.DETECTOR, new StateMapperBase() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation("refinedstorage:detector" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties()));
}
});
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> { ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack)); ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));

31
src/main/resources/assets/refinedstorage/blockstates/detector_glow.json Normal file
View File

@@ -0,0 +1,31 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:detector_glow",
"textures": {
"particle": "refinedstorage:blocks/detector_top",
"torch": "refinedstorage:blocks/detector_side_off",
"side": "refinedstorage:blocks/detector_side_off",
"top": "refinedstorage:blocks/detector_top",
"bottom": "refinedstorage:blocks/detector_bottom",
"glow": "refinedstorage:blocks/none"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"powered": {
"true": {
"textures": {
"torch": "refinedstorage:blocks/detector_side_on",
"glow": "refinedstorage:blocks/detector_side_on_glow"
}
},
"false": {
}
}
}
}

350
src/main/resources/assets/refinedstorage/models/block/detector_glow.json Normal file
View File

@@ -0,0 +1,350 @@
{
"__comment": "Model made by CyanideX",
"elements": [
{
"name": "Element",
"from": [
7.0,
5.0,
7.0
],
"to": [
9.0,
10.0,
9.0
],
"shade": false,
"faces": {
"north": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"east": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"south": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"west": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"up": {
"texture": "#torch",
"uv": [
7.0,
5.0,
9.0,
7.0
]
},
"down": {
"texture": "#torch",
"uv": [
7.0,
7.0,
9.0,
9.0
]
}
}
},
{
"name": "Element",
"from": [
7.0,
5.0,
6.0
],
"to": [
9.0,
11.0,
10.0
],
"shade": false,
"faces": {
"east": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
},
"west": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
}
}
},
{
"name": "Element",
"from": [
6.0,
5.0,
7.0
],
"to": [
10.0,
11.0,
9.0
],
"shade": false,
"faces": {
"north": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
},
"south": {
"texture": "#torch",
"uv": [
6.0,
4.0,
10.0,
11.0
]
}
}
},
{
"name": "Element",
"from": [
7.0,
5.0,
7.0
],
"to": [
9.0,
10.0,
9.0
],
"shade": false,
"faces": {
"north": {
"texture": "#glow",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"east": {
"texture": "#glow",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"south": {
"texture": "#glow",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"west": {
"texture": "#glow",
"uv": [
7.0,
5.0,
9.0,
11.0
]
},
"up": {
"texture": "#glow",
"uv": [
7.0,
5.0,
9.0,
7.0
]
},
"down": {
"texture": "#glow",
"uv": [
7.0,
7.0,
9.0,
9.0
]
}
}
},
{
"name": "Element",
"from": [
7.0,
5.0,
6.0
],
"to": [
9.0,
11.0,
10.0
],
"shade": false,
"faces": {
"east": {
"texture": "#glow",
"uv": [
6.0,
4.0,
10.0,
11.0
]
},
"west": {
"texture": "#glow",
"uv": [
6.0,
4.0,
10.0,
11.0
]
}
}
},
{
"name": "Element",
"from": [
6.0,
5.0,
7.0
],
"to": [
10.0,
11.0,
9.0
],
"shade": false,
"faces": {
"north": {
"texture": "#glow",
"uv": [
6.0,
4.0,
10.0,
11.0
]
},
"south": {
"texture": "#glow",
"uv": [
6.0,
4.0,
10.0,
11.0
]
}
}
},
{
"name": "base",
"from": [
0.0,
0.0,
0.0
],
"to": [
16.0,
5.0,
16.0
],
"faces": {
"north": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
},
"east": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
},
"south": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
},
"west": {
"texture": "#side",
"uv": [
0.0,
11.0,
16.0,
16.0
]
},
"up": {
"texture": "#top",
"uv": [
0.0,
0.0,
16.0,
16.0
]
},
"down": {
"texture": "#bottom",
"uv": [
0.0,
0.0,
16.0,
16.0
]
}
}
}
]
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 262 B

9
src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta Normal file
View File

@@ -0,0 +1,9 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}