1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 04:00:30 +00:00

Merge branch 'feature/more-datagen' into mc-1.16.x

This commit is contained in:
Jonathan Coates 2022-10-22 12:04:07 +01:00
commit 18d9993fa7
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
179 changed files with 2631 additions and 3295 deletions

View File

@ -72,6 +72,7 @@ minecraft {
data {
workingDirectory project.file('run')
args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
property("cct.pretty-json", "true")
}
testClient {

View File

@ -0,0 +1,125 @@
{
"multipart": [
{
"when": {
"OR": [
{"east": "false", "north": "false", "south": "false", "cable": "true", "up": "true", "west": "false"},
{"down": "true", "east": "false", "north": "false", "south": "false", "cable": "true", "west": "false"}
]
},
"apply": {"model": "computercraft:block/cable_core_facing", "x": 90}
},
{
"when": {
"OR": [
{
"down": "false",
"east": "false",
"north": "false",
"south": "false",
"cable": "true",
"up": "false",
"west": "false"
},
{"down": "false", "east": "false", "north": "true", "cable": "true", "up": "false", "west": "false"},
{"down": "false", "east": "false", "south": "true", "cable": "true", "up": "false", "west": "false"}
]
},
"apply": {"model": "computercraft:block/cable_core_facing", "y": 0}
},
{
"when": {
"OR": [
{"down": "false", "east": "true", "north": "false", "south": "false", "cable": "true", "up": "false"},
{"down": "false", "north": "false", "south": "false", "cable": "true", "up": "false", "west": "true"}
]
},
"apply": {"model": "computercraft:block/cable_core_facing", "y": 90}
},
{
"when": {
"OR": [
{"down": "true", "north": "true", "cable": "true"},
{"down": "true", "south": "true", "cable": "true"},
{"down": "true", "cable": "true", "west": "true"},
{"down": "true", "east": "true", "cable": "true"},
{"north": "true", "cable": "true", "up": "true"},
{"south": "true", "cable": "true", "up": "true"},
{"cable": "true", "up": "true", "west": "true"},
{"east": "true", "cable": "true", "up": "true"},
{"north": "true", "cable": "true", "west": "true"},
{"east": "true", "north": "true", "cable": "true"},
{"south": "true", "cable": "true", "west": "true"},
{"east": "true", "south": "true", "cable": "true"}
]
},
"apply": {"model": "computercraft:block/cable_core_any"}
},
{"when": {"down": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 270, "y": 0}},
{"when": {"up": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 90, "y": 0}},
{"when": {"north": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 180}},
{"when": {"south": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 0}},
{"when": {"west": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 90}},
{"when": {"east": "true"}, "apply": {"model": "computercraft:block/cable_arm", "x": 0, "y": 270}},
{"when": {"modem": "down_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 90, "y": 0}},
{
"when": {"modem": "down_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 90, "y": 0}
},
{"when": {"modem": "down_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 90, "y": 0}},
{
"when": {"modem": "down_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 90, "y": 0}
},
{"when": {"modem": "up_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 270, "y": 0}},
{
"when": {"modem": "up_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 270, "y": 0}
},
{"when": {"modem": "up_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 270, "y": 0}},
{
"when": {"modem": "up_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 270, "y": 0}
},
{"when": {"modem": "north_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 0}},
{
"when": {"modem": "north_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 0}
},
{"when": {"modem": "north_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 0}},
{
"when": {"modem": "north_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 0}
},
{"when": {"modem": "south_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 180}},
{
"when": {"modem": "south_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 180}
},
{"when": {"modem": "south_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 180}},
{
"when": {"modem": "south_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 180}
},
{"when": {"modem": "west_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 270}},
{
"when": {"modem": "west_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 270}
},
{"when": {"modem": "west_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 270}},
{
"when": {"modem": "west_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 270}
},
{"when": {"modem": "east_off"}, "apply": {"model": "computercraft:block/wired_modem_off", "x": 0, "y": 90}},
{
"when": {"modem": "east_off_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_off_peripheral", "x": 0, "y": 90}
},
{"when": {"modem": "east_on"}, "apply": {"model": "computercraft:block/wired_modem_on", "x": 0, "y": 90}},
{
"when": {"modem": "east_on_peripheral"},
"apply": {"model": "computercraft:block/wired_modem_on_peripheral", "x": 0, "y": 90}
}
]
}

View File

@ -1,49 +1,16 @@
{
"variants": {
"facing=north,state=off": {
"model": "computercraft:block/computer_advanced_off"
},
"facing=south,state=off": {
"model": "computercraft:block/computer_advanced_off",
"y": 180
},
"facing=west,state=off": {
"model": "computercraft:block/computer_advanced_off",
"y": 270
},
"facing=east,state=off": {
"model": "computercraft:block/computer_advanced_off",
"y": 90
},
"facing=north,state=on": {
"model": "computercraft:block/computer_advanced_on"
},
"facing=south,state=on": {
"model": "computercraft:block/computer_advanced_on",
"y": 180
},
"facing=west,state=on": {
"model": "computercraft:block/computer_advanced_on",
"y": 270
},
"facing=east,state=on": {
"model": "computercraft:block/computer_advanced_on",
"y": 90
},
"facing=north,state=blinking": {
"model": "computercraft:block/computer_advanced_blinking"
},
"facing=south,state=blinking": {
"model": "computercraft:block/computer_advanced_blinking",
"y": 180
},
"facing=west,state=blinking": {
"model": "computercraft:block/computer_advanced_blinking",
"y": 270
},
"facing=east,state=blinking": {
"model": "computercraft:block/computer_advanced_blinking",
"y": 90
}
"facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_advanced_blinking"},
"facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_advanced_off"},
"facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_advanced_on"},
"facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_advanced_blinking"},
"facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_advanced_off"},
"facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_advanced_on"},
"facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_advanced_blinking"},
"facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_advanced_off"},
"facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_advanced_on"},
"facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_advanced_blinking"},
"facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_advanced_off"},
"facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_advanced_on"}
}
}

View File

@ -1,49 +1,16 @@
{
"variants": {
"facing=north,state=off": {
"model": "computercraft:block/computer_command_off"
},
"facing=south,state=off": {
"model": "computercraft:block/computer_command_off",
"y": 180
},
"facing=west,state=off": {
"model": "computercraft:block/computer_command_off",
"y": 270
},
"facing=east,state=off": {
"model": "computercraft:block/computer_command_off",
"y": 90
},
"facing=north,state=on": {
"model": "computercraft:block/computer_command_on"
},
"facing=south,state=on": {
"model": "computercraft:block/computer_command_on",
"y": 180
},
"facing=west,state=on": {
"model": "computercraft:block/computer_command_on",
"y": 270
},
"facing=east,state=on": {
"model": "computercraft:block/computer_command_on",
"y": 90
},
"facing=north,state=blinking": {
"model": "computercraft:block/computer_command_blinking"
},
"facing=south,state=blinking": {
"model": "computercraft:block/computer_command_blinking",
"y": 180
},
"facing=west,state=blinking": {
"model": "computercraft:block/computer_command_blinking",
"y": 270
},
"facing=east,state=blinking": {
"model": "computercraft:block/computer_command_blinking",
"y": 90
}
"facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_command_blinking"},
"facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_command_off"},
"facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_command_on"},
"facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_command_blinking"},
"facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_command_off"},
"facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_command_on"},
"facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_command_blinking"},
"facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_command_off"},
"facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_command_on"},
"facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_command_blinking"},
"facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_command_off"},
"facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_command_on"}
}
}

View File

@ -1,49 +1,16 @@
{
"variants": {
"facing=north,state=off": {
"model": "computercraft:block/computer_normal_off"
},
"facing=south,state=off": {
"model": "computercraft:block/computer_normal_off",
"y": 180
},
"facing=west,state=off": {
"model": "computercraft:block/computer_normal_off",
"y": 270
},
"facing=east,state=off": {
"model": "computercraft:block/computer_normal_off",
"y": 90
},
"facing=north,state=on": {
"model": "computercraft:block/computer_normal_on"
},
"facing=south,state=on": {
"model": "computercraft:block/computer_normal_on",
"y": 180
},
"facing=west,state=on": {
"model": "computercraft:block/computer_normal_on",
"y": 270
},
"facing=east,state=on": {
"model": "computercraft:block/computer_normal_on",
"y": 90
},
"facing=north,state=blinking": {
"model": "computercraft:block/computer_normal_blinking"
},
"facing=south,state=blinking": {
"model": "computercraft:block/computer_normal_blinking",
"y": 180
},
"facing=west,state=blinking": {
"model": "computercraft:block/computer_normal_blinking",
"y": 270
},
"facing=east,state=blinking": {
"model": "computercraft:block/computer_normal_blinking",
"y": 90
}
"facing=east,state=blinking": {"y": 90, "model": "computercraft:block/computer_normal_blinking"},
"facing=east,state=off": {"y": 90, "model": "computercraft:block/computer_normal_off"},
"facing=east,state=on": {"y": 90, "model": "computercraft:block/computer_normal_on"},
"facing=north,state=blinking": {"y": 0, "model": "computercraft:block/computer_normal_blinking"},
"facing=north,state=off": {"y": 0, "model": "computercraft:block/computer_normal_off"},
"facing=north,state=on": {"y": 0, "model": "computercraft:block/computer_normal_on"},
"facing=south,state=blinking": {"y": 180, "model": "computercraft:block/computer_normal_blinking"},
"facing=south,state=off": {"y": 180, "model": "computercraft:block/computer_normal_off"},
"facing=south,state=on": {"y": 180, "model": "computercraft:block/computer_normal_on"},
"facing=west,state=blinking": {"y": 270, "model": "computercraft:block/computer_normal_blinking"},
"facing=west,state=off": {"y": 270, "model": "computercraft:block/computer_normal_off"},
"facing=west,state=on": {"y": 270, "model": "computercraft:block/computer_normal_on"}
}
}

View File

@ -0,0 +1,16 @@
{
"variants": {
"facing=east,state=empty": {"y": 90, "model": "computercraft:block/disk_drive_empty"},
"facing=east,state=full": {"y": 90, "model": "computercraft:block/disk_drive_full"},
"facing=east,state=invalid": {"y": 90, "model": "computercraft:block/disk_drive_invalid"},
"facing=north,state=empty": {"y": 0, "model": "computercraft:block/disk_drive_empty"},
"facing=north,state=full": {"y": 0, "model": "computercraft:block/disk_drive_full"},
"facing=north,state=invalid": {"y": 0, "model": "computercraft:block/disk_drive_invalid"},
"facing=south,state=empty": {"y": 180, "model": "computercraft:block/disk_drive_empty"},
"facing=south,state=full": {"y": 180, "model": "computercraft:block/disk_drive_full"},
"facing=south,state=invalid": {"y": 180, "model": "computercraft:block/disk_drive_invalid"},
"facing=west,state=empty": {"y": 270, "model": "computercraft:block/disk_drive_empty"},
"facing=west,state=full": {"y": 270, "model": "computercraft:block/disk_drive_full"},
"facing=west,state=invalid": {"y": 270, "model": "computercraft:block/disk_drive_invalid"}
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,20 @@
{
"variants": {
"bottom=false,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_empty"},
"bottom=false,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_top_full"},
"bottom=false,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_empty"},
"bottom=false,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_top_full"},
"bottom=false,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_empty"},
"bottom=false,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_top_full"},
"bottom=false,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_empty"},
"bottom=false,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_top_full"},
"bottom=true,facing=east,top=false": {"y": 90, "model": "computercraft:block/printer_bottom_full"},
"bottom=true,facing=east,top=true": {"y": 90, "model": "computercraft:block/printer_both_full"},
"bottom=true,facing=north,top=false": {"y": 0, "model": "computercraft:block/printer_bottom_full"},
"bottom=true,facing=north,top=true": {"y": 0, "model": "computercraft:block/printer_both_full"},
"bottom=true,facing=south,top=false": {"y": 180, "model": "computercraft:block/printer_bottom_full"},
"bottom=true,facing=south,top=true": {"y": 180, "model": "computercraft:block/printer_both_full"},
"bottom=true,facing=west,top=false": {"y": 270, "model": "computercraft:block/printer_bottom_full"},
"bottom=true,facing=west,top=true": {"y": 270, "model": "computercraft:block/printer_both_full"}
}
}

View File

@ -1,19 +1,8 @@
{
"variants": {
"facing=north": {
"model": "computercraft:block/speaker"
},
"facing=south": {
"model": "computercraft:block/speaker",
"y": 180
},
"facing=west": {
"model": "computercraft:block/speaker",
"y": 270
},
"facing=east": {
"model": "computercraft:block/speaker",
"y": 90
}
"facing=east": {"model": "computercraft:block/speaker", "y": 90},
"facing=north": {"model": "computercraft:block/speaker"},
"facing=south": {"model": "computercraft:block/speaker", "y": 180},
"facing=west": {"model": "computercraft:block/speaker", "y": 270}
}
}

View File

@ -1,19 +1,8 @@
{
"variants": {
"facing=north": {
"model": "computercraft:block/turtle_advanced"
},
"facing=south": {
"model": "computercraft:block/turtle_advanced",
"y": 180
},
"facing=west": {
"model": "computercraft:block/turtle_advanced",
"y": 270
},
"facing=east": {
"model": "computercraft:block/turtle_advanced",
"y": 90
}
"facing=east": {"model": "computercraft:block/turtle_advanced", "y": 90},
"facing=north": {"model": "computercraft:block/turtle_advanced", "y": 0},
"facing=south": {"model": "computercraft:block/turtle_advanced", "y": 180},
"facing=west": {"model": "computercraft:block/turtle_advanced", "y": 270}
}
}

View File

@ -1,19 +1,8 @@
{
"variants": {
"facing=north": {
"model": "computercraft:block/turtle_normal"
},
"facing=south": {
"model": "computercraft:block/turtle_normal",
"y": 180
},
"facing=west": {
"model": "computercraft:block/turtle_normal",
"y": 270
},
"facing=east": {
"model": "computercraft:block/turtle_normal",
"y": 90
}
"facing=east": {"model": "computercraft:block/turtle_normal", "y": 90},
"facing=north": {"model": "computercraft:block/turtle_normal", "y": 0},
"facing=south": {"model": "computercraft:block/turtle_normal", "y": 180},
"facing=west": {"model": "computercraft:block/turtle_normal", "y": 270}
}
}

View File

@ -1,16 +1,8 @@
{
"variants": {
"modem=false,peripheral=false": {
"model": "computercraft:block/wired_modem_full_off"
},
"modem=true,peripheral=false": {
"model": "computercraft:block/wired_modem_full_on"
},
"modem=false,peripheral=true": {
"model": "computercraft:block/wired_modem_full_off_peripheral"
},
"modem=true,peripheral=true": {
"model": "computercraft:block/wired_modem_full_on_peripheral"
}
"modem=false,peripheral=false": {"model": "computercraft:block/wired_modem_full_off"},
"modem=false,peripheral=true": {"model": "computercraft:block/wired_modem_full_off_peripheral"},
"modem=true,peripheral=false": {"model": "computercraft:block/wired_modem_full_on"},
"modem=true,peripheral=true": {"model": "computercraft:block/wired_modem_full_on_peripheral"}
}
}

View File

@ -1,54 +1,16 @@
{
"variants": {
"facing=down,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off",
"x": 90,
"y": 90
},
"facing=up,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off",
"x": 270,
"y": 90
},
"facing=north,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off"
},
"facing=south,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off",
"y": 180
},
"facing=west,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off",
"y": 270
},
"facing=east,on=false": {
"model": "computercraft:block/wireless_modem_advanced_off",
"y": 90
},
"facing=down,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on",
"x": 90,
"y": 90
},
"facing=up,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on",
"x": 270,
"y": 90
},
"facing=north,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on"
},
"facing=south,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on",
"y": 180
},
"facing=west,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on",
"y": 270
},
"facing=east,on=true": {
"model": "computercraft:block/wireless_modem_advanced_on",
"y": 90
}
"facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_advanced_on"},
"facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
"facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
"facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"},
"facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_advanced_on"},
"facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_off"},
"facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_advanced_on"}
}
}

View File

@ -1,54 +1,16 @@
{
"variants": {
"facing=down,on=false": {
"model": "computercraft:block/wireless_modem_normal_off",
"x": 90,
"y": 90
},
"facing=up,on=false": {
"model": "computercraft:block/wireless_modem_normal_off",
"x": 270,
"y": 90
},
"facing=north,on=false": {
"model": "computercraft:block/wireless_modem_normal_off"
},
"facing=south,on=false": {
"model": "computercraft:block/wireless_modem_normal_off",
"y": 180
},
"facing=west,on=false": {
"model": "computercraft:block/wireless_modem_normal_off",
"y": 270
},
"facing=east,on=false": {
"model": "computercraft:block/wireless_modem_normal_off",
"y": 90
},
"facing=down,on=true": {
"model": "computercraft:block/wireless_modem_normal_on",
"x": 90,
"y": 90
},
"facing=up,on=true": {
"model": "computercraft:block/wireless_modem_normal_on",
"x": 270,
"y": 90
},
"facing=north,on=true": {
"model": "computercraft:block/wireless_modem_normal_on"
},
"facing=south,on=true": {
"model": "computercraft:block/wireless_modem_normal_on",
"y": 180
},
"facing=west,on=true": {
"model": "computercraft:block/wireless_modem_normal_on",
"y": 270
},
"facing=east,on=true": {
"model": "computercraft:block/wireless_modem_normal_on",
"y": 90
}
"facing=down,on=false": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=down,on=true": {"y": 0, "x": 90, "model": "computercraft:block/wireless_modem_normal_on"},
"facing=east,on=false": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=east,on=true": {"y": 90, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
"facing=north,on=false": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=north,on=true": {"y": 0, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
"facing=south,on=false": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=south,on=true": {"y": 180, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"},
"facing=up,on=false": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=up,on=true": {"y": 0, "x": 270, "model": "computercraft:block/wireless_modem_normal_on"},
"facing=west,on=false": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_off"},
"facing=west,on=true": {"y": 270, "x": 0, "model": "computercraft:block/wireless_modem_normal_on"}
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_advanced_side",
"top": "computercraft:block/computer_advanced_top",
"front": "computercraft:block/computer_advanced_front_blink",
"top": "computercraft:block/computer_advanced_top"
"side": "computercraft:block/computer_advanced_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_advanced_side",
"top": "computercraft:block/computer_advanced_top",
"front": "computercraft:block/computer_advanced_front",
"top": "computercraft:block/computer_advanced_top"
"side": "computercraft:block/computer_advanced_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_advanced_side",
"top": "computercraft:block/computer_advanced_top",
"front": "computercraft:block/computer_advanced_front_on",
"top": "computercraft:block/computer_advanced_top"
"side": "computercraft:block/computer_advanced_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_command_side",
"top": "computercraft:block/computer_command_top",
"front": "computercraft:block/computer_command_front_blink",
"top": "computercraft:block/computer_command_top"
"side": "computercraft:block/computer_command_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_command_side",
"top": "computercraft:block/computer_command_top",
"front": "computercraft:block/computer_command_front",
"top": "computercraft:block/computer_command_top"
"side": "computercraft:block/computer_command_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_command_side",
"top": "computercraft:block/computer_command_top",
"front": "computercraft:block/computer_command_front_on",
"top": "computercraft:block/computer_command_top"
"side": "computercraft:block/computer_command_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_normal_side",
"top": "computercraft:block/computer_normal_top",
"front": "computercraft:block/computer_normal_front_blink",
"top": "computercraft:block/computer_normal_top"
"side": "computercraft:block/computer_normal_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_normal_side",
"top": "computercraft:block/computer_normal_top",
"front": "computercraft:block/computer_normal_front",
"top": "computercraft:block/computer_normal_top"
"side": "computercraft:block/computer_normal_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/computer_normal_side",
"top": "computercraft:block/computer_normal_top",
"front": "computercraft:block/computer_normal_front_on",
"top": "computercraft:block/computer_normal_top"
"side": "computercraft:block/computer_normal_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/disk_drive_top",
"front": "computercraft:block/disk_drive_front",
"side": "computercraft:block/disk_drive_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/disk_drive_top",
"front": "computercraft:block/disk_drive_front_accepted",
"side": "computercraft:block/disk_drive_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/disk_drive_top",
"front": "computercraft:block/disk_drive_front_rejected",
"side": "computercraft:block/disk_drive_side"
}
}

View File

@ -1,8 +1,9 @@
{
"parent": "minecraft:block/orientable",
"parent": "computercraft:block/monitor_base",
"textures": {
"side": "computercraft:block/monitor_advanced_4",
"front": "computercraft:block/monitor_advanced_15",
"top": "computercraft:block/monitor_advanced_0"
"side": "computercraft:block/monitor_advanced_4",
"top": "computercraft:block/monitor_advanced_0",
"back": "computercraft:block/monitor_advanced_32"
}
}

View File

@ -1,8 +1,9 @@
{
"parent": "minecraft:block/orientable",
"parent": "computercraft:block/monitor_base",
"textures": {
"side": "computercraft:block/monitor_normal_4",
"front": "computercraft:block/monitor_normal_15",
"top": "computercraft:block/monitor_normal_0"
"side": "computercraft:block/monitor_normal_4",
"top": "computercraft:block/monitor_normal_0",
"back": "computercraft:block/monitor_normal_32"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/printer_top",
"front": "computercraft:block/printer_front_both_trays",
"side": "computercraft:block/printer_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/printer_top",
"front": "computercraft:block/printer_front_bottom_tray",
"side": "computercraft:block/printer_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/printer_top",
"front": "computercraft:block/printer_front_empty",
"side": "computercraft:block/printer_side"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "computercraft:block/printer_top",
"front": "computercraft:block/printer_front_top_tray",
"side": "computercraft:block/printer_side"
}
}

View File

@ -1,8 +1,8 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"side": "computercraft:block/speaker_side",
"top": "computercraft:block/speaker_top",
"front": "computercraft:block/speaker_front",
"top": "computercraft:block/speaker_top"
"side": "computercraft:block/speaker_side"
}
}

View File

@ -1,4 +1 @@
{
"loader": "computercraft:turtle",
"model": "computercraft:block/turtle_advanced_base"
}
{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_advanced"}}

View File

@ -1,6 +0,0 @@
{
"parent": "computercraft:block/turtle_base",
"textures": {
"texture": "computercraft:block/turtle_advanced"
}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/turtle_crafty_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/turtle_crafty_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/wireless_modem_advanced_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/wireless_modem_advanced_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/wireless_modem_advanced_face_on"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/wireless_modem_normal_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/wireless_modem_normal_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/wireless_modem_normal_face_on"}
}

View File

@ -1,4 +1 @@
{
"loader": "computercraft:turtle",
"model": "computercraft:block/turtle_normal_base"
}
{"parent": "computercraft:block/turtle_base", "textures": {"texture": "computercraft:block/turtle_normal"}}

View File

@ -1,6 +0,0 @@
{
"parent": "computercraft:block/turtle_base",
"textures": {
"texture": "computercraft:block/turtle_normal"
}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_left",
"textures": {"texture": "computercraft:block/turtle_speaker_face"}
}

View File

@ -0,0 +1,4 @@
{
"parent": "computercraft:block/turtle_upgrade_base_right",
"textures": {"texture": "computercraft:block/turtle_speaker_face"}
}

View File

@ -1,6 +1 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "computercraft:block/wired_modem_face"
}
}
{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face"}}

View File

@ -1,6 +1 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "computercraft:block/wired_modem_face_peripheral"
}
}
{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral"}}

View File

@ -1,6 +1 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "computercraft:block/wired_modem_face_on"
}
}
{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_on"}}

View File

@ -1,6 +1 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "computercraft:block/wired_modem_face_peripheral_on"
}
}
{"parent": "minecraft:block/cube_all", "textures": {"all": "computercraft:block/wired_modem_face_peripheral_on"}}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wired_modem_face",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wired_modem_face", "back": "computercraft:block/modem_back"}
}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wired_modem_face_peripheral",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wired_modem_face_peripheral", "back": "computercraft:block/modem_back"}
}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wired_modem_face_on",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wired_modem_face_on", "back": "computercraft:block/modem_back"}
}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wireless_modem_advanced_face",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wireless_modem_advanced_face", "back": "computercraft:block/modem_back"}
}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wireless_modem_normal_face",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wireless_modem_normal_face", "back": "computercraft:block/modem_back"}
}

View File

@ -1,7 +1,4 @@
{
"parent": "computercraft:block/modem",
"textures": {
"front": "computercraft:block/wireless_modem_normal_face_on",
"back": "computercraft:block/modem_back"
}
"textures": {"front": "computercraft:block/wireless_modem_normal_face_on", "back": "computercraft:block/modem_back"}
}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/computer_advanced_blinking"
}
{"parent": "computercraft:block/computer_advanced_blinking"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/computer_command_blinking"
}
{"parent": "computercraft:block/computer_command_blinking"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/computer_normal_blinking"
}
{"parent": "computercraft:block/computer_normal_blinking"}

View File

@ -0,0 +1,4 @@
{
"parent": "minecraft:item/generated",
"textures": {"layer0": "computercraft:item/disk_frame", "layer1": "computercraft:item/disk_colour"}
}

View File

@ -0,0 +1 @@
{"parent": "computercraft:block/disk_drive_empty"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/monitor_advanced_item"
}
{"parent": "computercraft:block/monitor_advanced_item"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/monitor_normal_item"
}
{"parent": "computercraft:block/monitor_normal_item"}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_blink",
"layer1": "computercraft:item/pocket_computer_advanced",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_on",
"layer1": "computercraft:item/pocket_computer_advanced",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_frame",
"layer1": "computercraft:item/pocket_computer_colour"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_blink",
"layer1": "computercraft:item/pocket_computer_colour",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_on",
"layer1": "computercraft:item/pocket_computer_colour",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_blink",
"layer1": "computercraft:item/pocket_computer_normal",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1,8 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "computercraft:item/pocket_computer_on",
"layer1": "computercraft:item/pocket_computer_normal",
"layer2": "computercraft:item/pocket_computer_light"
}
}

View File

@ -0,0 +1 @@
{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_book"}}

View File

@ -0,0 +1 @@
{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_page"}}

View File

@ -0,0 +1 @@
{"parent": "minecraft:item/generated", "textures": {"layer0": "computercraft:item/printed_pages"}}

View File

@ -0,0 +1 @@
{"parent": "computercraft:block/printer_empty"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/speaker"
}
{"parent": "computercraft:block/speaker"}

View File

@ -0,0 +1,4 @@
{
"parent": "minecraft:item/generated",
"textures": {"layer0": "computercraft:item/disk_frame", "layer1": "computercraft:item/disk_colour"}
}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/turtle_advanced"
}
{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_advanced"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/turtle_normal"
}
{"loader": "computercraft:turtle", "model": "computercraft:block/turtle_normal"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/wired_modem_off"
}
{"parent": "computercraft:block/wired_modem_off"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/wired_modem_full_off"
}
{"parent": "computercraft:block/wired_modem_full_off"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/wireless_modem_advanced_off"
}
{"parent": "computercraft:block/wireless_modem_advanced_off"}

View File

@ -1,3 +1 @@
{
"parent": "computercraft:block/wireless_modem_normal_off"
}
{"parent": "computercraft:block/wireless_modem_normal_off"}

View File

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:computer_advanced_upgrade"
]
},
"criteria": {
"has_components": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:computer_normal"
},
{
"tag": "forge:ingots/gold"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:computer_advanced_upgrade"
}
}
},
"requirements": [
[
"has_components",
"has_the_recipe"
]
]
}

View File

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_computer_advanced_upgrade"
]
},
"criteria": {
"has_components": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"tag": "forge:ingots/gold"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_computer_advanced_upgrade"
}
}
},
"requirements": [
[
"has_components",
"has_the_recipe"
]
]
}

View File

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:turtle_advanced"
]
},
"criteria": {
"has_computer": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:computer_normal"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:turtle_advanced"
}
}
},
"requirements": [
[
"has_computer",
"has_the_recipe"
]
]
}

View File

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:turtle_advanced_upgrade"
]
},
"criteria": {
"has_components": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:turtle_normal"
},
{
"tag": "forge:ingots/gold"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:turtle_advanced_upgrade"
}
}
},
"requirements": [
[
"has_components",
"has_the_recipe"
]
]
}

View File

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:turtle_normal"
]
},
"criteria": {
"has_computer": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:computer_normal"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:turtle_normal"
}
}
},
"requirements": [
[
"has_computer",
"has_the_recipe"
]
]
}

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "cable",
"rolls": 1,
"entries": [
{
@ -24,7 +23,6 @@
]
},
{
"name": "wired_modem",
"rolls": 1,
"entries": [
{

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

View File

@ -2,11 +2,16 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "computercraft:disk_drive"
}
],

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

View File

@ -2,11 +2,16 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "computercraft:printer"
}
],

View File

@ -2,7 +2,6 @@
"type": "minecraft:block",
"pools": [
{
"name": "main",
"rolls": 1,
"entries": [
{

Some files were not shown because too many files have changed in this diff Show More