diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index 214a39b7c..06f72c8c8 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -30,9 +30,10 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; import net.minecraft.util.Identifier; +import reborncore.client.containerBuilder.builder.BuiltContainer; import techreborn.tiles.machine.iron.TileIronAlloyFurnace; -public class GuiAlloyFurnace extends AbstractContainerScreen { +public class GuiAlloyFurnace extends AbstractContainerScreen { private static final Identifier texture = new Identifier("techreborn", "textures/gui/alloy_furnace.png"); diff --git a/src/main/resources/assets/techreborn/blockstates/cable_inv.json b/src/main/resources/assets/techreborn/blockstates/cable_inv.json deleted file mode 100644 index 9436c2454..000000000 --- a/src/main/resources/assets/techreborn/blockstates/cable_inv.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-item", - "model": "builtin/generated" - }, - "variants": { - "type": { - "copper": { - "textures": { - "layer0": "techreborn:items/cables/copper" - } - }, - "tin": { - "textures": { - "layer0": "techreborn:items/cables/tin" - } - }, - "gold": { - "textures": { - "layer0": "techreborn:items/cables/gold" - } - }, - "hv": { - "textures": { - "layer0": "techreborn:items/cables/hv" - } - }, - "glassfiber": { - "textures": { - "layer0": "techreborn:items/cables/glassfiber" - } - }, - "insulated_copper": { - "textures": { - "layer0": "techreborn:items/cables/insulatedcopper" - } - }, - "insulated_gold": { - "textures": { - "layer0": "techreborn:items/cables/insulatedgold" - } - }, - "insulated_hv": { - "textures": { - "layer0": "techreborn:items/cables/insulatedhv" - } - }, - "superconductor": { - "textures": { - "layer0": "techreborn:items/cables/superconductor" - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/cable_thick.json b/src/main/resources/assets/techreborn/blockstates/cable_thick.json deleted file mode 100644 index fbcb38928..000000000 --- a/src/main/resources/assets/techreborn/blockstates/cable_thick.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "techreborn:cable", - "textures": { - "particle": "#cable" - } - }, - "variants": { - "down": { - "true": { - "submodel": { - "pipeDown": { - "model": "techreborn:cable_connection_alt", - "x": 270 - } - } - }, - "false": { - } - }, - "east": { - "true": { - "submodel": "techreborn:cable_connection", - "y": 90 - }, - "false": { - } - }, - "north": { - "true": { - "submodel": "techreborn:cable_connection" - }, - "false": { - } - }, - "south": { - "true": { - "submodel": "techreborn:cable_connection_alt" - }, - "false": { - } - }, - "up": { - "true": { - "submodel": { - "pipeUp": { - "model": "techreborn:cable_connection", - "x": 270 - } - } - }, - "false": { - } - }, - "west": { - "true": { - "submodel": "techreborn:cable_connection_alt", - "y": 90 - }, - "false": { - } - }, - "ztype": { - "insulated_copper": { - "textures": { - "cable": "techreborn:blocks/cables/copper_insulated_cable" - } - }, - "insulated_gold": { - "textures": { - "cable": "techreborn:blocks/cables/gold_insulated_cable" - } - }, - "insulated_hv": { - "textures": { - "cable": "techreborn:blocks/cables/hv_insulated_cable" - } - }, - "superconductor": { - "textures": { - "cable": "techreborn:blocks/cables/superconductor_cable" - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/cable_thin.json b/src/main/resources/assets/techreborn/blockstates/cable_thin.json deleted file mode 100644 index d949ad193..000000000 --- a/src/main/resources/assets/techreborn/blockstates/cable_thin.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "techreborn:cable_thin", - "textures": { - "particle": "#cable" - } - }, - "variants": { - "down": { - "true": { - "submodel": { - "pipeDown": { - "model": "techreborn:cable_connection_alt_thin", - "x": 270 - } - } - }, - "false": { - - } - }, - "east": { - "true": { - "submodel": "techreborn:cable_connection_thin", - "y": 90 - }, - "false": { - - } - }, - "north": { - "true": { - "submodel": "techreborn:cable_connection_thin" - }, - "false": { - - } - }, - "south": { - "true": { - "submodel": "techreborn:cable_connection_alt_thin" - }, - "false": { - - } - }, - "up": { - "true": { - "submodel": { - "pipeUp": { - "model": "techreborn:cable_connection_thin", - "x": 270 - } - } - }, - "false": { - - } - }, - "west": { - "true": { - "submodel": "techreborn:cable_connection_alt_thin", - "y": 90 - }, - "false": { - - } - }, - "ztype": { - "copper": { - "textures": { - "cable": "techreborn:blocks/cables/copper_cable" - } - }, - "tin": { - "textures": { - "cable": "techreborn:blocks/cables/tin_cable" - } - }, - "gold": { - "textures": { - "cable": "techreborn:blocks/cables/gold_cable" - } - }, - "hv": { - "textures": { - "cable": "techreborn:blocks/cables/hv_cable" - } - }, - "glassfiber": { - "textures": { - "cable": "techreborn:blocks/cables/glass_fiber_cable" - } - } - } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/copper_cable.json b/src/main/resources/assets/techreborn/blockstates/copper_cable.json new file mode 100644 index 000000000..a7fb942fb --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/copper_cable.json @@ -0,0 +1,33 @@ +{ + "multipart": [ + { + "apply": { + "model": "techreborn:block/cable/copper_cable_core" + } + }, + { + "when": { "north": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side" } + }, + { + "when": { "east": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side", "y": 90 } + }, + { + "when": { "south": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side", "y": 180 } + }, + { + "when": { "west": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side", "y": 270 } + }, + { + "when": { "up": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side", "x": 270} + }, + { + "when": { "down": "true" }, + "apply": { "model": "techreborn:block/cable/copper_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/glassfiber_cable.json b/src/main/resources/assets/techreborn/blockstates/glassfiber_cable.json new file mode 100644 index 000000000..f1c41e7ed --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/glassfiber_cable.json @@ -0,0 +1,33 @@ +{ + "multipart": [ + { + "apply": { + "model": "techreborn:block/cable/glassfiber_cable_core" + } + }, + { + "when": { "north": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side" } + }, + { + "when": { "east": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side", "y": 90 } + }, + { + "when": { "south": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side", "y": 180 } + }, + { + "when": { "west": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side", "y": 270 } + }, + { + "when": { "up": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side", "x": 270} + }, + { + "when": { "down": "true" }, + "apply": { "model": "techreborn:block/cable/glassfiber_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/gold_cable.json b/src/main/resources/assets/techreborn/blockstates/gold_cable.json new file mode 100644 index 000000000..fdacadb76 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/gold_cable.json @@ -0,0 +1,33 @@ +{ + "multipart": [ + { + "apply": { + "model": "techreborn:block/cable/gold_cable_core" + } + }, + { + "when": { "north": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side" } + }, + { + "when": { "east": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side", "y": 90 } + }, + { + "when": { "south": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side", "y": 180 } + }, + { + "when": { "west": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side", "y": 270 } + }, + { + "when": { "up": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side", "x": 270} + }, + { + "when": { "down": "true" }, + "apply": { "model": "techreborn:block/cable/gold_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/hv_cable.json b/src/main/resources/assets/techreborn/blockstates/hv_cable.json new file mode 100644 index 000000000..9e195512a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/hv_cable.json @@ -0,0 +1,33 @@ +{ + "multipart": [ + { + "apply": { + "model": "techreborn:block/cable/hv_cable_core" + } + }, + { + "when": { "north": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side" } + }, + { + "when": { "east": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side", "y": 90 } + }, + { + "when": { "south": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side", "y": 180 } + }, + { + "when": { "west": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side", "y": 270 } + }, + { + "when": { "up": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side", "x": 270} + }, + { + "when": { "down": "true" }, + "apply": { "model": "techreborn:block/cable/hv_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/insulated_copper_cable.json b/src/main/resources/assets/techreborn/blockstates/insulated_copper_cable.json new file mode 100644 index 000000000..c0faa365b --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/insulated_copper_cable.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_core" } + }, + { + "when": { "north": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side" } + }, + { + "when": { "east": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side", "y": 90 } + }, + { + "when": { "south": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side", "y": 180 } + }, + { + "when": { "west": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side", "y": 270 } + }, + { + "when": { "up": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side", "x": 270} + }, + { + "when": { "down": true }, + "apply": { "model": "techreborn:block/cable/insulated_copper_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/insulated_gold_cable.json b/src/main/resources/assets/techreborn/blockstates/insulated_gold_cable.json new file mode 100644 index 000000000..a368481a2 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/insulated_gold_cable.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_core" } + }, + { + "when": { "north": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side" } + }, + { + "when": { "east": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side", "y": 90 } + }, + { + "when": { "south": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side", "y": 180 } + }, + { + "when": { "west": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side", "y": 270 } + }, + { + "when": { "up": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side", "x": 270} + }, + { + "when": { "down": true }, + "apply": { "model": "techreborn:block/cable/insulated_gold_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/insulated_hv_cable.json b/src/main/resources/assets/techreborn/blockstates/insulated_hv_cable.json new file mode 100644 index 000000000..d6d6de2fa --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/insulated_hv_cable.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_core" } + }, + { + "when": { "north": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side" } + }, + { + "when": { "east": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side", "y": 90 } + }, + { + "when": { "south": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side", "y": 180 } + }, + { + "when": { "west": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side", "y": 270 } + }, + { + "when": { "up": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side", "x": 270} + }, + { + "when": { "down": true }, + "apply": { "model": "techreborn:block/cable/insulated_hv_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/items/misc/cables.json b/src/main/resources/assets/techreborn/blockstates/items/misc/cables.json deleted file mode 100644 index 81a80dc69..000000000 --- a/src/main/resources/assets/techreborn/blockstates/items/misc/cables.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "builtin/generated", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "copper": { - "textures": { - "layer0": "techreborn:items/cables/copper" - } - }, - "glassfiber": { - "textures": { - "layer0": "techreborn:items/cables/glassfiber" - } - }, - "gold": { - "textures": { - "layer0": "techreborn:items/cables/gold" - } - }, - "hv": { - "textures": { - "layer0": "techreborn:items/cables/hv" - } - }, - "insulatedcopper": { - "textures": { - "layer0": "techreborn:items/cables/insulatedcopper" - } - }, - "insulatedgold": { - "textures": { - "layer0": "techreborn:items/cables/insulatedgold" - } - }, - "insulatedhv": { - "textures": { - "layer0": "techreborn:items/cables/insulatedhv" - } - }, - "tin": { - "textures": { - "layer0": "techreborn:items/cables/tin" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json b/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/resources/assets/techreborn/blockstates/superconductor_cable.json b/src/main/resources/assets/techreborn/blockstates/superconductor_cable.json new file mode 100644 index 000000000..58931ff6d --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/superconductor_cable.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "techreborn:block/cable/superconductor_cable_core" } + }, + { + "when": { "north": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side" } + }, + { + "when": { "east": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side", "y": 90 } + }, + { + "when": { "south": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side", "y": 180 } + }, + { + "when": { "west": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side", "y": 270 } + }, + { + "when": { "up": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side", "x": 270} + }, + { + "when": { "down": true }, + "apply": { "model": "techreborn:block/cable/superconductor_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/tin_cable.json b/src/main/resources/assets/techreborn/blockstates/tin_cable.json new file mode 100644 index 000000000..e70601df9 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/tin_cable.json @@ -0,0 +1,33 @@ +{ + "multipart": [ + { + "apply": { + "model": "techreborn:block/cable/tin_cable_core" + } + }, + { + "when": { "north": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side" } + }, + { + "when": { "east": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side", "y": 90 } + }, + { + "when": { "south": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side", "y": 180 } + }, + { + "when": { "west": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side", "y": 270 } + }, + { + "when": { "up": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side", "x": 270} + }, + { + "when": { "down": "true" }, + "apply": { "model": "techreborn:block/cable/tin_cable_side", "x": 90 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/cable/copper_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/copper_cable_core.json new file mode 100644 index 000000000..a1018be62 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/copper_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_core", + "textures": { + "cable": "techreborn:block/cables/copper_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/copper_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/copper_cable_side.json new file mode 100644 index 000000000..819c1d484 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/copper_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_side", + "textures": { + "cable": "techreborn:block/cables/copper_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_core.json new file mode 100644 index 000000000..ad073cf93 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_core", + "textures": { + "cable": "techreborn:block/cables/glassfiber_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_side.json new file mode 100644 index 000000000..880761907 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/glassfiber_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_side", + "textures": { + "cable": "techreborn:block/cables/glassfiber_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/gold_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/gold_cable_core.json new file mode 100644 index 000000000..618b64ef0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/gold_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_core", + "textures": { + "cable": "techreborn:block/cables/gold_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/gold_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/gold_cable_side.json new file mode 100644 index 000000000..b94cf197a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/gold_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_side", + "textures": { + "cable": "techreborn:block/cables/gold_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/hv_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/hv_cable_core.json new file mode 100644 index 000000000..a17c1a16f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/hv_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_core", + "textures": { + "cable": "techreborn:block/cables/hv_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/hv_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/hv_cable_side.json new file mode 100644 index 000000000..53b2de6d7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/hv_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_side", + "textures": { + "cable": "techreborn:block/cables/hv_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core.json new file mode 100644 index 000000000..fea8a82e8 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_core", + "textures": { + "cable": "techreborn:block/cables/copper_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core_alt.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core_alt.json new file mode 100644 index 000000000..4f1d56b22 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_core_alt.json @@ -0,0 +1,7 @@ +{ + "__comment": "Not used as for now. part of work aimed to hide core if there are side connections", + "parent": "techreborn:block/template/template_thick_cable_core_alt", + "textures": { + "cable": "techreborn:block/cables/copper_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_side.json new file mode 100644 index 000000000..9276123a4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_copper_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_side", + "textures": { + "cable": "techreborn:block/cables/copper_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_core.json new file mode 100644 index 000000000..0a2a4706b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_core", + "textures": { + "cable": "techreborn:block/cables/gold_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_side.json new file mode 100644 index 000000000..3e1e3f216 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_gold_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_side", + "textures": { + "cable": "techreborn:block/cables/gold_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_core.json new file mode 100644 index 000000000..023bf8ac2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_core", + "textures": { + "cable": "techreborn:block/cables/hv_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_side.json new file mode 100644 index 000000000..18e428684 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/insulated_hv_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_side", + "textures": { + "cable": "techreborn:block/cables/hv_insulated_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_core.json new file mode 100644 index 000000000..0a638a250 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_core", + "textures": { + "cable": "techreborn:block/cables/superconductor_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_side.json new file mode 100644 index 000000000..34f4192df --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/superconductor_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thick_cable_side", + "textures": { + "cable": "techreborn:block/cables/superconductor_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/tin_cable_core.json b/src/main/resources/assets/techreborn/models/block/cable/tin_cable_core.json new file mode 100644 index 000000000..5c9304713 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/tin_cable_core.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_core", + "textures": { + "cable": "techreborn:block/cables/tin_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/cable/tin_cable_side.json b/src/main/resources/assets/techreborn/models/block/cable/tin_cable_side.json new file mode 100644 index 000000000..13775d013 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cable/tin_cable_side.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:block/template/template_thin_cable_side", + "textures": { + "cable": "techreborn:block/cables/tin_cable" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_core.json b/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_core.json new file mode 100644 index 000000000..6f381d175 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_core.json @@ -0,0 +1,21 @@ +{ + "textures": { + "particle": "#cable" + }, + "elements": [ + { + "__comment": "central part, no sides connected", + "from": [5, 5, 5], + "to": [11, 11, 11], + "shade": true, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#cable"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#cable"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#cable"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#cable"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#cable"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#cable"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_side.json b/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_side.json new file mode 100644 index 000000000..e4912ff96 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/template/template_thick_cable_side.json @@ -0,0 +1,21 @@ +{ + "textures": { + "particle": "#cable" + }, + "elements": [ + { + "__comment": "side part", + "from": [ 5, 5, 0 ], + "to": [ 11, 11, 5 ], + "shade": true, + "faces": { + "north": { "texture": "#cable", "uv": [ 0, 0, 6, 6 ] }, + "east": { "texture": "#cable", "uv": [0, 6, 5, 12] }, + "south": { "texture": "#cable", "uv": [ 0, 0, 6, 6 ], "cullface": "south" }, + "west": { "texture": "#cable", "uv": [0, 6, 5, 12] }, + "up": { "texture": "#cable", "uv": [ 0, 6, 6, 12 ], "rotation": 90 }, + "down": { "texture": "#cable", "uv": [ 0, 6, 6, 12 ], "rotation": 90 } + } + } + ] +} diff --git a/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_core.json b/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_core.json new file mode 100644 index 000000000..5ea7a2cdb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_core.json @@ -0,0 +1,21 @@ +{ + "textures": { + "particle": "#cable" + }, + "elements": [ + { + "__comment": "central part", + "from": [6, 6, 6], + "to": [10, 10, 10], + "shade": true, + "faces": { + "north": {"uv": [1, 1, 5, 5], "texture": "#cable"}, + "east": {"uv": [1, 1, 5, 5], "texture": "#cable"}, + "south": {"uv": [1, 1, 5, 5], "texture": "#cable"}, + "west": {"uv": [1, 1, 5, 5], "texture": "#cable"}, + "up": {"uv": [1, 1, 5, 5], "texture": "#cable"}, + "down": {"uv": [1, 1, 5, 5], "texture": "#cable"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_side.json b/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_side.json new file mode 100644 index 000000000..c2c3c302d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/template/template_thin_cable_side.json @@ -0,0 +1,41 @@ +{ + "textures": { + "particle": "#cable" + }, + "elements": [ + { + "from": [ 6, 6, 0 ], + "to": [ 10, 10, 6 ], + "shade": true, + "faces": { + "north": { + "uv": [ 1, 1, 5, 5 ], + "texture": "#cable" + }, + "east": { + "uv": [0, 7, 6, 11], + "texture": "#cable" + }, + "south": { + "uv": [ 1, 1, 5, 5 ], + "texture": "#cable", + "cullface": "south" + }, + "west": { + "uv": [0, 7, 6, 11], + "texture": "#cable" + }, + "up": { + "uv": [ 0, 7, 6, 11 ], + "texture": "#cable", + "rotation": 90 + }, + "down": { + "uv": [ 0, 7, 6, 11 ], + "texture": "#cable", + "rotation": 90 + } + } + } + ] +} diff --git a/src/main/resources/assets/techreborn/models/item/copper_cable.json b/src/main/resources/assets/techreborn/models/item/copper_cable.json new file mode 100644 index 000000000..d99f562f9 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/copper_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/copper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/glassfiber_cable.json b/src/main/resources/assets/techreborn/models/item/glassfiber_cable.json new file mode 100644 index 000000000..69305ae6d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/glassfiber_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/glassfiber" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/gold_cable.json b/src/main/resources/assets/techreborn/models/item/gold_cable.json new file mode 100644 index 000000000..50bfaf3d3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/gold_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/gold" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hv_cable.json b/src/main/resources/assets/techreborn/models/item/hv_cable.json new file mode 100644 index 000000000..c1fe9aba2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hv_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/hv" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/insulated_copper_cable.json b/src/main/resources/assets/techreborn/models/item/insulated_copper_cable.json new file mode 100644 index 000000000..4419402bf --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/insulated_copper_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/insulatedcopper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/insulated_gold_cable.json b/src/main/resources/assets/techreborn/models/item/insulated_gold_cable.json new file mode 100644 index 000000000..c61cdfb46 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/insulated_gold_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/insulatedgold" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/insulated_hv_cable.json b/src/main/resources/assets/techreborn/models/item/insulated_hv_cable.json new file mode 100644 index 000000000..ce0b11ef0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/insulated_hv_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/insulatedhv" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/superconductor_cable.json b/src/main/resources/assets/techreborn/models/item/superconductor_cable.json new file mode 100644 index 000000000..722dfdc7d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/superconductor_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/superconductor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tin_cable.json b/src/main/resources/assets/techreborn/models/item/tin_cable.json new file mode 100644 index 000000000..96c9d5706 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tin_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/cables/tin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/cables/glass_fiber_cable.png b/src/main/resources/assets/techreborn/textures/block/cables/glassfiber_cable.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/cables/glass_fiber_cable.png rename to src/main/resources/assets/techreborn/textures/block/cables/glassfiber_cable.png