diff --git a/src/main/resources/assets/techreborn/blockstates/items/material/ingot.json b/src/main/resources/assets/techreborn/blockstates/items/material/ingot.json deleted file mode 100644 index dc4b923ff..000000000 --- a/src/main/resources/assets/techreborn/blockstates/items/material/ingot.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "advanced_alloy": { - "textures": { - "layer0": "techreborn:items/ingot/advanced_alloy_ingot" - } - }, - "aluminum": { - "textures": { - "layer0": "techreborn:items/ingot/aluminum_ingot" - } - }, - "brass": { - "textures": { - "layer0": "techreborn:items/ingot/brass_ingot" - } - }, - "bronze": { - "textures": { - "layer0": "techreborn:items/ingot/bronze_ingot" - } - }, - "chrome": { - "textures": { - "layer0": "techreborn:items/ingot/chrome_ingot" - } - }, - "copper": { - "textures": { - "layer0": "techreborn:items/ingot/copper_ingot" - } - }, - "electrum": { - "textures": { - "layer0": "techreborn:items/ingot/electrum_ingot" - } - }, - "hot_tungstensteel": { - "textures": { - "layer0": "techreborn:items/ingot/hot_tungstensteel_ingot" - } - }, - "invar": { - "textures": { - "layer0": "techreborn:items/ingot/invar_ingot" - } - }, - "iridium_alloy": { - "textures": { - "layer0": "techreborn:items/ingot/iridium_alloy_ingot" - } - }, - "iridium": { - "textures": { - "layer0": "techreborn:items/ingot/iridium_ingot" - } - }, - "lead": { - "textures": { - "layer0": "techreborn:items/ingot/lead_ingot" - } - }, - "mixed_metal": { - "textures": { - "layer0": "techreborn:items/ingot/mixed_metal_ingot" - } - }, - "nickel": { - "textures": { - "layer0": "techreborn:items/ingot/nickel_ingot" - } - }, - "platinum": { - "textures": { - "layer0": "techreborn:items/ingot/platinum_ingot" - } - }, - "refined_iron": { - "textures": { - "layer0": "techreborn:items/ingot/refined_iron_ingot" - } - }, - "silver": { - "textures": { - "layer0": "techreborn:items/ingot/silver_ingot" - } - }, - "steel": { - "textures": { - "layer0": "techreborn:items/ingot/steel_ingot" - } - }, - "tin": { - "textures": { - "layer0": "techreborn:items/ingot/tin_ingot" - } - }, - "titanium": { - "textures": { - "layer0": "techreborn:items/ingot/titanium_ingot" - } - }, - "tungsten": { - "textures": { - "layer0": "techreborn:items/ingot/tungsten_ingot" - } - }, - "tungstensteel": { - "textures": { - "layer0": "techreborn:items/ingot/tungstensteel_ingot" - } - }, - "zinc": { - "textures": { - "layer0": "techreborn:items/ingot/zinc_ingot" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json index 9b22bb5c9..7f0bad815 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_inventory.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_inventory", + "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "block/iron_block" + "texture": "minecraft:block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json index 1a7a38171..28387992c 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_post", + "parent": "minecraft:block/fence_post", "textures": { - "texture": "block/iron_block" + "texture": "minecraft:block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json index e3743bb1d..02c5c29f0 100644 --- a/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json +++ b/src/main/resources/assets/techreborn/models/block/refined_iron_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_side", + "parent": "minecraft:block/fence_side", "textures": { - "texture": "block/iron_block" + "texture": "minecraft:block/iron_block" } } diff --git a/src/main/resources/assets/techreborn/models/item/advanced_alloy_ingot.json b/src/main/resources/assets/techreborn/models/item/advanced_alloy_ingot.json new file mode 100644 index 000000000..4a41d851e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_alloy_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/advanced_alloy_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/aluminum_ingot.json b/src/main/resources/assets/techreborn/models/item/aluminum_ingot.json new file mode 100644 index 000000000..6a674d4f6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/aluminum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/aluminum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/brass_ingot.json b/src/main/resources/assets/techreborn/models/item/brass_ingot.json new file mode 100644 index 000000000..f22489a61 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/brass_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/brass_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bronze_ingot.json b/src/main/resources/assets/techreborn/models/item/bronze_ingot.json new file mode 100644 index 000000000..b753496f6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/chrome_ingot.json b/src/main/resources/assets/techreborn/models/item/chrome_ingot.json new file mode 100644 index 000000000..e1ebf5efe --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/chrome_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/chrome_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/copper_ingot.json b/src/main/resources/assets/techreborn/models/item/copper_ingot.json new file mode 100644 index 000000000..95836f3ce --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/copper_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/copper_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/electrum_ingot.json b/src/main/resources/assets/techreborn/models/item/electrum_ingot.json new file mode 100644 index 000000000..cf3472a73 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/electrum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/electrum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_ingot.json b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_ingot.json new file mode 100644 index 000000000..89fef5ab3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/hot_tungstensteel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/invar_ingot.json b/src/main/resources/assets/techreborn/models/item/invar_ingot.json new file mode 100644 index 000000000..72d6b6529 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/invar_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/invar_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/iridium_alloy_ingot.json b/src/main/resources/assets/techreborn/models/item/iridium_alloy_ingot.json new file mode 100644 index 000000000..ff79d7bc7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/iridium_alloy_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/iridium_alloy_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/iridium_ingot.json b/src/main/resources/assets/techreborn/models/item/iridium_ingot.json new file mode 100644 index 000000000..185587e07 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/iridium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/iridium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lead_ingot.json b/src/main/resources/assets/techreborn/models/item/lead_ingot.json new file mode 100644 index 000000000..0d40a6932 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/lead_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/lead_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/mixed_metal_ingot.json b/src/main/resources/assets/techreborn/models/item/mixed_metal_ingot.json new file mode 100644 index 000000000..6ad4697c1 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/mixed_metal_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/mixed_metal_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/nickel_ingot.json b/src/main/resources/assets/techreborn/models/item/nickel_ingot.json new file mode 100644 index 000000000..f43730ac6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/nickel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/nickel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/platinum_ingot.json b/src/main/resources/assets/techreborn/models/item/platinum_ingot.json new file mode 100644 index 000000000..aae9f7e0f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/platinum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/platinum_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/refined_iron_ingot.json b/src/main/resources/assets/techreborn/models/item/refined_iron_ingot.json new file mode 100644 index 000000000..92ddb918e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/refined_iron_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/refined_iron_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/silver_ingot.json b/src/main/resources/assets/techreborn/models/item/silver_ingot.json new file mode 100644 index 000000000..0f6491721 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/silver_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/silver_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/steel_ingot.json b/src/main/resources/assets/techreborn/models/item/steel_ingot.json new file mode 100644 index 000000000..7486b44bb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/steel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tin_ingot.json b/src/main/resources/assets/techreborn/models/item/tin_ingot.json new file mode 100644 index 000000000..1272f0b4d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/tin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/titanium_ingot.json b/src/main/resources/assets/techreborn/models/item/titanium_ingot.json new file mode 100644 index 000000000..ca7521f86 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/titanium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/titanium_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tungsten_ingot.json b/src/main/resources/assets/techreborn/models/item/tungsten_ingot.json new file mode 100644 index 000000000..570cf85d4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tungsten_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/tungsten_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tungstensteel_ingot.json b/src/main/resources/assets/techreborn/models/item/tungstensteel_ingot.json new file mode 100644 index 000000000..38a98e71e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tungstensteel_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/tungstensteel_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/zinc_ingot.json b/src/main/resources/assets/techreborn/models/item/zinc_ingot.json new file mode 100644 index 000000000..8c9946365 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/zinc_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/ingot/zinc_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/part/energy_flow_circuit.png b/src/main/resources/assets/techreborn/textures/item/part/energy_flow_chip.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/energy_flow_circuit.png rename to src/main/resources/assets/techreborn/textures/item/part/energy_flow_chip.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_triple.png b/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_180k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/helium_coolant_triple.png rename to src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_180k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_six.png b/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_360k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/helium_coolant_six.png rename to src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_360k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_simple.png b/src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_60k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/helium_coolant_simple.png rename to src/main/resources/assets/techreborn/textures/item/part/helium_coolant_cell_60k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_triple.png b/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_180k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/nak_coolant_triple.png rename to src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_180k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_six.png b/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_360k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/nak_coolant_six.png rename to src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_360k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_simple.png b/src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_60k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/nak_coolant_simple.png rename to src/main/resources/assets/techreborn/textures/item/part/nak_coolant_cell_60k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/super_conductor.png b/src/main/resources/assets/techreborn/textures/item/part/superconductor.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/super_conductor.png rename to src/main/resources/assets/techreborn/textures/item/part/superconductor.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/coolant_simple.png b/src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_10k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/coolant_simple.png rename to src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_10k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/coolant_triple.png b/src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_30k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/coolant_triple.png rename to src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_30k.png diff --git a/src/main/resources/assets/techreborn/textures/item/part/coolant_six.png b/src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_60k.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/part/coolant_six.png rename to src/main/resources/assets/techreborn/textures/item/part/water_coolant_cell_60k.png