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

Added CTM integration for Security Manager

Browse Source
This commit is contained in:
raoulvdberge
2017-07-30 20:22:22 +02:00
parent 3686d8fca0
commit 66b9825894
17 changed files with 151 additions and 9 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

@@ -220,7 +220,6 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_STORAGE), FluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_MANIPULATOR), 0, new ModelResourceLocation("refinedstorage:disk_manipulator", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SECURITY_MANAGER), 0, new ModelResourceLocation("refinedstorage:security_manager", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE_MONITOR), 0, new ModelResourceLocation("refinedstorage:storage_monitor", "connected=false,direction=north"));
@@ -286,6 +285,14 @@ public class ProxyClient extends ProxyCommon {
}
});
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SECURITY_MANAGER), 0, new ModelResourceLocation("refinedstorage:security_manager", "inventory"));
ModelLoader.setCustomStateMapper(RSBlocks.SECURITY_MANAGER, new StateMapperBase() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation("refinedstorage:security_manager" + (Loader.isModLoaded("ctm") ? "_glow" : ""), getPropertyString(state.getProperties()));
}
});
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));

9
src/main/resources/assets/refinedstorage/blockstates/crafting_monitor_glow.json
View File

@@ -10,7 +10,12 @@
"west": "refinedstorage:blocks/crafting_monitor_right",
"up": "refinedstorage:blocks/crafting_monitor_top",
"down": "refinedstorage:blocks/bottom",
"glow": "refinedstorage:blocks/none"
"glow_north": "refinedstorage:blocks/none",
"glow_east": "refinedstorage:blocks/none",
"glow_south": "refinedstorage:blocks/none",
"glow_west": "refinedstorage:blocks/none",
"glow_up": "refinedstorage:blocks/none",
"glow_down": "refinedstorage:blocks/none"
}
},
"variants": {
@@ -24,7 +29,7 @@
"true": {
"textures": {
"north": "refinedstorage:blocks/crafting_monitor_front_connected",
"glow": "refinedstorage:blocks/crafting_monitor_front_connected_glow"
"glow_north": "refinedstorage:blocks/crafting_monitor_front_connected_glow"
}
},
"false": {

15
src/main/resources/assets/refinedstorage/blockstates/grid_glow.json
View File

@@ -10,7 +10,12 @@
"west": "refinedstorage:blocks/grid_right",
"up": "refinedstorage:blocks/grid_top",
"down": "refinedstorage:blocks/bottom",
"glow": "refinedstorage:blocks/none"
"glow_north": "refinedstorage:blocks/none",
"glow_east": "refinedstorage:blocks/none",
"glow_south": "refinedstorage:blocks/none",
"glow_west": "refinedstorage:blocks/none",
"glow_up": "refinedstorage:blocks/none",
"glow_down": "refinedstorage:blocks/none"
}
},
"variants": {
@@ -44,25 +49,25 @@
"normal": {
"textures": {
"north": "#north_normal",
"glow": "#north_normal_glow"
"glow_north": "#north_normal_glow"
}
},
"crafting": {
"textures": {
"north": "#north_crafting",
"glow": "#north_crafting_glow"
"glow_north": "#north_crafting_glow"
}
},
"pattern": {
"textures": {
"north": "#north_pattern",
"glow": "#north_pattern_glow"
"glow_north": "#north_pattern_glow"
}
},
"fluid": {
"textures": {
"north": "#north_fluid",
"glow": "#north_fluid_glow",
"glow_north": "#north_fluid_glow",
"east": "refinedstorage:blocks/grid_fluid_left",
"south": "refinedstorage:blocks/grid_fluid_back",
"west": "refinedstorage:blocks/grid_fluid_right",

60
src/main/resources/assets/refinedstorage/blockstates/security_manager_glow.json Normal file
View File

@@ -0,0 +1,60 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_glow",
"textures": {
"particle": "refinedstorage:blocks/security_manager_front_disconnected",
"down": "refinedstorage:blocks/security_manager_bottom",
"up": "refinedstorage:blocks/security_manager_top_disconnected",
"north": "refinedstorage:blocks/security_manager_front_disconnected",
"east": "refinedstorage:blocks/security_manager_left_disconnected",
"south": "refinedstorage:blocks/security_manager_back_disconnected",
"west": "refinedstorage:blocks/security_manager_right_disconnected",
"glow_north": "refinedstorage:blocks/none",
"glow_east": "refinedstorage:blocks/none",
"glow_south": "refinedstorage:blocks/none",
"glow_west": "refinedstorage:blocks/none",
"glow_up": "refinedstorage:blocks/none",
"glow_down": "refinedstorage:blocks/none"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"connected": {
"true": {
"textures": {
"up": "refinedstorage:blocks/security_manager_top_connected",
"north": "refinedstorage:blocks/security_manager_front_connected",
"east": "refinedstorage:blocks/security_manager_left_connected",
"south": "refinedstorage:blocks/security_manager_back_connected",
"west": "refinedstorage:blocks/security_manager_right_connected",
"glow_north": "refinedstorage:blocks/security_manager_front_connected_glow",
"glow_east": "refinedstorage:blocks/security_manager_left_connected_glow",
"glow_south": "refinedstorage:blocks/security_manager_back_connected_glow",
"glow_west": "refinedstorage:blocks/security_manager_right_connected_glow",
"glow_up": "refinedstorage:blocks/security_manager_top_connected_glow"
}
},
"false": {
}
},
"direction": {
"north": {
"y": 0
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
}
}
}
}

22
src/main/resources/assets/refinedstorage/models/block/cube_glow.json
View File

@@ -53,9 +53,29 @@
],
"shade": false,
"faces": {
"down": {
"texture": "#glow_down",
"cullface": "down"
},
"up": {
"texture": "#glow_up",
"cullface": "up"
},
"north": {
"texture": "#glow",
"texture": "#glow_north",
"cullface": "north"
},
"south": {
"texture": "#glow_south",
"cullface": "south"
},
"west": {
"texture": "#glow_west",
"cullface": "west"
},
"east": {
"texture": "#glow_east",
"cullface": "east"
}
}
}

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 380 B

9
src/main/resources/assets/refinedstorage/textures/blocks/security_manager_back_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/security_manager_front_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 331 B

9
src/main/resources/assets/refinedstorage/textures/blocks/security_manager_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/security_manager_left_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

9
src/main/resources/assets/refinedstorage/textures/blocks/security_manager_left_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/security_manager_right_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 354 B

9
src/main/resources/assets/refinedstorage/textures/blocks/security_manager_right_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/security_manager_side_connected.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 B

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

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