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

Re-add the Security Manager

Browse Source
This commit is contained in:
raoulvdberge
2019-10-20 23:08:47 +02:00
parent ea6c1f9492
commit 00090b2b28
26 changed files with 345 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/resources/assets/refinedstorage/blockstates/security_manager.json
View File

@@ -1,54 +1,36 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:security_manager",
"textures": {
"particle": "refinedstorage:blocks/security_manager/front",
"down": "refinedstorage:blocks/security_manager/bottom",
"up": "refinedstorage:blocks/security_manager/top",
"north": "refinedstorage:blocks/security_manager/front",
"east": "refinedstorage:blocks/security_manager/left",
"south": "refinedstorage:blocks/security_manager/back",
"west": "refinedstorage:blocks/security_manager/right",
"cutout_up": "refinedstorage:blocks/security_manager/cutouts/top_disconnected",
"cutout_north": "refinedstorage:blocks/security_manager/cutouts/front_disconnected",
"cutout_east": "refinedstorage:blocks/security_manager/cutouts/left_disconnected",
"cutout_south": "refinedstorage:blocks/security_manager/cutouts/back_disconnected",
"cutout_west": "refinedstorage:blocks/security_manager/cutouts/right_disconnected"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"connected": {
"true": {
"textures": {
"cutout_up": "refinedstorage:blocks/security_manager/cutouts/top_connected",
"cutout_north": "refinedstorage:blocks/security_manager/cutouts/front_connected",
"cutout_east": "refinedstorage:blocks/security_manager/cutouts/left_connected",
"cutout_south": "refinedstorage:blocks/security_manager/cutouts/back_connected",
"cutout_west": "refinedstorage:blocks/security_manager/cutouts/right_connected"
}
},
"false": {
}
"connected=true,direction=north": {
"model": "refinedstorage:block/security_manager_connected",
"y": 0
},
"direction": {
"north": {
"y": 0
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
}
"connected=true,direction=east": {
"model": "refinedstorage:block/security_manager_connected",
"y": 90
},
"connected=true,direction=south": {
"model": "refinedstorage:block/security_manager_connected",
"y": 180
},
"connected=true,direction=west": {
"model": "refinedstorage:block/security_manager_connected",
"y": 270
},
"connected=false,direction=north": {
"model": "refinedstorage:block/security_manager_disconnected",
"y": 0
},
"connected=false,direction=east": {
"model": "refinedstorage:block/security_manager_disconnected",
"y": 90
},
"connected=false,direction=south": {
"model": "refinedstorage:block/security_manager_disconnected",
"y": 180
},
"connected=false,direction=west": {
"model": "refinedstorage:block/security_manager_disconnected",
"y": 270
}
}
}

12
src/main/resources/assets/refinedstorage/lang/en_us.json
View File

@@ -65,16 +65,16 @@
"gui.refinedstorage:crafting_preview.error.recursive.4": "Offending pattern:",
"gui.refinedstorage:crafting_preview.error.too_complex.0": "The crafting task calculation was too complex",
"gui.refinedstorage:crafting_preview.error.too_complex.1": "and was stopped to avoid server strain.",
"gui.refinedstorage:security_manager": "Security Manager",
"gui.refinedstorage:security_manager.configure": "Configure",
"gui.refinedstorage.security_manager": "Security Manager",
"gui.refinedstorage.security_manager.configure": "Configure",
"gui.refinedstorage.security_manager.permission.0": "Insert",
"gui.refinedstorage.security_manager.permission.0.tooltip": "Inserting items to the network",
"gui.refinedstorage.security_manager.permission.0.tooltip": "Inserting items or fluids to the network",
"gui.refinedstorage.security_manager.permission.1": "Extract",
"gui.refinedstorage.security_manager.permission.1.tooltip": "Extracting items from the network",
"gui.refinedstorage.security_manager.permission.1.tooltip": "Extracting items or fluids from the network",
"gui.refinedstorage.security_manager.permission.2": "Autocrafting",
"gui.refinedstorage.security_manager.permission.2.tooltip": "Starting, cancelling and viewing crafting tasks",
"gui.refinedstorage.security_manager.permission.3": "Modify",
"gui.refinedstorage.security_manager.permission.3.tooltip": "Opening block GUIs",
"gui.refinedstorage.security_manager.permission.3.tooltip": "Opening blocks",
"gui.refinedstorage.security_manager.permission.4": "Build",
"gui.refinedstorage.security_manager.permission.4.tooltip": "Adding or removing devices to or from the network",
"gui.refinedstorage.security_manager.permission.5": "Security",
@@ -208,7 +208,7 @@
"block.refinedstorage.1024k_fluid_storage_block": "1024k Fluid Storage Block",
"block.refinedstorage.4096k_fluid_storage_block": "4096k Fluid Storage Block",
"block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block",
"block.refinedstorage:security_manager": "Security Manager",
"block.refinedstorage.security_manager": "Security Manager",
"block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron",
"block.refinedstorage:storage_monitor": "Storage Monitor",
"block.refinedstorage:portable_grid.0": "Portable Grid",

9
src/main/resources/assets/refinedstorage/models/block/security_manager.json
View File

@@ -1,5 +1,14 @@
{
"parent": "block/cube",
"textures": {
"particle": "refinedstorage:block/security_manager/front",
"down": "refinedstorage:block/security_manager/bottom",
"up": "refinedstorage:block/security_manager/top",
"north": "refinedstorage:block/security_manager/front",
"east": "refinedstorage:block/security_manager/left",
"south": "refinedstorage:block/security_manager/back",
"west": "refinedstorage:block/security_manager/right"
},
"elements": [
{
"from": [

10
src/main/resources/assets/refinedstorage/models/block/security_manager_connected.json Normal file
View File

@@ -0,0 +1,10 @@
{
"parent": "refinedstorage:block/security_manager",
"textures": {
"cutout_up": "refinedstorage:block/security_manager/cutouts/top_connected",
"cutout_north": "refinedstorage:block/security_manager/cutouts/front_connected",
"cutout_east": "refinedstorage:block/security_manager/cutouts/left_connected",
"cutout_south": "refinedstorage:block/security_manager/cutouts/back_connected",
"cutout_west": "refinedstorage:block/security_manager/cutouts/right_connected"
}
}

10
src/main/resources/assets/refinedstorage/models/block/security_manager_disconnected.json Normal file
View File

@@ -0,0 +1,10 @@
{
"parent": "refinedstorage:block/security_manager",
"textures": {
"cutout_up": "refinedstorage:block/security_manager/cutouts/top_disconnected",
"cutout_north": "refinedstorage:block/security_manager/cutouts/front_disconnected",
"cutout_east": "refinedstorage:block/security_manager/cutouts/left_disconnected",
"cutout_south": "refinedstorage:block/security_manager/cutouts/back_disconnected",
"cutout_west": "refinedstorage:block/security_manager/cutouts/right_disconnected"
}
}

3
src/main/resources/assets/refinedstorage/models/item/security_manager.json Normal file
View File

@@ -0,0 +1,3 @@
{
"parent": "refinedstorage:block/security_manager_disconnected"
}

19
src/main/resources/data/refinedstorage/loot_tables/blocks/security_manager.json Normal file
View File

@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "refinedstorage:security_manager"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

3
src/main/resources/assets/refinedstorage/recipes/security_manager.json → src/main/resources/data/refinedstorage/recipes/security_manager.json
View File

@@ -10,8 +10,7 @@
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"type": "forge:ore_dict",
"ore": "chest"
"tag": "forge:chests"
},
"S": {
"item": "refinedstorage:security_card"