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

Re-add the Crafter

Browse Source
This commit is contained in:
raoulvdberge
2019-10-27 18:57:23 +01:00
parent 7da0a53385
commit f60f09a262
37 changed files with 567 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
src/main/resources/assets/refinedstorage/blockstates/crafter.json Executable file → Normal file
View File

@@ -1,135 +1,52 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_cutout",
"textures": {
"particle": "refinedstorage:blocks/crafter/side",
"side": "refinedstorage:blocks/crafter/side",
"side_90": "refinedstorage:blocks/crafter/side_90",
"side_180": "refinedstorage:blocks/crafter/side_180",
"side_270": "refinedstorage:blocks/crafter/side_270",
"cutout_side": "refinedstorage:blocks/crafter/cutouts/side_disconnected",
"cutout_side_90": "refinedstorage:blocks/crafter/cutouts/side_disconnected_90",
"cutout_side_180": "refinedstorage:blocks/crafter/cutouts/side_disconnected_180",
"cutout_side_270": "refinedstorage:blocks/crafter/cutouts/side_disconnected_270",
"front": "refinedstorage:blocks/crafter/front",
"cutout_front": "refinedstorage:blocks/crafter/cutouts/front_disconnected"
},
"uvlock": true
},
"variants": {
"connected": {
"true": {
"textures": {
"cutout_side": "refinedstorage:blocks/crafter/cutouts/side_connected",
"cutout_side_90": "refinedstorage:blocks/crafter/cutouts/side_connected_90",
"cutout_side_180": "refinedstorage:blocks/crafter/cutouts/side_connected_180",
"cutout_side_270": "refinedstorage:blocks/crafter/cutouts/side_connected_270",
"cutout_front": "refinedstorage:blocks/crafter/cutouts/front_connected"
}
},
"false": {
"textures": {
}
}
"connected=false,direction=north": {
"model": "refinedstorage:block/crafter/disconnected/north",
"uvlock": true
},
"direction": {
"north": {
"textures": {
"down": "#side_180",
"up": "#side",
"north": "#front",
"east": "#side_90",
"south": "refinedstorage:blocks/crafter/bottom",
"west": "#side_270",
"cutout_down": "#cutout_side_180",
"cutout_up": "#cutout_side",
"cutout_north": "#cutout_front",
"cutout_east": "#cutout_side_90",
"cutout_south": "refinedstorage:blocks/crafter/bottom",
"cutout_west": "#cutout_side_270"
}
},
"east": {
"textures": {
"down": "#side_90",
"up": "#side_90",
"north": "#side_270",
"east": "#front",
"south": "#side_90",
"west": "refinedstorage:blocks/crafter/bottom",
"cutout_down": "#cutout_side_90",
"cutout_up": "#cutout_side_90",
"cutout_north": "#cutout_side_270",
"cutout_east": "#cutout_front",
"cutout_south": "#cutout_side_90",
"cutout_west": "refinedstorage:blocks/crafter/bottom"
}
},
"south": {
"textures": {
"down": "#side",
"up": "#side_180",
"north": "refinedstorage:blocks/crafter/bottom",
"east": "#side_270",
"south": "#front",
"west": "#side_90",
"cutout_down": "#cutout_side",
"cutout_up": "#cutout_side_180",
"cutout_north": "refinedstorage:blocks/crafter/bottom",
"cutout_east": "#cutout_side_270",
"cutout_south": "#cutout_front",
"cutout_west": "#cutout_side_90"
}
},
"west": {
"textures": {
"down": "#side_270",
"up": "#side_270",
"north": "#side_90",
"east": "refinedstorage:blocks/crafter/bottom",
"south": "#side_270",
"west": "#front",
"cutout_down": "#cutout_side_270",
"cutout_up": "#cutout_side_270",
"cutout_north": "#cutout_side_90",
"cutout_east": "refinedstorage:blocks/crafter/bottom",
"cutout_south": "#cutout_side_270",
"cutout_west": "#cutout_front"
}
},
"up": {
"textures": {
"down": "refinedstorage:blocks/crafter/bottom",
"up": "#front",
"north": "#side",
"east": "#side",
"south": "#side",
"west": "#side",
"cutout_down": "refinedstorage:blocks/crafter/bottom",
"cutout_up": "#cutout_front",
"cutout_north": "#cutout_side",
"cutout_east": "#cutout_side",
"cutout_south": "#cutout_side",
"cutout_west": "#cutout_side"
}
},
"down": {
"textures": {
"down": "#front",
"up": "refinedstorage:blocks/crafter/bottom",
"north": "#side_180",
"east": "#side_180",
"south": "#side_180",
"west": "#side_180",
"cutout_down": "#cutout_front",
"cutout_up": "refinedstorage:blocks/crafter/bottom",
"cutout_north": "#cutout_side_180",
"cutout_east": "#cutout_side_180",
"cutout_south": "#cutout_side_180",
"cutout_west": "#cutout_side_180"
}
}
"connected=false,direction=east": {
"model": "refinedstorage:block/crafter/disconnected/east",
"uvlock": true
},
"connected=false,direction=south": {
"model": "refinedstorage:block/crafter/disconnected/south",
"uvlock": true
},
"connected=false,direction=west": {
"model": "refinedstorage:block/crafter/disconnected/west",
"uvlock": true
},
"connected=false,direction=up": {
"model": "refinedstorage:block/crafter/disconnected/up",
"uvlock": true
},
"connected=false,direction=down": {
"model": "refinedstorage:block/crafter/disconnected/down",
"uvlock": true
},
"connected=true,direction=north": {
"model": "refinedstorage:block/crafter/connected/north",
"uvlock": true
},
"connected=true,direction=east": {
"model": "refinedstorage:block/crafter/connected/east",
"uvlock": true
},
"connected=true,direction=south": {
"model": "refinedstorage:block/crafter/connected/south",
"uvlock": true
},
"connected=true,direction=west": {
"model": "refinedstorage:block/crafter/connected/west",
"uvlock": true
},
"connected=true,direction=up": {
"model": "refinedstorage:block/crafter/connected/up",
"uvlock": true
},
"connected=true,direction=down": {
"model": "refinedstorage:block/crafter/connected/down",
"uvlock": true
}
}
}

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

@@ -46,7 +46,7 @@
"gui.refinedstorage:crafting_monitor.crafter_is_locked": "Crafter is locked",
"gui.refinedstorage.wireless_transmitter": "Wireless Transmitter",
"gui.refinedstorage.wireless_transmitter.distance": "%d block(s)",
"gui.refinedstorage:crafter": "Crafter",
"gui.refinedstorage.crafter": "Crafter",
"gui.refinedstorage.filter": "Filter",
"gui.refinedstorage.filter.compare_nbt": "NBT",
"gui.refinedstorage.filter.mod_filter": "Mod filter",
@@ -205,7 +205,7 @@
"block.refinedstorage:crafting_monitor": "Crafting Monitor",
"block.refinedstorage.wireless_transmitter": "Wireless Transmitter",
"block.refinedstorage.wireless_transmitter.tooltip": "Must be placed on %s.",
"block.refinedstorage:crafter": "Crafter",
"block.refinedstorage.crafter": "Crafter",
"block.refinedstorage.network_receiver": "Network Receiver",
"block.refinedstorage.network_transmitter": "Network Transmitter",
"block.refinedstorage.fluid_interface": "Fluid Interface",

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/down.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/front",
"up": "refinedstorage:block/crafter/bottom",
"north": "refinedstorage:block/crafter/side_180",
"east": "refinedstorage:block/crafter/side_180",
"south": "refinedstorage:block/crafter/side_180",
"west": "refinedstorage:block/crafter/side_180",
"cutout_down": "refinedstorage:block/crafter/cutouts/front_connected",
"cutout_up": "refinedstorage:block/crafter/bottom",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_connected_180",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_connected_180",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_connected_180",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_connected_180"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/east.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_90",
"up": "refinedstorage:block/crafter/side_90",
"north": "refinedstorage:block/crafter/side_270",
"east": "refinedstorage:block/crafter/front",
"south": "refinedstorage:block/crafter/side_90",
"west": "refinedstorage:block/crafter/bottom",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_connected_90",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_connected_90",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_connected_270",
"cutout_east": "refinedstorage:block/crafter/cutouts/front_connected",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_connected_90",
"cutout_west": "refinedstorage:block/crafter/bottom"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/north.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_180",
"up": "refinedstorage:block/crafter/side",
"north": "refinedstorage:block/crafter/front",
"east": "refinedstorage:block/crafter/side_90",
"south": "refinedstorage:block/crafter/bottom",
"west": "refinedstorage:block/crafter/side_270",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_connected_180",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_connected",
"cutout_north": "refinedstorage:block/crafter/cutouts/front_connected",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_connected_90",
"cutout_south": "refinedstorage:block/crafter/bottom",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_connected_270"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/south.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side",
"up": "refinedstorage:block/crafter/side_180",
"north": "refinedstorage:block/crafter/bottom",
"east": "refinedstorage:block/crafter/side_270",
"south": "refinedstorage:block/crafter/front",
"west": "refinedstorage:block/crafter/side_90",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_connected",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_connected_180",
"cutout_north": "refinedstorage:block/crafter/bottom",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_connected_270",
"cutout_south": "refinedstorage:block/crafter/cutouts/front_connected",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_connected_90"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/up.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/bottom",
"up": "refinedstorage:block/crafter/front",
"north": "refinedstorage:block/crafter/side",
"east": "refinedstorage:block/crafter/side",
"south": "refinedstorage:block/crafter/side",
"west": "refinedstorage:block/crafter/side",
"cutout_down": "refinedstorage:block/crafter/bottom",
"cutout_up": "refinedstorage:block/crafter/cutouts/front_connected",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_connected",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_connected",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_connected",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_connected"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/connected/west.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_270",
"up": "refinedstorage:block/crafter/side_270",
"north": "refinedstorage:block/crafter/side_90",
"east": "refinedstorage:block/crafter/bottom",
"south": "refinedstorage:block/crafter/side_270",
"west": "refinedstorage:block/crafter/front",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_connected_270",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_connected_270",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_connected_90",
"cutout_east": "refinedstorage:block/crafter/bottom",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_connected_270",
"cutout_west": "refinedstorage:block/crafter/cutouts/front_connected"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/down.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/front",
"up": "refinedstorage:block/crafter/bottom",
"north": "refinedstorage:block/crafter/side_180",
"east": "refinedstorage:block/crafter/side_180",
"south": "refinedstorage:block/crafter/side_180",
"west": "refinedstorage:block/crafter/side_180",
"cutout_down": "refinedstorage:block/crafter/cutouts/front_disconnected",
"cutout_up": "refinedstorage:block/crafter/bottom",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_disconnected_180",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected_180",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected_180",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected_180"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/east.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_90",
"up": "refinedstorage:block/crafter/side_90",
"north": "refinedstorage:block/crafter/side_270",
"east": "refinedstorage:block/crafter/front",
"south": "refinedstorage:block/crafter/side_90",
"west": "refinedstorage:block/crafter/bottom",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_disconnected_90",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_disconnected_90",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_disconnected_270",
"cutout_east": "refinedstorage:block/crafter/cutouts/front_disconnected",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected_90",
"cutout_west": "refinedstorage:block/crafter/bottom"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/north.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_180",
"up": "refinedstorage:block/crafter/side",
"north": "refinedstorage:block/crafter/front",
"east": "refinedstorage:block/crafter/side_90",
"south": "refinedstorage:block/crafter/bottom",
"west": "refinedstorage:block/crafter/side_270",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_disconnected_180",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_disconnected",
"cutout_north": "refinedstorage:block/crafter/cutouts/front_disconnected",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected_90",
"cutout_south": "refinedstorage:block/crafter/bottom",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected_270"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/south.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side",
"up": "refinedstorage:block/crafter/side_180",
"north": "refinedstorage:block/crafter/bottom",
"east": "refinedstorage:block/crafter/side_270",
"south": "refinedstorage:block/crafter/front",
"west": "refinedstorage:block/crafter/side_90",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_disconnected",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_disconnected_180",
"cutout_north": "refinedstorage:block/crafter/bottom",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected_270",
"cutout_south": "refinedstorage:block/crafter/cutouts/front_disconnected",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected_90"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/up.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/bottom",
"up": "refinedstorage:block/crafter/front",
"north": "refinedstorage:block/crafter/side",
"east": "refinedstorage:block/crafter/side",
"south": "refinedstorage:block/crafter/side",
"west": "refinedstorage:block/crafter/side",
"cutout_down": "refinedstorage:block/crafter/bottom",
"cutout_up": "refinedstorage:block/crafter/cutouts/front_disconnected",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_disconnected",
"cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected",
"cutout_west": "refinedstorage:block/crafter/cutouts/side_disconnected"
}
}

18
src/main/resources/assets/refinedstorage/models/block/crafter/disconnected/west.json Normal file
View File

@@ -0,0 +1,18 @@
{
"parent": "refinedstorage:block/cube_cutout",
"textures": {
"particle": "refinedstorage:block/crafter/side",
"down": "refinedstorage:block/crafter/side_270",
"up": "refinedstorage:block/crafter/side_270",
"north": "refinedstorage:block/crafter/side_90",
"east": "refinedstorage:block/crafter/bottom",
"south": "refinedstorage:block/crafter/side_270",
"west": "refinedstorage:block/crafter/front",
"cutout_down": "refinedstorage:block/crafter/cutouts/side_disconnected_270",
"cutout_up": "refinedstorage:block/crafter/cutouts/side_disconnected_270",
"cutout_north": "refinedstorage:block/crafter/cutouts/side_disconnected_90",
"cutout_east": "refinedstorage:block/crafter/bottom",
"cutout_south": "refinedstorage:block/crafter/cutouts/side_disconnected_270",
"cutout_west": "refinedstorage:block/crafter/cutouts/front_disconnected"
}
}

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

@@ -0,0 +1,3 @@
{
"parent": "refinedstorage:block/crafter/disconnected/north"
}

24
src/main/resources/data/refinedstorage/loot_tables/blocks/crafter.json Normal file
View File

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

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

@@ -10,16 +10,16 @@
"item": "refinedstorage:quartz_enriched_iron"
},
"C": {
"item": "#construction_core"
"item": "refinedstorage:construction_core"
},
"A": {
"item": "#advanced_processor"
"item": "refinedstorage:advanced_processor"
},
"M": {
"item": "refinedstorage:machine_casing"
},
"D": {
"item": "#destruction_core"
"item": "refinedstorage:destruction_core"
}
},
"result": {