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

Implement controller block (only the block) and machine casing

Browse Source
This commit is contained in:
raoulvdberge
2019-09-18 21:27:29 +02:00
parent da5ecdae47
commit b57e4dcacd
43 changed files with 506 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/resources/assets/refinedstorage/blockstates/controller.json
View File

@@ -1,44 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_all_cutout",
"textures": {
"particle": "refinedstorage:blocks/controller/controller_off",
"all": "refinedstorage:blocks/controller/controller_off",
"cutout": "refinedstorage:blocks/controller/cutouts/off"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"energy_type": {
"off": {
},
"nearly_off": {
"model": "refinedstorage:controller_nearly_on_off",
"textures": {
"all": "refinedstorage:blocks/controller/controller",
"cutout": "refinedstorage:blocks/controller/cutouts/nearly_off",
"cutout_gray": "refinedstorage:blocks/controller/cutouts/nearly_off_gray"
}
},
"nearly_on": {
"model": "refinedstorage:controller_nearly_on_off",
"textures": {
"all": "refinedstorage:blocks/controller/controller",
"cutout": "refinedstorage:blocks/controller/cutouts/nearly_on",
"cutout_gray": "refinedstorage:blocks/controller/cutouts/nearly_on_gray"
}
},
"on": {
"textures": {
"all": "refinedstorage:blocks/controller/controller",
"cutout": "refinedstorage:blocks/controller/cutouts/on"
}
}
"energy_type=off": {
"model": "refinedstorage:block/controller/controller_off"
},
"energy_type=nearly_off": {
"model": "refinedstorage:block/controller/controller_nearly_off"
},
"energy_type=nearly_on": {
"model": "refinedstorage:block/controller/controller_nearly_on"
},
"energy_type=on": {
"model": "refinedstorage:block/controller/controller_on"
}
}
}
}

16
src/main/resources/assets/refinedstorage/blockstates/creative_controller.json Normal file
View File

@@ -0,0 +1,16 @@
{
"variants": {
"energy_type=off": {
"model": "refinedstorage:block/controller/controller_off"
},
"energy_type=nearly_off": {
"model": "refinedstorage:block/controller/controller_nearly_off"
},
"energy_type=nearly_on": {
"model": "refinedstorage:block/controller/controller_nearly_on"
},
"energy_type=on": {
"model": "refinedstorage:block/controller/controller_on"
}
}
}

16
src/main/resources/assets/refinedstorage/blockstates/machine_casing.json
View File

@@ -1,19 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "cube_all",
"textures": {
"all": "refinedstorage:blocks/machine_casing"
}
},
"variants": {
"inventory": [
{
"transform": "forge:default-block"
}
],
"normal": {
"model": "cube_all"
"": {
"model": "refinedstorage:block/machine_casing"
}
}
}

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

@@ -176,8 +176,8 @@
"sidebutton.refinedstorage:access_type.0": "Insert and extract",
"sidebutton.refinedstorage:access_type.1": "Insert only",
"sidebutton.refinedstorage:access_type.2": "Extract only",
"block.refinedstorage:controller.0": "Controller",
"block.refinedstorage:controller.1": "Creative Controller",
"block.refinedstorage.controller": "Controller",
"block.refinedstorage.creative_controller": "Creative Controller",
"block.refinedstorage:cable": "Cable",
"block.refinedstorage:grid.0": "Grid",
"block.refinedstorage:grid.1": "Crafting Grid",
@@ -189,7 +189,7 @@
"block.refinedstorage:importer": "Importer",
"block.refinedstorage:exporter": "Exporter",
"block.refinedstorage:detector": "Detector",
"block.refinedstorage:machine_casing": "Machine Casing",
"block.refinedstorage.machine_casing": "Machine Casing",
"block.refinedstorage:destructor": "Destructor",
"block.refinedstorage:constructor": "Constructor",
"block.refinedstorage:storage.0": "1k Storage Block",

43
src/main/resources/assets/refinedstorage/models/block/controller/controller_nearly.json Normal file
View File

@@ -0,0 +1,43 @@
{
"parent": "refinedstorage:block/cube_all_cutout",
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"up": {
"texture": "#cutout_gray",
"cullface": "up"
},
"down": {
"texture": "#cutout_gray",
"cullface": "down"
},
"north": {
"texture": "#cutout_gray",
"cullface": "north"
},
"south": {
"texture": "#cutout_gray",
"cullface": "south"
},
"west": {
"texture": "#cutout_gray",
"cullface": "west"
},
"east": {
"texture": "#cutout_gray",
"cullface": "east"
}
}
}
]
}

9
src/main/resources/assets/refinedstorage/models/block/controller/controller_nearly_off.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "refinedstorage:block/controller/controller_nearly",
"textures": {
"particle": "refinedstorage:block/controller/controller_off",
"all": "refinedstorage:block/controller/controller",
"cutout": "refinedstorage:block/controller/cutouts/nearly_off",
"cutout_gray": "refinedstorage:block/controller/cutouts/nearly_off_gray"
}
}

9
src/main/resources/assets/refinedstorage/models/block/controller/controller_nearly_on.json Normal file
View File

@@ -0,0 +1,9 @@
{
"parent": "refinedstorage:block/controller/controller_nearly",
"textures": {
"particle": "refinedstorage:block/controller/controller_off",
"all": "refinedstorage:block/controller/controller",
"cutout": "refinedstorage:block/controller/cutouts/nearly_on",
"cutout_gray": "refinedstorage:block/controller/cutouts/nearly_on_gray"
}
}

8
src/main/resources/assets/refinedstorage/models/block/controller/controller_off.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "refinedstorage:block/cube_all_cutout",
"textures": {
"particle": "refinedstorage:block/controller/controller_off",
"all": "refinedstorage:block/controller/controller_off",
"cutout": "refinedstorage:block/controller/cutouts/off"
}
}

8
src/main/resources/assets/refinedstorage/models/block/controller/controller_on.json Normal file
View File

@@ -0,0 +1,8 @@
{
"parent": "refinedstorage:block/cube_all_cutout",
"textures": {
"particle": "refinedstorage:block/controller/controller_off",
"all": "refinedstorage:block/controller/controller",
"cutout": "refinedstorage:block/controller/cutouts/on"
}
}

119
src/main/resources/assets/refinedstorage/models/block/controller_nearly_on_off.json
View File

@@ -1,119 +0,0 @@
{
"parent": "block/cube",
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#all",
"cullface": "down"
},
"up": {
"texture": "#all",
"cullface": "up"
},
"north": {
"texture": "#all",
"cullface": "north"
},
"south": {
"texture": "#all",
"cullface": "south"
},
"west": {
"texture": "#all",
"cullface": "west"
},
"east": {
"texture": "#all",
"cullface": "east"
}
}
},
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"up": {
"texture": "#cutout",
"cullface": "up"
},
"down": {
"texture": "#cutout",
"cullface": "down"
},
"north": {
"texture": "#cutout",
"cullface": "north"
},
"south": {
"texture": "#cutout",
"cullface": "south"
},
"west": {
"texture": "#cutout",
"cullface": "west"
},
"east": {
"texture": "#cutout",
"cullface": "east"
}
}
},
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"up": {
"texture": "#cutout_gray",
"cullface": "up"
},
"down": {
"texture": "#cutout_gray",
"cullface": "down"
},
"north": {
"texture": "#cutout_gray",
"cullface": "north"
},
"south": {
"texture": "#cutout_gray",
"cullface": "south"
},
"west": {
"texture": "#cutout_gray",
"cullface": "west"
},
"east": {
"texture": "#cutout_gray",
"cullface": "east"
}
}
}
]
}

6
src/main/resources/assets/refinedstorage/models/block/machine_casing.json Normal file
View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "refinedstorage:block/machine_casing"
}
}

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

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

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

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

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

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

8
src/main/resources/assets/refinedstorage/recipes/controller.json → src/main/resources/data/refinedstorage/recipes/controller.json
View File

@@ -10,18 +10,16 @@
"item": "refinedstorage:quartz_enriched_iron"
},
"P": {
"item": "#advanced_processor"
"item": "refinedstorage:advanced_processor"
},
"S": {
"type": "forge:ore_dict",
"ore": "itemSilicon"
"tag": "refinedstorage:silicons"
},
"M": {
"item": "refinedstorage:machine_casing"
}
},
"result": {
"item": "refinedstorage:controller",
"data": 0
"item": "refinedstorage:controller"
}
}

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

@@ -10,8 +10,7 @@
"item": "refinedstorage:quartz_enriched_iron"
},
"S": {
"type": "forge:ore_dict",
"ore": "stone"
"tag": "forge:stone"
}
},
"result": {