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

Added CTM integration for Crafter

Browse Source
This commit is contained in:
raoulvdberge
2017-07-30 21:19:05 +02:00
parent a6e45ee8fa
commit d45dea9493
14 changed files with 185 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "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.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
@@ -257,6 +256,9 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WRITER), 0, new ModelResourceLocation("refinedstorage:writer", "inventory"));
ModelLoader.setCustomStateMapper(RSBlocks.WRITER, new StateMapperCTM("refinedstorage:writer"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north"));
ModelLoader.setCustomStateMapper(RSBlocks.CRAFTER, new StateMapperCTM("refinedstorage:crafter"));
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));

137
src/main/resources/assets/refinedstorage/blockstates/crafter_glow.json Normal file
View File

@@ -0,0 +1,137 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_glow",
"textures": {
"particle": "refinedstorage:blocks/crafter_side",
"crafter_side": "refinedstorage:blocks/crafter_side",
"crafter_side_90": "refinedstorage:blocks/crafter_side_90",
"crafter_side_180": "refinedstorage:blocks/crafter_side_180",
"crafter_side_270": "refinedstorage:blocks/crafter_side_270",
"crafter_front": "refinedstorage:blocks/crafter_front",
"glow_side": "refinedstorage:blocks/none",
"glow_side_90": "refinedstorage:blocks/none",
"glow_side_180": "refinedstorage:blocks/none",
"glow_side_270": "refinedstorage:blocks/none",
"glow_front": "refinedstorage:blocks/none",
"glow_up": "refinedstorage:blocks/none",
"glow_down": "refinedstorage:blocks/none"
},
"uvlock": true
},
"variants": {
"connected": {
"true": {
"textures": {
"crafter_side": "refinedstorage:blocks/crafter_side_connected",
"crafter_side_90": "refinedstorage:blocks/crafter_side_connected_90",
"crafter_side_180": "refinedstorage:blocks/crafter_side_connected_180",
"crafter_side_270": "refinedstorage:blocks/crafter_side_connected_270",
"crafter_front": "refinedstorage:blocks/crafter_front_connected",
"glow_side": "refinedstorage:blocks/crafter_side_connected_glow",
"glow_side_90": "refinedstorage:blocks/crafter_side_connected_90_glow",
"glow_side_180": "refinedstorage:blocks/crafter_side_connected_180_glow",
"glow_side_270": "refinedstorage:blocks/crafter_side_connected_270_glow",
"glow_front": "refinedstorage:blocks/crafter_front_connected_glow"
}
},
"false": {
"textures": {
}
}
},
"direction": {
"north": {
"textures": {
"down": "#crafter_side",
"up": "#crafter_side",
"north": "#crafter_front",
"east": "#crafter_side_90",
"south": "refinedstorage:blocks/crafter_bottom",
"west": "#crafter_side_270",
"glow_down": "#glow_side",
"glow_up": "#glow_side",
"glow_north": "#glow_front",
"glow_east": "#glow_side_90",
"glow_south": "refinedstorage:blocks/none",
"glow_west": "#glow_side_270"
}
},
"east": {
"textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_90",
"north": "#crafter_side_270",
"east": "#crafter_front",
"south": "#crafter_side_90",
"west": "refinedstorage:blocks/crafter_bottom",
"glow_up": "#glow_side_90",
"glow_north": "#glow_side_270",
"glow_east": "#glow_front",
"glow_south": "#glow_side_90",
"glow_west": "refinedstorage:blocks/none"
}
},
"south": {
"textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_180",
"north": "refinedstorage:blocks/crafter_bottom",
"east": "#crafter_side_270",
"south": "#crafter_front",
"west": "#crafter_side_90",
"glow_up": "#glow_side_180",
"glow_north": "refinedstorage:blocks/none",
"glow_east": "#glow_side_270",
"glow_south": "#glow_front",
"glow_west": "#glow_side_90"
}
},
"west": {
"textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_side_270",
"north": "#crafter_side_90",
"east": "refinedstorage:blocks/crafter_bottom",
"south": "#crafter_side_270",
"west": "#crafter_front",
"glow_up": "#glow_side_270",
"glow_north": "#glow_side_90",
"glow_east": "refinedstorage:blocks/none",
"glow_south": "#glow_side_270",
"glow_west": "#glow_front"
}
},
"up": {
"textures": {
"down": "refinedstorage:blocks/crafter_bottom",
"up": "#crafter_front",
"north": "#crafter_side",
"east": "#crafter_side",
"south": "#crafter_side",
"west": "#crafter_side",
"glow_up": "#glow_front",
"glow_north": "#glow_side",
"glow_east": "#glow_side",
"glow_south": "#glow_side",
"glow_west": "#glow_side"
}
},
"down": {
"textures": {
"down": "#crafter_front",
"up": "refinedstorage:blocks/crafter_bottom",
"north": "#crafter_side_180",
"east": "#crafter_side_180",
"south": "#crafter_side_180",
"west": "#crafter_side_180",
"glow_down": "#glow_front",
"glow_north": "#glow_side_180",
"glow_east": "#glow_side_180",
"glow_south": "#glow_side_180",
"glow_west": "#glow_side_180"
}
}
}
}
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 234 B

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 B

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 241 B

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

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

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 B

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

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

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB