Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)

This commit is contained in:
Prospector 2017-06-14 08:56:09 -07:00
parent 1fa9f1cf52
commit 40e3062903
123 changed files with 1469 additions and 1486 deletions

View file

@ -9,4 +9,4 @@
"south": "techreborn:blocks/machines/energy/lv_storage_side",
"west": "techreborn:blocks/machines/energy/lv_storage_side"
}
}
}

View file

@ -10,17 +10,17 @@
{}
],
"type": {
"0": {
"standard": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_casing"
}
},
"1": {
"reinforced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_casing"
}
},
"2": {
"advanced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_casing"
}

View file

@ -10,17 +10,17 @@
{}
],
"type": {
"0": {
"basic": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier1_machine_block"
}
},
"1": {
"advanced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier2_machine_block"
}
},
"2": {
"highly_advanced": {
"textures": {
"all": "techreborn:blocks/machines/structure/tier3_machine_block"
}

View file

@ -12,17 +12,17 @@
"type": {
"all": {
"textures": {
"all": "techreborn:blocks/tier1_machines/player_detector_all"
"all": "techreborn:blocks/machines/tier1_machines/player_detector_all"
}
},
"others": {
"textures": {
"all": "techreborn:blocks/tier1_machines/player_detector_others"
"all": "techreborn:blocks/machines/tier1_machines/player_detector_others"
}
},
"you": {
"textures": {
"all": "techreborn:blocks/tier1_machines/player_detector_you"
"all": "techreborn:blocks/machines/tier1_machines/player_detector_you"
}
}
}

View file

@ -79,6 +79,16 @@
"textures": {
"all": "techreborn:blocks/ore/silver_ore"
}
},
"copper": {
"textures": {
"all": "techreborn:blocks/ore/copper_ore"
}
},
"tin": {
"textures": {
"all": "techreborn:blocks/ore/tin_ore"
}
}
}
}

View file

@ -1,26 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"transform": "forge:default-block",
"model": "cube_all",
"textures": {
"particle": "#cable"
}
},
"variants": {
"type": {
"all": {
"textures": {
}
},
"others": {
"textures": {
}
},
"you": {
"textures": {
}
}
}
}
}

View file

@ -79,6 +79,61 @@
"textures": {
"all": "techreborn:blocks/storage/invar_block"
}
},
"tungstensteel": {
"textures": {
"all": "techreborn:blocks/storage/tungstensteel_block"
}
},
"iridium_reinforced_tungstensteel": {
"textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block"
}
},
"iridium_reinforced_stone": {
"textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_stone_block"
}
},
"ruby": {
"textures": {
"all": "techreborn:blocks/storage/ruby_block"
}
},
"sapphire": {
"textures": {
"all": "techreborn:blocks/storage/sapphire_block"
}
},
"peridot": {
"textures": {
"all": "techreborn:blocks/storage/peridot_block"
}
},
"yellow_garnet": {
"textures": {
"all": "techreborn:blocks/storage/yellowgarnet_block"
}
},
"red_garnet": {
"textures": {
"all": "techreborn:blocks/storage/redgarnet_block"
}
},
"copper": {
"textures": {
"all": "techreborn:blocks/storage/copper_block"
}
},
"tin": {
"textures": {
"all": "techreborn:blocks/storage/tin_block"
}
},
"refined_iron": {
"textures": {
"all": "techreborn:blocks/storage/refinediron_block"
}
}
}
}

View file

@ -1,25 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"textures": {},
"transform": "forge:default-block",
"model": "cube_all"
},
"variants": {
"inventory": [
{}
],
"type": {
"copper": {
"textures": {
"all": "techreborn:blocks/ore/copper_ore"
}
},
"tin": {
"textures": {
"all": "techreborn:blocks/ore/tin_ore"
}
}
}
}
}

View file

@ -1,70 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"textures": {},
"transform": "forge:default-block",
"model": "cube_all"
},
"variants": {
"inventory": [
{}
],
"type": {
"tungstensteel": {
"textures": {
"all": "techreborn:blocks/storage/tungstensteel_block"
}
},
"iridium_reinforced_tungstensteel": {
"textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block"
}
},
"iridium_reinforced_stone": {
"textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_stone_block"
}
},
"ruby": {
"textures": {
"all": "techreborn:blocks/storage/ruby_block"
}
},
"sapphire": {
"textures": {
"all": "techreborn:blocks/storage/sapphire_block"
}
},
"peridot": {
"textures": {
"all": "techreborn:blocks/storage/peridot_block"
}
},
"yellowgarnet": {
"textures": {
"all": "techreborn:blocks/storage/yellowgarnet_block"
}
},
"redgarnet": {
"textures": {
"all": "techreborn:blocks/storage/redgarnet_block"
}
},
"copper": {
"textures": {
"all": "techreborn:blocks/storage/copper_block"
}
},
"tin": {
"textures": {
"all": "techreborn:blocks/storage/tin_block"
}
},
"refinediron": {
"textures": {
"all": "techreborn:blocks/storage/refinediron_block"
}
}
}
}
}

File diff suppressed because it is too large Load diff