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

Re-add the Storage Blocks

Browse Source
This commit is contained in:
raoulvdberge
2019-10-12 21:18:55 +02:00
parent c657efe437
commit 3d7a1f5881
124 changed files with 886 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "refinedstorage:block/16k_storage_block"
}
}
}

7
src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "refinedstorage:block/1k_storage_block"
}
}
}

7
src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "refinedstorage:block/4k_storage_block"
}
}
}

7
src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "refinedstorage:block/64k_storage_block"
}
}
}

7
src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json Normal file
View File

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "refinedstorage:block/creative_storage_block"
}
}
}

36
src/main/resources/assets/refinedstorage/blockstates/storage.json
View File

@@ -1,36 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "cube_all",
"transform": "forge:default-block"
},
"variants": {
"type": {
"1k": {
"textures": {
"all": "refinedstorage:blocks/1k_storage_block"
}
},
"4k": {
"textures": {
"all": "refinedstorage:blocks/4k_storage_block"
}
},
"16k": {
"textures": {
"all": "refinedstorage:blocks/16k_storage_block"
}
},
"64k": {
"textures": {
"all": "refinedstorage:blocks/64k_storage_block"
}
},
"creative": {
"textures": {
"all": "refinedstorage:blocks/creative_storage_block"
}
}
}
}
}

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

@@ -123,58 +123,58 @@
"misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s",
"misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s",
"misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s",
"sidebutton.refinedstorage:compare.1": "Use NBT",
"sidebutton.refinedstorage:redstone_mode": "Redstone mode",
"sidebutton.refinedstorage:redstone_mode.0": "Ignore redstone signal",
"sidebutton.refinedstorage:redstone_mode.1": "Only work with redstone signal",
"sidebutton.refinedstorage:redstone_mode.2": "Only work without redstone signal",
"sidebutton.refinedstorage:crafter_mode": "Crafter mode",
"sidebutton.refinedstorage:crafter_mode.0": "Ignore redstone signal",
"sidebutton.refinedstorage:crafter_mode.1": "Redstone signal unlocks autocrafting",
"sidebutton.refinedstorage:crafter_mode.2": "Redstone signal locks autocrafting",
"sidebutton.refinedstorage:crafter_mode.3": "Redstone pulse inserts next set",
"sidebutton.refinedstorage:grid.view_type": "Display",
"sidebutton.refinedstorage:grid.view_type.0": "Normal",
"sidebutton.refinedstorage:grid.view_type.1": "No craftables",
"sidebutton.refinedstorage:grid.view_type.2": "Only craftables",
"sidebutton.refinedstorage:grid.sorting.direction": "Sorting direction",
"sidebutton.refinedstorage:grid.sorting.direction.0": "Ascending",
"sidebutton.refinedstorage:grid.sorting.direction.1": "Descending",
"sidebutton.refinedstorage:grid.sorting.type": "Sorting type",
"sidebutton.refinedstorage:grid.sorting.type.0": "Quantity",
"sidebutton.refinedstorage:grid.sorting.type.1": "Name",
"sidebutton.refinedstorage:grid.sorting.type.2": "ID",
"sidebutton.refinedstorage:grid.sorting.type.3": "InventoryTweaks",
"sidebutton.refinedstorage:grid.sorting.type.4": "Last modified",
"sidebutton.refinedstorage:grid.search_box_mode": "Search box mode",
"sidebutton.refinedstorage:grid.search_box_mode.0": "Normal",
"sidebutton.refinedstorage:grid.search_box_mode.1": "Normal (autoselected)",
"sidebutton.refinedstorage:grid.search_box_mode.2": "JEI synchronized",
"sidebutton.refinedstorage:grid.search_box_mode.3": "JEI synchronized (autoselected)",
"sidebutton.refinedstorage:grid.size": "Size",
"sidebutton.refinedstorage:grid.size.0": "Stretch",
"sidebutton.refinedstorage:grid.size.1": "Small",
"sidebutton.refinedstorage:grid.size.2": "Medium",
"sidebutton.refinedstorage:grid.size.3": "Large",
"sidebutton.refinedstorage.compare.1": "Use NBT",
"sidebutton.refinedstorage.redstone_mode": "Redstone mode",
"sidebutton.refinedstorage.redstone_mode.0": "Ignore redstone signal",
"sidebutton.refinedstorage.redstone_mode.1": "Only work with redstone signal",
"sidebutton.refinedstorage.redstone_mode.2": "Only work without redstone signal",
"sidebutton.refinedstorage.crafter_mode": "Crafter mode",
"sidebutton.refinedstorage.crafter_mode.0": "Ignore redstone signal",
"sidebutton.refinedstorage.crafter_mode.1": "Redstone signal unlocks autocrafting",
"sidebutton.refinedstorage.crafter_mode.2": "Redstone signal locks autocrafting",
"sidebutton.refinedstorage.crafter_mode.3": "Redstone pulse inserts next set",
"sidebutton.refinedstorage.grid.view_type": "Display",
"sidebutton.refinedstorage.grid.view_type.0": "Normal",
"sidebutton.refinedstorage.grid.view_type.1": "No craftables",
"sidebutton.refinedstorage.grid.view_type.2": "Only craftables",
"sidebutton.refinedstorage.grid.sorting.direction": "Sorting direction",
"sidebutton.refinedstorage.grid.sorting.direction.0": "Ascending",
"sidebutton.refinedstorage.grid.sorting.direction.1": "Descending",
"sidebutton.refinedstorage.grid.sorting.type": "Sorting type",
"sidebutton.refinedstorage.grid.sorting.type.0": "Quantity",
"sidebutton.refinedstorage.grid.sorting.type.1": "Name",
"sidebutton.refinedstorage.grid.sorting.type.2": "ID",
"sidebutton.refinedstorage.grid.sorting.type.3": "InventoryTweaks",
"sidebutton.refinedstorage.grid.sorting.type.4": "Last modified",
"sidebutton.refinedstorage.grid.search_box_mode": "Search box mode",
"sidebutton.refinedstorage.grid.search_box_mode.0": "Normal",
"sidebutton.refinedstorage.grid.search_box_mode.1": "Normal (autoselected)",
"sidebutton.refinedstorage.grid.search_box_mode.2": "JEI synchronized",
"sidebutton.refinedstorage.grid.search_box_mode.3": "JEI synchronized (autoselected)",
"sidebutton.refinedstorage.grid.size": "Size",
"sidebutton.refinedstorage.grid.size.0": "Stretch",
"sidebutton.refinedstorage.grid.size.1": "Small",
"sidebutton.refinedstorage.grid.size.2": "Medium",
"sidebutton.refinedstorage.grid.size.3": "Large",
"sidebutton.refinedstorage.mode": "Mode",
"sidebutton.refinedstorage.mode.whitelist": "Whitelist",
"sidebutton.refinedstorage.mode.blacklist": "Blacklist",
"sidebutton.refinedstorage:iomode": "IO mode",
"sidebutton.refinedstorage:iomode.insert": "Insert into network",
"sidebutton.refinedstorage:iomode.extract": "Extract from network",
"sidebutton.refinedstorage:type": "Type",
"sidebutton.refinedstorage:type.0": "Items",
"sidebutton.refinedstorage:type.1": "Fluids",
"sidebutton.refinedstorage:detector.mode": "Mode",
"sidebutton.refinedstorage:detector.mode.0": "Emit signal when under the amount",
"sidebutton.refinedstorage:detector.mode.1": "Emit signal when on the amount",
"sidebutton.refinedstorage:detector.mode.2": "Emit signal when above the amount",
"sidebutton.refinedstorage:constructor.drop": "Drop blocks instead of placing",
"sidebutton.refinedstorage:destructor.pickup": "Pickup items instead of breaking",
"sidebutton.refinedstorage:access_type": "Access type",
"sidebutton.refinedstorage:access_type.0": "Insert and extract",
"sidebutton.refinedstorage:access_type.1": "Insert only",
"sidebutton.refinedstorage:access_type.2": "Extract only",
"sidebutton.refinedstorage.iomode": "IO mode",
"sidebutton.refinedstorage.iomode.insert": "Insert into network",
"sidebutton.refinedstorage.iomode.extract": "Extract from network",
"sidebutton.refinedstorage.type": "Type",
"sidebutton.refinedstorage.type.0": "Items",
"sidebutton.refinedstorage.type.1": "Fluids",
"sidebutton.refinedstorage.detector.mode": "Mode",
"sidebutton.refinedstorage.detector.mode.0": "Emit signal when under the amount",
"sidebutton.refinedstorage.detector.mode.1": "Emit signal when on the amount",
"sidebutton.refinedstorage.detector.mode.2": "Emit signal when above the amount",
"sidebutton.refinedstorage.constructor.drop": "Drop blocks instead of placing",
"sidebutton.refinedstorage.destructor.pickup": "Pickup items instead of breaking",
"sidebutton.refinedstorage.access_type": "Access type",
"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": "Controller",
"block.refinedstorage.creative_controller": "Creative Controller",
"block.refinedstorage.cable": "Cable",
@@ -191,11 +191,11 @@
"block.refinedstorage.machine_casing": "Machine Casing",
"block.refinedstorage:destructor": "Destructor",
"block.refinedstorage:constructor": "Constructor",
"block.refinedstorage:storage.0": "1k Storage Block",
"block.refinedstorage:storage.1": "4k Storage Block",
"block.refinedstorage:storage.2": "16k Storage Block",
"block.refinedstorage:storage.3": "64k Storage Block",
"block.refinedstorage:storage.4": "Creative Storage Block",
"block.refinedstorage.1k_storage_block": "1k Storage Block",
"block.refinedstorage.4k_storage_block": "4k Storage Block",
"block.refinedstorage.16k_storage_block": "16k Storage Block",
"block.refinedstorage.64k_storage_block": "64k Storage Block",
"block.refinedstorage.creative_storage_block": "Creative Storage Block",
"block.refinedstorage:relay": "Relay",
"block.refinedstorage:interface": "Interface",
"block.refinedstorage:crafting_monitor": "Crafting Monitor",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
src/main/resources/assets/refinedstorage/recipes/16k_storage_block.json → src/main/resources/data/refinedstorage/recipes/16k_storage_block.json
View File

@@ -13,15 +13,13 @@
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:storage_part",
"data": 2
"item": "refinedstorage:16k_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:storage",
"data": 2
"item": "refinedstorage:16k_storage_block"
}
}

6
src/main/resources/assets/refinedstorage/recipes/1k_storage_block.json → src/main/resources/data/refinedstorage/recipes/1k_storage_block.json
View File

@@ -13,15 +13,13 @@
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:storage_part",
"data": 0
"item": "refinedstorage:1k_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:storage",
"data": 0
"item": "refinedstorage:1k_storage_block"
}
}

6
src/main/resources/assets/refinedstorage/recipes/4k_storage_block.json → src/main/resources/data/refinedstorage/recipes/4k_storage_block.json
View File

@@ -13,15 +13,13 @@
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:storage_part",
"data": 1
"item": "refinedstorage:4k_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:storage",
"data": 1
"item": "refinedstorage:4k_storage_block"
}
}

6
src/main/resources/assets/refinedstorage/recipes/64k_storage_block.json → src/main/resources/data/refinedstorage/recipes/64k_storage_block.json
View File

@@ -13,15 +13,13 @@
"item": "minecraft:redstone"
},
"P": {
"item": "refinedstorage:storage_part",
"data": 3
"item": "refinedstorage:64k_storage_part"
},
"E": {
"item": "refinedstorage:quartz_enriched_iron"
}
},
"result": {
"item": "refinedstorage:storage",
"data": 3
"item": "refinedstorage:64k_storage_block"
}
}