From 79d7d8b02404b369daf26e5b5e94bea3a9e9a334 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 27 Apr 2016 23:40:23 +0100 Subject: [PATCH] Fix up some more models, register StateMappers using the right function at the right time. --- build.gradle | 8 +- build.properties | 2 +- .../client/model/ModelChemicalInfuser.java | 7 + .../client/model/ModelChemicalWasher.java | 7 + .../model/ModelElectrolyticSeparator.java | 1 + .../client/model/ModelEnergyCube.java | 1 + .../mekanism/client/model/ModelLaser.java | 1 + .../model/ModelQuantumEntangloporter.java | 1 + .../client/model/ModelSecurityDesk.java | 7 + .../client/model/ModelSeismicVibrator.java | 13 + .../model/ModelSolarNeutronActivator.java | 18 + .../client/model/modelbase_to_json.perl | 129 +++ .../render/tileentity/RenderGasTank.java | 2 +- .../tileentity/RenderResistiveHeater.java | 2 +- .../RenderRotaryCondensentrator.java | 2 +- .../java/mekanism/common/MekanismBlocks.java | 29 +- .../mekanism/common/block/BlockGasTank.java | 39 + .../mekanism/common/block/BlockPlastic.java | 13 +- .../block/states/BlockStateGasTank.java | 3 - .../block/states/BlockStateMachine.java | 4 +- .../block/states/BlockStatePlastic.java | 21 +- .../assets/mekanism/blockstates/GasTank.json | 18 + .../mekanism/blockstates/bronze_block.json | 14 + .../mekanism/blockstates/coal_block.json | 14 + .../mekanism/blockstates/copper_block.json | 14 + .../mekanism/blockstates/dynamic_tank.json | 14 + .../mekanism/blockstates/dynamic_valve.json | 14 + .../blockstates/enrichment_chamber.json | 16 +- .../{portable_tank.json => fluid_tank.json} | 2 +- .../blockstates/induction_casing.json | 14 + .../mekanism/blockstates/induction_cell.json | 14 + .../mekanism/blockstates/induction_port.json | 14 + .../blockstates/induction_provider.json | 14 + .../blockstates/laser_tractor_beam.json | 3 +- .../blockstates/logistical_sorter.json | 12 +- .../mekanism/blockstates/osmium_block.json | 14 + .../mekanism/blockstates/plastic_block.json | 18 + .../blockstates/quantum_entangloporter.json | 19 + .../blockstates/refined_glowstone.json | 14 + .../blockstates/refined_obsidian.json | 14 + .../blockstates/solar_evaporation_block.json | 14 + .../blockstates/solar_evaporation_valve.json | 14 + .../blockstates/solar_neutron_activator.json | 2 +- .../mekanism/blockstates/steel_block.json | 14 + .../mekanism/blockstates/steel_casing.json | 14 + .../blockstates/structural_glass.json | 14 + .../blockstates/teleporter_frame.json | 14 + .../mekanism/blockstates/tin_block.json | 14 + .../mekanism/models/block/chargepad.json | 118 ++- .../models/block/chemical_crystallizer.json | 542 +++-------- .../block/chemical_dissolution_chamber.json | 607 ++++++------ .../models/block/chemical_infuser.json | 628 +++++------- .../models/block/chemical_oxidizer.json | 312 ++---- .../models/block/chemical_washer.json | 546 ++++------- .../mekanism/models/block/cube_colour.json | 16 + .../mekanism/models/block/digital_miner.json | 913 +++++++++++------- .../mekanism/models/block/electric_pump.json | 320 +++--- .../models/block/electrolytic_separator.json | 425 ++++---- .../mekanism/models/block/energy_cube.json | 782 ++++++++++----- .../models/block/enrichment_chamber.json | 2 +- .../{portable_tank.json => fluid_tank.json} | 192 ++-- .../models/block/fluidic_plenisher.json | 364 +++---- .../mekanism/models/block/gas_tank.json | 167 ++-- .../assets/mekanism/models/block/laser.json | 357 +++---- .../models/block/laser_amplifier.json | 114 +-- .../models/block/logistical_sorter.json | 447 +++++---- .../assets/mekanism/models/block/machine.json | 4 +- .../models/block/metallurgic_infuser.json | 412 +++----- .../assets/mekanism/models/block/nothing.json | 9 +- .../block/pressurized_reaction_chamber.json | 299 ++---- .../models/block/quantum_entangloporter.json | 541 +++++++++++ .../models/block/resistive_heater.json | 268 +++++ .../models/block/rotary_condensentrator.json | 437 ++++----- .../mekanism/models/block/security_desk.json | 138 +++ .../models/block/seismic_vibrator.json | 655 ++++++++++--- .../models/block/solar_neutron_activator.json | 619 ++++++++++++ .../textures/blocks/models/chargepad.png | Bin 0 -> 3389 bytes .../blocks/models/chemical_crystallizer.png | Bin 0 -> 4964 bytes .../models/chemical_dissolution_chamber.png | Bin 0 -> 6241 bytes .../blocks/models/chemical_infuser.png | Bin 0 -> 4560 bytes .../blocks/models/chemical_oxidizer.png | Bin 0 -> 5578 bytes .../blocks/models/chemical_washer.png | Bin 0 -> 5945 bytes .../textures/blocks/models/digital_miner.png | Bin 33801 -> 22417 bytes .../textures/blocks/models/electric_pump.png | Bin 3253 -> 5627 bytes .../blocks/models/electrolytic_separator.png | Bin 4529 -> 4166 bytes .../textures/blocks/models/fluid_tank.png | Bin 0 -> 2879 bytes .../blocks/models/fluidic_plenisher.png | Bin 0 -> 4582 bytes .../blocks/models/gas_tank_advanced.png | Bin 0 -> 2605 bytes .../textures/blocks/models/gas_tank_basic.png | Bin 0 -> 2639 bytes .../textures/blocks/models/gas_tank_elite.png | Bin 0 -> 2676 bytes .../blocks/models/gas_tank_ultimate.png | Bin 0 -> 2626 bytes .../mekanism/textures/blocks/models/laser.png | Bin 6074 -> 2275 bytes .../blocks/models/laser_amplifier.png | Bin 0 -> 2624 bytes .../blocks/models/laser_tractor_beam.png | Bin 0 -> 2982 bytes .../blocks/models/logistical_sorter.png | Bin 0 -> 3084 bytes .../blocks/models/logistical_sorter_on.png | Bin 0 -> 3076 bytes .../blocks/models/metallurgic_infuser.png | Bin 4558 -> 6372 bytes .../models/pressurized_reaction_chamber.png | Bin 0 -> 4502 bytes .../blocks/models/rotary_condensentrator.png | Bin 0 -> 6827 bytes .../blocks/models/seismic_vibrator.png | Bin 0 -> 7381 bytes .../blocks/models/solar_neutron_activator.png | Bin 0 -> 6249 bytes 101 files changed, 6636 insertions(+), 4264 deletions(-) create mode 100644 src/main/java/mekanism/client/model/modelbase_to_json.perl create mode 100644 src/main/resources/assets/mekanism/blockstates/GasTank.json create mode 100644 src/main/resources/assets/mekanism/blockstates/bronze_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/coal_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/copper_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/dynamic_tank.json create mode 100644 src/main/resources/assets/mekanism/blockstates/dynamic_valve.json rename src/main/resources/assets/mekanism/blockstates/{portable_tank.json => fluid_tank.json} (81%) create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_casing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_cell.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_port.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_provider.json create mode 100644 src/main/resources/assets/mekanism/blockstates/osmium_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/plastic_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/quantum_entangloporter.json create mode 100644 src/main/resources/assets/mekanism/blockstates/refined_glowstone.json create mode 100644 src/main/resources/assets/mekanism/blockstates/refined_obsidian.json create mode 100644 src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json create mode 100644 src/main/resources/assets/mekanism/blockstates/steel_block.json create mode 100644 src/main/resources/assets/mekanism/blockstates/steel_casing.json create mode 100644 src/main/resources/assets/mekanism/blockstates/structural_glass.json create mode 100644 src/main/resources/assets/mekanism/blockstates/teleporter_frame.json create mode 100644 src/main/resources/assets/mekanism/blockstates/tin_block.json create mode 100644 src/main/resources/assets/mekanism/models/block/cube_colour.json rename src/main/resources/assets/mekanism/models/block/{portable_tank.json => fluid_tank.json} (70%) create mode 100644 src/main/resources/assets/mekanism/models/block/quantum_entangloporter.json create mode 100644 src/main/resources/assets/mekanism/models/block/resistive_heater.json create mode 100644 src/main/resources/assets/mekanism/models/block/security_desk.json create mode 100644 src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chargepad.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_infuser.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_oxidizer.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_washer.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/fluid_tank.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/fluidic_plenisher.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_advanced.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_basic.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_elite.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_ultimate.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/laser_tractor_beam.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter_on.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/pressurized_reaction_chamber.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/rotary_condensentrator.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/seismic_vibrator.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/solar_neutron_activator.png diff --git a/build.gradle b/build.gradle index 0d91940f8..6fbc6a136 100644 --- a/build.gradle +++ b/build.gradle @@ -53,12 +53,12 @@ version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUI archivesBaseName = "MekanismAll" libsDirName = "../output" distsDirName = "../output" -sourceCompatibility = '1.7' -targetCompatibility = '1.7' +sourceCompatibility = '1.8' +targetCompatibility = '1.8' minecraft { version = config.minecraft_version + "-" + config.forge_version - mappings = "stable_20" + mappings = "stable_22" runDir = "run" } @@ -115,9 +115,11 @@ task generatorsJar(type: Jar) { } } +/* coreJar.dependsOn('reobf') toolsJar.dependsOn('reobf') generatorsJar.dependsOn('reobf') +*/ task MDKZip(type: Zip) { baseName = 'MDK' diff --git a/build.properties b/build.properties index 0d6906fcc..de38fe0f0 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.8.9 -forge_version=11.15.0.1697 +forge_version=11.15.1.1722 FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 47ec844d5..d5777f82f 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -96,12 +96,14 @@ public class ModelChemicalInfuser extends ModelBase pipeAngle2.setRotationPoint(5F, 13.01F, -2F); pipeAngle2.setTextureSize(128, 64); pipeAngle2.mirror = true; + //TODO setRotation(pipeAngle2, 0F, 0.7853982F, 0F); connectorAngle = new ModelRenderer(this, 40, 45); connectorAngle.addBox(0F, 0F, 0F, 2, 8, 2); connectorAngle.setRotationPoint(-1F, 13F, 5F); connectorAngle.setTextureSize(128, 64); connectorAngle.mirror = true; + //TODO setRotation(connectorAngle, -0.4886922F, 0F, 0F); pipe2 = new ModelRenderer(this, 40, 35); pipe2.addBox(0F, 0F, 0F, 1, 6, 4); @@ -192,30 +194,35 @@ public class ModelChemicalInfuser extends ModelBase pipeAngle1.setRotationPoint(-5F, 13.01F, -2F); pipeAngle1.setTextureSize(128, 64); pipeAngle1.mirror = true; + //TODO setRotation(pipeAngle1, 0F, -0.7853982F, 0F); exhaust4 = new ModelRenderer(this, 0, 9); exhaust4.addBox(0F, 0F, 0F, 1, 1, 1); exhaust4.setRotationPoint(-1.33F, 11.5F, -6.2F); exhaust4.setTextureSize(128, 64); exhaust4.mirror = true; + //TODO setRotation(exhaust4, 0.3490659F, 0F, 0F); exhaust3 = new ModelRenderer(this, 0, 9); exhaust3.addBox(0F, 0F, 0F, 1, 1, 1); exhaust3.setRotationPoint(-3F, 11.5F, -6.2F); exhaust3.setTextureSize(128, 64); exhaust3.mirror = true; + //TODO setRotation(exhaust3, 0.3490659F, 0F, 0F); exhaust2 = new ModelRenderer(this, 0, 9); exhaust2.addBox(0F, 0F, 0F, 1, 1, 1); exhaust2.setRotationPoint(2F, 11.5F, -6.2F); exhaust2.setTextureSize(128, 64); exhaust2.mirror = true; + //TODO setRotation(exhaust2, 0.3490659F, 0F, 0F); exhaust1 = new ModelRenderer(this, 0, 9); exhaust1.addBox(0F, 0F, 0F, 1, 1, 1); exhaust1.setRotationPoint(0.33F, 11.5F, -6.2F); exhaust1.setTextureSize(128, 64); exhaust1.mirror = true; + //TODO setRotation(exhaust1, 0.3490659F, 0F, 0F); } diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 757063f79..0e4c10df1 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -66,6 +66,7 @@ public class ModelChemicalWasher extends ModelBase pipe2b.setRotationPoint(-3.49F, 14F, -3.5F); pipe2b.setTextureSize(128, 64); pipe2b.mirror = true; + //TODO setRotation(pipe2b, 0.837758F, 0F, 0F); portRight = new ModelRenderer(this, 48, 0); portRight.addBox(0F, 0F, 0F, 1, 8, 8); @@ -108,6 +109,7 @@ public class ModelChemicalWasher extends ModelBase pipe2.setRotationPoint(-2.51F, 14F, -3.5F); pipe2.setTextureSize(128, 64); pipe2.mirror = true; + //TODO setRotation(pipe2, 0.837758F, 0F, 0F); tankLeft = new ModelRenderer(this, 0, 36); tankLeft.addBox(0F, 0F, 0F, 7, 10, 8); @@ -144,6 +146,7 @@ public class ModelChemicalWasher extends ModelBase tubeLeft1.setRotationPoint(-6F, 8.5F, 4F); tubeLeft1.setTextureSize(128, 64); tubeLeft1.mirror = true; + //TODO setRotation(tubeLeft1, 0.6806784F, 0F, 0F); tubeLeft2 = new ModelRenderer(this, 30, 36); tubeLeft2.addBox(0F, 0F, 0F, 1, 1, 8); @@ -156,24 +159,28 @@ public class ModelChemicalWasher extends ModelBase tubeRight3.setRotationPoint(6F, 10F, -2.5F); tubeRight3.setTextureSize(128, 64); tubeRight3.mirror = true; + //TODO setRotation(tubeRight3, 0F, 0F, 0.3141593F); tubeRight1 = new ModelRenderer(this, 30, 39); tubeRight1.addBox(0F, -1F, 0F, 1, 2, 1); tubeRight1.setRotationPoint(6F, 10F, -6.5F); tubeRight1.setTextureSize(128, 64); tubeRight1.mirror = true; + //TODO setRotation(tubeRight1, 0F, 0F, 0.3141593F); tubeRight2 = new ModelRenderer(this, 30, 39); tubeRight2.addBox(0F, -1F, 0F, 1, 2, 1); tubeRight2.setRotationPoint(6F, 10F, -4.5F); tubeRight2.setTextureSize(128, 64); tubeRight2.mirror = true; + //TODO setRotation(tubeRight2, 0F, 0F, 0.3141593F); tubeLeft3 = new ModelRenderer(this, 30, 36); tubeLeft3.addBox(0F, 0F, 0F, 1, 2, 1); tubeLeft3.setRotationPoint(-6F, 9.5F, -4F); tubeLeft3.setTextureSize(128, 64); tubeLeft3.mirror = true; + //TODO setRotation(tubeLeft3, 0F, 0F, -0.8203047F); } diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 16e18f2cf..4b2f235ee 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -78,6 +78,7 @@ public class ModelElectrolyticSeparator extends ModelBase tube2.setRotationPoint(5F, 12F, -0.5F); tube2.setTextureSize(128, 64); tube2.mirror = true; + //TODO setRotation(tube2, 0F, 0F, -0.5235988F); tube1 = new ModelRenderer(this, 0, 0); tube1.addBox(-3F, -1F, 0F, 3, 1, 1); diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 3d5848048..e42182e97 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -446,6 +446,7 @@ public class ModelEnergyCube extends ModelBase cube = new ModelRenderer(this, 0, 0); cube.addBox(-8, -8, -8, 16, 16, 16); + cube.setRotationPoint(0, 0, 0); cube.setTextureSize(32, 32); cube.mirror = true; } diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java index dfe696903..8a277f998 100644 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ b/src/main/java/mekanism/client/model/ModelLaser.java @@ -114,6 +114,7 @@ public class ModelLaser extends ModelBase wire.setRotationPoint(-1.5F, 11F, -0.5F); wire.setTextureSize(64, 32); wire.mirror = true; + //TODO setRotation(wire, 0F, 0F, 0.1919862F); rod3 = new ModelRenderer(this, 0, 9); rod3.addBox(0F, 0F, 0F, 1, 5, 1); diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index 83a45c3d1..f2142d6ab 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -106,6 +106,7 @@ public class ModelQuantumEntangloporter extends ModelBase energyCubeCore.setRotationPoint(0F, 16F, 0F); energyCubeCore.setTextureSize(128, 64); energyCubeCore.mirror = true; + //TODO setRotation(energyCubeCore, 0.7132579F, 0.403365F, 0.645384F); frameEdge1 = new ModelRenderer(this, 0, 16); frameEdge1.addBox(0F, 0F, 0F, 1, 10, 1); diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index 17f585a9f..fef14c4b9 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -50,36 +50,42 @@ public class ModelSecurityDesk extends ModelBase led.setRotationPoint(-7F, 5F, 4F); led.setTextureSize(128, 64); led.mirror = true; + //TODO setRotation(led, -0.4712389F, 0F, 0F); monitorBack = new ModelRenderer(this, 82, 0); monitorBack.addBox(1F, -3F, 0F, 12, 6, 1); monitorBack.setRotationPoint(-7F, 5F, 4F); monitorBack.setTextureSize(128, 64); monitorBack.mirror = true; + //TODO setRotation(monitorBack, -0.4712389F, 0F, 0F); keyboard = new ModelRenderer(this, 64, 27); keyboard.addBox(0F, 0F, 0F, 10, 1, 5); keyboard.setRotationPoint(-5F, 10.5F, -6F); keyboard.setTextureSize(128, 64); keyboard.mirror = true; + //TODO setRotation(keyboard, 0.0872665F, 0F, 0F); monitor = new ModelRenderer(this, 64, 10); monitor.addBox(0F, -5F, -2F, 14, 10, 2); monitor.setRotationPoint(-7F, 5F, 4F); monitor.setTextureSize(128, 64); monitor.mirror = true; + //TODO setRotation(monitor, -0.4712389F, 0F, 0F); standNeck = new ModelRenderer(this, 96, 7); standNeck.addBox(0F, -7F, -1F, 2, 7, 1); standNeck.setRotationPoint(-1F, 10F, 6F); standNeck.setTextureSize(128, 64); standNeck.mirror = true; + //TODO setRotation(standNeck, 0.0698132F, 0F, 0F); standBase = new ModelRenderer(this, 64, 22); standBase.addBox(0F, 0F, -4F, 8, 1, 4); standBase.setRotationPoint(-4F, 10F, 6F); standBase.setTextureSize(128, 64); standBase.mirror = true; + //TODO setRotation(standBase, 0.1047198F, 0F, 0F); deskMiddle = new ModelRenderer(this, 0, 23); deskMiddle.addBox(0F, 0F, 0F, 14, 1, 14); @@ -92,6 +98,7 @@ public class ModelSecurityDesk extends ModelBase monitorScreen.setRotationPoint(-7F, 5F, 4F); monitorScreen.setTextureSize(128, 64); monitorScreen.mirror = true; + //TODO setRotation(monitorScreen, -0.4712389F, 0F, 0F); } diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index b6441c650..f09a7f23b 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -106,6 +106,7 @@ public class ModelSeismicVibrator extends ModelBase arm3.setRotationPoint(-1F, 7F, 3F); arm3.setTextureSize(128, 64); arm3.mirror = true; + //TODO setRotation(arm3, -0.3665191F, 0F, 0F); plate2 = new ModelRenderer(this, 48, 0); plate2.addBox(0F, 0F, 0F, 4, 2, 4); @@ -136,6 +137,7 @@ public class ModelSeismicVibrator extends ModelBase frameBack5.setRotationPoint(7.5F, 7F, 6.49F); frameBack5.setTextureSize(128, 64); frameBack5.mirror = true; + //TODO setRotation(frameBack5, 0F, 0F, 0.837758F); pole3 = new ModelRenderer(this, 0, 34); pole3.addBox(0F, 0F, 0F, 1, 25, 1); @@ -148,6 +150,7 @@ public class ModelSeismicVibrator extends ModelBase frameRight5.setRotationPoint(6.485F, 7F, -7.5F); frameRight5.setTextureSize(128, 64); frameRight5.mirror = true; + //TODO setRotation(frameRight5, 0.837758F, 0F, 0F); baseRight = new ModelRenderer(this, 38, 18); baseRight.mirror = true; @@ -184,30 +187,35 @@ public class ModelSeismicVibrator extends ModelBase frameRight4.setRotationPoint(6.49F, 7F, 7.5F); frameRight4.setTextureSize(128, 64); frameRight4.mirror = true; + //TODO setRotation(frameRight4, -0.837758F, 0F, 0F); frameRight1 = new ModelRenderer(this, 4, 34); frameRight1.addBox(0F, 0F, 0F, 1, 19, 1); frameRight1.setRotationPoint(6.485F, -6F, -7.5F); frameRight1.setTextureSize(128, 64); frameRight1.mirror = true; + //TODO setRotation(frameRight1, 0.837758F, 0F, 0F); frameRight2 = new ModelRenderer(this, 4, 34); frameRight2.addBox(0F, 0F, -1F, 1, 19, 1); frameRight2.setRotationPoint(6.49F, -6F, 7.5F); frameRight2.setTextureSize(128, 64); frameRight2.mirror = true; + //TODO setRotation(frameRight2, -0.837758F, 0F, 0F); frameLeft5 = new ModelRenderer(this, 4, 34); frameLeft5.addBox(0F, 0F, 0F, 1, 19, 1); frameLeft5.setRotationPoint(-7.485F, 7F, -7.5F); frameLeft5.setTextureSize(128, 64); frameLeft5.mirror = true; + //TODO setRotation(frameLeft5, 0.837758F, 0F, 0F); frameLeft4 = new ModelRenderer(this, 4, 34); frameLeft4.addBox(0F, 0F, -1F, 1, 19, 1); frameLeft4.setRotationPoint(-7.49F, 7F, 7.5F); frameLeft4.setTextureSize(128, 64); frameLeft4.mirror = true; + //TODO setRotation(frameLeft4, -0.837758F, 0F, 0F); frameBack3 = new ModelRenderer(this, 36, 52); frameBack3.addBox(0F, 0F, 0F, 13, 1, 1); @@ -220,12 +228,14 @@ public class ModelSeismicVibrator extends ModelBase frameLeft2.setRotationPoint(-7.485F, -6F, -7.5F); frameLeft2.setTextureSize(128, 64); frameLeft2.mirror = true; + //TODO setRotation(frameLeft2, 0.837758F, 0F, 0F); frameLeft1 = new ModelRenderer(this, 4, 34); frameLeft1.addBox(0F, 0F, -1F, 1, 19, 1); frameLeft1.setRotationPoint(-7.49F, -6F, 7.5F); frameLeft1.setTextureSize(128, 64); frameLeft1.mirror = true; + //TODO setRotation(frameLeft1, -0.837758F, 0F, 0F); pole2 = new ModelRenderer(this, 0, 34); pole2.addBox(0F, 0F, 0F, 1, 25, 1); @@ -238,18 +248,21 @@ public class ModelSeismicVibrator extends ModelBase frameBack1.setRotationPoint(7.5F, -6F, 6.49F); frameBack1.setTextureSize(128, 64); frameBack1.mirror = true; + //TODO setRotation(frameBack1, 0F, 0F, 0.837758F); frameBack2 = new ModelRenderer(this, 4, 34); frameBack2.addBox(0F, 0F, 0F, 1, 19, 1); frameBack2.setRotationPoint(-7.5F, -6F, 6.49F); frameBack2.setTextureSize(128, 64); frameBack2.mirror = true; + //TODO setRotation(frameBack2, 0F, 0F, -0.837758F); frameBack4 = new ModelRenderer(this, 4, 34); frameBack4.addBox(0F, 0F, 0F, 1, 19, 1); frameBack4.setRotationPoint(-7.5F, 7F, 6.49F); frameBack4.setTextureSize(128, 64); frameBack4.mirror = true; + //TODO setRotation(frameBack4, 0F, 0F, -0.837758F); frameLeft3 = new ModelRenderer(this, 64, 27); frameLeft3.addBox(0F, 0F, 0F, 1, 1, 13); diff --git a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java index 109bc3dc0..80f542a39 100644 --- a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java @@ -72,6 +72,7 @@ public class ModelSolarNeutronActivator extends ModelBase panel3.setRotationPoint(-2.75F, -4.95F, 8F); panel3.setTextureSize(128, 64); panel3.mirror = true; + //TODO setRotation(panel3, -0.1082104F, 0.0279253F, 0.2617994F); port = new ModelRenderer(this, 0, 45); port.addBox(0F, 0F, 0F, 8, 8, 1); @@ -84,48 +85,56 @@ public class ModelSolarNeutronActivator extends ModelBase panel1.addBox(0F, 0F, -16F, 6, 1, 16); panel1.setRotationPoint(2.75F, -4.95F, 8F); panel1.setTextureSize(128, 64); + //TODO setRotation(panel1, -0.1082104F, -0.0279253F, -0.2617994F); panel2 = new ModelRenderer(this, 84, 15); panel2.addBox(0F, 0F, -16F, 6, 1, 16); panel2.setRotationPoint(-3F, -5F, 8F); panel2.setTextureSize(128, 64); panel2.mirror = true; + //TODO setRotation(panel2, -0.1047198F, 0F, 0F); panelBase = new ModelRenderer(this, 28, 45); panelBase.addBox(0F, 1F, -16F, 6, 1, 14); panelBase.setRotationPoint(-3F, -5F, 9F); panelBase.setTextureSize(128, 64); panelBase.mirror = true; + //TODO setRotation(panelBase, -0.1047198F, 0F, 0F); panelBraceLeft2 = new ModelRenderer(this, 64, 15); panelBraceLeft2.addBox(-4F, 0.5F, -5F, 5, 1, 2); panelBraceLeft2.setRotationPoint(-3F, -5F, 9F); panelBraceLeft2.setTextureSize(128, 64); panelBraceLeft2.mirror = true; + //TODO setRotation(panelBraceLeft2, -0.1047198F, 0F, 0.2505517F); panelBraceRight2 = new ModelRenderer(this, 64, 15); panelBraceRight2.addBox(-1F, 0.5F, -5F, 5, 1, 2); panelBraceRight2.setRotationPoint(3F, -5F, 9F); panelBraceRight2.setTextureSize(128, 64); panelBraceRight2.mirror = true; + //TODO setRotation(panelBraceRight2, -0.1047198F, 0F, -0.2555938F); panelBraceLeft1 = new ModelRenderer(this, 64, 15); panelBraceLeft1.addBox(-4F, 0.5F, -15F, 5, 1, 2); panelBraceLeft1.setRotationPoint(-3F, -5F, 9F); panelBraceLeft1.setTextureSize(128, 64); panelBraceLeft1.mirror = true; + //TODO setRotation(panelBraceLeft1, -0.1047198F, 0F, 0.2505517F); panelBraceRight1 = new ModelRenderer(this, 64, 15); panelBraceRight1.addBox(-1F, 0.5F, -15F, 5, 1, 2); panelBraceRight1.setRotationPoint(3F, -5F, 9F); panelBraceRight1.setTextureSize(128, 64); panelBraceRight1.mirror = true; + //TODO setRotation(panelBraceRight1, -0.1047198F, 0F, -0.2555938F); panelBrace = new ModelRenderer(this, 56, 18); panelBrace.addBox(0F, 1.2F, -10F, 2, 2, 9); panelBrace.setRotationPoint(-1F, -5F, 8F); panelBrace.setTextureSize(128, 64); panelBrace.mirror = true; + //TODO setRotation(panelBrace, -0.1047198F, 0F, 0F); bridge = new ModelRenderer(this, 65, 1); bridge.addBox(0F, 0F, 0F, 12, 1, 13); @@ -138,36 +147,42 @@ public class ModelSolarNeutronActivator extends ModelBase platform.setRotationPoint(-0.5F, 8F, -2.5F); platform.setTextureSize(128, 64); platform.mirror = true; + //TODO setRotation(platform, -0.1047198F, 0F, 0F); hole2 = new ModelRenderer(this, 0, 6); hole2.addBox(1F, 0F, 0F, 1, 2, 1); hole2.setRotationPoint(-0.5F, 8F, -2.5F); hole2.setTextureSize(128, 64); hole2.mirror = true; + //TODO setRotation(hole2, -0.1047198F, 0F, 0F); hole4 = new ModelRenderer(this, 0, 3); hole4.addBox(-1F, 0F, 1F, 3, 2, 1); hole4.setRotationPoint(-0.5F, 8F, -2.5F); hole4.setTextureSize(128, 64); hole4.mirror = true; + //TODO setRotation(hole4, -0.1047198F, 0F, 0F); hole1 = new ModelRenderer(this, 0, 3); hole1.addBox(-1F, 0F, -1F, 3, 2, 1); hole1.setRotationPoint(-0.5F, 8F, -2.5F); hole1.setTextureSize(128, 64); hole1.mirror = true; + //TODO setRotation(hole1, -0.1047198F, 0F, 0F); hole3 = new ModelRenderer(this, 0, 6); hole3.addBox(-1F, 0F, 0F, 1, 2, 1); hole3.setRotationPoint(-0.5F, 8F, -2.5F); hole3.setTextureSize(128, 64); hole3.mirror = true; + //TODO setRotation(hole3, -0.1047198F, 0F, 0F); brace2 = new ModelRenderer(this, 0, 11); brace2.addBox(0F, 0F, 0F, 1, 1, 2); brace2.setRotationPoint(1F, 9.5F, -7.1F); brace2.setTextureSize(128, 64); brace2.mirror = true; + //TODO setRotation(brace2, 0.1745329F, 0F, 0F); tube2c = new ModelRenderer(this, 0, 9); tube2c.addBox(0F, 0F, 0F, 1, 1, 1); @@ -216,6 +231,7 @@ public class ModelSolarNeutronActivator extends ModelBase brace1.setRotationPoint(-2F, 9.5F, -7.1F); brace1.setTextureSize(128, 64); brace1.mirror = true; + //TODO setRotation(brace1, 0.1745329F, 0F, 0F); tank = new ModelRenderer(this, 0, 0); tank.addBox(0F, 0F, 0F, 16, 9, 16); @@ -228,6 +244,7 @@ public class ModelSolarNeutronActivator extends ModelBase laser.setRotationPoint(-1F, -5F, 8F); laser.setTextureSize(128, 64); laser.mirror = true; + //TODO setRotation(laser, -0.1117011F, 0F, 0F); base = new ModelRenderer(this, 0, 25); base.addBox(0F, 0F, 0F, 16, 4, 16); @@ -342,6 +359,7 @@ public class ModelSolarNeutronActivator extends ModelBase laserBeamToggle.setRotationPoint(-1F, -5F, 8F); laserBeamToggle.setTextureSize(128, 64); laserBeamToggle.mirror = true; + //TODO setRotation(laserBeamToggle, -0.1117011F, 0F, 0F); } diff --git a/src/main/java/mekanism/client/model/modelbase_to_json.perl b/src/main/java/mekanism/client/model/modelbase_to_json.perl new file mode 100644 index 000000000..42cf321ba --- /dev/null +++ b/src/main/java/mekanism/client/model/modelbase_to_json.perl @@ -0,0 +1,129 @@ +#!/usr/bin/env perl +# Released into Public Domain + +# A quick and dirty script to convert ModelBase Java code as generated +# by Techne or Tabula (untested) into Minecraft's JSON model format. +# It is quite limited (it does not handle rotations, as the JSON model format +# is limited in that regard anyway), but it is at least a help. + +# Usage: +# modelbase_to_json input.java > output.json + +# Note that Minecraft requires the texure to be square, so you might need to +# resize your texture + +# If you instead want to convert to Wavefront OBJ, check out modelbase_to_obj.perl +# in this Gist below. + +use strict; +use warnings; +use List::Util qw[max]; + +my %parts; + +while(<>) { + if(/(\w+) = new ModelRenderer\(this, (\d+), (\d+)\);/) { + $parts{$1}{base_uv} = [$2, $3]; + } + elsif(/(\w+)\.addBox\((-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (\d+), (\d+), (\d+)\);/) { + $parts{$1}{offset} = [$2, $3, $4]; + $parts{$1}{size} = [$5, $6, $7]; + } + elsif(/(\w+)\.setRotationPoint\((-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?\);/) { + $parts{$1}{rot_point} = [$2, $3, $4]; + } + elsif(/(\w+)\.setTextureSize\((\d+), (\d+)\);/) { + $parts{$1}{tex_size} = [$2, $3]; + } + elsif(/(\w+)\.mirror = (true|false);/) { + #$parts{$1}{mirror} = ($2 eq "true"); #FIXME: This is being ignored + } + elsif(/setRotation\((\w+), (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?\)/) { + #$parts{$1}{rotation} = [$2, $3, $4]; + #We ignore the rotation + if($2 != 0 || $3 != 0 || $4 != 0) { + print STDERR "Warning: Line $.: Nonzero rotations are not supported\n"; + } + } + else { + #print STDERR "Ignoring line $.\n"; + } +} + +print qq({ + "elements": [ +); + +my $first = 1; + +foreach my $part (keys %parts) { + my $offset = $parts{$part}{offset}; + my $size = $parts{$part}{size}; + my $rot_point = $parts{$part}{rot_point}; + #Textures need to be square + my $tex_size = max($parts{$part}{tex_size}->[0], $parts{$part}{tex_size}->[1]); + my $base_uv = $parts{$part}{base_uv}; + + my $xmin = 8 - $offset->[0] - $size->[0] - $rot_point->[0]; + my $ymin = 24 - $offset->[1] - $size->[1] - $rot_point->[1]; + my $zmin = 8 + $offset->[2] + $rot_point->[2]; + + my $xmax = 8 - $offset->[0] - $rot_point->[0]; + my $ymax = 24 - $offset->[1] - $rot_point->[1]; + my $zmax = 8 + $offset->[2] + $size->[2] + $rot_point->[2]; + + my @uvmin = ( + [$base_uv->[0] + $size->[2] + 2*$size->[0], $base_uv->[1]], #down + [$base_uv->[0] + $size->[2] + $size->[0], $base_uv->[1] + $size->[2]], #up + [$base_uv->[0] + $size->[2], $base_uv->[1] + $size->[2]], #north + [$base_uv->[0] + 2*$size->[2] + $size->[0], $base_uv->[1] + $size->[2]], #south + [$base_uv->[0] + $size->[2] + $size->[0], $base_uv->[1] + $size->[2]], #west + [$base_uv->[0], $base_uv->[1] + $size->[2]]); #east + + my @uvmax = ( + [$uvmin[0][0] - $size->[0], $uvmin[0][1] + $size->[2]], #down + [$uvmin[1][0] - $size->[0], $uvmin[1][1] - $size->[2]], #up + [$uvmin[2][0] + $size->[0], $uvmin[2][1] + $size->[1]], #north + [$uvmin[3][0] + $size->[0], $uvmin[3][1] + $size->[1]], #south + [$uvmin[4][0] + $size->[2], $uvmin[4][1] + $size->[1]], #west + [$uvmin[5][0] + $size->[2], $uvmin[5][1] + $size->[1]]); #east + + #Scale UVs from 0 to 16 with respect to texture size + foreach my $f (@uvmin) { + foreach (@$f) { + $_ = $_ / $tex_size * 16; + } + } + foreach my $f (@uvmax) { + foreach (@$f) { + $_ = $_ / $tex_size * 16; + } + } + + print ",\n" unless $first; + $first = 0; + + print +qq( { + "__comment": "$part", + "from": [$xmin, $ymin, $zmin], + "to": [$xmax, $ymax, $zmax], + "faces": { + "down": {"uv": [$uvmin[0][0], $uvmin[0][1], $uvmax[0][0], $uvmax[0][1]], "texture": "#all"}, + "up": {"uv": [$uvmin[1][0], $uvmin[1][1], $uvmax[1][0], $uvmax[1][1]], "texture": "#all"}, + "north": {"uv": [$uvmin[2][0], $uvmin[2][1], $uvmax[2][0], $uvmax[2][1]], "texture": "#all"}, + "south": {"uv": [$uvmin[3][0], $uvmin[3][1], $uvmax[3][0], $uvmax[3][1]], "texture": "#all"}, + "west": {"uv": [$uvmin[4][0], $uvmin[4][1], $uvmax[4][0], $uvmax[4][1]], "texture": "#all"}, + "east": {"uv": [$uvmin[5][0], $uvmin[5][1], $uvmax[5][0], $uvmax[5][1]], "texture": "#all"} + } + }); +} + +print qq( + ], + "textures": { + "all": "...", + "particle": "..." + } +} +); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index c616aeb18..83b52203e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -22,7 +22,7 @@ public class RenderGasTank extends TileEntitySpecialRenderer public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getName() + ".png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ diff --git a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java index 9679fcac3..50cc8ef86 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -21,7 +21,7 @@ public class RenderResistiveHeater extends TileEntitySpecialRenderer colorProperty = PropertyEnum.create("color", EnumDyeColor.class); - public static PropertyEnum typeProperty = PropertyEnum.create("type", PlasticBlockType.class); public BlockStatePlastic(BlockPlastic block) { - super(block, colorProperty, typeProperty); + super(block, colorProperty); } public static enum PlasticBlockType implements IStringSerializable @@ -35,4 +38,18 @@ public class BlockStatePlastic extends BlockState return name().toLowerCase(); } } + + public static class PlasticBlockStateMapper extends StateMapperBase + { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + PlasticBlockType type = ((BlockPlastic)state.getBlock()).type; + String property = "type=" + type.getName(); + + ResourceLocation baseLocation = new ResourceLocation("mekanism", "plastic_block"); + return new ModelResourceLocation(baseLocation, property); + } + } + } diff --git a/src/main/resources/assets/mekanism/blockstates/GasTank.json b/src/main/resources/assets/mekanism/blockstates/GasTank.json new file mode 100644 index 000000000..382b7fc1f --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/GasTank.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:gas_tank" + }, + "variants": { + "facing": { + "up": {"x": -90}, + "down": {"x": 90}, + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/bronze_block.json b/src/main/resources/assets/mekanism/blockstates/bronze_block.json new file mode 100644 index 000000000..2fc162842 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bronze_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/BronzeBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/coal_block.json b/src/main/resources/assets/mekanism/blockstates/coal_block.json new file mode 100644 index 000000000..8876fcc5e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/coal_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/CoalBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/copper_block.json b/src/main/resources/assets/mekanism/blockstates/copper_block.json new file mode 100644 index 000000000..164b6072e --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/copper_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/CopperBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json b/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json new file mode 100644 index 000000000..baa07a60a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/DynamicTank" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json b/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json new file mode 100644 index 000000000..46c4ba0b9 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/DynamicValve" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json index e1052f8a8..c5c6829c5 100644 --- a/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json @@ -4,18 +4,22 @@ "model": "mekanism:machine", "textures": { "sides": "mekanism:blocks/SteelCasing", - "front": "mekanism:blocks/EnrichmentChamberFront" + "front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFront", + "east": "mekanism:blocks/enrichment_chamber/EnrichmentChamberRight", + "west": "mekanism:blocks/enrichment_chamber/EnrichmentChamberLeft", + "north": "mekanism:blocks/enrichment_chamber/EnrichmentChamberBack", + "up": "mekanism:blocks/enrichment_chamber/EnrichmentChamberTop" } }, "variants": { "facing": { - "north": {}, - "south": {"y": 180}, - "east": {"y": 90}, - "west": {"y": -90} + "north": {"y": 180}, + "south": {}, + "east": {"y": -90}, + "west": {"y": 90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/EnrichmentChamberFrontOn"}}, + "true": {"textures": {"front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFrontOn"}}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/portable_tank.json b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json similarity index 81% rename from src/main/resources/assets/mekanism/blockstates/portable_tank.json rename to src/main/resources/assets/mekanism/blockstates/fluid_tank.json index a3eb33172..dfcc785fb 100644 --- a/src/main/resources/assets/mekanism/blockstates/portable_tank.json +++ b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:portable_tank" + "model": "mekanism:fluid_tank" }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/mekanism/blockstates/induction_casing.json b/src/main/resources/assets/mekanism/blockstates/induction_casing.json new file mode 100644 index 000000000..934408e0a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_casing.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/InductionCasing" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell.json b/src/main/resources/assets/mekanism/blockstates/induction_cell.json new file mode 100644 index 000000000..a1e478842 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/InductionCell" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_port.json b/src/main/resources/assets/mekanism/blockstates/induction_port.json new file mode 100644 index 000000000..891b0dad2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_port.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/InductionPort" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider.json b/src/main/resources/assets/mekanism/blockstates/induction_provider.json new file mode 100644 index 000000000..8aee4d7ae --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/InductionProvider" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/laser_tractor_beam.json b/src/main/resources/assets/mekanism/blockstates/laser_tractor_beam.json index 9cdd9d226..fe983467a 100644 --- a/src/main/resources/assets/mekanism/blockstates/laser_tractor_beam.json +++ b/src/main/resources/assets/mekanism/blockstates/laser_tractor_beam.json @@ -1,7 +1,8 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:laser_amplifier" + "model": "mekanism:laser_amplifier", + "textures": {"all": "mekanism:blocks/models/laser_tractor_beam"} }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_sorter.json b/src/main/resources/assets/mekanism/blockstates/logistical_sorter.json index 7d4ada10c..0f3a0c962 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_sorter.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_sorter.json @@ -6,12 +6,12 @@ "variants": { "normal": [{}], "facing": { - "north": {"y": 90}, - "south": {"y": -90}, - "east": {"y": 180}, - "west": {}, - "up": {}, - "down": {} + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90}, + "up": {"x": -90}, + "down": {"x": 90} }, "active": { "true": {}, diff --git a/src/main/resources/assets/mekanism/blockstates/osmium_block.json b/src/main/resources/assets/mekanism/blockstates/osmium_block.json new file mode 100644 index 000000000..ef2fa44e0 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/osmium_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/OsmiumBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/plastic_block.json b/src/main/resources/assets/mekanism/blockstates/plastic_block.json new file mode 100644 index 000000000..73d6ae921 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/plastic_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:cube_colour" + }, + "variants": { + "normal": [{}], + "type": { + "plastic": {"textures": {"all": "mekanism:blocks/PlasticBlock"}}, + "slick": {"textures": {"all": "mekanism:blocks/SlickPlasticBlock"}}, + "glow": {"textures": {"all": "mekanism:blocks/GlowPlasticBlock"}}, + "reinforced": {"textures": {"all": "mekanism:blocks/ReinforcedPlasticBlock"}}, + "road": {"textures": {"all": "mekanism:blocks/RoadPlasticBlock"}} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/quantum_entangloporter.json b/src/main/resources/assets/mekanism/blockstates/quantum_entangloporter.json new file mode 100644 index 000000000..86994abd1 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/quantum_entangloporter.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:quantum_entangloporter" + }, + "variants": { + "normal": [{}], + "facing": { + "up": {}, + "down": {"x": 180}, + "north": {"x": -90, "y": 180}, + "south": {"x": -90}, + "east": {"x": -90, "y": -90}, + "west": {"x": -90, "y": 90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/refined_glowstone.json b/src/main/resources/assets/mekanism/blockstates/refined_glowstone.json new file mode 100644 index 000000000..bca485626 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/refined_glowstone.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/RefinedGlowstone" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/refined_obsidian.json b/src/main/resources/assets/mekanism/blockstates/refined_obsidian.json new file mode 100644 index 000000000..a3e14baf2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/refined_obsidian.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/RefinedObsidian" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json b/src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json new file mode 100644 index 000000000..6891a251a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/SolarEvaporationBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json b/src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json new file mode 100644 index 000000000..f2f085609 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/SolarEvaporationValve" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json index 83f97cd16..136868436 100644 --- a/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json +++ b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:solar_tri.obj" + "model": "mekanism:solar_neutron_activator" }, "variants": { "facing": { diff --git a/src/main/resources/assets/mekanism/blockstates/steel_block.json b/src/main/resources/assets/mekanism/blockstates/steel_block.json new file mode 100644 index 000000000..bf0d9dbfe --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/steel_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/SteelBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/steel_casing.json b/src/main/resources/assets/mekanism/blockstates/steel_casing.json new file mode 100644 index 000000000..2c6e1c144 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/steel_casing.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/SteelCasing" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/structural_glass.json b/src/main/resources/assets/mekanism/blockstates/structural_glass.json new file mode 100644 index 000000000..4083a5b20 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/structural_glass.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/DynamicGlass" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json b/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json new file mode 100644 index 000000000..738c7e6d4 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/TeleporterFrame" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/tin_block.json b/src/main/resources/assets/mekanism/blockstates/tin_block.json new file mode 100644 index 000000000..ece52fdea --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/tin_block.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/TinBlock" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/chargepad.json b/src/main/resources/assets/mekanism/models/block/chargepad.json index 043b0c932..7fb083efe 100644 --- a/src/main/resources/assets/mekanism/models/block/chargepad.json +++ b/src/main/resources/assets/mekanism/models/block/chargepad.json @@ -1,51 +1,38 @@ { "elements": [ { - "__comment": "Shape5", - "from": [11, 0, 13], - "to": [13, 5, 15], + "__comment": "pillar2", + "from": [4, 1, 11.99], + "to": [6, 8, 13.99], "faces": { - "down": {"uv": [1.75, 2, 2.25, 2.5], "texture": "#all"}, - "up": {"uv": [1.25, 2, 1.75, 2.5], "texture": "#all"}, - "north": {"uv": [1.25, 2.5, 1.75, 3.75], "texture": "#all"}, - "south": {"uv": [2.25, 2.5, 2.75, 3.75], "texture": "#all"}, - "west": {"uv": [1.75, 2.5, 2.25, 3.75], "texture": "#all"}, - "east": {"uv": [0.75, 2.5, 1.25, 3.75], "texture": "#all"} + "down": {"uv": [13.5, 0, 13, 0.5], "texture": "#all"}, + "up": {"uv": [13, 0.5, 12.5, 0], "texture": "#all"}, + "north": {"uv": [12.5, 0.5, 13, 2.25], "texture": "#all"}, + "south": {"uv": [13.5, 0.5, 14, 2.25], "texture": "#all"}, + "west": {"uv": [13, 0.5, 13.5, 2.25], "texture": "#all"}, + "east": {"uv": [12, 0.5, 12.5, 2.25], "texture": "#all"} } }, { - "__comment": "Shape4", - "from": [3, 0, 13], - "to": [5, 5, 15], + "__comment": "pillar1", + "from": [10, 1, 11.99], + "to": [12, 8, 13.99], "faces": { - "down": {"uv": [1.75, 2, 2.25, 2.5], "texture": "#all"}, - "up": {"uv": [1.25, 2, 1.75, 2.5], "texture": "#all"}, - "north": {"uv": [1.25, 2.5, 1.75, 3.75], "texture": "#all"}, - "south": {"uv": [2.25, 2.5, 2.75, 3.75], "texture": "#all"}, - "west": {"uv": [1.75, 2.5, 2.25, 3.75], "texture": "#all"}, - "east": {"uv": [0.75, 2.5, 1.25, 3.75], "texture": "#all"} + "down": {"uv": [13.5, 0, 13, 0.5], "texture": "#all"}, + "up": {"uv": [13, 0.5, 12.5, 0], "texture": "#all"}, + "north": {"uv": [12.5, 0.5, 13, 2.25], "texture": "#all"}, + "south": {"uv": [13.5, 0.5, 14, 2.25], "texture": "#all"}, + "west": {"uv": [13, 0.5, 13.5, 2.25], "texture": "#all"}, + "east": {"uv": [12, 0.5, 12.5, 2.25], "texture": "#all"} } }, { - "__comment": "Shape2", - "from": [4, 0, 14], - "to": [12, 11, 16], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 1, 16], "faces": { - "down": {"uv": [2.5, 4.5, 4.5, 5], "texture": "#all"}, - "up": {"uv": [0.5, 4.5, 2.5, 5], "texture": "#all"}, - "north": {"uv": [0.5, 5, 2.5, 7.75], "texture": "#all"}, - "south": {"uv": [3, 5, 5, 7.75], "texture": "#all"}, - "west": {"uv": [2.5, 5, 3, 7.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.5, 7.75], "texture": "#all"} - } - }, - { - "__comment": "Shape1", - "from": [0, -1, 0], - "to": [16, 0, 16], - "faces": { - "down": {"uv": [8, 0, 12, 4], "texture": "#all"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#all"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 4, 0], "texture": "#all"}, "north": {"uv": [4, 4, 8, 4.25], "texture": "#all"}, "south": {"uv": [12, 4, 16, 4.25], "texture": "#all"}, "west": {"uv": [8, 4, 12, 4.25], "texture": "#all"}, @@ -53,21 +40,60 @@ } }, { - "__comment": "Shape3", - "from": [6, 6, 13], - "to": [10, 9, 14], + "__comment": "connector", + "from": [5, 5, 14], + "to": [11, 11, 15], "faces": { - "down": {"uv": [1.25, 0, 2.25, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 1.25, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 1.25, 1], "texture": "#all"}, - "south": {"uv": [1.5, 0.25, 2.5, 1], "texture": "#all"}, - "west": {"uv": [1.25, 0.25, 1.5, 1], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 1], "texture": "#all"} + "down": {"uv": [7.75, 4.25, 6.25, 4.5], "texture": "#all"}, + "up": {"uv": [6.25, 4.5, 4.75, 4.25], "texture": "#all"}, + "north": {"uv": [4.75, 4.5, 6.25, 6], "texture": "#all"}, + "south": {"uv": [6.5, 4.5, 8, 6], "texture": "#all"}, + "west": {"uv": [6.25, 4.5, 6.5, 6], "texture": "#all"}, + "east": {"uv": [4.5, 4.5, 4.75, 6], "texture": "#all"} + } + }, + { + "__comment": "stand", + "from": [5, 1, 13], + "to": [11, 11, 14], + "faces": { + "down": {"uv": [3.25, 0, 1.75, 0.25], "texture": "#all"}, + "up": {"uv": [1.75, 0.25, 0.25, 0], "texture": "#all"}, + "north": {"uv": [0.25, 0.25, 1.75, 2.75], "texture": "#all"}, + "south": {"uv": [2, 0.25, 3.5, 2.75], "texture": "#all"}, + "west": {"uv": [1.75, 0.25, 2, 2.75], "texture": "#all"}, + "east": {"uv": [0, 0.25, 0.25, 2.75], "texture": "#all"} + } + }, + { + "__comment": "plug", + "from": [7, 4, 11], + "to": [9, 5, 13], + "faces": { + "down": {"uv": [1.5, 2.75, 1, 3.25], "texture": "#all"}, + "up": {"uv": [1, 3.25, 0.5, 2.75], "texture": "#all"}, + "north": {"uv": [0.5, 3.25, 1, 3.5], "texture": "#all"}, + "south": {"uv": [1.5, 3.25, 2, 3.5], "texture": "#all"}, + "west": {"uv": [1, 3.25, 1.5, 3.5], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.5, 3.5], "texture": "#all"} + } + }, + { + "__comment": "port", + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "down": {"uv": [4.25, 4.25, 2.25, 4.5], "texture": "#all"}, + "up": {"uv": [2.25, 4.5, 0.25, 4.25], "texture": "#all"}, + "north": {"uv": [0.25, 4.5, 2.25, 6.5], "texture": "#all"}, + "south": {"uv": [2.5, 4.5, 4.5, 6.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.5, 2.5, 6.5], "texture": "#all"}, + "east": {"uv": [0, 4.5, 0.25, 6.5], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chargepad", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json b/src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json index f87c0a336..e9242143b 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json @@ -1,463 +1,229 @@ { "elements": [ { - "__comment": "Can3Side4", - "from": [10, 10, 3], - "to": [11, 12, 5], + "__comment": "rimBack", + "from": [0, 5, 14], + "to": [16, 7, 16], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [4.25, 5.75, 2.25, 6], "texture": "#all"}, + "up": {"uv": [2.25, 6, 0.25, 5.75], "texture": "#all"}, + "north": {"uv": [0.25, 6, 2.25, 6.25], "texture": "#all"}, + "south": {"uv": [2.5, 6, 4.5, 6.25], "texture": "#all"}, + "west": {"uv": [2.25, 6, 2.5, 6.25], "texture": "#all"}, + "east": {"uv": [0, 6, 0.25, 6.25], "texture": "#all"} } }, { - "__comment": "Can2T", - "from": [2, 12, 10], - "to": [6, 13, 14], + "__comment": "support2", + "from": [0.5, 6, 0.5], + "to": [1.5, 11, 1.5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.75], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.75], "texture": "#all"} } }, { - "__comment": "Vial3", - "from": [5, 3.5, 3], - "to": [7, 6.5, 5], + "__comment": "portRight", + "from": [-0.00999999999999979, 3, 3], + "to": [0.99, 13, 13], "faces": { - "down": {"uv": [1.5, 0.75, 1.75, 1], "texture": "#all"}, - "up": {"uv": [1.25, 0.75, 1.5, 1], "texture": "#all"}, - "north": {"uv": [1.25, 1, 1.5, 1.375], "texture": "#all"}, - "south": {"uv": [1.75, 1, 2, 1.375], "texture": "#all"}, - "west": {"uv": [1.5, 1, 1.75, 1.375], "texture": "#all"}, - "east": {"uv": [1, 1, 1.25, 1.375], "texture": "#all"} + "down": {"uv": [8.25, 5.25, 8.125, 6.5], "texture": "#all"}, + "up": {"uv": [8.125, 6.5, 8, 5.25], "texture": "#all"}, + "north": {"uv": [8, 6.5, 8.125, 7.75], "texture": "#all"}, + "south": {"uv": [9.375, 6.5, 9.5, 7.75], "texture": "#all"}, + "west": {"uv": [8.125, 6.5, 9.375, 7.75], "texture": "#all"}, + "east": {"uv": [6.75, 6.5, 8, 7.75], "texture": "#all"} } }, { - "__comment": "Can1Side1", - "from": [10, 10, 13], - "to": [14, 12, 14], + "__comment": "tank", + "from": [0, 11, 0], + "to": [16, 16, 16], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.625], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.625], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.625], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.625], "texture": "#all"} } }, { - "__comment": "Can3Side3", - "from": [13, 10, 3], - "to": [14, 12, 5], + "__comment": "tray", + "from": [3, 4.5, 3], + "to": [13, 5.5, 13], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [9.75, 0, 8.5, 1.25], "texture": "#all"}, + "up": {"uv": [8.5, 1.25, 7.25, 0], "texture": "#all"}, + "north": {"uv": [7.25, 1.25, 8.5, 1.375], "texture": "#all"}, + "south": {"uv": [9.75, 1.25, 11, 1.375], "texture": "#all"}, + "west": {"uv": [8.5, 1.25, 9.75, 1.375], "texture": "#all"}, + "east": {"uv": [6, 1.25, 7.25, 1.375], "texture": "#all"} } }, { - "__comment": "Can1T", - "from": [10, 12, 10], - "to": [14, 13, 14], + "__comment": "portLeft", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [5.75, 5.25, 5.625, 6.25], "texture": "#all"}, + "up": {"uv": [5.625, 6.25, 5.5, 5.25], "texture": "#all"}, + "north": {"uv": [5.5, 6.25, 5.625, 7.25], "texture": "#all"}, + "south": {"uv": [6.625, 6.25, 6.75, 7.25], "texture": "#all"}, + "west": {"uv": [5.625, 6.25, 6.625, 7.25], "texture": "#all"}, + "east": {"uv": [4.5, 6.25, 5.5, 7.25], "texture": "#all"} } }, { - "__comment": "Can4B", - "from": [2, 9, 2], - "to": [6, 10, 6], + "__comment": "rimRight", + "from": [0, 5, 2], + "to": [2, 7, 14], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [2, 6.25, 1.75, 7.75], "texture": "#all"}, + "up": {"uv": [1.75, 7.75, 1.5, 6.25], "texture": "#all"}, + "north": {"uv": [1.5, 7.75, 1.75, 8], "texture": "#all"}, + "south": {"uv": [3.25, 7.75, 3.5, 8], "texture": "#all"}, + "west": {"uv": [1.75, 7.75, 3.25, 8], "texture": "#all"}, + "east": {"uv": [0, 7.75, 1.5, 8], "texture": "#all"} } }, { - "__comment": "Spire", - "from": [7, 0, 7], - "to": [9, 8, 9], + "__comment": "Shape1", + "from": [1, 7, 1], + "to": [15, 11, 15], "faces": { - "down": {"uv": [0.5, 0.75, 0.75, 1], "texture": "#all"}, - "up": {"uv": [0.25, 0.75, 0.5, 1], "texture": "#all"}, - "north": {"uv": [0.25, 1, 0.5, 2], "texture": "#all"}, - "south": {"uv": [0.75, 1, 1, 2], "texture": "#all"}, - "west": {"uv": [0.5, 1, 0.75, 2], "texture": "#all"}, - "east": {"uv": [0, 1, 0.25, 2], "texture": "#all"} + "down": {"uv": [13.25, 1.375, 11.5, 3.125], "texture": "#all"}, + "up": {"uv": [11.5, 3.125, 9.75, 1.375], "texture": "#all"}, + "north": {"uv": [9.75, 3.125, 11.5, 3.625], "texture": "#all"}, + "south": {"uv": [13.25, 3.125, 15, 3.625], "texture": "#all"}, + "west": {"uv": [11.5, 3.125, 13.25, 3.625], "texture": "#all"}, + "east": {"uv": [8, 3.125, 9.75, 3.625], "texture": "#all"} } }, { - "__comment": "Vial4", - "from": [9, 3.5, 3], - "to": [11, 6.5, 5], + "__comment": "rod3", + "from": [7.5, 7, 6], + "to": [8.5, 11, 7], "faces": { - "down": {"uv": [1.5, 0.75, 1.75, 1], "texture": "#all"}, - "up": {"uv": [1.25, 0.75, 1.5, 1], "texture": "#all"}, - "north": {"uv": [1.25, 1, 1.5, 1.375], "texture": "#all"}, - "south": {"uv": [1.75, 1, 2, 1.375], "texture": "#all"}, - "west": {"uv": [1.5, 1, 1.75, 1.375], "texture": "#all"}, - "east": {"uv": [1, 1, 1.25, 1.375], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.125], "texture": "#all"}, + "up": {"uv": [0.75, 0.125, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.125, 0.75, 0.625], "texture": "#all"}, + "south": {"uv": [0.875, 0.125, 1, 0.625], "texture": "#all"}, + "west": {"uv": [0.75, 0.125, 0.875, 0.625], "texture": "#all"}, + "east": {"uv": [0.5, 0.125, 0.625, 0.625], "texture": "#all"} } }, { - "__comment": "Can2B", - "from": [2, 9, 10], - "to": [6, 10, 14], + "__comment": "rod1", + "from": [9, 9, 8], + "to": [10, 11, 9], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [1.375, 0, 1.25, 0.125], "texture": "#all"}, + "up": {"uv": [1.25, 0.125, 1.125, 0], "texture": "#all"}, + "north": {"uv": [1.125, 0.125, 1.25, 0.375], "texture": "#all"}, + "south": {"uv": [1.375, 0.125, 1.5, 0.375], "texture": "#all"}, + "west": {"uv": [1.25, 0.125, 1.375, 0.375], "texture": "#all"}, + "east": {"uv": [1, 0.125, 1.125, 0.375], "texture": "#all"} } }, { - "__comment": "Can4Sjde4", - "from": [2, 10, 3], - "to": [3, 12, 5], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 5, 16], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [6, 2.625, 4, 4.625], "texture": "#all"}, + "up": {"uv": [4, 4.625, 2, 2.625], "texture": "#all"}, + "north": {"uv": [2, 4.625, 4, 5.25], "texture": "#all"}, + "south": {"uv": [6, 4.625, 8, 5.25], "texture": "#all"}, + "west": {"uv": [4, 4.625, 6, 5.25], "texture": "#all"}, + "east": {"uv": [0, 4.625, 2, 5.25], "texture": "#all"} } }, { - "__comment": "Spin", - "from": [4, 6, 4], - "to": [12, 7, 12], + "__comment": "rod2", + "from": [6, 8, 9], + "to": [7, 11, 10], "faces": { - "down": {"uv": [5.5, 3, 6.5, 4], "texture": "#all"}, - "up": {"uv": [4.5, 3, 5.5, 4], "texture": "#all"}, - "north": {"uv": [4.5, 4, 5.5, 4.125], "texture": "#all"}, - "south": {"uv": [6.5, 4, 7.5, 4.125], "texture": "#all"}, - "west": {"uv": [5.5, 4, 6.5, 4.125], "texture": "#all"}, - "east": {"uv": [3.5, 4, 4.5, 4.125], "texture": "#all"} + "down": {"uv": [1.375, 0.375, 1.25, 0.5], "texture": "#all"}, + "up": {"uv": [1.25, 0.5, 1.125, 0.375], "texture": "#all"}, + "north": {"uv": [1.125, 0.5, 1.25, 0.875], "texture": "#all"}, + "south": {"uv": [1.375, 0.5, 1.5, 0.875], "texture": "#all"}, + "west": {"uv": [1.25, 0.5, 1.375, 0.875], "texture": "#all"}, + "east": {"uv": [1, 0.5, 1.125, 0.875], "texture": "#all"} } }, { - "__comment": "Can2Side3", - "from": [5, 10, 11], - "to": [6, 12, 13], + "__comment": "support3", + "from": [14.5, 6, 14.5], + "to": [15.5, 11, 15.5], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.75], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.75], "texture": "#all"} } }, { - "__comment": "Can4Side3", - "from": [5, 10, 3], - "to": [6, 12, 5], + "__comment": "rimLeft", + "from": [14, 5, 2], + "to": [16, 7, 14], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [2, 6.25, 1.75, 7.75], "texture": "#all"}, + "up": {"uv": [1.75, 7.75, 1.5, 6.25], "texture": "#all"}, + "north": {"uv": [1.5, 7.75, 1.75, 8], "texture": "#all"}, + "south": {"uv": [3.25, 7.75, 3.5, 8], "texture": "#all"}, + "west": {"uv": [1.75, 7.75, 3.25, 8], "texture": "#all"}, + "east": {"uv": [0, 7.75, 1.5, 8], "texture": "#all"} } }, { - "__comment": "Can2Side4", - "from": [2, 10, 11], - "to": [3, 12, 13], + "__comment": "rimFront", + "from": [0, 5, 0], + "to": [16, 7, 2], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [4.25, 5.25, 2.25, 5.5], "texture": "#all"}, + "up": {"uv": [2.25, 5.5, 0.25, 5.25], "texture": "#all"}, + "north": {"uv": [0.25, 5.5, 2.25, 5.75], "texture": "#all"}, + "south": {"uv": [2.5, 5.5, 4.5, 5.75], "texture": "#all"}, + "west": {"uv": [2.25, 5.5, 2.5, 5.75], "texture": "#all"}, + "east": {"uv": [0, 5.5, 0.25, 5.75], "texture": "#all"} } }, { - "__comment": "Base2", - "from": [1, 8, 1], - "to": [15, 9, 15], + "__comment": "support1", + "from": [14.5, 6, 0.5], + "to": [15.5, 11, 1.5], "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.75], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.75], "texture": "#all"} } }, { - "__comment": "Vial2", - "from": [9, 3.5, 11], - "to": [11, 6.5, 13], + "__comment": "support4", + "from": [0.5, 6, 14.5], + "to": [1.5, 11, 15.5], "faces": { - "down": {"uv": [1.5, 0.75, 1.75, 1], "texture": "#all"}, - "up": {"uv": [1.25, 0.75, 1.5, 1], "texture": "#all"}, - "north": {"uv": [1.25, 1, 1.5, 1.375], "texture": "#all"}, - "south": {"uv": [1.75, 1, 2, 1.375], "texture": "#all"}, - "west": {"uv": [1.5, 1, 1.75, 1.375], "texture": "#all"}, - "east": {"uv": [1, 1, 1.25, 1.375], "texture": "#all"} - } - }, - { - "__comment": "IO2", - "from": [15, 3, 4], - "to": [16, 11, 12], - "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} - } - }, - { - "__comment": "Can1B", - "from": [10, 9, 10], - "to": [14, 10, 14], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can4Side1", - "from": [2, 10, 5], - "to": [6, 12, 6], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Base", - "from": [1, -1, 1], - "to": [15, 0, 15], - "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} - } - }, - { - "__comment": "Can3T", - "from": [10, 12, 2], - "to": [14, 13, 6], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Base3", - "from": [1, 13, 1], - "to": [15, 14, 15], - "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} - } - }, - { - "__comment": "Can3B", - "from": [10, 9, 2], - "to": [14, 10, 6], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can1Side4", - "from": [10, 10, 11], - "to": [11, 12, 13], - "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Can2Side2", - "from": [2, 10, 10], - "to": [6, 12, 11], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Can2Side1", - "from": [2, 10, 13], - "to": [6, 12, 14], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Vial1", - "from": [5, 3.5, 11], - "to": [7, 6.5, 13], - "faces": { - "down": {"uv": [1.5, 0.75, 1.75, 1], "texture": "#all"}, - "up": {"uv": [1.25, 0.75, 1.5, 1], "texture": "#all"}, - "north": {"uv": [1.25, 1, 1.5, 1.375], "texture": "#all"}, - "south": {"uv": [1.75, 1, 2, 1.375], "texture": "#all"}, - "west": {"uv": [1.5, 1, 1.75, 1.375], "texture": "#all"}, - "east": {"uv": [1, 1, 1.25, 1.375], "texture": "#all"} - } - }, - { - "__comment": "Can3Side1", - "from": [10, 10, 5], - "to": [14, 12, 6], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Can4Side2", - "from": [2, 10, 2], - "to": [6, 12, 3], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "IO1", - "from": [0, 3, 4], - "to": [1, 11, 12], - "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} - } - }, - { - "__comment": "Can4T", - "from": [2, 12, 2], - "to": [6, 13, 6], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can3Side2", - "from": [10, 10, 2], - "to": [14, 12, 3], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Can1Side2", - "from": [10, 10, 10], - "to": [14, 12, 11], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Can1Side3", - "from": [13, 10, 11], - "to": [14, 12, 13], - "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.75], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.75], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chemical_crystallizer", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json b/src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json index b851728e9..1ecff1153 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json @@ -1,463 +1,398 @@ { "elements": [ { - "__comment": "Can4Side3", - "from": [5, 2, 3], - "to": [6, 5, 5], + "__comment": "glass", + "from": [1, 7, 1], + "to": [15, 12, 14], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [13.125, 1.75, 11.375, 3.375], "texture": "#all"}, + "up": {"uv": [11.375, 3.375, 9.625, 1.75], "texture": "#all"}, + "north": {"uv": [9.625, 3.375, 11.375, 4], "texture": "#all"}, + "south": {"uv": [13, 3.375, 14.75, 4], "texture": "#all"}, + "west": {"uv": [11.375, 3.375, 13, 4], "texture": "#all"}, + "east": {"uv": [8, 3.375, 9.625, 4], "texture": "#all"} } }, { - "__comment": "Base2", - "from": [1, 6, 1], - "to": [15, 7, 15], + "__comment": "vat2", + "from": [10, 7, 6.5], + "to": [13, 11, 9.5], "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Coil1", - "from": [4, 8, 4], - "to": [12, 9, 12], + "__comment": "portToggle1", + "from": [15.01, 3.01, 3], + "to": [16.01, 13.01, 13], "faces": { - "down": {"uv": [2, 4.25, 3, 5.25], "texture": "#all"}, - "up": {"uv": [1, 4.25, 2, 5.25], "texture": "#all"}, - "north": {"uv": [1, 5.25, 2, 5.375], "texture": "#all"}, - "south": {"uv": [3, 5.25, 4, 5.375], "texture": "#all"}, - "west": {"uv": [2, 5.25, 3, 5.375], "texture": "#all"}, - "east": {"uv": [0, 5.25, 1, 5.375], "texture": "#all"} + "down": {"uv": [14.75, 0, 14.625, 1.25], "texture": "#all"}, + "up": {"uv": [14.625, 1.25, 14.5, 0], "texture": "#all"}, + "north": {"uv": [14.5, 1.25, 14.625, 2.5], "texture": "#all"}, + "south": {"uv": [15.875, 1.25, 16, 2.5], "texture": "#all"}, + "west": {"uv": [14.625, 1.25, 15.875, 2.5], "texture": "#all"}, + "east": {"uv": [13.25, 1.25, 14.5, 2.5], "texture": "#all"} } }, { - "__comment": "IO2", - "from": [15, 3, 4], - "to": [16, 11, 12], + "__comment": "vat9", + "from": [3, 7, 10], + "to": [6, 11, 13], "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can3Side4", - "from": [10, 2, 3], - "to": [11, 5, 5], + "__comment": "backEdge1", + "from": [15, 7, 15], + "to": [16, 15, 16], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [1.375, 0, 1.25, 0.125], "texture": "#all"}, + "up": {"uv": [1.25, 0.125, 1.125, 0], "texture": "#all"}, + "north": {"uv": [1.125, 0.125, 1.25, 1.125], "texture": "#all"}, + "south": {"uv": [1.375, 0.125, 1.5, 1.125], "texture": "#all"}, + "west": {"uv": [1.25, 0.125, 1.375, 1.125], "texture": "#all"}, + "east": {"uv": [1, 0.125, 1.125, 1.125], "texture": "#all"} } }, { - "__comment": "Can4T", - "from": [2, 5, 2], - "to": [6, 6, 6], + "__comment": "support2", + "from": [1, 13, 1], + "to": [2, 15, 2], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.125], "texture": "#all"}, + "up": {"uv": [0.75, 0.125, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, + "south": {"uv": [0.875, 0.125, 1, 0.375], "texture": "#all"}, + "west": {"uv": [0.75, 0.125, 0.875, 0.375], "texture": "#all"}, + "east": {"uv": [0.5, 0.125, 0.625, 0.375], "texture": "#all"} } }, { - "__comment": "Can1B", - "from": [10, 1, 10], - "to": [14, 2, 14], + "__comment": "nozzle4", + "from": [7.5, 11.5, 4], + "to": [8.5, 12.5, 5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can1T", - "from": [10, 5, 10], - "to": [14, 6, 14], + "__comment": "vat4", + "from": [6.5, 7, 3], + "to": [9.5, 11, 6], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Coil4", - "from": [4, 14, 4], - "to": [12, 15, 12], + "__comment": "vat3", + "from": [10, 7, 10], + "to": [13, 11, 13], "faces": { - "down": {"uv": [2, 4.25, 3, 5.25], "texture": "#all"}, - "up": {"uv": [1, 4.25, 2, 5.25], "texture": "#all"}, - "north": {"uv": [1, 5.25, 2, 5.375], "texture": "#all"}, - "south": {"uv": [3, 5.25, 4, 5.375], "texture": "#all"}, - "west": {"uv": [2, 5.25, 3, 5.375], "texture": "#all"}, - "east": {"uv": [0, 5.25, 1, 5.375], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can1Side4", - "from": [10, 2, 11], - "to": [11, 5, 13], + "__comment": "vents", + "from": [4, 13, 4], + "to": [12, 15, 14], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [12, 0, 11, 1.25], "texture": "#all"}, + "up": {"uv": [11, 1.25, 10, 0], "texture": "#all"}, + "north": {"uv": [10, 1.25, 11, 1.5], "texture": "#all"}, + "south": {"uv": [12.25, 1.25, 13.25, 1.5], "texture": "#all"}, + "west": {"uv": [11, 1.25, 12.25, 1.5], "texture": "#all"}, + "east": {"uv": [8.75, 1.25, 10, 1.5], "texture": "#all"} } }, { - "__comment": "IO1", - "from": [0, 3, 4], - "to": [1, 11, 12], + "__comment": "portToggle2", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} + "down": {"uv": [9.25, 4, 9.125, 5], "texture": "#all"}, + "up": {"uv": [9.125, 5, 9, 4], "texture": "#all"}, + "north": {"uv": [9, 5, 9.125, 6], "texture": "#all"}, + "south": {"uv": [10.125, 5, 10.25, 6], "texture": "#all"}, + "west": {"uv": [9.125, 5, 10.125, 6], "texture": "#all"}, + "east": {"uv": [8, 5, 9, 6], "texture": "#all"} } }, { - "__comment": "Can3B", - "from": [10, 1, 2], - "to": [14, 2, 6], + "__comment": "backEdge2", + "from": [0, 7, 15], + "to": [1, 15, 16], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [1.375, 0, 1.25, 0.125], "texture": "#all"}, + "up": {"uv": [1.25, 0.125, 1.125, 0], "texture": "#all"}, + "north": {"uv": [1.125, 0.125, 1.25, 1.125], "texture": "#all"}, + "south": {"uv": [1.375, 0.125, 1.5, 1.125], "texture": "#all"}, + "west": {"uv": [1.25, 0.125, 1.375, 1.125], "texture": "#all"}, + "east": {"uv": [1, 0.125, 1.125, 1.125], "texture": "#all"} } }, { - "__comment": "Can3Side3", - "from": [13, 2, 3], - "to": [14, 5, 5], + "__comment": "vat7", + "from": [3, 7, 3], + "to": [6, 11, 6], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can2Side4", - "from": [2, 2, 11], - "to": [3, 5, 13], + "__comment": "vat5", + "from": [6.5, 7, 6.5], + "to": [9.5, 11, 9.5], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can4Sjde4", - "from": [2, 2, 3], - "to": [3, 5, 5], + "__comment": "vat6", + "from": [6.5, 7, 10], + "to": [9.5, 11, 13], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can3Side1", - "from": [10, 2, 5], - "to": [14, 5, 6], + "__comment": "nozzle9", + "from": [4, 11.5, 11], + "to": [5, 12.5, 12], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Centre", - "from": [7, 1, 7], - "to": [9, 14, 9], + "__comment": "nozzle5", + "from": [7.5, 11.5, 7.5], + "to": [8.5, 12.5, 8.5], "faces": { - "down": {"uv": [0.5, 2.125, 0.75, 2.375], "texture": "#all"}, - "up": {"uv": [0.25, 2.125, 0.5, 2.375], "texture": "#all"}, - "north": {"uv": [0.25, 2.375, 0.5, 4], "texture": "#all"}, - "south": {"uv": [0.75, 2.375, 1, 4], "texture": "#all"}, - "west": {"uv": [0.5, 2.375, 0.75, 4], "texture": "#all"}, - "east": {"uv": [0, 2.375, 0.25, 4], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can4B", - "from": [2, 1, 2], - "to": [6, 2, 6], + "__comment": "nozzle8", + "from": [4, 11.5, 7.5], + "to": [5, 12.5, 8.5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Coil3", - "from": [4, 12, 4], - "to": [12, 13, 12], + "__comment": "support1", + "from": [14, 13, 1], + "to": [15, 15, 2], "faces": { - "down": {"uv": [2, 4.25, 3, 5.25], "texture": "#all"}, - "up": {"uv": [1, 4.25, 2, 5.25], "texture": "#all"}, - "north": {"uv": [1, 5.25, 2, 5.375], "texture": "#all"}, - "south": {"uv": [3, 5.25, 4, 5.375], "texture": "#all"}, - "west": {"uv": [2, 5.25, 3, 5.375], "texture": "#all"}, - "east": {"uv": [0, 5.25, 1, 5.375], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.125], "texture": "#all"}, + "up": {"uv": [0.75, 0.125, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, + "south": {"uv": [0.875, 0.125, 1, 0.375], "texture": "#all"}, + "west": {"uv": [0.75, 0.125, 0.875, 0.375], "texture": "#all"}, + "east": {"uv": [0.5, 0.125, 0.625, 0.375], "texture": "#all"} } }, { - "__comment": "Can1Side1", - "from": [10, 2, 13], - "to": [14, 5, 14], + "__comment": "nozzle6", + "from": [7.5, 11.5, 11], + "to": [8.5, 12.5, 12], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can2Side2", - "from": [2, 2, 10], - "to": [6, 5, 11], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 7, 16], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.875], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.875], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.875], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.875], "texture": "#all"} } }, { - "__comment": "Can3T", - "from": [10, 5, 2], - "to": [14, 6, 6], + "__comment": "vat1", + "from": [10, 7, 3], + "to": [13, 11, 6], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can2T", - "from": [2, 5, 10], - "to": [6, 6, 14], + "__comment": "nozzle1", + "from": [11, 11.5, 4], + "to": [12, 12.5, 5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "IO2Port2", - "from": [13, 7, 6], - "to": [15, 9, 10], + "__comment": "vat8", + "from": [3, 7, 6.5], + "to": [6, 11, 9.5], "faces": { - "down": {"uv": [4.25, 2.125, 4.5, 2.625], "texture": "#all"}, - "up": {"uv": [4, 2.125, 4.25, 2.625], "texture": "#all"}, - "north": {"uv": [4, 2.625, 4.25, 2.875], "texture": "#all"}, - "south": {"uv": [4.75, 2.625, 5, 2.875], "texture": "#all"}, - "west": {"uv": [4.25, 2.625, 4.75, 2.875], "texture": "#all"}, - "east": {"uv": [3.5, 2.625, 4, 2.875], "texture": "#all"} + "down": {"uv": [1.125, 2.875, 0.75, 3.25], "texture": "#all"}, + "up": {"uv": [0.75, 3.25, 0.375, 2.875], "texture": "#all"}, + "north": {"uv": [0.375, 3.25, 0.75, 3.75], "texture": "#all"}, + "south": {"uv": [1.125, 3.25, 1.5, 3.75], "texture": "#all"}, + "west": {"uv": [0.75, 3.25, 1.125, 3.75], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.375, 3.75], "texture": "#all"} } }, { - "__comment": "Can3Side2", - "from": [10, 2, 2], - "to": [14, 5, 3], + "__comment": "top2", + "from": [0, 12, 0], + "to": [16, 13, 15], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [5.875, 5, 3.875, 6.875], "texture": "#all"}, + "up": {"uv": [3.875, 6.875, 1.875, 5], "texture": "#all"}, + "north": {"uv": [1.875, 6.875, 3.875, 7], "texture": "#all"}, + "south": {"uv": [5.75, 6.875, 7.75, 7], "texture": "#all"}, + "west": {"uv": [3.875, 6.875, 5.75, 7], "texture": "#all"}, + "east": {"uv": [0, 6.875, 1.875, 7], "texture": "#all"} } }, { - "__comment": "Can4Side2", - "from": [2, 2, 2], - "to": [6, 5, 3], + "__comment": "back", + "from": [1, 7, 14], + "to": [15, 15, 16], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [9.75, 0, 8, 0.25], "texture": "#all"}, + "up": {"uv": [8, 0.25, 6.25, 0], "texture": "#all"}, + "north": {"uv": [6.25, 0.25, 8, 1.25], "texture": "#all"}, + "south": {"uv": [8.25, 0.25, 10, 1.25], "texture": "#all"}, + "west": {"uv": [8, 0.25, 8.25, 1.25], "texture": "#all"}, + "east": {"uv": [6, 0.25, 6.25, 1.25], "texture": "#all"} } }, { - "__comment": "Coil2", - "from": [4, 10, 4], - "to": [12, 11, 12], + "__comment": "nozzle7", + "from": [4, 11.5, 4], + "to": [5, 12.5, 5], "faces": { - "down": {"uv": [2, 4.25, 3, 5.25], "texture": "#all"}, - "up": {"uv": [1, 4.25, 2, 5.25], "texture": "#all"}, - "north": {"uv": [1, 5.25, 2, 5.375], "texture": "#all"}, - "south": {"uv": [3, 5.25, 4, 5.375], "texture": "#all"}, - "west": {"uv": [2, 5.25, 3, 5.375], "texture": "#all"}, - "east": {"uv": [0, 5.25, 1, 5.375], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can2Side1", - "from": [2, 2, 13], - "to": [6, 5, 14], + "__comment": "top", + "from": [0, 15, 0], + "to": [16, 16, 16], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + "down": {"uv": [6, 2.875, 4, 4.875], "texture": "#all"}, + "up": {"uv": [4, 4.875, 2, 2.875], "texture": "#all"}, + "north": {"uv": [2, 4.875, 4, 5], "texture": "#all"}, + "south": {"uv": [6, 4.875, 8, 5], "texture": "#all"}, + "west": {"uv": [4, 4.875, 6, 5], "texture": "#all"}, + "east": {"uv": [0, 4.875, 2, 5], "texture": "#all"} } }, { - "__comment": "Can1Side3", - "from": [13, 2, 11], - "to": [14, 5, 13], + "__comment": "nozzle2", + "from": [11, 11.5, 7.5], + "to": [12, 12.5, 8.5], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can4Side1", - "from": [2, 2, 5], - "to": [6, 5, 6], + "__comment": "nozzle3", + "from": [11, 11.5, 11], + "to": [12, 12.5, 12], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Can1Side2", - "from": [10, 2, 10], - "to": [14, 5, 11], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.5], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.5], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Base", - "from": [1, -1, 1], - "to": [15, 1, 15], - "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 2], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 2], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 2], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 2], "texture": "#all"} - } - }, - { - "__comment": "Can2Side3", - "from": [5, 2, 11], - "to": [6, 5, 13], - "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.625], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.625], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.625], "texture": "#all"} - } - }, - { - "__comment": "IO2Port", - "from": [1, 7, 6], - "to": [3, 9, 10], - "faces": { - "down": {"uv": [4.25, 2.125, 4.5, 2.625], "texture": "#all"}, - "up": {"uv": [4, 2.125, 4.25, 2.625], "texture": "#all"}, - "north": {"uv": [4, 2.625, 4.25, 2.875], "texture": "#all"}, - "south": {"uv": [4.75, 2.625, 5, 2.875], "texture": "#all"}, - "west": {"uv": [4.25, 2.625, 4.75, 2.875], "texture": "#all"}, - "east": {"uv": [3.5, 2.625, 4, 2.875], "texture": "#all"} - } - }, - { - "__comment": "Can2B", - "from": [2, 1, 10], - "to": [6, 2, 14], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chemical_dissolution_chamber", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_infuser.json b/src/main/resources/assets/mekanism/models/block/chemical_infuser.json index ccc7f6b87..5cb11a64b 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_infuser.json @@ -1,489 +1,385 @@ { "elements": [ { - "__comment": "LTopW", - "from": [2, 14, 10], - "to": [3, 15, 13], + "__comment": "portRight", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], "faces": { - "down": {"uv": [11.75, 0, 11.875, 0.375], "texture": "#all"}, - "up": {"uv": [11.625, 0, 11.75, 0.375], "texture": "#all"}, - "north": {"uv": [11.625, 0.375, 11.75, 0.5], "texture": "#all"}, - "south": {"uv": [12.125, 0.375, 12.25, 0.5], "texture": "#all"}, - "west": {"uv": [11.75, 0.375, 12.125, 0.5], "texture": "#all"}, - "east": {"uv": [11.25, 0.375, 11.625, 0.5], "texture": "#all"} + "down": {"uv": [1.25, 4.75, 1.125, 5.75], "texture": "#all"}, + "up": {"uv": [1.125, 5.75, 1, 4.75], "texture": "#all"}, + "north": {"uv": [1, 5.75, 1.125, 6.75], "texture": "#all"}, + "south": {"uv": [2.125, 5.75, 2.25, 6.75], "texture": "#all"}, + "west": {"uv": [1.125, 5.75, 2.125, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.75, 1, 6.75], "texture": "#all"} } }, { - "__comment": "TopPanel", - "from": [7, 11, 5], - "to": [9, 12, 13], + "__comment": "tank3", + "from": [2, 5, 1], + "to": [14, 12, 8], "faces": { - "down": {"uv": [1.25, 5, 1.5, 6], "texture": "#all"}, - "up": {"uv": [1, 5, 1.25, 6], "texture": "#all"}, - "north": {"uv": [1, 6, 1.25, 6.125], "texture": "#all"}, - "south": {"uv": [2.25, 6, 2.5, 6.125], "texture": "#all"}, - "west": {"uv": [1.25, 6, 2.25, 6.125], "texture": "#all"}, - "east": {"uv": [0, 6, 1, 6.125], "texture": "#all"} + "down": {"uv": [6.875, 2.625, 5.375, 3.5], "texture": "#all"}, + "up": {"uv": [5.375, 3.5, 3.875, 2.625], "texture": "#all"}, + "north": {"uv": [3.875, 3.5, 5.375, 4.375], "texture": "#all"}, + "south": {"uv": [6.25, 3.5, 7.75, 4.375], "texture": "#all"}, + "west": {"uv": [5.375, 3.5, 6.25, 4.375], "texture": "#all"}, + "east": {"uv": [3, 3.5, 3.875, 4.375], "texture": "#all"} } }, { - "__comment": "FrontConnection", - "from": [6, 5, 1], - "to": [10, 9, 3], + "__comment": "tube4", + "from": [9, 13.5, 4], + "to": [10, 14.5, 6], "faces": { - "down": {"uv": [0.75, 7.375, 1.25, 7.625], "texture": "#all"}, - "up": {"uv": [0.25, 7.375, 0.75, 7.625], "texture": "#all"}, - "north": {"uv": [0.25, 7.625, 0.75, 8.125], "texture": "#all"}, - "south": {"uv": [1, 7.625, 1.5, 8.125], "texture": "#all"}, - "west": {"uv": [0.75, 7.625, 1, 8.125], "texture": "#all"}, - "east": {"uv": [0, 7.625, 0.25, 8.125], "texture": "#all"} + "down": {"uv": [0.5, 0.25, 0.375, 0.5], "texture": "#all"}, + "up": {"uv": [0.375, 0.5, 0.25, 0.25], "texture": "#all"}, + "north": {"uv": [0.25, 0.5, 0.375, 0.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 0.75, 0.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.5, 0.625, 0.625], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.25, 0.625], "texture": "#all"} } }, { - "__comment": "Base", - "from": [0, -1, 0], - "to": [16, 0, 16], + "__comment": "tank2", + "from": [1, 5, 9], + "to": [7, 16, 15], "faces": { - "down": {"uv": [4, 0, 6, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 4, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} + "down": {"uv": [2.25, 2.625, 1.5, 3.375], "texture": "#all"}, + "up": {"uv": [1.5, 3.375, 0.75, 2.625], "texture": "#all"}, + "north": {"uv": [0.75, 3.375, 1.5, 4.75], "texture": "#all"}, + "south": {"uv": [2.25, 3.375, 3, 4.75], "texture": "#all"}, + "west": {"uv": [1.5, 3.375, 2.25, 4.75], "texture": "#all"}, + "east": {"uv": [0, 3.375, 0.75, 4.75], "texture": "#all"} } }, { - "__comment": "LPanelNE", - "from": [6, 0, 9], - "to": [7, 15, 10], + "__comment": "pipeAngle1", + "from": [8, 4.99, 6], + "to": [13, 10.99, 9], "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} + "down": {"uv": [3.875, 6.875, 3.25, 7.25], "texture": "#all"}, + "up": {"uv": [3.25, 7.25, 2.625, 6.875], "texture": "#all"}, + "north": {"uv": [2.625, 7.25, 3.25, 8], "texture": "#all"}, + "south": {"uv": [3.625, 7.25, 4.25, 8], "texture": "#all"}, + "west": {"uv": [3.25, 7.25, 3.625, 8], "texture": "#all"}, + "east": {"uv": [2.25, 7.25, 2.625, 8], "texture": "#all"} } }, { - "__comment": "RPanelSW", - "from": [9, 0, 13], - "to": [10, 15, 14], + "__comment": "pipe2", + "from": [1, 5, 5], + "to": [2, 11, 9], "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} + "down": {"uv": [5.75, 4.375, 5.625, 4.875], "texture": "#all"}, + "up": {"uv": [5.625, 4.875, 5.5, 4.375], "texture": "#all"}, + "north": {"uv": [5.5, 4.875, 5.625, 5.625], "texture": "#all"}, + "south": {"uv": [6.125, 4.875, 6.25, 5.625], "texture": "#all"}, + "west": {"uv": [5.625, 4.875, 6.125, 5.625], "texture": "#all"}, + "east": {"uv": [5, 4.875, 5.5, 5.625], "texture": "#all"} } }, { - "__comment": "RightConnection", - "from": [13, 5, 6], - "to": [15, 9, 10], + "__comment": "tube5", + "from": [6, 13.5, 4], + "to": [7, 14.5, 6], "faces": { - "down": {"uv": [13, 0, 13.25, 0.5], "texture": "#all"}, - "up": {"uv": [12.75, 0, 13, 0.5], "texture": "#all"}, - "north": {"uv": [12.75, 0.5, 13, 1], "texture": "#all"}, - "south": {"uv": [13.5, 0.5, 13.75, 1], "texture": "#all"}, - "west": {"uv": [13, 0.5, 13.5, 1], "texture": "#all"}, - "east": {"uv": [12.25, 0.5, 12.75, 1], "texture": "#all"} + "down": {"uv": [0.5, 0.25, 0.375, 0.5], "texture": "#all"}, + "up": {"uv": [0.375, 0.5, 0.25, 0.25], "texture": "#all"}, + "north": {"uv": [0.25, 0.5, 0.375, 0.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 0.75, 0.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.5, 0.625, 0.625], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.25, 0.625], "texture": "#all"} } }, { - "__comment": "RGlassR", - "from": [13, 0, 10], - "to": [14, 14, 13], + "__comment": "tube10", + "from": [7, 14, 13], + "to": [9, 15, 14], "faces": { - "down": {"uv": [0.5, 8.125, 0.625, 8.5], "texture": "#all"}, - "up": {"uv": [0.375, 8.125, 0.5, 8.5], "texture": "#all"}, - "north": {"uv": [0.375, 8.5, 0.5, 10.25], "texture": "#all"}, - "south": {"uv": [0.875, 8.5, 1, 10.25], "texture": "#all"}, - "west": {"uv": [0.5, 8.5, 0.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.5, 0.375, 10.25], "texture": "#all"} + "down": {"uv": [0.625, 1.75, 0.375, 1.875], "texture": "#all"}, + "up": {"uv": [0.375, 1.875, 0.125, 1.75], "texture": "#all"}, + "north": {"uv": [0.125, 1.875, 0.375, 2], "texture": "#all"}, + "south": {"uv": [0.5, 1.875, 0.75, 2], "texture": "#all"}, + "west": {"uv": [0.375, 1.875, 0.5, 2], "texture": "#all"}, + "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} } }, { - "__comment": "RTopW", - "from": [9, 14, 10], - "to": [10, 15, 13], + "__comment": "connector", + "from": [7, 5, 13], + "to": [9, 11, 15], "faces": { - "down": {"uv": [11.75, 0, 11.875, 0.375], "texture": "#all"}, - "up": {"uv": [11.625, 0, 11.75, 0.375], "texture": "#all"}, - "north": {"uv": [11.625, 0.375, 11.75, 0.5], "texture": "#all"}, - "south": {"uv": [12.125, 0.375, 12.25, 0.5], "texture": "#all"}, - "west": {"uv": [11.75, 0.375, 12.125, 0.5], "texture": "#all"}, - "east": {"uv": [11.25, 0.375, 11.625, 0.5], "texture": "#all"} + "down": {"uv": [7, 4.375, 6.75, 4.625], "texture": "#all"}, + "up": {"uv": [6.75, 4.625, 6.5, 4.375], "texture": "#all"}, + "north": {"uv": [6.5, 4.625, 6.75, 5.375], "texture": "#all"}, + "south": {"uv": [7, 4.625, 7.25, 5.375], "texture": "#all"}, + "west": {"uv": [6.75, 4.625, 7, 5.375], "texture": "#all"}, + "east": {"uv": [6.25, 4.625, 6.5, 5.375], "texture": "#all"} } }, { - "__comment": "GasLeft", - "from": [0, 4, 5], - "to": [1, 10, 11], + "__comment": "exhaust4", + "from": [8.33, 11.5, 1.8], + "to": [9.33, 12.5, 2.8], "faces": { - "down": {"uv": [8.875, 0, 9, 0.75], "texture": "#all"}, - "up": {"uv": [8.75, 0, 8.875, 0.75], "texture": "#all"}, - "north": {"uv": [8.75, 0.75, 8.875, 1.5], "texture": "#all"}, - "south": {"uv": [9.625, 0.75, 9.75, 1.5], "texture": "#all"}, - "west": {"uv": [8.875, 0.75, 9.625, 1.5], "texture": "#all"}, - "east": {"uv": [8, 0.75, 8.75, 1.5], "texture": "#all"} + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} } }, { - "__comment": "GasRight", - "from": [15, 4, 5], - "to": [16, 10, 11], + "__comment": "portLeft", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], "faces": { - "down": {"uv": [8.875, 0, 9, 0.75], "texture": "#all"}, - "up": {"uv": [8.75, 0, 8.875, 0.75], "texture": "#all"}, - "north": {"uv": [8.75, 0.75, 8.875, 1.5], "texture": "#all"}, - "south": {"uv": [9.625, 0.75, 9.75, 1.5], "texture": "#all"}, - "west": {"uv": [8.875, 0.75, 9.625, 1.5], "texture": "#all"}, - "east": {"uv": [8, 0.75, 8.75, 1.5], "texture": "#all"} + "down": {"uv": [1.25, 4.75, 1.125, 5.75], "texture": "#all"}, + "up": {"uv": [1.125, 5.75, 1, 4.75], "texture": "#all"}, + "north": {"uv": [1, 5.75, 1.125, 6.75], "texture": "#all"}, + "south": {"uv": [2.125, 5.75, 2.25, 6.75], "texture": "#all"}, + "west": {"uv": [1.125, 5.75, 2.125, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.75, 1, 6.75], "texture": "#all"} } }, { - "__comment": "FrontPanel", - "from": [4, 1, 3], - "to": [12, 10, 4], + "__comment": "tube2", + "from": [11, 13.5, 6.5], + "to": [13, 14.5, 7.5], "faces": { - "down": {"uv": [1.125, 6.125, 2.125, 6.25], "texture": "#all"}, - "up": {"uv": [0.125, 6.125, 1.125, 6.25], "texture": "#all"}, - "north": {"uv": [0.125, 6.25, 1.125, 7.375], "texture": "#all"}, - "south": {"uv": [1.25, 6.25, 2.25, 7.375], "texture": "#all"}, - "west": {"uv": [1.125, 6.25, 1.25, 7.375], "texture": "#all"}, - "east": {"uv": [0, 6.25, 0.125, 7.375], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "GasExit", - "from": [5, 4, 0], - "to": [11, 10, 1], + "__comment": "portFront", + "from": [4, 4, -0.00999999999999979], + "to": [12, 12, 0.99], "faces": { - "down": {"uv": [0.875, 2.125, 1.625, 2.25], "texture": "#all"}, - "up": {"uv": [0.125, 2.125, 0.875, 2.25], "texture": "#all"}, - "north": {"uv": [0.125, 2.25, 0.875, 3], "texture": "#all"}, - "south": {"uv": [1, 2.25, 1.75, 3], "texture": "#all"}, - "west": {"uv": [0.875, 2.25, 1, 3], "texture": "#all"}, - "east": {"uv": [0, 2.25, 0.125, 3], "texture": "#all"} + "down": {"uv": [4.375, 4.75, 3.375, 4.875], "texture": "#all"}, + "up": {"uv": [3.375, 4.875, 2.375, 4.75], "texture": "#all"}, + "north": {"uv": [2.375, 4.875, 3.375, 5.875], "texture": "#all"}, + "south": {"uv": [3.5, 4.875, 4.5, 5.875], "texture": "#all"}, + "west": {"uv": [3.375, 4.875, 3.5, 5.875], "texture": "#all"}, + "east": {"uv": [2.25, 4.875, 2.375, 5.875], "texture": "#all"} } }, { - "__comment": "RTopN", - "from": [10, 14, 9], - "to": [13, 15, 10], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 5, 16], "faces": { - "down": {"uv": [10.75, 0, 11.125, 0.125], "texture": "#all"}, - "up": {"uv": [10.375, 0, 10.75, 0.125], "texture": "#all"}, - "north": {"uv": [10.375, 0.125, 10.75, 0.25], "texture": "#all"}, - "south": {"uv": [10.875, 0.125, 11.25, 0.25], "texture": "#all"}, - "west": {"uv": [10.75, 0.125, 10.875, 0.25], "texture": "#all"}, - "east": {"uv": [10.25, 0.125, 10.375, 0.25], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.625], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.625], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.625], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.625], "texture": "#all"} } }, { - "__comment": "LPanelSE", - "from": [6, 0, 13], - "to": [7, 15, 14], + "__comment": "tube8", + "from": [3, 13.5, 7.5], + "to": [4, 14.5, 9.5], "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} + "down": {"uv": [0.5, 0.25, 0.375, 0.5], "texture": "#all"}, + "up": {"uv": [0.375, 0.5, 0.25, 0.25], "texture": "#all"}, + "north": {"uv": [0.25, 0.5, 0.375, 0.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 0.75, 0.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.5, 0.625, 0.625], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.25, 0.625], "texture": "#all"} } }, { - "__comment": "LTopS", - "from": [3, 14, 13], - "to": [6, 15, 14], + "__comment": "pipe1", + "from": [14, 5, 5], + "to": [15, 11, 9], "faces": { - "down": {"uv": [10.75, 0, 11.125, 0.125], "texture": "#all"}, - "up": {"uv": [10.375, 0, 10.75, 0.125], "texture": "#all"}, - "north": {"uv": [10.375, 0.125, 10.75, 0.25], "texture": "#all"}, - "south": {"uv": [10.875, 0.125, 11.25, 0.25], "texture": "#all"}, - "west": {"uv": [10.75, 0.125, 10.875, 0.25], "texture": "#all"}, - "east": {"uv": [10.25, 0.125, 10.375, 0.25], "texture": "#all"} + "down": {"uv": [5.75, 4.375, 5.625, 4.875], "texture": "#all"}, + "up": {"uv": [5.625, 4.875, 5.5, 4.375], "texture": "#all"}, + "north": {"uv": [5.5, 4.875, 5.625, 5.625], "texture": "#all"}, + "south": {"uv": [6.125, 4.875, 6.25, 5.625], "texture": "#all"}, + "west": {"uv": [5.625, 4.875, 6.125, 5.625], "texture": "#all"}, + "east": {"uv": [5, 4.875, 5.5, 5.625], "texture": "#all"} } }, { - "__comment": "SidePanel", - "from": [7, 0, 12], - "to": [9, 11, 13], + "__comment": "tube1", + "from": [12, 13.5, 7.5], + "to": [13, 14.5, 9.5], "faces": { - "down": {"uv": [4.125, 2.125, 4.375, 2.25], "texture": "#all"}, - "up": {"uv": [3.875, 2.125, 4.125, 2.25], "texture": "#all"}, - "north": {"uv": [3.875, 2.25, 4.125, 3.625], "texture": "#all"}, - "south": {"uv": [4.25, 2.25, 4.5, 3.625], "texture": "#all"}, - "west": {"uv": [4.125, 2.25, 4.25, 3.625], "texture": "#all"}, - "east": {"uv": [3.75, 2.25, 3.875, 3.625], "texture": "#all"} + "down": {"uv": [0.5, 0.25, 0.375, 0.5], "texture": "#all"}, + "up": {"uv": [0.375, 0.5, 0.25, 0.25], "texture": "#all"}, + "north": {"uv": [0.25, 0.5, 0.375, 0.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 0.75, 0.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.5, 0.625, 0.625], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.25, 0.625], "texture": "#all"} } }, { - "__comment": "LPanelNW", - "from": [2, 0, 9], - "to": [3, 15, 10], + "__comment": "exhaust2", + "from": [5, 11.5, 1.8], + "to": [6, 12.5, 2.8], "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} } }, { - "__comment": "LGlassS", - "from": [3, 0, 13], - "to": [6, 14, 14], + "__comment": "tube6", + "from": [6, 11.5, 4], + "to": [7, 13.5, 5], "faces": { - "down": {"uv": [6.5, 2.125, 6.875, 2.25], "texture": "#all"}, - "up": {"uv": [6.125, 2.125, 6.5, 2.25], "texture": "#all"}, - "north": {"uv": [6.125, 2.25, 6.5, 4], "texture": "#all"}, - "south": {"uv": [6.625, 2.25, 7, 4], "texture": "#all"}, - "west": {"uv": [6.5, 2.25, 6.625, 4], "texture": "#all"}, - "east": {"uv": [6, 2.25, 6.125, 4], "texture": "#all"} + "down": {"uv": [1.875, 1.625, 1.75, 1.75], "texture": "#all"}, + "up": {"uv": [1.75, 1.75, 1.625, 1.625], "texture": "#all"}, + "north": {"uv": [1.625, 1.75, 1.75, 2], "texture": "#all"}, + "south": {"uv": [1.875, 1.75, 2, 2], "texture": "#all"}, + "west": {"uv": [1.75, 1.75, 1.875, 2], "texture": "#all"}, + "east": {"uv": [1.5, 1.75, 1.625, 2], "texture": "#all"} } }, { - "__comment": "RTopE", - "from": [13, 14, 10], - "to": [14, 15, 13], + "__comment": "connectorAngle", + "from": [7, 3, 13], + "to": [9, 11, 15], "faces": { - "down": {"uv": [11.75, 0, 11.875, 0.375], "texture": "#all"}, - "up": {"uv": [11.625, 0, 11.75, 0.375], "texture": "#all"}, - "north": {"uv": [11.625, 0.375, 11.75, 0.5], "texture": "#all"}, - "south": {"uv": [12.125, 0.375, 12.25, 0.5], "texture": "#all"}, - "west": {"uv": [11.75, 0.375, 12.125, 0.5], "texture": "#all"}, - "east": {"uv": [11.25, 0.375, 11.625, 0.5], "texture": "#all"} + "down": {"uv": [5.75, 5.625, 5.5, 5.875], "texture": "#all"}, + "up": {"uv": [5.5, 5.875, 5.25, 5.625], "texture": "#all"}, + "north": {"uv": [5.25, 5.875, 5.5, 6.875], "texture": "#all"}, + "south": {"uv": [5.75, 5.875, 6, 6.875], "texture": "#all"}, + "west": {"uv": [5.5, 5.875, 5.75, 6.875], "texture": "#all"}, + "east": {"uv": [5, 5.875, 5.25, 6.875], "texture": "#all"} } }, { - "__comment": "MachineCore", - "from": [3, 0, 4], - "to": [13, 11, 9], + "__comment": "portBack", + "from": [4, 4, 15.01], + "to": [12, 12, 16.01], "faces": { - "down": {"uv": [1.875, 3, 3.125, 3.625], "texture": "#all"}, - "up": {"uv": [0.625, 3, 1.875, 3.625], "texture": "#all"}, - "north": {"uv": [0.625, 3.625, 1.875, 5], "texture": "#all"}, - "south": {"uv": [2.5, 3.625, 3.75, 5], "texture": "#all"}, - "west": {"uv": [1.875, 3.625, 2.5, 5], "texture": "#all"}, - "east": {"uv": [0, 3.625, 0.625, 5], "texture": "#all"} + "down": {"uv": [2.125, 6.75, 1.125, 6.875], "texture": "#all"}, + "up": {"uv": [1.125, 6.875, 0.125, 6.75], "texture": "#all"}, + "north": {"uv": [0.125, 6.875, 1.125, 7.875], "texture": "#all"}, + "south": {"uv": [1.25, 6.875, 2.25, 7.875], "texture": "#all"}, + "west": {"uv": [1.125, 6.875, 1.25, 7.875], "texture": "#all"}, + "east": {"uv": [0, 6.875, 0.125, 7.875], "texture": "#all"} } }, { - "__comment": "LTopE", - "from": [6, 14, 10], - "to": [7, 15, 13], + "__comment": "tube7", + "from": [3, 13.5, 6.5], + "to": [5, 14.5, 7.5], "faces": { - "down": {"uv": [11.75, 0, 11.875, 0.375], "texture": "#all"}, - "up": {"uv": [11.625, 0, 11.75, 0.375], "texture": "#all"}, - "north": {"uv": [11.625, 0.375, 11.75, 0.5], "texture": "#all"}, - "south": {"uv": [12.125, 0.375, 12.25, 0.5], "texture": "#all"}, - "west": {"uv": [11.75, 0.375, 12.125, 0.5], "texture": "#all"}, - "east": {"uv": [11.25, 0.375, 11.625, 0.5], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "RTopS", - "from": [10, 14, 13], - "to": [13, 15, 14], + "__comment": "tube9", + "from": [7, 14, 10], + "to": [9, 15, 11], "faces": { - "down": {"uv": [10.75, 0, 11.125, 0.125], "texture": "#all"}, - "up": {"uv": [10.375, 0, 10.75, 0.125], "texture": "#all"}, - "north": {"uv": [10.375, 0.125, 10.75, 0.25], "texture": "#all"}, - "south": {"uv": [10.875, 0.125, 11.25, 0.25], "texture": "#all"}, - "west": {"uv": [10.75, 0.125, 10.875, 0.25], "texture": "#all"}, - "east": {"uv": [10.25, 0.125, 10.375, 0.25], "texture": "#all"} + "down": {"uv": [0.625, 1.75, 0.375, 1.875], "texture": "#all"}, + "up": {"uv": [0.375, 1.875, 0.125, 1.75], "texture": "#all"}, + "north": {"uv": [0.125, 1.875, 0.375, 2], "texture": "#all"}, + "south": {"uv": [0.5, 1.875, 0.75, 2], "texture": "#all"}, + "west": {"uv": [0.375, 1.875, 0.5, 2], "texture": "#all"}, + "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} } }, { - "__comment": "RPanelNE", - "from": [13, 0, 9], - "to": [14, 15, 10], + "__comment": "compressor", + "from": [5, 12.5, 5.5], + "to": [11, 15.5, 8.5], "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} + "down": {"uv": [4.125, 6.125, 3.375, 6.5], "texture": "#all"}, + "up": {"uv": [3.375, 6.5, 2.625, 6.125], "texture": "#all"}, + "north": {"uv": [2.625, 6.5, 3.375, 6.875], "texture": "#all"}, + "south": {"uv": [3.75, 6.5, 4.5, 6.875], "texture": "#all"}, + "west": {"uv": [3.375, 6.5, 3.75, 6.875], "texture": "#all"}, + "east": {"uv": [2.25, 6.5, 2.625, 6.875], "texture": "#all"} } }, { - "__comment": "LGlassR", - "from": [6, 0, 10], - "to": [7, 14, 13], + "__comment": "tube3", + "from": [9, 11.5, 4], + "to": [10, 13.5, 5], "faces": { - "down": {"uv": [0.5, 8.125, 0.625, 8.5], "texture": "#all"}, - "up": {"uv": [0.375, 8.125, 0.5, 8.5], "texture": "#all"}, - "north": {"uv": [0.375, 8.5, 0.5, 10.25], "texture": "#all"}, - "south": {"uv": [0.875, 8.5, 1, 10.25], "texture": "#all"}, - "west": {"uv": [0.5, 8.5, 0.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.5, 0.375, 10.25], "texture": "#all"} + "down": {"uv": [1.875, 1.625, 1.75, 1.75], "texture": "#all"}, + "up": {"uv": [1.75, 1.75, 1.625, 1.625], "texture": "#all"}, + "north": {"uv": [1.625, 1.75, 1.75, 2], "texture": "#all"}, + "south": {"uv": [1.875, 1.75, 2, 2], "texture": "#all"}, + "west": {"uv": [1.75, 1.75, 1.875, 2], "texture": "#all"}, + "east": {"uv": [1.5, 1.75, 1.625, 2], "texture": "#all"} } }, { - "__comment": "LGlassL", - "from": [2, 0, 10], - "to": [3, 14, 13], + "__comment": "pipeAngle2", + "from": [3, 4.99, 6], + "to": [8, 10.99, 9], "faces": { - "down": {"uv": [0.5, 8.125, 0.625, 8.5], "texture": "#all"}, - "up": {"uv": [0.375, 8.125, 0.5, 8.5], "texture": "#all"}, - "north": {"uv": [0.375, 8.5, 0.5, 10.25], "texture": "#all"}, - "south": {"uv": [0.875, 8.5, 1, 10.25], "texture": "#all"}, - "west": {"uv": [0.5, 8.5, 0.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.5, 0.375, 10.25], "texture": "#all"} + "down": {"uv": [3.875, 6.875, 3.25, 7.25], "texture": "#all"}, + "up": {"uv": [3.25, 7.25, 2.625, 6.875], "texture": "#all"}, + "north": {"uv": [2.625, 7.25, 3.25, 8], "texture": "#all"}, + "south": {"uv": [3.625, 7.25, 4.25, 8], "texture": "#all"}, + "west": {"uv": [3.25, 7.25, 3.625, 8], "texture": "#all"}, + "east": {"uv": [2.25, 7.25, 2.625, 8], "texture": "#all"} } }, { - "__comment": "LGlassN", - "from": [3, 0, 9], - "to": [6, 14, 10], + "__comment": "exhaust1", + "from": [6.67, 11.5, 1.8], + "to": [7.67, 12.5, 2.8], "faces": { - "down": {"uv": [6.5, 2.125, 6.875, 2.25], "texture": "#all"}, - "up": {"uv": [6.125, 2.125, 6.5, 2.25], "texture": "#all"}, - "north": {"uv": [6.125, 2.25, 6.5, 4], "texture": "#all"}, - "south": {"uv": [6.625, 2.25, 7, 4], "texture": "#all"}, - "west": {"uv": [6.5, 2.25, 6.625, 4], "texture": "#all"}, - "east": {"uv": [6, 2.25, 6.125, 4], "texture": "#all"} + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} } }, { - "__comment": "RGlassT", - "from": [10, 14, 10], - "to": [13, 15, 13], + "__comment": "exhaust3", + "from": [10, 11.5, 1.8], + "to": [11, 12.5, 2.8], "faces": { - "down": {"uv": [5.25, 2.125, 5.625, 2.5], "texture": "#all"}, - "up": {"uv": [4.875, 2.125, 5.25, 2.5], "texture": "#all"}, - "north": {"uv": [4.875, 2.5, 5.25, 2.625], "texture": "#all"}, - "south": {"uv": [5.625, 2.5, 6, 2.625], "texture": "#all"}, - "west": {"uv": [5.25, 2.5, 5.625, 2.625], "texture": "#all"}, - "east": {"uv": [4.5, 2.5, 4.875, 2.625], "texture": "#all"} + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} } }, { - "__comment": "RGlassL", - "from": [9, 0, 10], - "to": [10, 14, 13], + "__comment": "tank1", + "from": [9, 5, 9], + "to": [15, 16, 15], "faces": { - "down": {"uv": [0.5, 8.125, 0.625, 8.5], "texture": "#all"}, - "up": {"uv": [0.375, 8.125, 0.5, 8.5], "texture": "#all"}, - "north": {"uv": [0.375, 8.5, 0.5, 10.25], "texture": "#all"}, - "south": {"uv": [0.875, 8.5, 1, 10.25], "texture": "#all"}, - "west": {"uv": [0.5, 8.5, 0.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.5, 0.375, 10.25], "texture": "#all"} - } - }, - { - "__comment": "RGlassN", - "from": [10, 0, 9], - "to": [13, 14, 10], - "faces": { - "down": {"uv": [6.5, 2.125, 6.875, 2.25], "texture": "#all"}, - "up": {"uv": [6.125, 2.125, 6.5, 2.25], "texture": "#all"}, - "north": {"uv": [6.125, 2.25, 6.5, 4], "texture": "#all"}, - "south": {"uv": [6.625, 2.25, 7, 4], "texture": "#all"}, - "west": {"uv": [6.5, 2.25, 6.625, 4], "texture": "#all"}, - "east": {"uv": [6, 2.25, 6.125, 4], "texture": "#all"} - } - }, - { - "__comment": "LTopN", - "from": [3, 14, 9], - "to": [6, 15, 10], - "faces": { - "down": {"uv": [10.75, 0, 11.125, 0.125], "texture": "#all"}, - "up": {"uv": [10.375, 0, 10.75, 0.125], "texture": "#all"}, - "north": {"uv": [10.375, 0.125, 10.75, 0.25], "texture": "#all"}, - "south": {"uv": [10.875, 0.125, 11.25, 0.25], "texture": "#all"}, - "west": {"uv": [10.75, 0.125, 10.875, 0.25], "texture": "#all"}, - "east": {"uv": [10.25, 0.125, 10.375, 0.25], "texture": "#all"} - } - }, - { - "__comment": "RPanelSE", - "from": [13, 0, 13], - "to": [14, 15, 14], - "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} - } - }, - { - "__comment": "RGlassS", - "from": [10, 0, 13], - "to": [13, 14, 14], - "faces": { - "down": {"uv": [6.5, 2.125, 6.875, 2.25], "texture": "#all"}, - "up": {"uv": [6.125, 2.125, 6.5, 2.25], "texture": "#all"}, - "north": {"uv": [6.125, 2.25, 6.5, 4], "texture": "#all"}, - "south": {"uv": [6.625, 2.25, 7, 4], "texture": "#all"}, - "west": {"uv": [6.5, 2.25, 6.625, 4], "texture": "#all"}, - "east": {"uv": [6, 2.25, 6.125, 4], "texture": "#all"} - } - }, - { - "__comment": "LeftConnection", - "from": [1, 5, 6], - "to": [3, 9, 10], - "faces": { - "down": {"uv": [13, 0, 13.25, 0.5], "texture": "#all"}, - "up": {"uv": [12.75, 0, 13, 0.5], "texture": "#all"}, - "north": {"uv": [12.75, 0.5, 13, 1], "texture": "#all"}, - "south": {"uv": [13.5, 0.5, 13.75, 1], "texture": "#all"}, - "west": {"uv": [13, 0.5, 13.5, 1], "texture": "#all"}, - "east": {"uv": [12.25, 0.5, 12.75, 1], "texture": "#all"} - } - }, - { - "__comment": "RPanelNW", - "from": [9, 0, 9], - "to": [10, 15, 10], - "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} - } - }, - { - "__comment": "LPanelSW", - "from": [2, 0, 13], - "to": [3, 15, 14], - "faces": { - "down": {"uv": [10, 0, 10.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.875, 0, 10, 0.125], "texture": "#all"}, - "north": {"uv": [9.875, 0.125, 10, 2], "texture": "#all"}, - "south": {"uv": [10.125, 0.125, 10.25, 2], "texture": "#all"}, - "west": {"uv": [10, 0.125, 10.125, 2], "texture": "#all"}, - "east": {"uv": [9.75, 0.125, 9.875, 2], "texture": "#all"} - } - }, - { - "__comment": "LGlassT", - "from": [3, 14, 10], - "to": [6, 15, 13], - "faces": { - "down": {"uv": [5.25, 2.125, 5.625, 2.5], "texture": "#all"}, - "up": {"uv": [4.875, 2.125, 5.25, 2.5], "texture": "#all"}, - "north": {"uv": [4.875, 2.5, 5.25, 2.625], "texture": "#all"}, - "south": {"uv": [5.625, 2.5, 6, 2.625], "texture": "#all"}, - "west": {"uv": [5.25, 2.5, 5.625, 2.625], "texture": "#all"}, - "east": {"uv": [4.5, 2.5, 4.875, 2.625], "texture": "#all"} + "down": {"uv": [2.25, 2.625, 1.5, 3.375], "texture": "#all"}, + "up": {"uv": [1.5, 3.375, 0.75, 2.625], "texture": "#all"}, + "north": {"uv": [0.75, 3.375, 1.5, 4.75], "texture": "#all"}, + "south": {"uv": [2.25, 3.375, 3, 4.75], "texture": "#all"}, + "west": {"uv": [1.5, 3.375, 2.25, 4.75], "texture": "#all"}, + "east": {"uv": [0, 3.375, 0.75, 4.75], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chemical_infuser", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json b/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json index 5f54f707a..36f5c821a 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_oxidizer.json @@ -1,268 +1,138 @@ { "elements": [ { - "__comment": "Post", - "from": [3, 0, 7], - "to": [5, 4, 9], + "__comment": "stand", + "from": [8.5, 4, 1.5], + "to": [13.5, 5, 14.5], "faces": { - "down": {"uv": [0.5, 7.125, 0.75, 7.375], "texture": "#all"}, - "up": {"uv": [0.25, 7.125, 0.5, 7.375], "texture": "#all"}, - "north": {"uv": [0.25, 7.375, 0.5, 7.875], "texture": "#all"}, - "south": {"uv": [0.75, 7.375, 1, 7.875], "texture": "#all"}, - "west": {"uv": [0.5, 7.375, 0.75, 7.875], "texture": "#all"}, - "east": {"uv": [0, 7.375, 0.25, 7.875], "texture": "#all"} + "down": {"uv": [2.875, 2.5, 2.25, 4.125], "texture": "#all"}, + "up": {"uv": [2.25, 4.125, 1.625, 2.5], "texture": "#all"}, + "north": {"uv": [1.625, 4.125, 2.25, 4.25], "texture": "#all"}, + "south": {"uv": [3.875, 4.125, 4.5, 4.25], "texture": "#all"}, + "west": {"uv": [2.25, 4.125, 3.875, 4.25], "texture": "#all"}, + "east": {"uv": [0, 4.125, 1.625, 4.25], "texture": "#all"} } }, { - "__comment": "GasExit", - "from": [15, 4, 5], - "to": [16, 10, 11], + "__comment": "tower2", + "from": [8, 5, 7], + "to": [14, 16, 15], "faces": { - "down": {"uv": [0.875, 4.125, 1, 4.875], "texture": "#all"}, - "up": {"uv": [0.75, 4.125, 0.875, 4.875], "texture": "#all"}, - "north": {"uv": [0.75, 4.875, 0.875, 5.625], "texture": "#all"}, - "south": {"uv": [1.625, 4.875, 1.75, 5.625], "texture": "#all"}, - "west": {"uv": [0.875, 4.875, 1.625, 5.625], "texture": "#all"}, - "east": {"uv": [0, 4.875, 0.75, 5.625], "texture": "#all"} + "down": {"uv": [7, 2.5, 6.25, 3.5], "texture": "#all"}, + "up": {"uv": [6.25, 3.5, 5.5, 2.5], "texture": "#all"}, + "north": {"uv": [5.5, 3.5, 6.25, 4.875], "texture": "#all"}, + "south": {"uv": [7.25, 3.5, 8, 4.875], "texture": "#all"}, + "west": {"uv": [6.25, 3.5, 7.25, 4.875], "texture": "#all"}, + "east": {"uv": [4.5, 3.5, 5.5, 4.875], "texture": "#all"} } }, { - "__comment": "Base", - "from": [0, -1, 0], - "to": [16, 0, 16], + "__comment": "tower1", + "from": [8, 5, 1], + "to": [14, 16, 6], "faces": { - "down": {"uv": [4, 0, 6, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 4, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} + "down": {"uv": [8.125, 0, 7.375, 0.625], "texture": "#all"}, + "up": {"uv": [7.375, 0.625, 6.625, 0], "texture": "#all"}, + "north": {"uv": [6.625, 0.625, 7.375, 2], "texture": "#all"}, + "south": {"uv": [8, 0.625, 8.75, 2], "texture": "#all"}, + "west": {"uv": [7.375, 0.625, 8, 2], "texture": "#all"}, + "east": {"uv": [6, 0.625, 6.625, 2], "texture": "#all"} } }, { - "__comment": "GlassW", - "from": [7, 0, 5], - "to": [8, 14, 11], + "__comment": "pipe1", + "from": [7, 7, 9], + "to": [8, 10, 12], "faces": { - "down": {"uv": [0.875, 8.75, 1, 9.5], "texture": "#all"}, - "up": {"uv": [0.75, 8.75, 0.875, 9.5], "texture": "#all"}, - "north": {"uv": [0.75, 9.5, 0.875, 11.25], "texture": "#all"}, - "south": {"uv": [1.625, 9.5, 1.75, 11.25], "texture": "#all"}, - "west": {"uv": [0.875, 9.5, 1.625, 11.25], "texture": "#all"}, - "east": {"uv": [0, 9.5, 0.75, 11.25], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.5, 0.375], "texture": "#all"}, + "up": {"uv": [0.5, 0.375, 0.375, 0], "texture": "#all"}, + "north": {"uv": [0.375, 0.375, 0.5, 0.75], "texture": "#all"}, + "south": {"uv": [0.875, 0.375, 1, 0.75], "texture": "#all"}, + "west": {"uv": [0.5, 0.375, 0.875, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.375, 0.375, 0.75], "texture": "#all"} } }, { - "__comment": "TSSE", - "from": [14, 0, 11], - "to": [15, 15, 12], + "__comment": "tank", + "from": [0, 4, 0], + "to": [7, 16, 16], "faces": { - "down": {"uv": [0.25, 2.125, 0.375, 2.25], "texture": "#all"}, - "up": {"uv": [0.125, 2.125, 0.25, 2.25], "texture": "#all"}, - "north": {"uv": [0.125, 2.25, 0.25, 4.125], "texture": "#all"}, - "south": {"uv": [0.375, 2.25, 0.5, 4.125], "texture": "#all"}, - "west": {"uv": [0.25, 2.25, 0.375, 4.125], "texture": "#all"}, - "east": {"uv": [0, 2.25, 0.125, 4.125], "texture": "#all"} + "down": {"uv": [12, 0, 11.125, 2], "texture": "#all"}, + "up": {"uv": [11.125, 2, 10.25, 0], "texture": "#all"}, + "north": {"uv": [10.25, 2, 11.125, 3.5], "texture": "#all"}, + "south": {"uv": [13.125, 2, 14, 3.5], "texture": "#all"}, + "west": {"uv": [11.125, 2, 13.125, 3.5], "texture": "#all"}, + "east": {"uv": [8.25, 2, 10.25, 3.5], "texture": "#all"} } }, { - "__comment": "ItemEntry", - "from": [0, 3, 4], - "to": [1, 11, 12], + "__comment": "connectorToggle", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], "faces": { - "down": {"uv": [9.125, 0, 9.25, 1], "texture": "#all"}, - "up": {"uv": [9, 0, 9.125, 1], "texture": "#all"}, - "north": {"uv": [9, 1, 9.125, 2], "texture": "#all"}, - "south": {"uv": [10.125, 1, 10.25, 2], "texture": "#all"}, - "west": {"uv": [9.125, 1, 10.125, 2], "texture": "#all"}, - "east": {"uv": [8, 1, 9, 2], "texture": "#all"} + "down": {"uv": [9.25, 3.5, 9.125, 4.5], "texture": "#all"}, + "up": {"uv": [9.125, 4.5, 9, 3.5], "texture": "#all"}, + "north": {"uv": [9, 4.5, 9.125, 5.5], "texture": "#all"}, + "south": {"uv": [10.125, 4.5, 10.25, 5.5], "texture": "#all"}, + "west": {"uv": [9.125, 4.5, 10.125, 5.5], "texture": "#all"}, + "east": {"uv": [8, 4.5, 9, 5.5], "texture": "#all"} } }, { - "__comment": "TSNW", - "from": [7, 0, 4], - "to": [8, 15, 5], + "__comment": "bridge", + "from": [8.5, 5.5, 6], + "to": [13.5, 15.5, 7], "faces": { - "down": {"uv": [0.25, 2.125, 0.375, 2.25], "texture": "#all"}, - "up": {"uv": [0.125, 2.125, 0.25, 2.25], "texture": "#all"}, - "north": {"uv": [0.125, 2.25, 0.25, 4.125], "texture": "#all"}, - "south": {"uv": [0.375, 2.25, 0.5, 4.125], "texture": "#all"}, - "west": {"uv": [0.25, 2.25, 0.375, 4.125], "texture": "#all"}, - "east": {"uv": [0, 2.25, 0.125, 4.125], "texture": "#all"} + "down": {"uv": [10.125, 0, 9.5, 0.125], "texture": "#all"}, + "up": {"uv": [9.5, 0.125, 8.875, 0], "texture": "#all"}, + "north": {"uv": [8.875, 0.125, 9.5, 1.375], "texture": "#all"}, + "south": {"uv": [9.625, 0.125, 10.25, 1.375], "texture": "#all"}, + "west": {"uv": [9.5, 0.125, 9.625, 1.375], "texture": "#all"}, + "east": {"uv": [8.75, 0.125, 8.875, 1.375], "texture": "#all"} } }, { - "__comment": "GasConnection", - "from": [14, 5, 6], - "to": [15, 9, 10], + "__comment": "pipe2", + "from": [13, 5, 5], + "to": [15, 11, 11], "faces": { - "down": {"uv": [10.875, 0, 11, 0.5], "texture": "#all"}, - "up": {"uv": [10.75, 0, 10.875, 0.5], "texture": "#all"}, - "north": {"uv": [10.75, 0.5, 10.875, 1], "texture": "#all"}, - "south": {"uv": [11.375, 0.5, 11.5, 1], "texture": "#all"}, - "west": {"uv": [10.875, 0.5, 11.375, 1], "texture": "#all"}, - "east": {"uv": [10.25, 0.5, 10.75, 1], "texture": "#all"} + "down": {"uv": [11.5, 3.5, 11.25, 4.25], "texture": "#all"}, + "up": {"uv": [11.25, 4.25, 11, 3.5], "texture": "#all"}, + "north": {"uv": [11, 4.25, 11.25, 5], "texture": "#all"}, + "south": {"uv": [12, 4.25, 12.25, 5], "texture": "#all"}, + "west": {"uv": [11.25, 4.25, 12, 5], "texture": "#all"}, + "east": {"uv": [10.25, 4.25, 11, 5], "texture": "#all"} } }, { - "__comment": "TTW", - "from": [7, 14, 5], - "to": [8, 15, 11], + "__comment": "connector", + "from": [15, 3, 3], + "to": [16, 13, 13], "faces": { - "down": {"uv": [3.125, 2.125, 3.25, 2.875], "texture": "#all"}, - "up": {"uv": [3, 2.125, 3.125, 2.875], "texture": "#all"}, - "north": {"uv": [3, 2.875, 3.125, 3], "texture": "#all"}, - "south": {"uv": [3.875, 2.875, 4, 3], "texture": "#all"}, - "west": {"uv": [3.125, 2.875, 3.875, 3], "texture": "#all"}, - "east": {"uv": [2.25, 2.875, 3, 3], "texture": "#all"} + "down": {"uv": [1.5, 4.25, 1.375, 5.5], "texture": "#all"}, + "up": {"uv": [1.375, 5.5, 1.25, 4.25], "texture": "#all"}, + "north": {"uv": [1.25, 5.5, 1.375, 6.75], "texture": "#all"}, + "south": {"uv": [2.625, 5.5, 2.75, 6.75], "texture": "#all"}, + "west": {"uv": [1.375, 5.5, 2.625, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.5, 1.25, 6.75], "texture": "#all"} } }, { - "__comment": "Machine", - "from": [2, 4, 5], - "to": [6, 10, 11], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 4, 16], "faces": { - "down": {"uv": [1.25, 5.625, 1.75, 6.375], "texture": "#all"}, - "up": {"uv": [0.75, 5.625, 1.25, 6.375], "texture": "#all"}, - "north": {"uv": [0.75, 6.375, 1.25, 7.125], "texture": "#all"}, - "south": {"uv": [2, 6.375, 2.5, 7.125], "texture": "#all"}, - "west": {"uv": [1.25, 6.375, 2, 7.125], "texture": "#all"}, - "east": {"uv": [0, 6.375, 0.75, 7.125], "texture": "#all"} - } - }, - { - "__comment": "TTN", - "from": [8, 14, 4], - "to": [14, 15, 5], - "faces": { - "down": {"uv": [1.375, 2.125, 2.125, 2.25], "texture": "#all"}, - "up": {"uv": [0.625, 2.125, 1.375, 2.25], "texture": "#all"}, - "north": {"uv": [0.625, 2.25, 1.375, 2.375], "texture": "#all"}, - "south": {"uv": [1.5, 2.25, 2.25, 2.375], "texture": "#all"}, - "west": {"uv": [1.375, 2.25, 1.5, 2.375], "texture": "#all"}, - "east": {"uv": [0.5, 2.25, 0.625, 2.375], "texture": "#all"} - } - }, - { - "__comment": "GlassE", - "from": [14, 0, 5], - "to": [15, 14, 11], - "faces": { - "down": {"uv": [0.875, 8.75, 1, 9.5], "texture": "#all"}, - "up": {"uv": [0.75, 8.75, 0.875, 9.5], "texture": "#all"}, - "north": {"uv": [0.75, 9.5, 0.875, 11.25], "texture": "#all"}, - "south": {"uv": [1.625, 9.5, 1.75, 11.25], "texture": "#all"}, - "west": {"uv": [0.875, 9.5, 1.625, 11.25], "texture": "#all"}, - "east": {"uv": [0, 9.5, 0.75, 11.25], "texture": "#all"} - } - }, - { - "__comment": "TSSW", - "from": [7, 0, 11], - "to": [8, 15, 12], - "faces": { - "down": {"uv": [0.25, 2.125, 0.375, 2.25], "texture": "#all"}, - "up": {"uv": [0.125, 2.125, 0.25, 2.25], "texture": "#all"}, - "north": {"uv": [0.125, 2.25, 0.25, 4.125], "texture": "#all"}, - "south": {"uv": [0.375, 2.25, 0.5, 4.125], "texture": "#all"}, - "west": {"uv": [0.25, 2.25, 0.375, 4.125], "texture": "#all"}, - "east": {"uv": [0, 2.25, 0.125, 4.125], "texture": "#all"} - } - }, - { - "__comment": "TSNE", - "from": [14, 0, 4], - "to": [15, 15, 5], - "faces": { - "down": {"uv": [0.25, 2.125, 0.375, 2.25], "texture": "#all"}, - "up": {"uv": [0.125, 2.125, 0.25, 2.25], "texture": "#all"}, - "north": {"uv": [0.125, 2.25, 0.25, 4.125], "texture": "#all"}, - "south": {"uv": [0.375, 2.25, 0.5, 4.125], "texture": "#all"}, - "west": {"uv": [0.25, 2.25, 0.375, 4.125], "texture": "#all"}, - "east": {"uv": [0, 2.25, 0.125, 4.125], "texture": "#all"} - } - }, - { - "__comment": "Connection", - "from": [1, 5, 6], - "to": [8, 9, 10], - "faces": { - "down": {"uv": [5.375, 2.125, 6.25, 2.625], "texture": "#all"}, - "up": {"uv": [4.5, 2.125, 5.375, 2.625], "texture": "#all"}, - "north": {"uv": [4.5, 2.625, 5.375, 3.125], "texture": "#all"}, - "south": {"uv": [5.875, 2.625, 6.75, 3.125], "texture": "#all"}, - "west": {"uv": [5.375, 2.625, 5.875, 3.125], "texture": "#all"}, - "east": {"uv": [4, 2.625, 4.5, 3.125], "texture": "#all"} - } - }, - { - "__comment": "TTE", - "from": [14, 14, 5], - "to": [15, 15, 11], - "faces": { - "down": {"uv": [3.125, 2.125, 3.25, 2.875], "texture": "#all"}, - "up": {"uv": [3, 2.125, 3.125, 2.875], "texture": "#all"}, - "north": {"uv": [3, 2.875, 3.125, 3], "texture": "#all"}, - "south": {"uv": [3.875, 2.875, 4, 3], "texture": "#all"}, - "west": {"uv": [3.125, 2.875, 3.875, 3], "texture": "#all"}, - "east": {"uv": [2.25, 2.875, 3, 3], "texture": "#all"} - } - }, - { - "__comment": "GlassN", - "from": [8, 0, 4], - "to": [14, 14, 5], - "faces": { - "down": {"uv": [12.375, 0, 13.125, 0.125], "texture": "#all"}, - "up": {"uv": [11.625, 0, 12.375, 0.125], "texture": "#all"}, - "north": {"uv": [11.625, 0.125, 12.375, 1.875], "texture": "#all"}, - "south": {"uv": [12.5, 0.125, 13.25, 1.875], "texture": "#all"}, - "west": {"uv": [12.375, 0.125, 12.5, 1.875], "texture": "#all"}, - "east": {"uv": [11.5, 0.125, 11.625, 1.875], "texture": "#all"} - } - }, - { - "__comment": "GlassU", - "from": [8, 14, 5], - "to": [14, 15, 11], - "faces": { - "down": {"uv": [1.5, 7.875, 2.25, 8.625], "texture": "#all"}, - "up": {"uv": [0.75, 7.875, 1.5, 8.625], "texture": "#all"}, - "north": {"uv": [0.75, 8.625, 1.5, 8.75], "texture": "#all"}, - "south": {"uv": [2.25, 8.625, 3, 8.75], "texture": "#all"}, - "west": {"uv": [1.5, 8.625, 2.25, 8.75], "texture": "#all"}, - "east": {"uv": [0, 8.625, 0.75, 8.75], "texture": "#all"} - } - }, - { - "__comment": "GlassS", - "from": [8, 0, 11], - "to": [14, 14, 12], - "faces": { - "down": {"uv": [12.375, 0, 13.125, 0.125], "texture": "#all"}, - "up": {"uv": [11.625, 0, 12.375, 0.125], "texture": "#all"}, - "north": {"uv": [11.625, 0.125, 12.375, 1.875], "texture": "#all"}, - "south": {"uv": [12.5, 0.125, 13.25, 1.875], "texture": "#all"}, - "west": {"uv": [12.375, 0.125, 12.5, 1.875], "texture": "#all"}, - "east": {"uv": [11.5, 0.125, 11.625, 1.875], "texture": "#all"} - } - }, - { - "__comment": "TTS", - "from": [8, 14, 11], - "to": [14, 15, 12], - "faces": { - "down": {"uv": [1.375, 2.125, 2.125, 2.25], "texture": "#all"}, - "up": {"uv": [0.625, 2.125, 1.375, 2.25], "texture": "#all"}, - "north": {"uv": [0.625, 2.25, 1.375, 2.375], "texture": "#all"}, - "south": {"uv": [1.5, 2.25, 2.25, 2.375], "texture": "#all"}, - "west": {"uv": [1.375, 2.25, 1.5, 2.375], "texture": "#all"}, - "east": {"uv": [0.5, 2.25, 0.625, 2.375], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.5], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.5], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chemical_oxidizer", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_washer.json b/src/main/resources/assets/mekanism/models/block/chemical_washer.json index c80dccd03..17b65abf1 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_washer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_washer.json @@ -1,437 +1,307 @@ { "elements": [ { - "__comment": "IO2", - "from": [15, 3, 4], - "to": [16, 11, 12], + "__comment": "connectorRight", + "from": [1, 5, 8], + "to": [3, 11, 10], "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} + "down": {"uv": [0.75, 0.875, 0.5, 1.125], "texture": "#all"}, + "up": {"uv": [0.5, 1.125, 0.25, 0.875], "texture": "#all"}, + "north": {"uv": [0.25, 1.125, 0.5, 1.875], "texture": "#all"}, + "south": {"uv": [0.75, 1.125, 1, 1.875], "texture": "#all"}, + "west": {"uv": [0.5, 1.125, 0.75, 1.875], "texture": "#all"}, + "east": {"uv": [0, 1.125, 0.25, 1.875], "texture": "#all"} } }, { - "__comment": "Can2B", - "from": [2, 0, 10], - "to": [6, 1, 14], + "__comment": "tankBack", + "from": [0, 4, 10], + "to": [16, 14, 16], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [4.75, 2.5, 2.75, 3.25], "texture": "#all"}, + "up": {"uv": [2.75, 3.25, 0.75, 2.5], "texture": "#all"}, + "north": {"uv": [0.75, 3.25, 2.75, 4.5], "texture": "#all"}, + "south": {"uv": [3.5, 3.25, 5.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.75, 3.25, 3.5, 4.5], "texture": "#all"}, + "east": {"uv": [0, 3.25, 0.75, 4.5], "texture": "#all"} } }, { - "__comment": "Can1Side4", - "from": [10, 1, 11], - "to": [11, 3, 13], + "__comment": "tubeLeft1", + "from": [13, 13.5, 11], + "to": [14, 15.5, 12], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [4.125, 4.5, 4, 4.625], "texture": "#all"}, + "up": {"uv": [4, 4.625, 3.875, 4.5], "texture": "#all"}, + "north": {"uv": [3.875, 4.625, 4, 4.875], "texture": "#all"}, + "south": {"uv": [4.125, 4.625, 4.25, 4.875], "texture": "#all"}, + "west": {"uv": [4, 4.625, 4.125, 4.875], "texture": "#all"}, + "east": {"uv": [3.75, 4.625, 3.875, 4.875], "texture": "#all"} } }, { - "__comment": "Can1Side3", - "from": [13, 1, 11], - "to": [14, 3, 13], + "__comment": "tubeLeft2", + "from": [13, 14.5, 4], + "to": [14, 15.5, 12], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [5, 4.5, 4.875, 5.5], "texture": "#all"}, + "up": {"uv": [4.875, 5.5, 4.75, 4.5], "texture": "#all"}, + "north": {"uv": [4.75, 5.5, 4.875, 5.625], "texture": "#all"}, + "south": {"uv": [5.875, 5.5, 6, 5.625], "texture": "#all"}, + "west": {"uv": [4.875, 5.5, 5.875, 5.625], "texture": "#all"}, + "east": {"uv": [3.75, 5.5, 4.75, 5.625], "texture": "#all"} } }, { - "__comment": "Base6", - "from": [1, 4, 1], - "to": [15, 5, 15], + "__comment": "pipe1", + "from": [4.5, 10, 4.5], + "to": [11.5, 15, 11.5], "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} + "down": {"uv": [10.875, 1.125, 10, 2], "texture": "#all"}, + "up": {"uv": [10, 2, 9.125, 1.125], "texture": "#all"}, + "north": {"uv": [9.125, 2, 10, 2.625], "texture": "#all"}, + "south": {"uv": [10.875, 2, 11.75, 2.625], "texture": "#all"}, + "west": {"uv": [10, 2, 10.875, 2.625], "texture": "#all"}, + "east": {"uv": [8.25, 2, 9.125, 2.625], "texture": "#all"} } }, { - "__comment": "IO3", - "from": [2, 14, 4], - "to": [14, 15, 12], + "__comment": "pipe2", + "from": [4.51, 2, 4.5], + "to": [10.51, 10, 8.5], "faces": { - "down": {"uv": [2.5, 5.25, 4, 6.25], "texture": "#all"}, - "up": {"uv": [1, 5.25, 2.5, 6.25], "texture": "#all"}, - "north": {"uv": [1, 6.25, 2.5, 6.375], "texture": "#all"}, - "south": {"uv": [3.5, 6.25, 5, 6.375], "texture": "#all"}, - "west": {"uv": [2.5, 6.25, 3.5, 6.375], "texture": "#all"}, - "east": {"uv": [0, 6.25, 1, 6.375], "texture": "#all"} + "down": {"uv": [8.75, 2.625, 8, 3.125], "texture": "#all"}, + "up": {"uv": [8, 3.125, 7.25, 2.625], "texture": "#all"}, + "north": {"uv": [7.25, 3.125, 8, 4.125], "texture": "#all"}, + "south": {"uv": [8.5, 3.125, 9.25, 4.125], "texture": "#all"}, + "west": {"uv": [8, 3.125, 8.5, 4.125], "texture": "#all"}, + "east": {"uv": [6.75, 3.125, 7.25, 4.125], "texture": "#all"} } }, { - "__comment": "Can4Side3", - "from": [5, 1, 3], - "to": [6, 3, 5], + "__comment": "tankRight", + "from": [0, 4, 0], + "to": [7, 14, 8], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [2.75, 4.5, 1.875, 5.5], "texture": "#all"}, + "up": {"uv": [1.875, 5.5, 1, 4.5], "texture": "#all"}, + "north": {"uv": [1, 5.5, 1.875, 6.75], "texture": "#all"}, + "south": {"uv": [2.875, 5.5, 3.75, 6.75], "texture": "#all"}, + "west": {"uv": [1.875, 5.5, 2.875, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.5, 1, 6.75], "texture": "#all"} } }, { - "__comment": "Can1Side2", - "from": [10, 1, 10], - "to": [14, 3, 11], + "__comment": "tubeRight1", + "from": [1, 13, 1.5], + "to": [2, 15, 2.5], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [4.125, 4.875, 4, 5], "texture": "#all"}, + "up": {"uv": [4, 5, 3.875, 4.875], "texture": "#all"}, + "north": {"uv": [3.875, 5, 4, 5.25], "texture": "#all"}, + "south": {"uv": [4.125, 5, 4.25, 5.25], "texture": "#all"}, + "west": {"uv": [4, 5, 4.125, 5.25], "texture": "#all"}, + "east": {"uv": [3.75, 5, 3.875, 5.25], "texture": "#all"} } }, { - "__comment": "Can2Side3", - "from": [5, 1, 11], - "to": [6, 3, 13], + "__comment": "bridge4", + "from": [7, 6, 1], + "to": [9, 7, 2], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can4T", - "from": [2, 3, 2], - "to": [6, 4, 6], + "__comment": "connectorLeft", + "from": [13, 5, 8], + "to": [15, 11, 10], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.75, 0.875, 0.5, 1.125], "texture": "#all"}, + "up": {"uv": [0.5, 1.125, 0.25, 0.875], "texture": "#all"}, + "north": {"uv": [0.25, 1.125, 0.5, 1.875], "texture": "#all"}, + "south": {"uv": [0.75, 1.125, 1, 1.875], "texture": "#all"}, + "west": {"uv": [0.5, 1.125, 0.75, 1.875], "texture": "#all"}, + "east": {"uv": [0, 1.125, 0.25, 1.875], "texture": "#all"} } }, { - "__comment": "Base2", - "from": [1, 5, 14], - "to": [15, 15, 15], + "__comment": "tubeRight3", + "from": [1, 13, 5.5], + "to": [2, 15, 6.5], "faces": { - "down": {"uv": [10.875, 0, 12.625, 0.125], "texture": "#all"}, - "up": {"uv": [9.125, 0, 10.875, 0.125], "texture": "#all"}, - "north": {"uv": [9.125, 0.125, 10.875, 1.375], "texture": "#all"}, - "south": {"uv": [11, 0.125, 12.75, 1.375], "texture": "#all"}, - "west": {"uv": [10.875, 0.125, 11, 1.375], "texture": "#all"}, - "east": {"uv": [9, 0.125, 9.125, 1.375], "texture": "#all"} + "down": {"uv": [4.125, 4.875, 4, 5], "texture": "#all"}, + "up": {"uv": [4, 5, 3.875, 4.875], "texture": "#all"}, + "north": {"uv": [3.875, 5, 4, 5.25], "texture": "#all"}, + "south": {"uv": [4.125, 5, 4.25, 5.25], "texture": "#all"}, + "west": {"uv": [4, 5, 4.125, 5.25], "texture": "#all"}, + "east": {"uv": [3.75, 5, 3.875, 5.25], "texture": "#all"} } }, { - "__comment": "Can2Side4", - "from": [2, 1, 11], - "to": [3, 3, 13], + "__comment": "tankLeft", + "from": [9, 4, 0], + "to": [16, 14, 8], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [2.75, 4.5, 1.875, 5.5], "texture": "#all"}, + "up": {"uv": [1.875, 5.5, 1, 4.5], "texture": "#all"}, + "north": {"uv": [1, 5.5, 1.875, 6.75], "texture": "#all"}, + "south": {"uv": [2.875, 5.5, 3.75, 6.75], "texture": "#all"}, + "west": {"uv": [1.875, 5.5, 2.875, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.5, 1, 6.75], "texture": "#all"} } }, { - "__comment": "Can3Side3", - "from": [13, 1, 3], - "to": [14, 3, 5], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 4, 16], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.5], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.5], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} } }, { - "__comment": "IO1", - "from": [0, 3, 4], - "to": [1, 11, 12], + "__comment": "conduit", + "from": [7, 3.5, 3], + "to": [9, 4.5, 5], "faces": { - "down": {"uv": [2.25, 2.125, 2.375, 3.125], "texture": "#all"}, - "up": {"uv": [2.125, 2.125, 2.25, 3.125], "texture": "#all"}, - "north": {"uv": [2.125, 3.125, 2.25, 4.125], "texture": "#all"}, - "south": {"uv": [3.25, 3.125, 3.375, 4.125], "texture": "#all"}, - "west": {"uv": [2.25, 3.125, 3.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.125, 3.125, 2.125, 4.125], "texture": "#all"} + "down": {"uv": [0.75, 0.375, 0.5, 0.625], "texture": "#all"}, + "up": {"uv": [0.5, 0.625, 0.25, 0.375], "texture": "#all"}, + "north": {"uv": [0.25, 0.625, 0.5, 0.75], "texture": "#all"}, + "south": {"uv": [0.75, 0.625, 1, 0.75], "texture": "#all"}, + "west": {"uv": [0.5, 0.625, 0.75, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.25, 0.75], "texture": "#all"} } }, { - "__comment": "Can4Sjde4", - "from": [2, 1, 3], - "to": [3, 3, 5], + "__comment": "portTop", + "from": [3, 15, 3], + "to": [13, 16, 13], "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} + "down": {"uv": [10.375, 4.125, 9.125, 5.375], "texture": "#all"}, + "up": {"uv": [9.125, 5.375, 7.875, 4.125], "texture": "#all"}, + "north": {"uv": [7.875, 5.375, 9.125, 5.5], "texture": "#all"}, + "south": {"uv": [10.375, 5.375, 11.625, 5.5], "texture": "#all"}, + "west": {"uv": [9.125, 5.375, 10.375, 5.5], "texture": "#all"}, + "east": {"uv": [6.625, 5.375, 7.875, 5.5], "texture": "#all"} } }, { - "__comment": "Can1Side1", - "from": [10, 1, 13], - "to": [14, 3, 14], + "__comment": "bridge1", + "from": [7, 12, 1], + "to": [9, 13, 2], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can2Side1", - "from": [2, 1, 13], - "to": [6, 3, 14], + "__comment": "bridge3", + "from": [7, 8, 1], + "to": [9, 9, 2], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can4Side2", - "from": [2, 1, 2], - "to": [6, 3, 3], + "__comment": "tubeRight2", + "from": [1, 13, 3.5], + "to": [2, 15, 4.5], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [4.125, 4.875, 4, 5], "texture": "#all"}, + "up": {"uv": [4, 5, 3.875, 4.875], "texture": "#all"}, + "north": {"uv": [3.875, 5, 4, 5.25], "texture": "#all"}, + "south": {"uv": [4.125, 5, 4.25, 5.25], "texture": "#all"}, + "west": {"uv": [4, 5, 4.125, 5.25], "texture": "#all"}, + "east": {"uv": [3.75, 5, 3.875, 5.25], "texture": "#all"} } }, { - "__comment": "Can4B", - "from": [2, 0, 2], - "to": [6, 1, 6], + "__comment": "bridge2", + "from": [7, 10, 1], + "to": [9, 11, 2], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Can4Side1", - "from": [2, 1, 5], - "to": [6, 3, 6], + "__comment": "portRight", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} + "down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"}, + "up": {"uv": [7.125, 1, 7, 0], "texture": "#all"}, + "north": {"uv": [7, 1, 7.125, 2], "texture": "#all"}, + "south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"}, + "west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"}, + "east": {"uv": [6, 1, 7, 2], "texture": "#all"} } }, { - "__comment": "Base4", - "from": [14, 5, 2], - "to": [15, 15, 14], + "__comment": "portLeft", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], "faces": { - "down": {"uv": [10.625, 1.5, 10.75, 3], "texture": "#all"}, - "up": {"uv": [10.5, 1.5, 10.625, 3], "texture": "#all"}, - "north": {"uv": [10.5, 3, 10.625, 4.25], "texture": "#all"}, - "south": {"uv": [12.125, 3, 12.25, 4.25], "texture": "#all"}, - "west": {"uv": [10.625, 3, 12.125, 4.25], "texture": "#all"}, - "east": {"uv": [9, 3, 10.5, 4.25], "texture": "#all"} + "down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"}, + "up": {"uv": [7.125, 1, 7, 0], "texture": "#all"}, + "north": {"uv": [7, 1, 7.125, 2], "texture": "#all"}, + "south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"}, + "west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"}, + "east": {"uv": [6, 1, 7, 2], "texture": "#all"} } }, { - "__comment": "Can1T", - "from": [10, 3, 10], - "to": [14, 4, 14], + "__comment": "tubeLeft3", + "from": [13, 12.5, 4], + "to": [14, 14.5, 5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} + "down": {"uv": [4.125, 4.5, 4, 4.625], "texture": "#all"}, + "up": {"uv": [4, 4.625, 3.875, 4.5], "texture": "#all"}, + "north": {"uv": [3.875, 4.625, 4, 4.875], "texture": "#all"}, + "south": {"uv": [4.125, 4.625, 4.25, 4.875], "texture": "#all"}, + "west": {"uv": [4, 4.625, 4.125, 4.875], "texture": "#all"}, + "east": {"uv": [3.75, 4.625, 3.875, 4.875], "texture": "#all"} } }, { - "__comment": "Can2T", - "from": [2, 3, 10], - "to": [6, 4, 14], + "__comment": "pipe2b", + "from": [10.49, 2, 4.5], + "to": [11.49, 10, 8.5], "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can3Side4", - "from": [10, 1, 3], - "to": [11, 3, 5], - "faces": { - "down": {"uv": [0.375, 0, 0.5, 0.25], "texture": "#all"}, - "up": {"uv": [0.25, 0, 0.375, 0.25], "texture": "#all"}, - "north": {"uv": [0.25, 0.25, 0.375, 0.5], "texture": "#all"}, - "south": {"uv": [0.625, 0.25, 0.75, 0.5], "texture": "#all"}, - "west": {"uv": [0.375, 0.25, 0.625, 0.5], "texture": "#all"}, - "east": {"uv": [0, 0.25, 0.25, 0.5], "texture": "#all"} - } - }, - { - "__comment": "Can3Side1", - "from": [10, 1, 5], - "to": [14, 3, 6], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Base5", - "from": [1, 5, 2], - "to": [2, 15, 14], - "faces": { - "down": {"uv": [10.625, 1.5, 10.75, 3], "texture": "#all"}, - "up": {"uv": [10.5, 1.5, 10.625, 3], "texture": "#all"}, - "north": {"uv": [10.5, 3, 10.625, 4.25], "texture": "#all"}, - "south": {"uv": [12.125, 3, 12.25, 4.25], "texture": "#all"}, - "west": {"uv": [10.625, 3, 12.125, 4.25], "texture": "#all"}, - "east": {"uv": [9, 3, 10.5, 4.25], "texture": "#all"} - } - }, - { - "__comment": "Can3T", - "from": [10, 3, 2], - "to": [14, 4, 6], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can3B", - "from": [10, 0, 2], - "to": [14, 1, 6], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can1B", - "from": [10, 0, 10], - "to": [14, 1, 14], - "faces": { - "down": {"uv": [1, 0, 1.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0, 1, 0.5], "texture": "#all"}, - "north": {"uv": [0.5, 0.5, 1, 0.625], "texture": "#all"}, - "south": {"uv": [1.5, 0.5, 2, 0.625], "texture": "#all"}, - "west": {"uv": [1, 0.5, 1.5, 0.625], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "Can2Side2", - "from": [2, 1, 10], - "to": [6, 3, 11], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Base3", - "from": [1, 5, 1], - "to": [15, 15, 2], - "faces": { - "down": {"uv": [10.875, 0, 12.625, 0.125], "texture": "#all"}, - "up": {"uv": [9.125, 0, 10.875, 0.125], "texture": "#all"}, - "north": {"uv": [9.125, 0.125, 10.875, 1.375], "texture": "#all"}, - "south": {"uv": [11, 0.125, 12.75, 1.375], "texture": "#all"}, - "west": {"uv": [10.875, 0.125, 11, 1.375], "texture": "#all"}, - "east": {"uv": [9, 0.125, 9.125, 1.375], "texture": "#all"} - } - }, - { - "__comment": "Can3Side2", - "from": [10, 1, 2], - "to": [14, 3, 3], - "faces": { - "down": {"uv": [0.625, 0, 1.125, 0.125], "texture": "#all"}, - "up": {"uv": [0.125, 0, 0.625, 0.125], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.625, 0.375], "texture": "#all"}, - "south": {"uv": [0.75, 0.125, 1.25, 0.375], "texture": "#all"}, - "west": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.375], "texture": "#all"} - } - }, - { - "__comment": "Base", - "from": [1, -1, 1], - "to": [15, 0, 15], - "faces": { - "down": {"uv": [5.5, 0, 7.25, 1.75], "texture": "#all"}, - "up": {"uv": [3.75, 0, 5.5, 1.75], "texture": "#all"}, - "north": {"uv": [3.75, 1.75, 5.5, 1.875], "texture": "#all"}, - "south": {"uv": [7.25, 1.75, 9, 1.875], "texture": "#all"}, - "west": {"uv": [5.5, 1.75, 7.25, 1.875], "texture": "#all"}, - "east": {"uv": [2, 1.75, 3.75, 1.875], "texture": "#all"} + "down": {"uv": [6.25, 2.625, 6.125, 3.125], "texture": "#all"}, + "up": {"uv": [6.125, 3.125, 6, 2.625], "texture": "#all"}, + "north": {"uv": [6, 3.125, 6.125, 4.125], "texture": "#all"}, + "south": {"uv": [6.625, 3.125, 6.75, 4.125], "texture": "#all"}, + "west": {"uv": [6.125, 3.125, 6.625, 4.125], "texture": "#all"}, + "east": {"uv": [5.5, 3.125, 6, 4.125], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/chemical_washer", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/cube_colour.json b/src/main/resources/assets/mekanism/models/block/cube_colour.json new file mode 100644 index 000000000..a70133b66 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/cube_colour.json @@ -0,0 +1,16 @@ +{ + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#all", "tintindex": 0, "cullface": "down" }, + "up": { "texture": "#all", "tintindex": 0, "cullface": "up" }, + "north": { "texture": "#all", "tintindex": 0, "cullface": "north" }, + "south": { "texture": "#all", "tintindex": 0, "cullface": "south" }, + "west": { "texture": "#all", "tintindex": 0, "cullface": "west" }, + "east": { "texture": "#all", "tintindex": 0, "cullface": "east" } + } + } + ] +} + diff --git a/src/main/resources/assets/mekanism/models/block/digital_miner.json b/src/main/resources/assets/mekanism/models/block/digital_miner.json index 84ed0be00..98d07ae74 100644 --- a/src/main/resources/assets/mekanism/models/block/digital_miner.json +++ b/src/main/resources/assets/mekanism/models/block/digital_miner.json @@ -1,484 +1,731 @@ { "elements": [ { - "__comment": "ToeLeft2", - "from": [3.5, -5, 25.5], - "to": [6.5, 1, 28.5], + "__comment": "supportBeam2", + "from": [26, 2, 22], + "to": [30, 30, 30], "faces": { - "down": {"uv": [3.125, 11.125, 3.3125, 11.3125], "texture": "#all"}, - "up": {"uv": [2.9375, 11.125, 3.125, 11.3125], "texture": "#all"}, - "north": {"uv": [2.9375, 11.3125, 3.125, 11.6875], "texture": "#all"}, - "south": {"uv": [3.3125, 11.3125, 3.5, 11.6875], "texture": "#all"}, - "west": {"uv": [3.125, 11.3125, 3.3125, 11.6875], "texture": "#all"}, - "east": {"uv": [2.75, 11.3125, 2.9375, 11.6875], "texture": "#all"} + "down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"}, + "up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"}, + "north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"}, + "south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"}, + "west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"}, + "east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"} } }, { - "__comment": "LaserBase", - "from": [3, 6, 3], - "to": [13, 11, 13], + "__comment": "supportBeam1", + "from": [26, 2, -7], + "to": [30, 30, 1], "faces": { - "down": {"uv": [1.25, 6.125, 1.875, 6.75], "texture": "#all"}, - "up": {"uv": [0.625, 6.125, 1.25, 6.75], "texture": "#all"}, - "north": {"uv": [0.625, 6.75, 1.25, 7.0625], "texture": "#all"}, - "south": {"uv": [1.875, 6.75, 2.5, 7.0625], "texture": "#all"}, - "west": {"uv": [1.25, 6.75, 1.875, 7.0625], "texture": "#all"}, - "east": {"uv": [0, 6.75, 0.625, 7.0625], "texture": "#all"} + "down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"}, + "up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"}, + "north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"}, + "south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"}, + "west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"}, + "east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"} } }, { - "__comment": "RightBackUpperLeg", - "from": [24.5, 5, -7.95556], - "to": [29.5, 17, -6.95556], + "__comment": "keyboardSupportExt2", + "from": [10, 9, -14], + "to": [11, 10, -13], "faces": { - "down": {"uv": [5.25, 3.375, 5.5625, 3.4375], "texture": "#all"}, - "up": {"uv": [4.9375, 3.375, 5.25, 3.4375], "texture": "#all"}, - "north": {"uv": [4.9375, 3.4375, 5.25, 4.1875], "texture": "#all"}, - "south": {"uv": [5.3125, 3.4375, 5.625, 4.1875], "texture": "#all"}, - "west": {"uv": [5.25, 3.4375, 5.3125, 4.1875], "texture": "#all"}, - "east": {"uv": [4.875, 3.4375, 4.9375, 4.1875], "texture": "#all"} + "down": {"uv": [8.8125, 1.625, 8.75, 1.6875], "texture": "#all"}, + "up": {"uv": [8.75, 1.6875, 8.6875, 1.625], "texture": "#all"}, + "north": {"uv": [8.6875, 1.6875, 8.75, 1.75], "texture": "#all"}, + "south": {"uv": [8.8125, 1.6875, 8.875, 1.75], "texture": "#all"}, + "west": {"uv": [8.75, 1.6875, 8.8125, 1.75], "texture": "#all"}, + "east": {"uv": [8.625, 1.6875, 8.6875, 1.75], "texture": "#all"} } }, { - "__comment": "RightBackLowerLeg", - "from": [25, 1, -8.5], - "to": [29, 7, -6.5], + "__comment": "powerCable3", + "from": [22, 5, 5], + "to": [31, 11, 11], "faces": { - "down": {"uv": [5.25, 4.25, 5.5, 4.375], "texture": "#all"}, - "up": {"uv": [5, 4.25, 5.25, 4.375], "texture": "#all"}, - "north": {"uv": [5, 4.375, 5.25, 4.75], "texture": "#all"}, - "south": {"uv": [5.375, 4.375, 5.625, 4.75], "texture": "#all"}, - "west": {"uv": [5.25, 4.375, 5.375, 4.75], "texture": "#all"}, - "east": {"uv": [4.875, 4.375, 5, 4.75], "texture": "#all"} + "down": {"uv": [4.125, 6.8125, 3.5625, 7.1875], "texture": "#all"}, + "up": {"uv": [3.5625, 7.1875, 3, 6.8125], "texture": "#all"}, + "north": {"uv": [3, 7.1875, 3.5625, 7.5625], "texture": "#all"}, + "south": {"uv": [3.9375, 7.1875, 4.5, 7.5625], "texture": "#all"}, + "west": {"uv": [3.5625, 7.1875, 3.9375, 7.5625], "texture": "#all"}, + "east": {"uv": [2.625, 7.1875, 3, 7.5625], "texture": "#all"} } }, { - "__comment": "ToeTopLeft2", - "from": [9.5, 3, 25.5], - "to": [12.5, 4, 28.5], + "__comment": "foot4", + "from": [-15, 0, -8], + "to": [-8, 2, 2], "faces": { - "down": {"uv": [2.3125, 11.125, 2.5, 11.3125], "texture": "#all"}, - "up": {"uv": [2.125, 11.125, 2.3125, 11.3125], "texture": "#all"}, - "north": {"uv": [2.125, 11.3125, 2.3125, 11.375], "texture": "#all"}, - "south": {"uv": [2.5, 11.3125, 2.6875, 11.375], "texture": "#all"}, - "west": {"uv": [2.3125, 11.3125, 2.5, 11.375], "texture": "#all"}, - "east": {"uv": [1.9375, 11.3125, 2.125, 11.375], "texture": "#all"} + "down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"}, + "up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"}, + "north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"}, + "south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"}, + "west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"}, + "east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"} } }, { - "__comment": "Laser3", - "from": [3.5, 2, 10.5], - "to": [5.5, 6, 12.5], + "__comment": "powerConnector2b", + "from": [-9, 4, 4], + "to": [-8, 12, 12], "faces": { - "down": {"uv": [2.4375, 2.6875, 2.5625, 2.8125], "texture": "#all"}, - "up": {"uv": [2.3125, 2.6875, 2.4375, 2.8125], "texture": "#all"}, - "north": {"uv": [2.3125, 2.8125, 2.4375, 3.0625], "texture": "#all"}, - "south": {"uv": [2.5625, 2.8125, 2.6875, 3.0625], "texture": "#all"}, - "west": {"uv": [2.4375, 2.8125, 2.5625, 3.0625], "texture": "#all"}, - "east": {"uv": [2.1875, 2.8125, 2.3125, 3.0625], "texture": "#all"} + "down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"}, + "up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"}, + "north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"}, + "south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"}, + "west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"}, + "east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"} } }, { - "__comment": "LeftBackUpperLeg", - "from": [24.5, 5, 23.04444], - "to": [29.5, 17, 24.04444], + "__comment": "frame2c", + "from": [-8, 15, 4], + "to": [24, 20, 19], "faces": { - "down": {"uv": [5.25, 5.6875, 5.5625, 5.75], "texture": "#all"}, - "up": {"uv": [4.9375, 5.6875, 5.25, 5.75], "texture": "#all"}, - "north": {"uv": [4.9375, 5.75, 5.25, 6.5], "texture": "#all"}, - "south": {"uv": [5.3125, 5.75, 5.625, 6.5], "texture": "#all"}, - "west": {"uv": [5.25, 5.75, 5.3125, 6.5], "texture": "#all"}, - "east": {"uv": [4.875, 5.75, 4.9375, 6.5], "texture": "#all"} + "down": {"uv": [12.8125, 3.125, 10.8125, 4.0625], "texture": "#all"}, + "up": {"uv": [10.8125, 4.0625, 8.8125, 3.125], "texture": "#all"}, + "north": {"uv": [8.8125, 4.0625, 10.8125, 4.375], "texture": "#all"}, + "south": {"uv": [11.75, 4.0625, 13.75, 4.375], "texture": "#all"}, + "west": {"uv": [10.8125, 4.0625, 11.75, 4.375], "texture": "#all"}, + "east": {"uv": [7.875, 4.0625, 8.8125, 4.375], "texture": "#all"} } }, { - "__comment": "LeftBackFoot", - "from": [24, -1, 21], - "to": [32, 1, 26], + "__comment": "frame1", + "from": [-8, 3, -9], + "to": [24, 32, 3], "faces": { - "down": {"uv": [7, 5, 7.5, 5.3125], "texture": "#all"}, - "up": {"uv": [6.5, 5, 7, 5.3125], "texture": "#all"}, - "north": {"uv": [6.5, 5.3125, 7, 5.4375], "texture": "#all"}, - "south": {"uv": [7.3125, 5.3125, 7.8125, 5.4375], "texture": "#all"}, - "west": {"uv": [7, 5.3125, 7.3125, 5.4375], "texture": "#all"}, - "east": {"uv": [6.1875, 5.3125, 6.5, 5.4375], "texture": "#all"} + "down": {"uv": [4.75, 0, 2.75, 0.75], "texture": "#all"}, + "up": {"uv": [2.75, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 2.75, 2.5625], "texture": "#all"}, + "south": {"uv": [3.5, 0.75, 5.5, 2.5625], "texture": "#all"}, + "west": {"uv": [2.75, 0.75, 3.5, 2.5625], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 2.5625], "texture": "#all"} } }, { - "__comment": "Laser4", - "from": [3.5, 2, 3.5], - "to": [5.5, 6, 5.5], + "__comment": "foot1", + "from": [24, 0, -8], + "to": [31, 2, 2], "faces": { - "down": {"uv": [2.4375, 2.6875, 2.5625, 2.8125], "texture": "#all"}, - "up": {"uv": [2.3125, 2.6875, 2.4375, 2.8125], "texture": "#all"}, - "north": {"uv": [2.3125, 2.8125, 2.4375, 3.0625], "texture": "#all"}, - "south": {"uv": [2.5625, 2.8125, 2.6875, 3.0625], "texture": "#all"}, - "west": {"uv": [2.4375, 2.8125, 2.5625, 3.0625], "texture": "#all"}, - "east": {"uv": [2.1875, 2.8125, 2.3125, 3.0625], "texture": "#all"} + "down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"}, + "up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"}, + "north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"}, + "south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"}, + "west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"}, + "east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"} } }, { - "__comment": "UpperLegLeft", - "from": [6, 18, 17], - "to": [10, 23, 30], + "__comment": "bracket4", + "from": [24, 24, 29], + "to": [29, 29, 31], "faces": { - "down": {"uv": [1.0625, 11.8125, 1.3125, 12.625], "texture": "#all"}, - "up": {"uv": [0.8125, 11.8125, 1.0625, 12.625], "texture": "#all"}, - "north": {"uv": [0.8125, 12.625, 1.0625, 12.9375], "texture": "#all"}, - "south": {"uv": [1.875, 12.625, 2.125, 12.9375], "texture": "#all"}, - "west": {"uv": [1.0625, 12.625, 1.875, 12.9375], "texture": "#all"}, - "east": {"uv": [0, 12.625, 0.8125, 12.9375], "texture": "#all"} + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} } }, { - "__comment": "RightBackFoot", - "from": [24, -1, -10], - "to": [32, 1, -5], + "__comment": "powerCpnnector3a", + "from": [31, 4, 4], + "to": [32, 12, 12], "faces": { - "down": {"uv": [7, 2.6875, 7.5, 3], "texture": "#all"}, - "up": {"uv": [6.5, 2.6875, 7, 3], "texture": "#all"}, - "north": {"uv": [6.5, 3, 7, 3.125], "texture": "#all"}, - "south": {"uv": [7.3125, 3, 7.8125, 3.125], "texture": "#all"}, - "west": {"uv": [7, 3, 7.3125, 3.125], "texture": "#all"}, - "east": {"uv": [6.1875, 3, 6.5, 3.125], "texture": "#all"} + "down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"}, + "up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"}, + "north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"}, + "south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"}, + "west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"}, + "east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"} } }, { - "__comment": "LegHoldRight2", - "from": [4, 18, -10], - "to": [6, 21, 2], + "__comment": "led2", + "from": [2, 15.533333, -12.9], + "to": [3, 16.533333, -11.9], "faces": { - "down": {"uv": [0.875, 9.125, 1, 9.875], "texture": "#all"}, - "up": {"uv": [0.75, 9.125, 0.875, 9.875], "texture": "#all"}, - "north": {"uv": [0.75, 9.875, 0.875, 10.0625], "texture": "#all"}, - "south": {"uv": [1.625, 9.875, 1.75, 10.0625], "texture": "#all"}, - "west": {"uv": [0.875, 9.875, 1.625, 10.0625], "texture": "#all"}, - "east": {"uv": [0, 9.875, 0.75, 10.0625], "texture": "#all"} + "down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"}, + "up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"}, + "north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"}, + "south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"}, + "west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"}, + "east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"} } }, { - "__comment": "ToeTopLeft1", - "from": [4, 3, 25.5], - "to": [7, 4, 28.5], + "__comment": "powerCable1b", + "from": [5, 1, 5], + "to": [11, 4, 11], "faces": { - "down": {"uv": [2.3125, 11.125, 2.5, 11.3125], "texture": "#all"}, - "up": {"uv": [2.125, 11.125, 2.3125, 11.3125], "texture": "#all"}, - "north": {"uv": [2.125, 11.3125, 2.3125, 11.375], "texture": "#all"}, - "south": {"uv": [2.5, 11.3125, 2.6875, 11.375], "texture": "#all"}, - "west": {"uv": [2.3125, 11.3125, 2.5, 11.375], "texture": "#all"}, - "east": {"uv": [1.9375, 11.3125, 2.125, 11.375], "texture": "#all"} + "down": {"uv": [7, 3.25, 6.625, 3.625], "texture": "#all"}, + "up": {"uv": [6.625, 3.625, 6.25, 3.25], "texture": "#all"}, + "north": {"uv": [6.25, 3.625, 6.625, 3.8125], "texture": "#all"}, + "south": {"uv": [7, 3.625, 7.375, 3.8125], "texture": "#all"}, + "west": {"uv": [6.625, 3.625, 7, 3.8125], "texture": "#all"}, + "east": {"uv": [5.875, 3.625, 6.25, 3.8125], "texture": "#all"} } }, { - "__comment": "Back", - "from": [15, 10, -1], - "to": [32, 30, 17], + "__comment": "led1", + "from": [17, 15.5, -12.9], + "to": [18, 16.5, -11.9], "faces": { - "down": {"uv": [7, 0, 8.0625, 1.125], "texture": "#all"}, - "up": {"uv": [5.9375, 0, 7, 1.125], "texture": "#all"}, - "north": {"uv": [5.9375, 1.125, 7, 2.375], "texture": "#all"}, - "south": {"uv": [8.125, 1.125, 9.1875, 2.375], "texture": "#all"}, - "west": {"uv": [7, 1.125, 8.125, 2.375], "texture": "#all"}, - "east": {"uv": [4.8125, 1.125, 5.9375, 2.375], "texture": "#all"} + "down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"}, + "up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"}, + "north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"}, + "south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"}, + "west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"}, + "east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"} } }, { - "__comment": "UpperLegRight", - "from": [6, 18, -14], - "to": [10, 23, -1], + "__comment": "monitor1", + "from": [16, 16, -13], + "to": [30, 26, -11], "faces": { - "down": {"uv": [2.375, 7.125, 2.625, 7.9375], "texture": "#all"}, - "up": {"uv": [2.125, 7.125, 2.375, 7.9375], "texture": "#all"}, - "north": {"uv": [2.125, 7.9375, 2.375, 8.25], "texture": "#all"}, - "south": {"uv": [3.1875, 7.9375, 3.4375, 8.25], "texture": "#all"}, - "west": {"uv": [2.375, 7.9375, 3.1875, 8.25], "texture": "#all"}, - "east": {"uv": [1.3125, 7.9375, 2.125, 8.25], "texture": "#all"} + "down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"}, + "up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"}, + "north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"}, + "south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"}, + "west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"}, + "east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"} } }, { - "__comment": "FootBaseLeft", - "from": [4, -1, 25], - "to": [12, 1, 32], + "__comment": "foot2", + "from": [24, 0, 21], + "to": [31, 2, 31], "faces": { - "down": {"uv": [0.9375, 11.125, 1.4375, 11.5625], "texture": "#all"}, - "up": {"uv": [0.4375, 11.125, 0.9375, 11.5625], "texture": "#all"}, - "north": {"uv": [0.4375, 11.5625, 0.9375, 11.6875], "texture": "#all"}, - "south": {"uv": [1.375, 11.5625, 1.875, 11.6875], "texture": "#all"}, - "west": {"uv": [0.9375, 11.5625, 1.375, 11.6875], "texture": "#all"}, - "east": {"uv": [0, 11.5625, 0.4375, 11.6875], "texture": "#all"} + "down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"}, + "up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"}, + "north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"}, + "south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"}, + "west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"}, + "east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"} } }, { - "__comment": "LegLeft", - "from": [5, 1, 27], - "to": [11, 27, 31], + "__comment": "monitorBar1", + "from": [13.5, 20, -11.2], + "to": [17.5, 22, -10.2], "faces": { - "down": {"uv": [2.8125, 11.8125, 3.1875, 12.0625], "texture": "#all"}, - "up": {"uv": [2.4375, 11.8125, 2.8125, 12.0625], "texture": "#all"}, - "north": {"uv": [2.4375, 12.0625, 2.8125, 13.6875], "texture": "#all"}, - "south": {"uv": [3.0625, 12.0625, 3.4375, 13.6875], "texture": "#all"}, - "west": {"uv": [2.8125, 12.0625, 3.0625, 13.6875], "texture": "#all"}, - "east": {"uv": [2.1875, 12.0625, 2.4375, 13.6875], "texture": "#all"} + "down": {"uv": [7.6875, 2.25, 7.4375, 2.3125], "texture": "#all"}, + "up": {"uv": [7.4375, 2.3125, 7.1875, 2.25], "texture": "#all"}, + "north": {"uv": [7.1875, 2.3125, 7.4375, 2.4375], "texture": "#all"}, + "south": {"uv": [7.5, 2.3125, 7.75, 2.4375], "texture": "#all"}, + "west": {"uv": [7.4375, 2.3125, 7.5, 2.4375], "texture": "#all"}, + "east": {"uv": [7.125, 2.3125, 7.1875, 2.4375], "texture": "#all"} } }, { - "__comment": "LegHoldRight1", - "from": [10, 18, -10], - "to": [12, 21, 2], + "__comment": "monitor2", + "from": [1, 16, -13], + "to": [15, 26, -11], "faces": { - "down": {"uv": [0.875, 9.125, 1, 9.875], "texture": "#all"}, - "up": {"uv": [0.75, 9.125, 0.875, 9.875], "texture": "#all"}, - "north": {"uv": [0.75, 9.875, 0.875, 10.0625], "texture": "#all"}, - "south": {"uv": [1.625, 9.875, 1.75, 10.0625], "texture": "#all"}, - "west": {"uv": [0.875, 9.875, 1.625, 10.0625], "texture": "#all"}, - "east": {"uv": [0, 9.875, 0.75, 10.0625], "texture": "#all"} + "down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"}, + "up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"}, + "north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"}, + "south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"}, + "west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"}, + "east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"} } }, { - "__comment": "LeftAxil", - "from": [25, 12, 17], - "to": [29, 16, 23], + "__comment": "powerCable1a", + "from": [5, 2, -6], + "to": [11, 4, 5], "faces": { - "down": {"uv": [5.5, 5, 5.75, 5.375], "texture": "#all"}, - "up": {"uv": [5.25, 5, 5.5, 5.375], "texture": "#all"}, - "north": {"uv": [5.25, 5.375, 5.5, 5.625], "texture": "#all"}, - "south": {"uv": [5.875, 5.375, 6.125, 5.625], "texture": "#all"}, - "west": {"uv": [5.5, 5.375, 5.875, 5.625], "texture": "#all"}, - "east": {"uv": [4.875, 5.375, 5.25, 5.625], "texture": "#all"} + "down": {"uv": [6.9375, 2.4375, 6.5625, 3.125], "texture": "#all"}, + "up": {"uv": [6.5625, 3.125, 6.1875, 2.4375], "texture": "#all"}, + "north": {"uv": [6.1875, 3.125, 6.5625, 3.25], "texture": "#all"}, + "south": {"uv": [7.25, 3.125, 7.625, 3.25], "texture": "#all"}, + "west": {"uv": [6.5625, 3.125, 7.25, 3.25], "texture": "#all"}, + "east": {"uv": [5.5, 3.125, 6.1875, 3.25], "texture": "#all"} } }, { - "__comment": "ToeRight1", - "from": [9.5, -5, -12.5], - "to": [12.5, 1, -9.5], + "__comment": "core", + "from": [-7, 4, 3], + "to": [23, 31, 20], "faces": { - "down": {"uv": [2.5625, 8.375, 2.75, 8.5625], "texture": "#all"}, - "up": {"uv": [2.375, 8.375, 2.5625, 8.5625], "texture": "#all"}, - "north": {"uv": [2.375, 8.5625, 2.5625, 8.9375], "texture": "#all"}, - "south": {"uv": [2.75, 8.5625, 2.9375, 8.9375], "texture": "#all"}, - "west": {"uv": [2.5625, 8.5625, 2.75, 8.9375], "texture": "#all"}, - "east": {"uv": [2.1875, 8.5625, 2.375, 8.9375], "texture": "#all"} + "down": {"uv": [4.8125, 2.5625, 2.9375, 3.625], "texture": "#all"}, + "up": {"uv": [2.9375, 3.625, 1.0625, 2.5625], "texture": "#all"}, + "north": {"uv": [1.0625, 3.625, 2.9375, 5.3125], "texture": "#all"}, + "south": {"uv": [4, 3.625, 5.875, 5.3125], "texture": "#all"}, + "west": {"uv": [2.9375, 3.625, 4, 5.3125], "texture": "#all"}, + "east": {"uv": [0, 3.625, 1.0625, 5.3125], "texture": "#all"} } }, { - "__comment": "LegHoldLeft1", - "from": [10, 18, 14], - "to": [12, 21, 26], + "__comment": "bracketPlate3", + "from": [-9, 24, -6], + "to": [-8, 29, 0], "faces": { - "down": {"uv": [0.875, 13, 1, 13.75], "texture": "#all"}, - "up": {"uv": [0.75, 13, 0.875, 13.75], "texture": "#all"}, - "north": {"uv": [0.75, 13.75, 0.875, 13.9375], "texture": "#all"}, - "south": {"uv": [1.625, 13.75, 1.75, 13.9375], "texture": "#all"}, - "west": {"uv": [0.875, 13.75, 1.625, 13.9375], "texture": "#all"}, - "east": {"uv": [0, 13.75, 0.75, 13.9375], "texture": "#all"} + "down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"}, + "up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"}, + "north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"}, + "south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"}, + "west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"}, + "east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"} } }, { - "__comment": "RightAxil", - "from": [25, 12, -7], - "to": [29, 16, -1], + "__comment": "keyboardBottom", + "from": [4, 8.5, -13.5], + "to": [12, 12.5, -12.5], "faces": { - "down": {"uv": [5.5, 2.6875, 5.75, 3.0625], "texture": "#all"}, - "up": {"uv": [5.25, 2.6875, 5.5, 3.0625], "texture": "#all"}, - "north": {"uv": [5.25, 3.0625, 5.5, 3.3125], "texture": "#all"}, - "south": {"uv": [5.875, 3.0625, 6.125, 3.3125], "texture": "#all"}, - "west": {"uv": [5.5, 3.0625, 5.875, 3.3125], "texture": "#all"}, - "east": {"uv": [4.875, 3.0625, 5.25, 3.3125], "texture": "#all"} + "down": {"uv": [8.5625, 1.625, 8.0625, 1.6875], "texture": "#all"}, + "up": {"uv": [8.0625, 1.6875, 7.5625, 1.625], "texture": "#all"}, + "north": {"uv": [7.5625, 1.6875, 8.0625, 1.9375], "texture": "#all"}, + "south": {"uv": [8.125, 1.6875, 8.625, 1.9375], "texture": "#all"}, + "west": {"uv": [8.0625, 1.6875, 8.125, 1.9375], "texture": "#all"}, + "east": {"uv": [7.5, 1.6875, 7.5625, 1.9375], "texture": "#all"} } }, { - "__comment": "ToeTopRight1", - "from": [4, 3, -12.5], - "to": [7, 4, -9.5], + "__comment": "bracket3", + "from": [24, 24, 21], + "to": [29, 29, 23], "faces": { - "down": {"uv": [1.6875, 8.375, 1.875, 8.5625], "texture": "#all"}, - "up": {"uv": [1.5, 8.375, 1.6875, 8.5625], "texture": "#all"}, - "north": {"uv": [1.5, 8.5625, 1.6875, 8.625], "texture": "#all"}, - "south": {"uv": [1.875, 8.5625, 2.0625, 8.625], "texture": "#all"}, - "west": {"uv": [1.6875, 8.5625, 1.875, 8.625], "texture": "#all"}, - "east": {"uv": [1.3125, 8.5625, 1.5, 8.625], "texture": "#all"} + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} } }, { - "__comment": "PanelStem", - "from": [-6, 21, 6], - "to": [1, 25, 10], + "__comment": "monitorMount1", + "from": [10, 20, -11], + "to": [12, 22, -9], "faces": { - "down": {"uv": [0.6875, 4.4375, 1.125, 4.6875], "texture": "#all"}, - "up": {"uv": [0.25, 4.4375, 0.6875, 4.6875], "texture": "#all"}, - "north": {"uv": [0.25, 4.6875, 0.6875, 4.9375], "texture": "#all"}, - "south": {"uv": [0.9375, 4.6875, 1.375, 4.9375], "texture": "#all"}, - "west": {"uv": [0.6875, 4.6875, 0.9375, 4.9375], "texture": "#all"}, - "east": {"uv": [0, 4.6875, 0.25, 4.9375], "texture": "#all"} + "down": {"uv": [7.5, 2, 7.375, 2.125], "texture": "#all"}, + "up": {"uv": [7.375, 2.125, 7.25, 2], "texture": "#all"}, + "north": {"uv": [7.25, 2.125, 7.375, 2.25], "texture": "#all"}, + "south": {"uv": [7.5, 2.125, 7.625, 2.25], "texture": "#all"}, + "west": {"uv": [7.375, 2.125, 7.5, 2.25], "texture": "#all"}, + "east": {"uv": [7.125, 2.125, 7.25, 2.25], "texture": "#all"} } }, { - "__comment": "Keyboard", - "from": [-9, 11.5, 3], - "to": [-4, 12.5, 13], + "__comment": "monitor3back", + "from": [-13, 18, -11], + "to": [-1, 24, -10], "faces": { - "down": {"uv": [0.9375, 5.375, 1.25, 6], "texture": "#all"}, - "up": {"uv": [0.625, 5.375, 0.9375, 6], "texture": "#all"}, - "north": {"uv": [0.625, 6, 0.9375, 6.0625], "texture": "#all"}, - "south": {"uv": [1.5625, 6, 1.875, 6.0625], "texture": "#all"}, - "west": {"uv": [0.9375, 6, 1.5625, 6.0625], "texture": "#all"}, - "east": {"uv": [0, 6, 0.625, 6.0625], "texture": "#all"} + "down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"}, + "up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"}, + "north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"}, + "south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"}, + "west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"}, + "east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"} } }, { - "__comment": "LeftBackLowerLeg", - "from": [25, 1, 22.5], - "to": [29, 7, 24.5], + "__comment": "bracket2", + "from": [24, 24, 0], + "to": [29, 29, 2], "faces": { - "down": {"uv": [5.25, 6.5625, 5.5, 6.6875], "texture": "#all"}, - "up": {"uv": [5, 6.5625, 5.25, 6.6875], "texture": "#all"}, - "north": {"uv": [5, 6.6875, 5.25, 7.0625], "texture": "#all"}, - "south": {"uv": [5.375, 6.6875, 5.625, 7.0625], "texture": "#all"}, - "west": {"uv": [5.25, 6.6875, 5.375, 7.0625], "texture": "#all"}, - "east": {"uv": [4.875, 6.6875, 5, 7.0625], "texture": "#all"} + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} } }, { - "__comment": "Laser1", - "from": [10.5, 2, 10.5], - "to": [12.5, 6, 12.5], + "__comment": "foot3", + "from": [-15, 0, 21], + "to": [-8, 2, 31], "faces": { - "down": {"uv": [2.4375, 2.6875, 2.5625, 2.8125], "texture": "#all"}, - "up": {"uv": [2.3125, 2.6875, 2.4375, 2.8125], "texture": "#all"}, - "north": {"uv": [2.3125, 2.8125, 2.4375, 3.0625], "texture": "#all"}, - "south": {"uv": [2.5625, 2.8125, 2.6875, 3.0625], "texture": "#all"}, - "west": {"uv": [2.4375, 2.8125, 2.5625, 3.0625], "texture": "#all"}, - "east": {"uv": [2.1875, 2.8125, 2.3125, 3.0625], "texture": "#all"} + "down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"}, + "up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"}, + "north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"}, + "south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"}, + "west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"}, + "east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"} } }, { - "__comment": "ToeRight2", - "from": [3.5, -5, -12.5], - "to": [6.5, 1, -9.5], + "__comment": "keyboardSupport1", + "from": [10, 9, -13], + "to": [11, 11, -9], "faces": { - "down": {"uv": [2.5625, 8.375, 2.75, 8.5625], "texture": "#all"}, - "up": {"uv": [2.375, 8.375, 2.5625, 8.5625], "texture": "#all"}, - "north": {"uv": [2.375, 8.5625, 2.5625, 8.9375], "texture": "#all"}, - "south": {"uv": [2.75, 8.5625, 2.9375, 8.9375], "texture": "#all"}, - "west": {"uv": [2.5625, 8.5625, 2.75, 8.9375], "texture": "#all"}, - "east": {"uv": [2.1875, 8.5625, 2.375, 8.9375], "texture": "#all"} + "down": {"uv": [9.25, 1.25, 9.1875, 1.5], "texture": "#all"}, + "up": {"uv": [9.1875, 1.5, 9.125, 1.25], "texture": "#all"}, + "north": {"uv": [9.125, 1.5, 9.1875, 1.625], "texture": "#all"}, + "south": {"uv": [9.4375, 1.5, 9.5, 1.625], "texture": "#all"}, + "west": {"uv": [9.1875, 1.5, 9.4375, 1.625], "texture": "#all"}, + "east": {"uv": [8.875, 1.5, 9.125, 1.625], "texture": "#all"} } }, { - "__comment": "Base", - "from": [0, 9, -2], - "to": [18, 31, 18], + "__comment": "bracketPlate2", + "from": [24, 24, 23], + "to": [25, 29, 29], "faces": { - "down": {"uv": [2.375, 0, 3.5, 1.25], "texture": "#all"}, - "up": {"uv": [1.25, 0, 2.375, 1.25], "texture": "#all"}, - "north": {"uv": [1.25, 1.25, 2.375, 2.625], "texture": "#all"}, - "south": {"uv": [3.625, 1.25, 4.75, 2.625], "texture": "#all"}, - "west": {"uv": [2.375, 1.25, 3.625, 2.625], "texture": "#all"}, - "east": {"uv": [0, 1.25, 1.25, 2.625], "texture": "#all"} + "down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"}, + "up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"}, + "north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"}, + "south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"}, + "west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"}, + "east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"} } }, { - "__comment": "LegHoldLeft2", - "from": [4, 18, 14], - "to": [6, 21, 26], + "__comment": "powerConnector1", + "from": [4, 0, 4], + "to": [12, 1, 12], "faces": { - "down": {"uv": [0.875, 13, 1, 13.75], "texture": "#all"}, - "up": {"uv": [0.75, 13, 0.875, 13.75], "texture": "#all"}, - "north": {"uv": [0.75, 13.75, 0.875, 13.9375], "texture": "#all"}, - "south": {"uv": [1.625, 13.75, 1.75, 13.9375], "texture": "#all"}, - "west": {"uv": [0.875, 13.75, 1.625, 13.9375], "texture": "#all"}, - "east": {"uv": [0, 13.75, 0.75, 13.9375], "texture": "#all"} + "down": {"uv": [7.375, 3.8125, 6.875, 4.3125], "texture": "#all"}, + "up": {"uv": [6.875, 4.3125, 6.375, 3.8125], "texture": "#all"}, + "north": {"uv": [6.375, 4.3125, 6.875, 4.375], "texture": "#all"}, + "south": {"uv": [7.375, 4.3125, 7.875, 4.375], "texture": "#all"}, + "west": {"uv": [6.875, 4.3125, 7.375, 4.375], "texture": "#all"}, + "east": {"uv": [5.875, 4.3125, 6.375, 4.375], "texture": "#all"} } }, { - "__comment": "FootBaseRight", - "from": [4, -1, -16], - "to": [12, 1, -9], + "__comment": "bracketPlate1", + "from": [24, 24, -6], + "to": [25, 29, 0], "faces": { - "down": {"uv": [0.9375, 10.125, 1.4375, 10.5625], "texture": "#all"}, - "up": {"uv": [0.4375, 10.125, 0.9375, 10.5625], "texture": "#all"}, - "north": {"uv": [0.4375, 10.5625, 0.9375, 10.6875], "texture": "#all"}, - "south": {"uv": [1.375, 10.5625, 1.875, 10.6875], "texture": "#all"}, - "west": {"uv": [0.9375, 10.5625, 1.375, 10.6875], "texture": "#all"}, - "east": {"uv": [0, 10.5625, 0.4375, 10.6875], "texture": "#all"} + "down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"}, + "up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"}, + "north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"}, + "south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"}, + "west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"}, + "east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"} } }, { - "__comment": "Laser2", - "from": [10.5, 2, 3.5], - "to": [12.5, 6, 5.5], + "__comment": "monitorMount2", + "from": [4, 20, -11], + "to": [6, 22, -9], "faces": { - "down": {"uv": [2.4375, 2.6875, 2.5625, 2.8125], "texture": "#all"}, - "up": {"uv": [2.3125, 2.6875, 2.4375, 2.8125], "texture": "#all"}, - "north": {"uv": [2.3125, 2.8125, 2.4375, 3.0625], "texture": "#all"}, - "south": {"uv": [2.5625, 2.8125, 2.6875, 3.0625], "texture": "#all"}, - "west": {"uv": [2.4375, 2.8125, 2.5625, 3.0625], "texture": "#all"}, - "east": {"uv": [2.1875, 2.8125, 2.3125, 3.0625], "texture": "#all"} + "down": {"uv": [7.5, 2, 7.375, 2.125], "texture": "#all"}, + "up": {"uv": [7.375, 2.125, 7.25, 2], "texture": "#all"}, + "north": {"uv": [7.25, 2.125, 7.375, 2.25], "texture": "#all"}, + "south": {"uv": [7.5, 2.125, 7.625, 2.25], "texture": "#all"}, + "west": {"uv": [7.375, 2.125, 7.5, 2.25], "texture": "#all"}, + "east": {"uv": [7.125, 2.125, 7.25, 2.25], "texture": "#all"} } }, { - "__comment": "LegRight", - "from": [5, 1, -15], - "to": [11, 27, -11], + "__comment": "powerConnector3b", + "from": [24, 4, 4], + "to": [25, 12, 12], "faces": { - "down": {"uv": [0.625, 7.125, 1, 7.375], "texture": "#all"}, - "up": {"uv": [0.25, 7.125, 0.625, 7.375], "texture": "#all"}, - "north": {"uv": [0.25, 7.375, 0.625, 9], "texture": "#all"}, - "south": {"uv": [0.875, 7.375, 1.25, 9], "texture": "#all"}, - "west": {"uv": [0.625, 7.375, 0.875, 9], "texture": "#all"}, - "east": {"uv": [0, 7.375, 0.25, 9], "texture": "#all"} + "down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"}, + "up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"}, + "north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"}, + "south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"}, + "west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"}, + "east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"} } }, { - "__comment": "Panel", - "from": [-7, 17, 0.5], - "to": [-5, 29, 15.5], + "__comment": "frame2a", + "from": [-8, 27, 4], + "to": [24, 32, 19], "faces": { - "down": {"uv": [1.0625, 2.6875, 1.1875, 3.625], "texture": "#all"}, - "up": {"uv": [0.9375, 2.6875, 1.0625, 3.625], "texture": "#all"}, - "north": {"uv": [0.9375, 3.625, 1.0625, 4.375], "texture": "#all"}, - "south": {"uv": [2, 3.625, 2.125, 4.375], "texture": "#all"}, - "west": {"uv": [1.0625, 3.625, 2, 4.375], "texture": "#all"}, - "east": {"uv": [0, 3.625, 0.9375, 4.375], "texture": "#all"} + "down": {"uv": [10.4375, 0, 8.4375, 0.9375], "texture": "#all"}, + "up": {"uv": [8.4375, 0.9375, 6.4375, 0], "texture": "#all"}, + "north": {"uv": [6.4375, 0.9375, 8.4375, 1.25], "texture": "#all"}, + "south": {"uv": [9.375, 0.9375, 11.375, 1.25], "texture": "#all"}, + "west": {"uv": [8.4375, 0.9375, 9.375, 1.25], "texture": "#all"}, + "east": {"uv": [5.5, 0.9375, 6.4375, 1.25], "texture": "#all"} } }, { - "__comment": "KeyboardStem", - "from": [-6, 14, 6], - "to": [1, 15, 10], + "__comment": "bracket5", + "from": [-13, 24, -8], + "to": [-8, 29, -6], "faces": { - "down": {"uv": [0.6875, 5, 1.125, 5.25], "texture": "#all"}, - "up": {"uv": [0.25, 5, 0.6875, 5.25], "texture": "#all"}, - "north": {"uv": [0.25, 5.25, 0.6875, 5.3125], "texture": "#all"}, - "south": {"uv": [0.9375, 5.25, 1.375, 5.3125], "texture": "#all"}, - "west": {"uv": [0.6875, 5.25, 0.9375, 5.3125], "texture": "#all"}, - "east": {"uv": [0, 5.25, 0.25, 5.3125], "texture": "#all"} + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} } }, { - "__comment": "ToeLeft1", - "from": [9.5, -5, 25.5], - "to": [12.5, 1, 28.5], + "__comment": "keyboard", + "from": [3, 8, -14], + "to": [13, 13, -13], "faces": { - "down": {"uv": [3.125, 11.125, 3.3125, 11.3125], "texture": "#all"}, - "up": {"uv": [2.9375, 11.125, 3.125, 11.3125], "texture": "#all"}, - "north": {"uv": [2.9375, 11.3125, 3.125, 11.6875], "texture": "#all"}, - "south": {"uv": [3.3125, 11.3125, 3.5, 11.6875], "texture": "#all"}, - "west": {"uv": [3.125, 11.3125, 3.3125, 11.6875], "texture": "#all"}, - "east": {"uv": [2.75, 11.3125, 2.9375, 11.6875], "texture": "#all"} + "down": {"uv": [8.8125, 1.25, 8.1875, 1.3125], "texture": "#all"}, + "up": {"uv": [8.1875, 1.3125, 7.5625, 1.25], "texture": "#all"}, + "north": {"uv": [7.5625, 1.3125, 8.1875, 1.625], "texture": "#all"}, + "south": {"uv": [8.25, 1.3125, 8.875, 1.625], "texture": "#all"}, + "west": {"uv": [8.1875, 1.3125, 8.25, 1.625], "texture": "#all"}, + "east": {"uv": [7.5, 1.3125, 7.5625, 1.625], "texture": "#all"} } }, { - "__comment": "ToeTopRight2", - "from": [9.5, 3, -12.5], - "to": [12.5, 4, -9.5], + "__comment": "bracketPlate4", + "from": [-9, 24, 23], + "to": [-8, 29, 29], "faces": { - "down": {"uv": [1.6875, 8.375, 1.875, 8.5625], "texture": "#all"}, - "up": {"uv": [1.5, 8.375, 1.6875, 8.5625], "texture": "#all"}, - "north": {"uv": [1.5, 8.5625, 1.6875, 8.625], "texture": "#all"}, - "south": {"uv": [1.875, 8.5625, 2.0625, 8.625], "texture": "#all"}, - "west": {"uv": [1.6875, 8.5625, 1.875, 8.625], "texture": "#all"}, - "east": {"uv": [1.3125, 8.5625, 1.5, 8.625], "texture": "#all"} + "down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"}, + "up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"}, + "north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"}, + "south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"}, + "west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"}, + "east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"} + } + }, + { + "__comment": "monitorBar2", + "from": [-1.5, 20, -11.2], + "to": [2.5, 22, -10.2], + "faces": { + "down": {"uv": [7.6875, 2.25, 7.4375, 2.3125], "texture": "#all"}, + "up": {"uv": [7.4375, 2.3125, 7.1875, 2.25], "texture": "#all"}, + "north": {"uv": [7.1875, 2.3125, 7.4375, 2.4375], "texture": "#all"}, + "south": {"uv": [7.5, 2.3125, 7.75, 2.4375], "texture": "#all"}, + "west": {"uv": [7.4375, 2.3125, 7.5, 2.4375], "texture": "#all"}, + "east": {"uv": [7.125, 2.3125, 7.1875, 2.4375], "texture": "#all"} + } + }, + { + "__comment": "monitor1back", + "from": [17, 18, -11], + "to": [29, 24, -10], + "faces": { + "down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"}, + "up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"}, + "north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"}, + "south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"}, + "west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"}, + "east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"} + } + }, + { + "__comment": "bracket8", + "from": [-13, 24, 29], + "to": [-8, 29, 31], + "faces": { + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} + } + }, + { + "__comment": "led3", + "from": [-13, 15.5, -12.9], + "to": [-12, 16.5, -11.9], + "faces": { + "down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"}, + "up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"}, + "north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"}, + "south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"}, + "west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"}, + "east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"} + } + }, + { + "__comment": "plate5", + "from": [-8, 3, 4], + "to": [24, 8, 19], + "faces": { + "down": {"uv": [10.4375, 5.625, 8.4375, 6.5625], "texture": "#all"}, + "up": {"uv": [8.4375, 6.5625, 6.4375, 5.625], "texture": "#all"}, + "north": {"uv": [6.4375, 6.5625, 8.4375, 6.875], "texture": "#all"}, + "south": {"uv": [9.375, 6.5625, 11.375, 6.875], "texture": "#all"}, + "west": {"uv": [8.4375, 6.5625, 9.375, 6.875], "texture": "#all"}, + "east": {"uv": [5.5, 6.5625, 6.4375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "bracket7", + "from": [-13, 24, 21], + "to": [-8, 29, 23], + "faces": { + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} + } + }, + { + "__comment": "supportBeam3", + "from": [-14, 2, -7], + "to": [-10, 30, 1], + "faces": { + "down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"}, + "up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"}, + "north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"}, + "south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"}, + "west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"}, + "east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"} + } + }, + { + "__comment": "powerConnector2a", + "from": [-16, 4, 4], + "to": [-15, 12, 12], + "faces": { + "down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"}, + "up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"}, + "north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"}, + "south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"}, + "west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"}, + "east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"} + } + }, + { + "__comment": "keyboardSupport2", + "from": [5, 9, -13], + "to": [6, 11, -9], + "faces": { + "down": {"uv": [9.25, 1.25, 9.1875, 1.5], "texture": "#all"}, + "up": {"uv": [9.1875, 1.5, 9.125, 1.25], "texture": "#all"}, + "north": {"uv": [9.125, 1.5, 9.1875, 1.625], "texture": "#all"}, + "south": {"uv": [9.4375, 1.5, 9.5, 1.625], "texture": "#all"}, + "west": {"uv": [9.1875, 1.5, 9.4375, 1.625], "texture": "#all"}, + "east": {"uv": [8.875, 1.5, 9.125, 1.625], "texture": "#all"} + } + }, + { + "__comment": "powerCable2", + "from": [-15, 5, 5], + "to": [-6, 11, 11], + "faces": { + "down": {"uv": [4.125, 6.8125, 3.5625, 7.1875], "texture": "#all"}, + "up": {"uv": [3.5625, 7.1875, 3, 6.8125], "texture": "#all"}, + "north": {"uv": [3, 7.1875, 3.5625, 7.5625], "texture": "#all"}, + "south": {"uv": [3.9375, 7.1875, 4.5, 7.5625], "texture": "#all"}, + "west": {"uv": [3.5625, 7.1875, 3.9375, 7.5625], "texture": "#all"}, + "east": {"uv": [2.625, 7.1875, 3, 7.5625], "texture": "#all"} + } + }, + { + "__comment": "monitor2back", + "from": [2, 18, -11], + "to": [14, 24, -10], + "faces": { + "down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"}, + "up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"}, + "north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"}, + "south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"}, + "west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"}, + "east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"} + } + }, + { + "__comment": "bracket6", + "from": [-13, 24, 0], + "to": [-8, 29, 2], + "faces": { + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} + } + }, + { + "__comment": "monitor3", + "from": [-14, 16, -13], + "to": [0, 26, -11], + "faces": { + "down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"}, + "up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"}, + "north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"}, + "south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"}, + "west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"}, + "east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"} + } + }, + { + "__comment": "keyboardSupportExt1", + "from": [5, 9, -14], + "to": [6, 10, -13], + "faces": { + "down": {"uv": [8.8125, 1.625, 8.75, 1.6875], "texture": "#all"}, + "up": {"uv": [8.75, 1.6875, 8.6875, 1.625], "texture": "#all"}, + "north": {"uv": [8.6875, 1.6875, 8.75, 1.75], "texture": "#all"}, + "south": {"uv": [8.8125, 1.6875, 8.875, 1.75], "texture": "#all"}, + "west": {"uv": [8.75, 1.6875, 8.8125, 1.75], "texture": "#all"}, + "east": {"uv": [8.625, 1.6875, 8.6875, 1.75], "texture": "#all"} + } + }, + { + "__comment": "frame2b", + "from": [-8, 21, 4], + "to": [24, 26, 19], + "faces": { + "down": {"uv": [12.8125, 3.125, 10.8125, 4.0625], "texture": "#all"}, + "up": {"uv": [10.8125, 4.0625, 8.8125, 3.125], "texture": "#all"}, + "north": {"uv": [8.8125, 4.0625, 10.8125, 4.375], "texture": "#all"}, + "south": {"uv": [11.75, 4.0625, 13.75, 4.375], "texture": "#all"}, + "west": {"uv": [10.8125, 4.0625, 11.75, 4.375], "texture": "#all"}, + "east": {"uv": [7.875, 4.0625, 8.8125, 4.375], "texture": "#all"} + } + }, + { + "__comment": "supportBeam4", + "from": [-14, 2, 22], + "to": [-10, 30, 30], + "faces": { + "down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"}, + "up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"}, + "north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"}, + "south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"}, + "west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"}, + "east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"} + } + }, + { + "__comment": "bracket1", + "from": [24, 24, -8], + "to": [29, 29, -6], + "faces": { + "down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"}, + "up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"}, + "north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"}, + "south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"}, + "west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"}, + "east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"} + } + }, + { + "__comment": "frame2d", + "from": [-8, 9, 4], + "to": [24, 14, 19], + "faces": { + "down": {"uv": [10.4375, 4.375, 8.4375, 5.3125], "texture": "#all"}, + "up": {"uv": [8.4375, 5.3125, 6.4375, 4.375], "texture": "#all"}, + "north": {"uv": [6.4375, 5.3125, 8.4375, 5.625], "texture": "#all"}, + "south": {"uv": [9.375, 5.3125, 11.375, 5.625], "texture": "#all"}, + "west": {"uv": [8.4375, 5.3125, 9.375, 5.625], "texture": "#all"}, + "east": {"uv": [5.5, 5.3125, 6.4375, 5.625], "texture": "#all"} + } + }, + { + "__comment": "frame3", + "from": [-8, 3, 20], + "to": [24, 32, 32], + "faces": { + "down": {"uv": [4.75, 0, 2.75, 0.75], "texture": "#all"}, + "up": {"uv": [2.75, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 2.75, 2.5625], "texture": "#all"}, + "south": {"uv": [3.5, 0.75, 5.5, 2.5625], "texture": "#all"}, + "west": {"uv": [2.75, 0.75, 3.5, 2.5625], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 2.5625], "texture": "#all"} } } ], diff --git a/src/main/resources/assets/mekanism/models/block/electric_pump.json b/src/main/resources/assets/mekanism/models/block/electric_pump.json index b61d39437..b72815ce5 100644 --- a/src/main/resources/assets/mekanism/models/block/electric_pump.json +++ b/src/main/resources/assets/mekanism/models/block/electric_pump.json @@ -1,159 +1,263 @@ { "elements": [ { - "__comment": "Ring1", - "from": [4, 10, 4], - "to": [12, 11, 12], + "__comment": "pumpCasing", + "from": [4.5, 1, 4.5], + "to": [11.5, 13, 11.5], "faces": { - "down": {"uv": [4, 8.75, 6, 10.75], "texture": "#all"}, - "up": {"uv": [2, 8.75, 4, 10.75], "texture": "#all"}, - "north": {"uv": [2, 10.75, 4, 11], "texture": "#all"}, - "south": {"uv": [6, 10.75, 8, 11], "texture": "#all"}, - "west": {"uv": [4, 10.75, 6, 11], "texture": "#all"}, - "east": {"uv": [0, 10.75, 2, 11], "texture": "#all"} + "down": {"uv": [2.625, 0, 1.75, 0.875], "texture": "#all"}, + "up": {"uv": [1.75, 0.875, 0.875, 0], "texture": "#all"}, + "north": {"uv": [0.875, 0.875, 1.75, 2.375], "texture": "#all"}, + "south": {"uv": [2.625, 0.875, 3.5, 2.375], "texture": "#all"}, + "west": {"uv": [1.75, 0.875, 2.625, 2.375], "texture": "#all"}, + "east": {"uv": [0, 0.875, 0.875, 2.375], "texture": "#all"} } }, { - "__comment": "Axil2", - "from": [6, 4, 3.5], - "to": [10, 6, 15.5], + "__comment": "pipeToggleRingBack", + "from": [4.5, 4.5, 13], + "to": [11.5, 11.5, 14], "faces": { - "down": {"uv": [4, 0, 5, 3], "texture": "#all"}, - "up": {"uv": [3, 0, 4, 3], "texture": "#all"}, - "north": {"uv": [3, 3, 4, 3.5], "texture": "#all"}, - "south": {"uv": [7, 3, 8, 3.5], "texture": "#all"}, - "west": {"uv": [4, 3, 7, 3.5], "texture": "#all"}, - "east": {"uv": [0, 3, 3, 3.5], "texture": "#all"} + "down": {"uv": [4.125, 3.75, 3.25, 3.875], "texture": "#all"}, + "up": {"uv": [3.25, 3.875, 2.375, 3.75], "texture": "#all"}, + "north": {"uv": [2.375, 3.875, 3.25, 4.75], "texture": "#all"}, + "south": {"uv": [3.375, 3.875, 4.25, 4.75], "texture": "#all"}, + "west": {"uv": [3.25, 3.875, 3.375, 4.75], "texture": "#all"}, + "east": {"uv": [2.25, 3.875, 2.375, 4.75], "texture": "#all"} } }, { - "__comment": "Panel1", - "from": [5, 2, 5], - "to": [11, 8, 6], + "__comment": "powerConnectorFrame1", + "from": [10, 10, 1], + "to": [11, 11, 5], "faces": { - "down": {"uv": [1.75, 3.75, 3.25, 4], "texture": "#all"}, - "up": {"uv": [0.25, 3.75, 1.75, 4], "texture": "#all"}, - "north": {"uv": [0.25, 4, 1.75, 5.5], "texture": "#all"}, - "south": {"uv": [2, 4, 3.5, 5.5], "texture": "#all"}, - "west": {"uv": [1.75, 4, 2, 5.5], "texture": "#all"}, - "east": {"uv": [0, 4, 0.25, 5.5], "texture": "#all"} + "down": {"uv": [5.5, 2.625, 5.375, 3.125], "texture": "#all"}, + "up": {"uv": [5.375, 3.125, 5.25, 2.625], "texture": "#all"}, + "north": {"uv": [5.25, 3.125, 5.375, 3.25], "texture": "#all"}, + "south": {"uv": [5.875, 3.125, 6, 3.25], "texture": "#all"}, + "west": {"uv": [5.375, 3.125, 5.875, 3.25], "texture": "#all"}, + "east": {"uv": [4.75, 3.125, 5.25, 3.25], "texture": "#all"} } }, { - "__comment": "Ring3", - "from": [4, 14, 4], - "to": [12, 15, 12], + "__comment": "pipeToggleBack", + "from": [5, 5, 11], + "to": [11, 11, 15], "faces": { - "down": {"uv": [4, 8.75, 6, 10.75], "texture": "#all"}, - "up": {"uv": [2, 8.75, 4, 10.75], "texture": "#all"}, - "north": {"uv": [2, 10.75, 4, 11], "texture": "#all"}, - "south": {"uv": [6, 10.75, 8, 11], "texture": "#all"}, - "west": {"uv": [4, 10.75, 6, 11], "texture": "#all"}, - "east": {"uv": [0, 10.75, 2, 11], "texture": "#all"} + "down": {"uv": [2, 2.375, 1.25, 2.875], "texture": "#all"}, + "up": {"uv": [1.25, 2.875, 0.5, 2.375], "texture": "#all"}, + "north": {"uv": [0.5, 2.875, 1.25, 3.625], "texture": "#all"}, + "south": {"uv": [1.75, 2.875, 2.5, 3.625], "texture": "#all"}, + "west": {"uv": [1.25, 2.875, 1.75, 3.625], "texture": "#all"}, + "east": {"uv": [0, 2.875, 0.5, 3.625], "texture": "#all"} } }, { - "__comment": "Body", - "from": [5, 4, 5], - "to": [11, 14, 11], + "__comment": "pumpBase", + "from": [5, 0, 5], + "to": [11, 15, 11], "faces": { - "down": {"uv": [10.5, 4.25, 12, 5.75], "texture": "#all"}, - "up": {"uv": [9, 4.25, 10.5, 5.75], "texture": "#all"}, - "north": {"uv": [9, 5.75, 10.5, 8.25], "texture": "#all"}, - "south": {"uv": [12, 5.75, 13.5, 8.25], "texture": "#all"}, - "west": {"uv": [10.5, 5.75, 12, 8.25], "texture": "#all"}, - "east": {"uv": [7.5, 5.75, 9, 8.25], "texture": "#all"} + "down": {"uv": [5.75, 0, 5, 0.75], "texture": "#all"}, + "up": {"uv": [5, 0.75, 4.25, 0], "texture": "#all"}, + "north": {"uv": [4.25, 0.75, 5, 2.625], "texture": "#all"}, + "south": {"uv": [5.75, 0.75, 6.5, 2.625], "texture": "#all"}, + "west": {"uv": [5, 0.75, 5.75, 2.625], "texture": "#all"}, + "east": {"uv": [3.5, 0.75, 4.25, 2.625], "texture": "#all"} } }, { - "__comment": "PumpHead", - "from": [5, 1, 5], - "to": [11, 4, 11], + "__comment": "pumpPortTop", + "from": [4, 15, 4], + "to": [12, 16, 12], "faces": { - "down": {"uv": [11.25, 0, 12.75, 1.5], "texture": "#all"}, - "up": {"uv": [9.75, 0, 11.25, 1.5], "texture": "#all"}, - "north": {"uv": [9.75, 1.5, 11.25, 2.25], "texture": "#all"}, - "south": {"uv": [12.75, 1.5, 14.25, 2.25], "texture": "#all"}, - "west": {"uv": [11.25, 1.5, 12.75, 2.25], "texture": "#all"}, - "east": {"uv": [8.25, 1.5, 9.75, 2.25], "texture": "#all"} + "down": {"uv": [11.5, 0, 10.5, 1], "texture": "#all"}, + "up": {"uv": [10.5, 1, 9.5, 0], "texture": "#all"}, + "north": {"uv": [9.5, 1, 10.5, 1.125], "texture": "#all"}, + "south": {"uv": [11.5, 1, 12.5, 1.125], "texture": "#all"}, + "west": {"uv": [10.5, 1, 11.5, 1.125], "texture": "#all"}, + "east": {"uv": [8.5, 1, 9.5, 1.125], "texture": "#all"} } }, { - "__comment": "Ring2", - "from": [4, 12, 4], - "to": [12, 13, 12], + "__comment": "pipeTogglePortLeft", + "from": [0, 4, 4], + "to": [1, 12, 12], "faces": { - "down": {"uv": [4, 8.75, 6, 10.75], "texture": "#all"}, - "up": {"uv": [2, 8.75, 4, 10.75], "texture": "#all"}, - "north": {"uv": [2, 10.75, 4, 11], "texture": "#all"}, - "south": {"uv": [6, 10.75, 8, 11], "texture": "#all"}, - "west": {"uv": [4, 10.75, 6, 11], "texture": "#all"}, - "east": {"uv": [0, 10.75, 2, 11], "texture": "#all"} + "down": {"uv": [1.25, 4.75, 1.125, 5.75], "texture": "#all"}, + "up": {"uv": [1.125, 5.75, 1, 4.75], "texture": "#all"}, + "north": {"uv": [1, 5.75, 1.125, 6.75], "texture": "#all"}, + "south": {"uv": [2.125, 5.75, 2.25, 6.75], "texture": "#all"}, + "west": {"uv": [1.125, 5.75, 2.125, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.75, 1, 6.75], "texture": "#all"} } }, { - "__comment": "Plug", - "from": [5, 4, 15], - "to": [11, 10, 16], + "__comment": "pipeToggleRingRight", + "from": [13, 4.5, 4.5], + "to": [14, 11.5, 11.5], "faces": { - "down": {"uv": [1.75, 11.25, 3.25, 11.5], "texture": "#all"}, - "up": {"uv": [0.25, 11.25, 1.75, 11.5], "texture": "#all"}, - "north": {"uv": [0.25, 11.5, 1.75, 13], "texture": "#all"}, - "south": {"uv": [2, 11.5, 3.5, 13], "texture": "#all"}, - "west": {"uv": [1.75, 11.5, 2, 13], "texture": "#all"}, - "east": {"uv": [0, 11.5, 0.25, 13], "texture": "#all"} + "down": {"uv": [3.375, 4.75, 3.25, 5.625], "texture": "#all"}, + "up": {"uv": [3.25, 5.625, 3.125, 4.75], "texture": "#all"}, + "north": {"uv": [3.125, 5.625, 3.25, 6.5], "texture": "#all"}, + "south": {"uv": [4.125, 5.625, 4.25, 6.5], "texture": "#all"}, + "west": {"uv": [3.25, 5.625, 4.125, 6.5], "texture": "#all"}, + "east": {"uv": [2.25, 5.625, 3.125, 6.5], "texture": "#all"} } }, { - "__comment": "Connector", - "from": [6, 8, 10.5], - "to": [10, 9, 15.5], + "__comment": "powerConnectorFrame4", + "from": [5, 5, 1], + "to": [6, 6, 5], "faces": { - "down": {"uv": [10.5, 2.5, 11.5, 3.75], "texture": "#all"}, - "up": {"uv": [9.5, 2.5, 10.5, 3.75], "texture": "#all"}, - "north": {"uv": [9.5, 3.75, 10.5, 4], "texture": "#all"}, - "south": {"uv": [11.75, 3.75, 12.75, 4], "texture": "#all"}, - "west": {"uv": [10.5, 3.75, 11.75, 4], "texture": "#all"}, - "east": {"uv": [8.25, 3.75, 9.5, 4], "texture": "#all"} + "down": {"uv": [5.5, 2.625, 5.375, 3.125], "texture": "#all"}, + "up": {"uv": [5.375, 3.125, 5.25, 2.625], "texture": "#all"}, + "north": {"uv": [5.25, 3.125, 5.375, 3.25], "texture": "#all"}, + "south": {"uv": [5.875, 3.125, 6, 3.25], "texture": "#all"}, + "west": {"uv": [5.375, 3.125, 5.875, 3.25], "texture": "#all"}, + "east": {"uv": [4.75, 3.125, 5.25, 3.25], "texture": "#all"} } }, { - "__comment": "Panel3", - "from": [10, 2, 5], - "to": [11, 8, 11], + "__comment": "pipeToggleRingLeft", + "from": [2, 4.5, 4.5], + "to": [3, 11.5, 11.5], "faces": { - "down": {"uv": [5.5, 3.75, 5.75, 5.25], "texture": "#all"}, - "up": {"uv": [5.25, 3.75, 5.5, 5.25], "texture": "#all"}, - "north": {"uv": [5.25, 5.25, 5.5, 6.75], "texture": "#all"}, - "south": {"uv": [7, 5.25, 7.25, 6.75], "texture": "#all"}, - "west": {"uv": [5.5, 5.25, 7, 6.75], "texture": "#all"}, - "east": {"uv": [3.75, 5.25, 5.25, 6.75], "texture": "#all"} + "down": {"uv": [3.375, 4.75, 3.25, 5.625], "texture": "#all"}, + "up": {"uv": [3.25, 5.625, 3.125, 4.75], "texture": "#all"}, + "north": {"uv": [3.125, 5.625, 3.25, 6.5], "texture": "#all"}, + "south": {"uv": [4.125, 5.625, 4.25, 6.5], "texture": "#all"}, + "west": {"uv": [3.25, 5.625, 4.125, 6.5], "texture": "#all"}, + "east": {"uv": [2.25, 5.625, 3.125, 6.5], "texture": "#all"} } }, { - "__comment": "Panel2", - "from": [5, 2, 5], - "to": [6, 8, 11], + "__comment": "pipeTogglePortRight", + "from": [15, 4, 4], + "to": [16, 12, 12], "faces": { - "down": {"uv": [5.5, 3.75, 5.75, 5.25], "texture": "#all"}, - "up": {"uv": [5.25, 3.75, 5.5, 5.25], "texture": "#all"}, - "north": {"uv": [5.25, 5.25, 5.5, 6.75], "texture": "#all"}, - "south": {"uv": [7, 5.25, 7.25, 6.75], "texture": "#all"}, - "west": {"uv": [5.5, 5.25, 7, 6.75], "texture": "#all"}, - "east": {"uv": [3.75, 5.25, 5.25, 6.75], "texture": "#all"} + "down": {"uv": [1.25, 4.75, 1.125, 5.75], "texture": "#all"}, + "up": {"uv": [1.125, 5.75, 1, 4.75], "texture": "#all"}, + "north": {"uv": [1, 5.75, 1.125, 6.75], "texture": "#all"}, + "south": {"uv": [2.125, 5.75, 2.25, 6.75], "texture": "#all"}, + "west": {"uv": [1.125, 5.75, 2.125, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.75, 1, 6.75], "texture": "#all"} } }, { - "__comment": "Axil", - "from": [3.5, 4, 6], - "to": [12.5, 6, 10], + "__comment": "pumpRingTop", + "from": [4, 13, 4], + "to": [12, 14, 12], "faces": { - "down": {"uv": [3.25, 7, 5.5, 8], "texture": "#all"}, - "up": {"uv": [1, 7, 3.25, 8], "texture": "#all"}, - "north": {"uv": [1, 8, 3.25, 8.5], "texture": "#all"}, - "south": {"uv": [4.25, 8, 6.5, 8.5], "texture": "#all"}, - "west": {"uv": [3.25, 8, 4.25, 8.5], "texture": "#all"}, - "east": {"uv": [0, 8, 1, 8.5], "texture": "#all"} + "down": {"uv": [11.5, 1.125, 10.5, 2.125], "texture": "#all"}, + "up": {"uv": [10.5, 2.125, 9.5, 1.125], "texture": "#all"}, + "north": {"uv": [9.5, 2.125, 10.5, 2.25], "texture": "#all"}, + "south": {"uv": [11.5, 2.125, 12.5, 2.25], "texture": "#all"}, + "west": {"uv": [10.5, 2.125, 11.5, 2.25], "texture": "#all"}, + "east": {"uv": [8.5, 2.125, 9.5, 2.25], "texture": "#all"} + } + }, + { + "__comment": "powerConnectorFrame3", + "from": [10, 5, 1], + "to": [11, 6, 5], + "faces": { + "down": {"uv": [5.5, 2.625, 5.375, 3.125], "texture": "#all"}, + "up": {"uv": [5.375, 3.125, 5.25, 2.625], "texture": "#all"}, + "north": {"uv": [5.25, 3.125, 5.375, 3.25], "texture": "#all"}, + "south": {"uv": [5.875, 3.125, 6, 3.25], "texture": "#all"}, + "west": {"uv": [5.375, 3.125, 5.875, 3.25], "texture": "#all"}, + "east": {"uv": [4.75, 3.125, 5.25, 3.25], "texture": "#all"} + } + }, + { + "__comment": "powerConnector", + "from": [5.5, 5.5, 1], + "to": [10.5, 10.5, 5], + "faces": { + "down": {"uv": [1.75, 3.625, 1.125, 4.125], "texture": "#all"}, + "up": {"uv": [1.125, 4.125, 0.5, 3.625], "texture": "#all"}, + "north": {"uv": [0.5, 4.125, 1.125, 4.75], "texture": "#all"}, + "south": {"uv": [1.625, 4.125, 2.25, 4.75], "texture": "#all"}, + "west": {"uv": [1.125, 4.125, 1.625, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4.125, 0.5, 4.75], "texture": "#all"} + } + }, + { + "__comment": "powerPort", + "from": [4, 4, 0], + "to": [12, 12, 1], + "faces": { + "down": {"uv": [6.875, 3.625, 5.875, 3.75], "texture": "#all"}, + "up": {"uv": [5.875, 3.75, 4.875, 3.625], "texture": "#all"}, + "north": {"uv": [4.875, 3.75, 5.875, 4.75], "texture": "#all"}, + "south": {"uv": [6, 3.75, 7, 4.75], "texture": "#all"}, + "west": {"uv": [5.875, 3.75, 6, 4.75], "texture": "#all"}, + "east": {"uv": [4.75, 3.75, 4.875, 4.75], "texture": "#all"} + } + }, + { + "__comment": "pumpPipe", + "from": [6, -8, 6], + "to": [10, 0, 10], + "faces": { + "down": {"uv": [8, 0, 7.5, 0.5], "texture": "#all"}, + "up": {"uv": [7.5, 0.5, 7, 0], "texture": "#all"}, + "north": {"uv": [7, 0.5, 7.5, 1.5], "texture": "#all"}, + "south": {"uv": [8, 0.5, 8.5, 1.5], "texture": "#all"}, + "west": {"uv": [7.5, 0.5, 8, 1.5], "texture": "#all"}, + "east": {"uv": [6.5, 0.5, 7, 1.5], "texture": "#all"} + } + }, + { + "__comment": "pipeTogglePortBack", + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "down": {"uv": [4.625, 2.625, 3.625, 2.75], "texture": "#all"}, + "up": {"uv": [3.625, 2.75, 2.625, 2.625], "texture": "#all"}, + "north": {"uv": [2.625, 2.75, 3.625, 3.75], "texture": "#all"}, + "south": {"uv": [3.75, 2.75, 4.75, 3.75], "texture": "#all"}, + "west": {"uv": [3.625, 2.75, 3.75, 3.75], "texture": "#all"}, + "east": {"uv": [2.5, 2.75, 2.625, 3.75], "texture": "#all"} + } + }, + { + "__comment": "pipeToggleRight", + "from": [11, 5, 5], + "to": [15, 11, 11], + "faces": { + "down": {"uv": [6, 4.75, 5.5, 5.5], "texture": "#all"}, + "up": {"uv": [5.5, 5.5, 5, 4.75], "texture": "#all"}, + "north": {"uv": [5, 5.5, 5.5, 6.25], "texture": "#all"}, + "south": {"uv": [6.25, 5.5, 6.75, 6.25], "texture": "#all"}, + "west": {"uv": [5.5, 5.5, 6.25, 6.25], "texture": "#all"}, + "east": {"uv": [4.25, 5.5, 5, 6.25], "texture": "#all"} + } + }, + { + "__comment": "powerConnectorFrame2", + "from": [5, 10, 1], + "to": [6, 11, 5], + "faces": { + "down": {"uv": [5.5, 2.625, 5.375, 3.125], "texture": "#all"}, + "up": {"uv": [5.375, 3.125, 5.25, 2.625], "texture": "#all"}, + "north": {"uv": [5.25, 3.125, 5.375, 3.25], "texture": "#all"}, + "south": {"uv": [5.875, 3.125, 6, 3.25], "texture": "#all"}, + "west": {"uv": [5.375, 3.125, 5.875, 3.25], "texture": "#all"}, + "east": {"uv": [4.75, 3.125, 5.25, 3.25], "texture": "#all"} + } + }, + { + "__comment": "pipeToggleLeft", + "from": [1, 5, 5], + "to": [5, 11, 11], + "faces": { + "down": {"uv": [6, 4.75, 5.5, 5.5], "texture": "#all"}, + "up": {"uv": [5.5, 5.5, 5, 4.75], "texture": "#all"}, + "north": {"uv": [5, 5.5, 5.5, 6.25], "texture": "#all"}, + "south": {"uv": [6.25, 5.5, 6.75, 6.25], "texture": "#all"}, + "west": {"uv": [5.5, 5.5, 6.25, 6.25], "texture": "#all"}, + "east": {"uv": [4.25, 5.5, 5, 6.25], "texture": "#all"} } } ], diff --git a/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json b/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json index b72e485ad..96460813c 100644 --- a/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json +++ b/src/main/resources/assets/mekanism/models/block/electrolytic_separator.json @@ -1,289 +1,224 @@ { "elements": [ { - "__comment": "S", - "from": [10, 7, 11], - "to": [14, 8, 12], + "__comment": "portToggle2a", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], "faces": { - "down": {"uv": [0.625, 10.5, 1.125, 10.625], "texture": "#all"}, - "up": {"uv": [0.125, 10.5, 0.625, 10.625], "texture": "#all"}, - "north": {"uv": [0.125, 10.625, 0.625, 10.75], "texture": "#all"}, - "south": {"uv": [0.75, 10.625, 1.25, 10.75], "texture": "#all"}, - "west": {"uv": [0.625, 10.625, 0.75, 10.75], "texture": "#all"}, - "east": {"uv": [0, 10.625, 0.125, 10.75], "texture": "#all"} + "down": {"uv": [7.25, 2.5, 7.125, 3.5], "texture": "#all"}, + "up": {"uv": [7.125, 3.5, 7, 2.5], "texture": "#all"}, + "north": {"uv": [7, 3.5, 7.125, 4.5], "texture": "#all"}, + "south": {"uv": [8.125, 3.5, 8.25, 4.5], "texture": "#all"}, + "west": {"uv": [7.125, 3.5, 8.125, 4.5], "texture": "#all"}, + "east": {"uv": [6, 3.5, 7, 4.5], "texture": "#all"} } }, { - "__comment": "OUTPUT", - "from": [7, 7, 2], - "to": [11, 9, 4], + "__comment": "portToggle4a", + "from": [4, 4, 15.01], + "to": [12, 12, 16.01], "faces": { - "down": {"uv": [9, 5.25, 9.5, 5.5], "texture": "#all"}, - "up": {"uv": [8.5, 5.25, 9, 5.5], "texture": "#all"}, - "north": {"uv": [8.5, 5.5, 9, 5.75], "texture": "#all"}, - "south": {"uv": [9.25, 5.5, 9.75, 5.75], "texture": "#all"}, - "west": {"uv": [9, 5.5, 9.25, 5.75], "texture": "#all"}, - "east": {"uv": [8.25, 5.5, 8.5, 5.75], "texture": "#all"} + "down": {"uv": [10.375, 2.5, 9.375, 2.625], "texture": "#all"}, + "up": {"uv": [9.375, 2.625, 8.375, 2.5], "texture": "#all"}, + "north": {"uv": [8.375, 2.625, 9.375, 3.625], "texture": "#all"}, + "south": {"uv": [9.5, 2.625, 10.5, 3.625], "texture": "#all"}, + "west": {"uv": [9.375, 2.625, 9.5, 3.625], "texture": "#all"}, + "east": {"uv": [8.25, 2.625, 8.375, 3.625], "texture": "#all"} } }, { - "__comment": "H", - "from": [-2, 1, 14], - "to": [2, 13, 16], + "__comment": "tank2", + "from": [0, 4, 9], + "to": [7, 14, 16], "faces": { - "down": {"uv": [0.75, 6.25, 1.25, 6.5], "texture": "#all"}, - "up": {"uv": [0.25, 6.25, 0.75, 6.5], "texture": "#all"}, - "north": {"uv": [0.25, 6.5, 0.75, 8], "texture": "#all"}, - "south": {"uv": [1, 6.5, 1.5, 8], "texture": "#all"}, - "west": {"uv": [0.75, 6.5, 1, 8], "texture": "#all"}, - "east": {"uv": [0, 6.5, 0.25, 8], "texture": "#all"} + "down": {"uv": [10.625, 0, 9.75, 0.875], "texture": "#all"}, + "up": {"uv": [9.75, 0.875, 8.875, 0], "texture": "#all"}, + "north": {"uv": [8.875, 0.875, 9.75, 2.125], "texture": "#all"}, + "south": {"uv": [10.625, 0.875, 11.5, 2.125], "texture": "#all"}, + "west": {"uv": [9.75, 0.875, 10.625, 2.125], "texture": "#all"}, + "east": {"uv": [8, 0.875, 8.875, 2.125], "texture": "#all"} } }, { - "__comment": "N", - "from": [7, 7, 3], - "to": [9, 13, 5], - "faces": { - "down": {"uv": [8.75, 4, 9, 4.25], "texture": "#all"}, - "up": {"uv": [8.5, 4, 8.75, 4.25], "texture": "#all"}, - "north": {"uv": [8.5, 4.25, 8.75, 5], "texture": "#all"}, - "south": {"uv": [9, 4.25, 9.25, 5], "texture": "#all"}, - "west": {"uv": [8.75, 4.25, 9, 5], "texture": "#all"}, - "east": {"uv": [8.25, 4.25, 8.5, 5], "texture": "#all"} - } - }, - { - "__comment": "B", - "from": [10, 2, 2], - "to": [14, 12, 6], - "faces": { - "down": {"uv": [11.625, 0, 12.125, 0.5], "texture": "#all"}, - "up": {"uv": [11.125, 0, 11.625, 0.5], "texture": "#all"}, - "north": {"uv": [11.125, 0.5, 11.625, 1.75], "texture": "#all"}, - "south": {"uv": [12.125, 0.5, 12.625, 1.75], "texture": "#all"}, - "west": {"uv": [11.625, 0.5, 12.125, 1.75], "texture": "#all"}, - "east": {"uv": [10.625, 0.5, 11.125, 1.75], "texture": "#all"} - } - }, - { - "__comment": "G", - "from": [0, 2, 9], - "to": [6, 4, 11], - "faces": { - "down": {"uv": [13.875, 0, 14.625, 0.25], "texture": "#all"}, - "up": {"uv": [13.125, 0, 13.875, 0.25], "texture": "#all"}, - "north": {"uv": [13.125, 0.25, 13.875, 0.5], "texture": "#all"}, - "south": {"uv": [14.125, 0.25, 14.875, 0.5], "texture": "#all"}, - "west": {"uv": [13.875, 0.25, 14.125, 0.5], "texture": "#all"}, - "east": {"uv": [12.875, 0.25, 13.125, 0.5], "texture": "#all"} - } - }, - { - "__comment": "E", - "from": [0, 1, 12], - "to": [14, 16, 16], - "faces": { - "down": {"uv": [2.25, 2.375, 2.75, 4.125], "texture": "#all"}, - "up": {"uv": [1.75, 2.375, 2.25, 4.125], "texture": "#all"}, - "east": {"uv": [1.75, 4.125, 2.25, 6], "texture": "#all"}, - "west": {"uv": [4, 4.125, 4.5, 6], "texture": "#all"}, - "north": {"uv": [2.25, 4.125, 4, 6], "texture": "#all"}, - "south": {"uv": [0, 4.125, 1.75, 6], "texture": "#all"} - } - }, - { - "__comment": "R", - "from": [16, 1, 6], - "to": [19, 12, 12], - "faces": { - "down": {"uv": [1.125, 8.125, 1.5, 8.875], "texture": "#all"}, - "up": {"uv": [0.75, 8.125, 1.125, 8.875], "texture": "#all"}, - "north": {"uv": [0.75, 8.875, 1.125, 10.25], "texture": "#all"}, - "south": {"uv": [1.875, 8.875, 2.25, 10.25], "texture": "#all"}, - "west": {"uv": [1.125, 8.875, 1.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.875, 0.75, 10.25], "texture": "#all"} - } - }, - { - "__comment": "M", - "from": [3, 13, 3], - "to": [5, 15, 9], - "faces": { - "down": {"uv": [9.25, 2.75, 9.5, 3.5], "texture": "#all"}, - "up": {"uv": [9, 2.75, 9.25, 3.5], "texture": "#all"}, - "north": {"uv": [9, 3.5, 9.25, 3.75], "texture": "#all"}, - "south": {"uv": [10, 3.5, 10.25, 3.75], "texture": "#all"}, - "west": {"uv": [9.25, 3.5, 10, 3.75], "texture": "#all"}, - "east": {"uv": [8.25, 3.5, 9, 3.75], "texture": "#all"} - } - }, - { - "__comment": "D", - "from": [5, 5, 4], - "to": [7, 7, 10], - "faces": { - "down": {"uv": [7, 2.375, 7.25, 3.125], "texture": "#all"}, - "up": {"uv": [6.75, 2.375, 7, 3.125], "texture": "#all"}, - "north": {"uv": [6.75, 3.125, 7, 3.375], "texture": "#all"}, - "south": {"uv": [7.75, 3.125, 8, 3.375], "texture": "#all"}, - "west": {"uv": [7, 3.125, 7.75, 3.375], "texture": "#all"}, - "east": {"uv": [6, 3.125, 6.75, 3.375], "texture": "#all"} - } - }, - { - "__comment": "I", - "from": [1, 1, 1], - "to": [7, 2, 7], - "faces": { - "down": {"uv": [6.625, 3.5, 7.375, 4.25], "texture": "#all"}, - "up": {"uv": [5.875, 3.5, 6.625, 4.25], "texture": "#all"}, - "north": {"uv": [5.875, 4.25, 6.625, 4.375], "texture": "#all"}, - "south": {"uv": [7.375, 4.25, 8.125, 4.375], "texture": "#all"}, - "west": {"uv": [6.625, 4.25, 7.375, 4.375], "texture": "#all"}, - "east": {"uv": [5.125, 4.25, 5.875, 4.375], "texture": "#all"} - } - }, - { - "__comment": "U", - "from": [2, 5, 11], - "to": [6, 6, 12], - "faces": { - "down": {"uv": [0.625, 10.875, 1.125, 11], "texture": "#all"}, - "up": {"uv": [0.125, 10.875, 0.625, 11], "texture": "#all"}, - "north": {"uv": [0.125, 11, 0.625, 11.125], "texture": "#all"}, - "south": {"uv": [0.75, 11, 1.25, 11.125], "texture": "#all"}, - "west": {"uv": [0.625, 11, 0.75, 11.125], "texture": "#all"}, - "east": {"uv": [0, 11, 0.125, 11.125], "texture": "#all"} - } - }, - { - "__comment": "C", - "from": [2, 2, 2], - "to": [6, 12, 6], - "faces": { - "down": {"uv": [9.25, 0, 9.75, 0.5], "texture": "#all"}, - "up": {"uv": [8.75, 0, 9.25, 0.5], "texture": "#all"}, - "north": {"uv": [8.75, 0.5, 9.25, 1.75], "texture": "#all"}, - "south": {"uv": [9.75, 0.5, 10.25, 1.75], "texture": "#all"}, - "west": {"uv": [9.25, 0.5, 9.75, 1.75], "texture": "#all"}, - "east": {"uv": [8.25, 0.5, 8.75, 1.75], "texture": "#all"} - } - }, - { - "__comment": "Q", - "from": [0, 1, 6], - "to": [3, 12, 12], - "faces": { - "down": {"uv": [1.125, 8.125, 1.5, 8.875], "texture": "#all"}, - "up": {"uv": [0.75, 8.125, 1.125, 8.875], "texture": "#all"}, - "north": {"uv": [0.75, 8.875, 1.125, 10.25], "texture": "#all"}, - "south": {"uv": [1.875, 8.875, 2.25, 10.25], "texture": "#all"}, - "west": {"uv": [1.125, 8.875, 1.875, 10.25], "texture": "#all"}, - "east": {"uv": [0, 8.875, 0.75, 10.25], "texture": "#all"} - } - }, - { - "__comment": "V", - "from": [10, 5, 11], - "to": [14, 6, 12], - "faces": { - "down": {"uv": [0.625, 10.875, 1.125, 11], "texture": "#all"}, - "up": {"uv": [0.125, 10.875, 0.625, 11], "texture": "#all"}, - "north": {"uv": [0.125, 11, 0.625, 11.125], "texture": "#all"}, - "south": {"uv": [0.75, 11, 1.25, 11.125], "texture": "#all"}, - "west": {"uv": [0.625, 11, 0.75, 11.125], "texture": "#all"}, - "east": {"uv": [0, 11, 0.125, 11.125], "texture": "#all"} - } - }, - { - "__comment": "A", + "__comment": "base", "from": [0, 0, 0], - "to": [16, 1, 16], + "to": [16, 4, 16], "faces": { - "down": {"uv": [4, 0, 6, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 4, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.5], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.5], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} } }, { - "__comment": "J", - "from": [9, 1, 1], - "to": [15, 2, 7], + "__comment": "tube2", + "from": [3, 12, 7.5], + "to": [7, 13, 8.5], "faces": { - "down": {"uv": [6.625, 3.5, 7.375, 4.25], "texture": "#all"}, - "up": {"uv": [5.875, 3.5, 6.625, 4.25], "texture": "#all"}, - "north": {"uv": [5.875, 4.25, 6.625, 4.375], "texture": "#all"}, - "south": {"uv": [7.375, 4.25, 8.125, 4.375], "texture": "#all"}, - "west": {"uv": [6.625, 4.25, 7.375, 4.375], "texture": "#all"}, - "east": {"uv": [5.125, 4.25, 5.875, 4.375], "texture": "#all"} + "down": {"uv": [1.125, 0, 0.625, 0.125], "texture": "#all"}, + "up": {"uv": [0.625, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.625, 0.25], "texture": "#all"}, + "south": {"uv": [0.75, 0.125, 1.25, 0.25], "texture": "#all"}, + "west": {"uv": [0.625, 0.125, 0.75, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "L", - "from": [11, 12, 3], - "to": [13, 14, 5], + "__comment": "portToggle2b", + "from": [1, 4, 7], + "to": [3, 11, 9], "faces": { - "down": {"uv": [11.125, 1.875, 11.375, 2.125], "texture": "#all"}, - "up": {"uv": [10.875, 1.875, 11.125, 2.125], "texture": "#all"}, - "north": {"uv": [10.875, 2.125, 11.125, 2.375], "texture": "#all"}, - "south": {"uv": [11.375, 2.125, 11.625, 2.375], "texture": "#all"}, - "west": {"uv": [11.125, 2.125, 11.375, 2.375], "texture": "#all"}, - "east": {"uv": [10.625, 2.125, 10.875, 2.375], "texture": "#all"} + "down": {"uv": [0.75, 0.5, 0.5, 0.75], "texture": "#all"}, + "up": {"uv": [0.5, 0.75, 0.25, 0.5], "texture": "#all"}, + "north": {"uv": [0.25, 0.75, 0.5, 1.625], "texture": "#all"}, + "south": {"uv": [0.75, 0.75, 1, 1.625], "texture": "#all"}, + "west": {"uv": [0.5, 0.75, 0.75, 1.625], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.25, 1.625], "texture": "#all"} } }, { - "__comment": "K", - "from": [3, 12, 3], - "to": [5, 13, 5], + "__comment": "portToggle3a", + "from": [4, 4, -0.00999999999999979], + "to": [12, 12, 0.99], "faces": { - "down": {"uv": [8.75, 2, 9, 2.25], "texture": "#all"}, - "up": {"uv": [8.5, 2, 8.75, 2.25], "texture": "#all"}, - "north": {"uv": [8.5, 2.25, 8.75, 2.375], "texture": "#all"}, - "south": {"uv": [9, 2.25, 9.25, 2.375], "texture": "#all"}, - "west": {"uv": [8.75, 2.25, 9, 2.375], "texture": "#all"}, - "east": {"uv": [8.25, 2.25, 8.5, 2.375], "texture": "#all"} + "down": {"uv": [10.375, 2.5, 9.375, 2.625], "texture": "#all"}, + "up": {"uv": [9.375, 2.625, 8.375, 2.5], "texture": "#all"}, + "north": {"uv": [8.375, 2.625, 9.375, 3.625], "texture": "#all"}, + "south": {"uv": [9.5, 2.625, 10.5, 3.625], "texture": "#all"}, + "west": {"uv": [9.375, 2.625, 9.5, 3.625], "texture": "#all"}, + "east": {"uv": [8.25, 2.625, 8.375, 3.625], "texture": "#all"} } }, { - "__comment": "P", - "from": [12, 13, 3], - "to": [14, 16, 5], + "__comment": "tube6", + "from": [3, 14, 12], + "to": [4, 15, 13], "faces": { - "down": {"uv": [11.125, 2.625, 11.375, 2.875], "texture": "#all"}, - "up": {"uv": [10.875, 2.625, 11.125, 2.875], "texture": "#all"}, - "north": {"uv": [10.875, 2.875, 11.125, 3.25], "texture": "#all"}, - "south": {"uv": [11.375, 2.875, 11.625, 3.25], "texture": "#all"}, - "west": {"uv": [11.125, 2.875, 11.375, 3.25], "texture": "#all"}, - "east": {"uv": [10.625, 2.875, 10.875, 3.25], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "T", - "from": [2, 7, 11], - "to": [6, 8, 12], + "__comment": "tank1", + "from": [8, 4, 0], + "to": [16, 16, 16], "faces": { - "down": {"uv": [0.625, 10.5, 1.125, 10.625], "texture": "#all"}, - "up": {"uv": [0.125, 10.5, 0.625, 10.625], "texture": "#all"}, - "north": {"uv": [0.125, 10.625, 0.625, 10.75], "texture": "#all"}, - "south": {"uv": [0.75, 10.625, 1.25, 10.75], "texture": "#all"}, - "west": {"uv": [0.625, 10.625, 0.75, 10.75], "texture": "#all"}, - "east": {"uv": [0, 10.625, 0.125, 10.75], "texture": "#all"} + "down": {"uv": [4, 2.5, 3, 4.5], "texture": "#all"}, + "up": {"uv": [3, 4.5, 2, 2.5], "texture": "#all"}, + "north": {"uv": [2, 4.5, 3, 6], "texture": "#all"}, + "south": {"uv": [5, 4.5, 6, 6], "texture": "#all"}, + "west": {"uv": [3, 4.5, 5, 6], "texture": "#all"}, + "east": {"uv": [0, 4.5, 2, 6], "texture": "#all"} } }, { - "__comment": "F", - "from": [9, 3, 8], - "to": [15, 5, 10], + "__comment": "tube3", + "from": [3, 12, 7.5], + "to": [4, 15, 8.5], "faces": { - "down": {"uv": [13.875, 0, 14.625, 0.25], "texture": "#all"}, - "up": {"uv": [13.125, 0, 13.875, 0.25], "texture": "#all"}, - "north": {"uv": [13.125, 0.25, 13.875, 0.5], "texture": "#all"}, - "south": {"uv": [14.125, 0.25, 14.875, 0.5], "texture": "#all"}, - "west": {"uv": [13.875, 0.25, 14.125, 0.5], "texture": "#all"}, - "east": {"uv": [12.875, 0.25, 13.125, 0.5], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.5], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.5], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.5], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.5], "texture": "#all"} + } + }, + { + "__comment": "portToggle3b", + "from": [7, 4, 1], + "to": [8, 11, 3], + "faces": { + "down": {"uv": [0.5, 0.5, 0.375, 0.75], "texture": "#all"}, + "up": {"uv": [0.375, 0.75, 0.25, 0.5], "texture": "#all"}, + "north": {"uv": [0.25, 0.75, 0.375, 1.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.75, 0.75, 1.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.75, 0.625, 1.625], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.25, 1.625], "texture": "#all"} + } + }, + { + "__comment": "portToggle4b", + "from": [7, 4, 13], + "to": [8, 11, 15], + "faces": { + "down": {"uv": [0.5, 0.5, 0.375, 0.75], "texture": "#all"}, + "up": {"uv": [0.375, 0.75, 0.25, 0.5], "texture": "#all"}, + "north": {"uv": [0.25, 0.75, 0.375, 1.625], "texture": "#all"}, + "south": {"uv": [0.625, 0.75, 0.75, 1.625], "texture": "#all"}, + "west": {"uv": [0.375, 0.75, 0.625, 1.625], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.25, 1.625], "texture": "#all"} + } + }, + { + "__comment": "portToggle1", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], + "faces": { + "down": {"uv": [7.25, 2.5, 7.125, 3.5], "texture": "#all"}, + "up": {"uv": [7.125, 3.5, 7, 2.5], "texture": "#all"}, + "north": {"uv": [7, 3.5, 7.125, 4.5], "texture": "#all"}, + "south": {"uv": [8.125, 3.5, 8.25, 4.5], "texture": "#all"}, + "west": {"uv": [7.125, 3.5, 8.125, 4.5], "texture": "#all"}, + "east": {"uv": [6, 3.5, 7, 4.5], "texture": "#all"} + } + }, + { + "__comment": "tube1", + "from": [6.5, 10, 7.5], + "to": [9.5, 11, 8.5], + "faces": { + "down": {"uv": [0.875, 0, 0.5, 0.125], "texture": "#all"}, + "up": {"uv": [0.5, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.5, 0.25], "texture": "#all"}, + "south": {"uv": [0.625, 0.125, 1, 0.25], "texture": "#all"}, + "west": {"uv": [0.5, 0.125, 0.625, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "tube4", + "from": [3, 15, 3], + "to": [4, 16, 13], + "faces": { + "down": {"uv": [1.5, 6, 1.375, 7.25], "texture": "#all"}, + "up": {"uv": [1.375, 7.25, 1.25, 6], "texture": "#all"}, + "north": {"uv": [1.25, 7.25, 1.375, 7.375], "texture": "#all"}, + "south": {"uv": [2.625, 7.25, 2.75, 7.375], "texture": "#all"}, + "west": {"uv": [1.375, 7.25, 2.625, 7.375], "texture": "#all"}, + "east": {"uv": [0, 7.25, 1.25, 7.375], "texture": "#all"} + } + }, + { + "__comment": "tube5", + "from": [3, 14, 3], + "to": [4, 15, 4], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "tank3", + "from": [0, 4, 0], + "to": [7, 14, 7], + "faces": { + "down": {"uv": [10.625, 0, 9.75, 0.875], "texture": "#all"}, + "up": {"uv": [9.75, 0.875, 8.875, 0], "texture": "#all"}, + "north": {"uv": [8.875, 0.875, 9.75, 2.125], "texture": "#all"}, + "south": {"uv": [10.625, 0.875, 11.5, 2.125], "texture": "#all"}, + "west": {"uv": [9.75, 0.875, 10.625, 2.125], "texture": "#all"}, + "east": {"uv": [8, 0.875, 8.875, 2.125], "texture": "#all"} } } ], diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube.json b/src/main/resources/assets/mekanism/models/block/energy_cube.json index e37a0c54d..44c398b09 100644 --- a/src/main/resources/assets/mekanism/models/block/energy_cube.json +++ b/src/main/resources/assets/mekanism/models/block/energy_cube.json @@ -1,281 +1,593 @@ { "elements": [ { - "__comment": "Corner8", - "from": [13, 13, 13], - "to": [16, 16, 16], + "__comment": "connectorTopToggle", + "from": [3, 14, 5], + "to": [13, 15, 11], "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} + "down": {"uv": [6.5, 4.75, 4, 6.25], "texture": "#all"}, + "up": {"uv": [4, 6.25, 1.5, 4.75], "texture": "#all"}, + "north": {"uv": [1.5, 6.25, 4, 6.5], "texture": "#all"}, + "south": {"uv": [5.5, 6.25, 8, 6.5], "texture": "#all"}, + "west": {"uv": [4, 6.25, 5.5, 6.5], "texture": "#all"}, + "east": {"uv": [0, 6.25, 1.5, 6.5], "texture": "#all"} } }, { - "__comment": "Connection", - "from": [3, 5, 0], - "to": [13, 11, 1], + "__comment": "ledBottom1", + "from": [12.5, 0.100000000000001, 7.5], + "to": [13.5, 1.1, 8.5], "faces": { - "down": {"uv": [2.75, 1.75, 5.25, 2], "texture": "#all"}, - "up": {"uv": [0.25, 1.75, 2.75, 2], "texture": "#all"}, - "north": {"uv": [0.25, 2, 2.75, 3.5], "texture": "#all"}, - "south": {"uv": [3, 2, 5.5, 3.5], "texture": "#all"}, - "west": {"uv": [2.75, 2, 3, 3.5], "texture": "#all"}, - "east": {"uv": [0, 2, 0.25, 3.5], "texture": "#all"} + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} } }, { - "__comment": "HoriPole4", - "from": [3, 0, 0], - "to": [13, 3, 3], - "faces": { - "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, - "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, - "north": {"uv": [0.75, 0.75, 3.25, 1.5], "texture": "#all"}, - "south": {"uv": [4, 0.75, 6.5, 1.5], "texture": "#all"}, - "west": {"uv": [3.25, 0.75, 4, 1.5], "texture": "#all"}, - "east": {"uv": [0, 0.75, 0.75, 1.5], "texture": "#all"} - } - }, - { - "__comment": "Corner5", - "from": [13, 13, 0], - "to": [16, 16, 3], - "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} - } - }, - { - "__comment": "HoriPole6", - "from": [3, 13, 13], - "to": [13, 16, 16], - "faces": { - "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, - "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, - "north": {"uv": [0.75, 0.75, 3.25, 1.5], "texture": "#all"}, - "south": {"uv": [4, 0.75, 6.5, 1.5], "texture": "#all"}, - "west": {"uv": [3.25, 0.75, 4, 1.5], "texture": "#all"}, - "east": {"uv": [0, 0.75, 0.75, 1.5], "texture": "#all"} - } - }, - { - "__comment": "HoriPole5", - "from": [13, 13, 3], - "to": [16, 16, 13], - "faces": { - "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, - "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, - "north": {"uv": [9.25, 2.5, 10, 3.25], "texture": "#all"}, - "south": {"uv": [12.5, 2.5, 13.25, 3.25], "texture": "#all"}, - "west": {"uv": [10, 2.5, 12.5, 3.25], "texture": "#all"}, - "east": {"uv": [6.75, 2.5, 9.25, 3.25], "texture": "#all"} - } - }, - { - "__comment": "Frame4", - "from": [13, 3, 0], - "to": [16, 13, 3], - "faces": { - "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, - "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, - "north": {"uv": [0.75, 6.75, 1.5, 9.25], "texture": "#all"}, - "south": {"uv": [2.25, 6.75, 3, 9.25], "texture": "#all"}, - "west": {"uv": [1.5, 6.75, 2.25, 9.25], "texture": "#all"}, - "east": {"uv": [0, 6.75, 0.75, 9.25], "texture": "#all"} - } - }, - { - "__comment": "Corner7", - "from": [0, 13, 13], - "to": [3, 16, 16], - "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} - } - }, - { - "__comment": "Corner2", - "from": [0, 0, 0], - "to": [3, 3, 3], - "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} - } - }, - { - "__comment": "HoriPole7", - "from": [0, 13, 3], - "to": [3, 16, 13], - "faces": { - "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, - "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, - "north": {"uv": [9.25, 2.5, 10, 3.25], "texture": "#all"}, - "south": {"uv": [12.5, 2.5, 13.25, 3.25], "texture": "#all"}, - "west": {"uv": [10, 2.5, 12.5, 3.25], "texture": "#all"}, - "east": {"uv": [6.75, 2.5, 9.25, 3.25], "texture": "#all"} - } - }, - { - "__comment": "Corner6", - "from": [0, 13, 0], - "to": [3, 16, 3], - "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} - } - }, - { - "__comment": "HoriPole1", - "from": [13, 0, 3], - "to": [16, 3, 13], - "faces": { - "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, - "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, - "north": {"uv": [9.25, 2.5, 10, 3.25], "texture": "#all"}, - "south": {"uv": [12.5, 2.5, 13.25, 3.25], "texture": "#all"}, - "west": {"uv": [10, 2.5, 12.5, 3.25], "texture": "#all"}, - "east": {"uv": [6.75, 2.5, 9.25, 3.25], "texture": "#all"} - } - }, - { - "__comment": "HoriPole3", - "from": [0, 0, 3], - "to": [3, 3, 13], - "faces": { - "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, - "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, - "north": {"uv": [9.25, 2.5, 10, 3.25], "texture": "#all"}, - "south": {"uv": [12.5, 2.5, 13.25, 3.25], "texture": "#all"}, - "west": {"uv": [10, 2.5, 12.5, 3.25], "texture": "#all"}, - "east": {"uv": [6.75, 2.5, 9.25, 3.25], "texture": "#all"} - } - }, - { - "__comment": "HoriPole2", - "from": [3, 0, 13], - "to": [13, 3, 16], - "faces": { - "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, - "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, - "north": {"uv": [0.75, 0.75, 3.25, 1.5], "texture": "#all"}, - "south": {"uv": [4, 0.75, 6.5, 1.5], "texture": "#all"}, - "west": {"uv": [3.25, 0.75, 4, 1.5], "texture": "#all"}, - "east": {"uv": [0, 0.75, 0.75, 1.5], "texture": "#all"} - } - }, - { - "__comment": "Frame3", - "from": [0, 3, 0], - "to": [3, 13, 3], - "faces": { - "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, - "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, - "north": {"uv": [0.75, 6.75, 1.5, 9.25], "texture": "#all"}, - "south": {"uv": [2.25, 6.75, 3, 9.25], "texture": "#all"}, - "west": {"uv": [1.5, 6.75, 2.25, 9.25], "texture": "#all"}, - "east": {"uv": [0, 6.75, 0.75, 9.25], "texture": "#all"} - } - }, - { - "__comment": "Corner1", + "__comment": "corner5", "from": [13, 0, 0], "to": [16, 3, 3], "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} } }, { - "__comment": "Frame2", + "__comment": "frame6", "from": [0, 3, 13], "to": [3, 13, 16], "faces": { - "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, - "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, - "north": {"uv": [0.75, 6.75, 1.5, 9.25], "texture": "#all"}, - "south": {"uv": [2.25, 6.75, 3, 9.25], "texture": "#all"}, - "west": {"uv": [1.5, 6.75, 2.25, 9.25], "texture": "#all"}, - "east": {"uv": [0, 6.75, 0.75, 9.25], "texture": "#all"} + "down": {"uv": [2.25, 0, 1.5, 0.75], "texture": "#all"}, + "up": {"uv": [1.5, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1.5, 3.25], "texture": "#all"}, + "south": {"uv": [2.25, 0.75, 3, 3.25], "texture": "#all"}, + "west": {"uv": [1.5, 0.75, 2.25, 3.25], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 3.25], "texture": "#all"} } }, { - "__comment": "HoriPole8", - "from": [3, 13, 0], - "to": [13, 16, 3], + "__comment": "frame9", + "from": [0, 0, 3], + "to": [3, 3, 13], "faces": { - "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, - "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, - "north": {"uv": [0.75, 0.75, 3.25, 1.5], "texture": "#all"}, - "south": {"uv": [4, 0.75, 6.5, 1.5], "texture": "#all"}, - "west": {"uv": [3.25, 0.75, 4, 1.5], "texture": "#all"}, - "east": {"uv": [0, 0.75, 0.75, 1.5], "texture": "#all"} + "down": {"uv": [7, 0, 6.25, 2.5], "texture": "#all"}, + "up": {"uv": [6.25, 2.5, 5.5, 0], "texture": "#all"}, + "north": {"uv": [5.5, 2.5, 6.25, 3.25], "texture": "#all"}, + "south": {"uv": [8.75, 2.5, 9.5, 3.25], "texture": "#all"}, + "west": {"uv": [6.25, 2.5, 8.75, 3.25], "texture": "#all"}, + "east": {"uv": [3, 2.5, 5.5, 3.25], "texture": "#all"} } }, { - "__comment": "Frame1", - "from": [13, 3, 13], - "to": [16, 13, 16], + "__comment": "frame7", + "from": [3, 0, 0], + "to": [13, 3, 3], "faces": { - "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, - "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, - "north": {"uv": [0.75, 6.75, 1.5, 9.25], "texture": "#all"}, - "south": {"uv": [2.25, 6.75, 3, 9.25], "texture": "#all"}, - "west": {"uv": [1.5, 6.75, 2.25, 9.25], "texture": "#all"}, - "east": {"uv": [0, 6.75, 0.75, 9.25], "texture": "#all"} + "down": {"uv": [5.75, 3.25, 3.25, 4], "texture": "#all"}, + "up": {"uv": [3.25, 4, 0.75, 3.25], "texture": "#all"}, + "north": {"uv": [0.75, 4, 3.25, 4.75], "texture": "#all"}, + "south": {"uv": [4, 4, 6.5, 4.75], "texture": "#all"}, + "west": {"uv": [3.25, 4, 4, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4, 0.75, 4.75], "texture": "#all"} } }, { - "__comment": "Corner4", + "__comment": "portLeftToggle", + "from": [15, 4, 4], + "to": [16, 12, 12], + "faces": { + "down": {"uv": [2.5, 8.75, 2.25, 10.75], "texture": "#all"}, + "up": {"uv": [2.25, 10.75, 2, 8.75], "texture": "#all"}, + "north": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, + "south": {"uv": [4.25, 10.75, 4.5, 12.75], "texture": "#all"}, + "west": {"uv": [2.25, 10.75, 4.25, 12.75], "texture": "#all"}, + "east": {"uv": [0, 10.75, 2, 12.75], "texture": "#all"} + } + }, + { + "__comment": "portRightToggle", + "from": [0, 4, 4], + "to": [1, 12, 12], + "faces": { + "down": {"uv": [2.5, 8.75, 2.25, 10.75], "texture": "#all"}, + "up": {"uv": [2.25, 10.75, 2, 8.75], "texture": "#all"}, + "north": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, + "south": {"uv": [4.25, 10.75, 4.5, 12.75], "texture": "#all"}, + "west": {"uv": [2.25, 10.75, 4.25, 12.75], "texture": "#all"}, + "east": {"uv": [0, 10.75, 2, 12.75], "texture": "#all"} + } + }, + { + "__comment": "corner2", + "from": [13, 13, 13], + "to": [16, 16, 16], + "faces": { + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "frame4", + "from": [0, 13, 3], + "to": [3, 16, 13], + "faces": { + "down": {"uv": [7, 0, 6.25, 2.5], "texture": "#all"}, + "up": {"uv": [6.25, 2.5, 5.5, 0], "texture": "#all"}, + "north": {"uv": [5.5, 2.5, 6.25, 3.25], "texture": "#all"}, + "south": {"uv": [8.75, 2.5, 9.5, 3.25], "texture": "#all"}, + "west": {"uv": [6.25, 2.5, 8.75, 3.25], "texture": "#all"}, + "east": {"uv": [3, 2.5, 5.5, 3.25], "texture": "#all"} + } + }, + { + "__comment": "frame3", + "from": [13, 0, 3], + "to": [16, 3, 13], + "faces": { + "down": {"uv": [7, 0, 6.25, 2.5], "texture": "#all"}, + "up": {"uv": [6.25, 2.5, 5.5, 0], "texture": "#all"}, + "north": {"uv": [5.5, 2.5, 6.25, 3.25], "texture": "#all"}, + "south": {"uv": [8.75, 2.5, 9.5, 3.25], "texture": "#all"}, + "west": {"uv": [6.25, 2.5, 8.75, 3.25], "texture": "#all"}, + "east": {"uv": [3, 2.5, 5.5, 3.25], "texture": "#all"} + } + }, + { + "__comment": "portBottomToggle", + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "down": {"uv": [6, 6.5, 4, 8.5], "texture": "#all"}, + "up": {"uv": [4, 8.5, 2, 6.5], "texture": "#all"}, + "north": {"uv": [2, 8.5, 4, 8.75], "texture": "#all"}, + "south": {"uv": [6, 8.5, 8, 8.75], "texture": "#all"}, + "west": {"uv": [4, 8.5, 6, 8.75], "texture": "#all"}, + "east": {"uv": [0, 8.5, 2, 8.75], "texture": "#all"} + } + }, + { + "__comment": "ledFront1", + "from": [12.5, 7.5, 0.0999999999999996], + "to": [13.5, 8.5, 1.1], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "connectorFrontToggle", + "from": [3, 5, 1], + "to": [13, 11, 2], + "faces": { + "down": {"uv": [14.75, 4, 12.25, 4.25], "texture": "#all"}, + "up": {"uv": [12.25, 4.25, 9.75, 4], "texture": "#all"}, + "north": {"uv": [9.75, 4.25, 12.25, 5.75], "texture": "#all"}, + "south": {"uv": [12.5, 4.25, 15, 5.75], "texture": "#all"}, + "west": {"uv": [12.25, 4.25, 12.5, 5.75], "texture": "#all"}, + "east": {"uv": [9.5, 4.25, 9.75, 5.75], "texture": "#all"} + } + }, + { + "__comment": "corner8", "from": [0, 0, 13], "to": [3, 3, 16], "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} } }, { - "__comment": "Corner3", + "__comment": "ledFront2", + "from": [2.5, 7.5, 0.0999999999999996], + "to": [3.5, 8.5, 1.1], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "frame2", + "from": [13, 13, 3], + "to": [16, 16, 13], + "faces": { + "down": {"uv": [7, 0, 6.25, 2.5], "texture": "#all"}, + "up": {"uv": [6.25, 2.5, 5.5, 0], "texture": "#all"}, + "north": {"uv": [5.5, 2.5, 6.25, 3.25], "texture": "#all"}, + "south": {"uv": [8.75, 2.5, 9.5, 3.25], "texture": "#all"}, + "west": {"uv": [6.25, 2.5, 8.75, 3.25], "texture": "#all"}, + "east": {"uv": [3, 2.5, 5.5, 3.25], "texture": "#all"} + } + }, + { + "__comment": "corner7", + "from": [0, 0, 0], + "to": [3, 3, 3], + "faces": { + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "ledLeft2", + "from": [14.9, 7.5, 2.5], + "to": [15.9, 8.5, 3.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "connectorBottomToggle", + "from": [3, 1, 5], + "to": [13, 2, 11], + "faces": { + "down": {"uv": [6.5, 4.75, 4, 6.25], "texture": "#all"}, + "up": {"uv": [4, 6.25, 1.5, 4.75], "texture": "#all"}, + "north": {"uv": [1.5, 6.25, 4, 6.5], "texture": "#all"}, + "south": {"uv": [5.5, 6.25, 8, 6.5], "texture": "#all"}, + "west": {"uv": [4, 6.25, 5.5, 6.5], "texture": "#all"}, + "east": {"uv": [0, 6.25, 1.5, 6.5], "texture": "#all"} + } + }, + { + "__comment": "frame12", + "from": [13, 3, 13], + "to": [16, 13, 16], + "faces": { + "down": {"uv": [2.25, 0, 1.5, 0.75], "texture": "#all"}, + "up": {"uv": [1.5, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1.5, 3.25], "texture": "#all"}, + "south": {"uv": [2.25, 0.75, 3, 3.25], "texture": "#all"}, + "west": {"uv": [1.5, 0.75, 2.25, 3.25], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 3.25], "texture": "#all"} + } + }, + { + "__comment": "ledLeft1", + "from": [14.9, 7.5, 12.5], + "to": [15.9, 8.5, 13.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "cube", + "from": [4.8, 4.8, 4.8], + "to": [11.2, 11.2, 11.2], + "faces": { + "down": {"uv": [24, 0, 16, 8], "texture": "#all"}, + "up": {"uv": [16, 8, 8, 0], "texture": "#all"}, + "north": {"uv": [8, 8, 16, 16], "texture": "#all"}, + "south": {"uv": [24, 8, 32, 16], "texture": "#all"}, + "west": {"uv": [16, 8, 24, 16], "texture": "#all"}, + "east": {"uv": [0, 8, 8, 16], "texture": "#all"} + } + }, + { + "__comment": "ledRight1", + "from": [0.0999999999999996, 7.5, 2.5], + "to": [1.1, 8.5, 3.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "ledBack1", + "from": [12.5, 7.5, 14.9], + "to": [13.5, 8.5, 15.9], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "ledBottom2", + "from": [2.5, 0.100000000000001, 7.5], + "to": [3.5, 1.1, 8.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "corner4", + "from": [0, 13, 13], + "to": [3, 16, 16], + "faces": { + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "connectorBackToggle", + "from": [3, 5, 14], + "to": [13, 11, 15], + "faces": { + "down": {"uv": [14.75, 4, 12.25, 4.25], "texture": "#all"}, + "up": {"uv": [12.25, 4.25, 9.75, 4], "texture": "#all"}, + "north": {"uv": [9.75, 4.25, 12.25, 5.75], "texture": "#all"}, + "south": {"uv": [12.5, 4.25, 15, 5.75], "texture": "#all"}, + "west": {"uv": [12.25, 4.25, 12.5, 5.75], "texture": "#all"}, + "east": {"uv": [9.5, 4.25, 9.75, 5.75], "texture": "#all"} + } + }, + { + "__comment": "corner1", + "from": [13, 13, 0], + "to": [16, 16, 3], + "faces": { + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "portBackToggle", + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "down": {"uv": [8.75, 8.75, 6.75, 9], "texture": "#all"}, + "up": {"uv": [6.75, 9, 4.75, 8.75], "texture": "#all"}, + "north": {"uv": [4.75, 9, 6.75, 11], "texture": "#all"}, + "south": {"uv": [7, 9, 9, 11], "texture": "#all"}, + "west": {"uv": [6.75, 9, 7, 11], "texture": "#all"}, + "east": {"uv": [4.5, 9, 4.75, 11], "texture": "#all"} + } + }, + { + "__comment": "ledTop1", + "from": [12.5, 14.9, 7.5], + "to": [13.5, 15.9, 8.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "portFrontToggle", + "from": [4, 4, 0], + "to": [12, 12, 1], + "faces": { + "down": {"uv": [8.75, 8.75, 6.75, 9], "texture": "#all"}, + "up": {"uv": [6.75, 9, 4.75, 8.75], "texture": "#all"}, + "north": {"uv": [4.75, 9, 6.75, 11], "texture": "#all"}, + "south": {"uv": [7, 9, 9, 11], "texture": "#all"}, + "west": {"uv": [6.75, 9, 7, 11], "texture": "#all"}, + "east": {"uv": [4.5, 9, 4.75, 11], "texture": "#all"} + } + }, + { + "__comment": "frame8", + "from": [3, 13, 13], + "to": [13, 16, 16], + "faces": { + "down": {"uv": [5.75, 3.25, 3.25, 4], "texture": "#all"}, + "up": {"uv": [3.25, 4, 0.75, 3.25], "texture": "#all"}, + "north": {"uv": [0.75, 4, 3.25, 4.75], "texture": "#all"}, + "south": {"uv": [4, 4, 6.5, 4.75], "texture": "#all"}, + "west": {"uv": [3.25, 4, 4, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4, 0.75, 4.75], "texture": "#all"} + } + }, + { + "__comment": "ledBack2", + "from": [2.5, 7.5, 14.9], + "to": [3.5, 8.5, 15.9], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "corner3", + "from": [0, 13, 0], + "to": [3, 16, 3], + "faces": { + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "frame5", + "from": [13, 3, 0], + "to": [16, 13, 3], + "faces": { + "down": {"uv": [2.25, 0, 1.5, 0.75], "texture": "#all"}, + "up": {"uv": [1.5, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1.5, 3.25], "texture": "#all"}, + "south": {"uv": [2.25, 0.75, 3, 3.25], "texture": "#all"}, + "west": {"uv": [1.5, 0.75, 2.25, 3.25], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 3.25], "texture": "#all"} + } + }, + { + "__comment": "frame1", + "from": [3, 13, 0], + "to": [13, 16, 3], + "faces": { + "down": {"uv": [5.75, 3.25, 3.25, 4], "texture": "#all"}, + "up": {"uv": [3.25, 4, 0.75, 3.25], "texture": "#all"}, + "north": {"uv": [0.75, 4, 3.25, 4.75], "texture": "#all"}, + "south": {"uv": [4, 4, 6.5, 4.75], "texture": "#all"}, + "west": {"uv": [3.25, 4, 4, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4, 0.75, 4.75], "texture": "#all"} + } + }, + { + "__comment": "frame10", + "from": [3, 0, 13], + "to": [13, 3, 16], + "faces": { + "down": {"uv": [5.75, 3.25, 3.25, 4], "texture": "#all"}, + "up": {"uv": [3.25, 4, 0.75, 3.25], "texture": "#all"}, + "north": {"uv": [0.75, 4, 3.25, 4.75], "texture": "#all"}, + "south": {"uv": [4, 4, 6.5, 4.75], "texture": "#all"}, + "west": {"uv": [3.25, 4, 4, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4, 0.75, 4.75], "texture": "#all"} + } + }, + { + "__comment": "connectorLeftToggle", + "from": [14, 5, 3], + "to": [15, 11, 13], + "faces": { + "down": {"uv": [12.5, 0, 12.25, 2.5], "texture": "#all"}, + "up": {"uv": [12.25, 2.5, 12, 0], "texture": "#all"}, + "north": {"uv": [12, 2.5, 12.25, 4], "texture": "#all"}, + "south": {"uv": [14.75, 2.5, 15, 4], "texture": "#all"}, + "west": {"uv": [12.25, 2.5, 14.75, 4], "texture": "#all"}, + "east": {"uv": [9.5, 2.5, 12, 4], "texture": "#all"} + } + }, + { + "__comment": "ledRight2", + "from": [0.0999999999999996, 7.5, 12.5], + "to": [1.1, 8.5, 13.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} + } + }, + { + "__comment": "frame11", + "from": [0, 3, 0], + "to": [3, 13, 3], + "faces": { + "down": {"uv": [2.25, 0, 1.5, 0.75], "texture": "#all"}, + "up": {"uv": [1.5, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1.5, 3.25], "texture": "#all"}, + "south": {"uv": [2.25, 0.75, 3, 3.25], "texture": "#all"}, + "west": {"uv": [1.5, 0.75, 2.25, 3.25], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 3.25], "texture": "#all"} + } + }, + { + "__comment": "corner6", "from": [13, 0, 13], "to": [16, 3, 16], "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} + "down": {"uv": [8.75, 3.25, 8, 4], "texture": "#all"}, + "up": {"uv": [8, 4, 7.25, 3.25], "texture": "#all"}, + "north": {"uv": [7.25, 4, 8, 4.75], "texture": "#all"}, + "south": {"uv": [8.75, 4, 9.5, 4.75], "texture": "#all"}, + "west": {"uv": [8, 4, 8.75, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 4, 7.25, 4.75], "texture": "#all"} + } + }, + { + "__comment": "connectorRightToggle", + "from": [1, 5, 3], + "to": [2, 11, 13], + "faces": { + "down": {"uv": [12.5, 0, 12.25, 2.5], "texture": "#all"}, + "up": {"uv": [12.25, 2.5, 12, 0], "texture": "#all"}, + "north": {"uv": [12, 2.5, 12.25, 4], "texture": "#all"}, + "south": {"uv": [14.75, 2.5, 15, 4], "texture": "#all"}, + "west": {"uv": [12.25, 2.5, 14.75, 4], "texture": "#all"}, + "east": {"uv": [9.5, 2.5, 12, 4], "texture": "#all"} + } + }, + { + "__comment": "portTopToggle", + "from": [4, 15, 4], + "to": [12, 16, 12], + "faces": { + "down": {"uv": [6, 6.5, 4, 8.5], "texture": "#all"}, + "up": {"uv": [4, 8.5, 2, 6.5], "texture": "#all"}, + "north": {"uv": [2, 8.5, 4, 8.75], "texture": "#all"}, + "south": {"uv": [6, 8.5, 8, 8.75], "texture": "#all"}, + "west": {"uv": [4, 8.5, 6, 8.75], "texture": "#all"}, + "east": {"uv": [0, 8.5, 2, 8.75], "texture": "#all"} + } + }, + { + "__comment": "ledTop2", + "from": [2.5, 14.9, 7.5], + "to": [3.5, 15.9, 8.5], + "faces": { + "down": {"uv": [0.75, 12.75, 0.5, 13], "texture": "#all"}, + "up": {"uv": [0.5, 13, 0.25, 12.75], "texture": "#all"}, + "north": {"uv": [0.25, 13, 0.5, 13.25], "texture": "#all"}, + "south": {"uv": [0.75, 13, 1, 13.25], "texture": "#all"}, + "west": {"uv": [0.5, 13, 0.75, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 0.25, 13.25], "texture": "#all"} } } ], "textures": { - "all": "mekanism:blocks/models/energy_cube_basic", - "particle": "mekanism:blocks/SteelCasing" + "all": "...", + "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json b/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json index 2bc129912..4c7566f70 100644 --- a/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json +++ b/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json @@ -1,7 +1,7 @@ { "parent": "block/cube_all", "textures": { - "all": "mekanism:blocks/enrichment_chamber" + "front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFront" } } diff --git a/src/main/resources/assets/mekanism/models/block/portable_tank.json b/src/main/resources/assets/mekanism/models/block/fluid_tank.json similarity index 70% rename from src/main/resources/assets/mekanism/models/block/portable_tank.json rename to src/main/resources/assets/mekanism/models/block/fluid_tank.json index 6639cad4c..4cb59fa47 100644 --- a/src/main/resources/assets/mekanism/models/block/portable_tank.json +++ b/src/main/resources/assets/mekanism/models/block/fluid_tank.json @@ -1,77 +1,12 @@ { "elements": [ - { - "__comment": "Top", - "from": [2, 14, 2], - "to": [14, 15, 14], - "faces": { - "down": {"uv": [3, 0, 4.5, 1.5], "texture": "#all"}, - "up": {"uv": [1.5, 0, 3, 1.5], "texture": "#all"}, - "north": {"uv": [1.5, 1.5, 3, 1.625], "texture": "#all"}, - "south": {"uv": [4.5, 1.5, 6, 1.625], "texture": "#all"}, - "west": {"uv": [3, 1.5, 4.5, 1.625], "texture": "#all"}, - "east": {"uv": [0, 1.5, 1.5, 1.625], "texture": "#all"} - } - }, - { - "__comment": "BackGlass", - "from": [3, 0, 13], - "to": [13, 14, 14], - "faces": { - "down": {"uv": [1.375, 3.5, 2.625, 3.625], "texture": "#all"}, - "up": {"uv": [0.125, 3.5, 1.375, 3.625], "texture": "#all"}, - "north": {"uv": [0.125, 3.625, 1.375, 5.375], "texture": "#all"}, - "south": {"uv": [1.5, 3.625, 2.75, 5.375], "texture": "#all"}, - "west": {"uv": [1.375, 3.625, 1.5, 5.375], "texture": "#all"}, - "east": {"uv": [0, 3.625, 0.125, 5.375], "texture": "#all"} - } - }, - { - "__comment": "PoleLB", - "from": [13, 0, 13], - "to": [14, 14, 14], - "faces": { - "down": {"uv": [6.25, 0, 6.375, 0.125], "texture": "#all"}, - "up": {"uv": [6.125, 0, 6.25, 0.125], "texture": "#all"}, - "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, - "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, - "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, - "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} - } - }, - { - "__comment": "LeftGlass", - "from": [13, 0, 3], - "to": [14, 14, 13], - "faces": { - "down": {"uv": [4.125, 4.625, 4.25, 5.875], "texture": "#all"}, - "up": {"uv": [4, 4.625, 4.125, 5.875], "texture": "#all"}, - "north": {"uv": [4, 5.875, 4.125, 7.625], "texture": "#all"}, - "south": {"uv": [5.375, 5.875, 5.5, 7.625], "texture": "#all"}, - "west": {"uv": [4.125, 5.875, 5.375, 7.625], "texture": "#all"}, - "east": {"uv": [2.75, 5.875, 4, 7.625], "texture": "#all"} - } - }, - { - "__comment": "PoleRF", - "from": [2, 0, 2], - "to": [3, 14, 3], - "faces": { - "down": {"uv": [6.25, 0, 6.375, 0.125], "texture": "#all"}, - "up": {"uv": [6.125, 0, 6.25, 0.125], "texture": "#all"}, - "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, - "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, - "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, - "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} - } - }, { "__comment": "RightGlass", - "from": [2, 0, 3], - "to": [3, 14, 13], + "from": [13, 1, 3], + "to": [14, 15, 13], "faces": { - "down": {"uv": [4.125, 1.625, 4.25, 2.875], "texture": "#all"}, - "up": {"uv": [4, 1.625, 4.125, 2.875], "texture": "#all"}, + "down": {"uv": [4.25, 1.625, 4.125, 2.875], "texture": "#all"}, + "up": {"uv": [4.125, 2.875, 4, 1.625], "texture": "#all"}, "north": {"uv": [4, 2.875, 4.125, 4.625], "texture": "#all"}, "south": {"uv": [5.375, 2.875, 5.5, 4.625], "texture": "#all"}, "west": {"uv": [4.125, 2.875, 5.375, 4.625], "texture": "#all"}, @@ -79,12 +14,25 @@ } }, { - "__comment": "Base", - "from": [2, -1, 2], - "to": [14, 0, 14], + "__comment": "PoleBR", + "from": [13, 1, 13], + "to": [14, 15, 14], "faces": { - "down": {"uv": [3, 0, 4.5, 1.5], "texture": "#all"}, - "up": {"uv": [1.5, 0, 3, 1.5], "texture": "#all"}, + "down": {"uv": [6.375, 0, 6.25, 0.125], "texture": "#all"}, + "up": {"uv": [6.25, 0.125, 6.125, 0], "texture": "#all"}, + "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, + "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, + "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, + "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} + } + }, + { + "__comment": "Top", + "from": [2, 15, 2], + "to": [14, 16, 14], + "faces": { + "down": {"uv": [4.5, 0, 3, 1.5], "texture": "#all"}, + "up": {"uv": [3, 1.5, 1.5, 0], "texture": "#all"}, "north": {"uv": [1.5, 1.5, 3, 1.625], "texture": "#all"}, "south": {"uv": [4.5, 1.5, 6, 1.625], "texture": "#all"}, "west": {"uv": [3, 1.5, 4.5, 1.625], "texture": "#all"}, @@ -93,24 +41,11 @@ }, { "__comment": "PoleFL", - "from": [13, 0, 2], - "to": [14, 14, 3], + "from": [2, 1, 2], + "to": [3, 15, 3], "faces": { - "down": {"uv": [6.25, 0, 6.375, 0.125], "texture": "#all"}, - "up": {"uv": [6.125, 0, 6.25, 0.125], "texture": "#all"}, - "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, - "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, - "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, - "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} - } - }, - { - "__comment": "PoleBR", - "from": [2, 0, 13], - "to": [3, 14, 14], - "faces": { - "down": {"uv": [6.25, 0, 6.375, 0.125], "texture": "#all"}, - "up": {"uv": [6.125, 0, 6.25, 0.125], "texture": "#all"}, + "down": {"uv": [6.375, 0, 6.25, 0.125], "texture": "#all"}, + "up": {"uv": [6.25, 0.125, 6.125, 0], "texture": "#all"}, "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, @@ -119,20 +54,85 @@ }, { "__comment": "FrontGlass", - "from": [3, 0, 2], - "to": [13, 14, 3], + "from": [3, 1, 2], + "to": [13, 15, 3], "faces": { - "down": {"uv": [1.375, 1.625, 2.625, 1.75], "texture": "#all"}, - "up": {"uv": [0.125, 1.625, 1.375, 1.75], "texture": "#all"}, + "down": {"uv": [2.625, 1.625, 1.375, 1.75], "texture": "#all"}, + "up": {"uv": [1.375, 1.75, 0.125, 1.625], "texture": "#all"}, "north": {"uv": [0.125, 1.75, 1.375, 3.5], "texture": "#all"}, "south": {"uv": [1.5, 1.75, 2.75, 3.5], "texture": "#all"}, "west": {"uv": [1.375, 1.75, 1.5, 3.5], "texture": "#all"}, "east": {"uv": [0, 1.75, 0.125, 3.5], "texture": "#all"} } + }, + { + "__comment": "LeftGlass", + "from": [2, 1, 3], + "to": [3, 15, 13], + "faces": { + "down": {"uv": [4.25, 4.625, 4.125, 5.875], "texture": "#all"}, + "up": {"uv": [4.125, 5.875, 4, 4.625], "texture": "#all"}, + "north": {"uv": [4, 5.875, 4.125, 7.625], "texture": "#all"}, + "south": {"uv": [5.375, 5.875, 5.5, 7.625], "texture": "#all"}, + "west": {"uv": [4.125, 5.875, 5.375, 7.625], "texture": "#all"}, + "east": {"uv": [2.75, 5.875, 4, 7.625], "texture": "#all"} + } + }, + { + "__comment": "BackGlass", + "from": [3, 1, 13], + "to": [13, 15, 14], + "faces": { + "down": {"uv": [2.625, 3.5, 1.375, 3.625], "texture": "#all"}, + "up": {"uv": [1.375, 3.625, 0.125, 3.5], "texture": "#all"}, + "north": {"uv": [0.125, 3.625, 1.375, 5.375], "texture": "#all"}, + "south": {"uv": [1.5, 3.625, 2.75, 5.375], "texture": "#all"}, + "west": {"uv": [1.375, 3.625, 1.5, 5.375], "texture": "#all"}, + "east": {"uv": [0, 3.625, 0.125, 5.375], "texture": "#all"} + } + }, + { + "__comment": "Base", + "from": [2, 0, 2], + "to": [14, 1, 14], + "faces": { + "down": {"uv": [4.5, 0, 3, 1.5], "texture": "#all"}, + "up": {"uv": [3, 1.5, 1.5, 0], "texture": "#all"}, + "north": {"uv": [1.5, 1.5, 3, 1.625], "texture": "#all"}, + "south": {"uv": [4.5, 1.5, 6, 1.625], "texture": "#all"}, + "west": {"uv": [3, 1.5, 4.5, 1.625], "texture": "#all"}, + "east": {"uv": [0, 1.5, 1.5, 1.625], "texture": "#all"} + } + }, + { + "__comment": "PoleLB", + "from": [2, 1, 13], + "to": [3, 15, 14], + "faces": { + "down": {"uv": [6.375, 0, 6.25, 0.125], "texture": "#all"}, + "up": {"uv": [6.25, 0.125, 6.125, 0], "texture": "#all"}, + "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, + "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, + "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, + "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} + } + }, + { + "__comment": "PoleRF", + "from": [13, 1, 2], + "to": [14, 15, 3], + "faces": { + "down": {"uv": [6.375, 0, 6.25, 0.125], "texture": "#all"}, + "up": {"uv": [6.25, 0.125, 6.125, 0], "texture": "#all"}, + "north": {"uv": [6.125, 0.125, 6.25, 1.875], "texture": "#all"}, + "south": {"uv": [6.375, 0.125, 6.5, 1.875], "texture": "#all"}, + "west": {"uv": [6.25, 0.125, 6.375, 1.875], "texture": "#all"}, + "east": {"uv": [6, 0.125, 6.125, 1.875], "texture": "#all"} + } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/fluid_tank", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json b/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json index 4209f8339..3f9e2870a 100644 --- a/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json +++ b/src/main/resources/assets/mekanism/models/block/fluidic_plenisher.json @@ -1,203 +1,203 @@ { "elements": [ { - "__comment": "Screen", - "from": [4, 6, 2], - "to": [12, 11, 3], - "faces": { - "down": {"uv": [6.125, 2.125, 7.125, 2.25], "texture": "#all"}, - "up": {"uv": [5.125, 2.125, 6.125, 2.25], "texture": "#all"}, - "north": {"uv": [5.125, 2.25, 6.125, 2.875], "texture": "#all"}, - "south": {"uv": [6.25, 2.25, 7.25, 2.875], "texture": "#all"}, - "west": {"uv": [6.125, 2.25, 6.25, 2.875], "texture": "#all"}, - "east": {"uv": [5, 2.25, 5.125, 2.875], "texture": "#all"} - } - }, - { - "__comment": "PumpTube", - "from": [7, 0, 7], - "to": [9, 3, 9], - "faces": { - "down": {"uv": [5.5, 0.625, 5.75, 0.875], "texture": "#all"}, - "up": {"uv": [5.25, 0.625, 5.5, 0.875], "texture": "#all"}, - "north": {"uv": [5.25, 0.875, 5.5, 1.25], "texture": "#all"}, - "south": {"uv": [5.75, 0.875, 6, 1.25], "texture": "#all"}, - "west": {"uv": [5.5, 0.875, 5.75, 1.25], "texture": "#all"}, - "east": {"uv": [5, 0.875, 5.25, 1.25], "texture": "#all"} - } - }, - { - "__comment": "LeftThing", - "from": [13, 6, 6], - "to": [14, 10, 10], - "faces": { - "down": {"uv": [3.625, 3.625, 3.75, 4.125], "texture": "#all"}, - "up": {"uv": [3.5, 3.625, 3.625, 4.125], "texture": "#all"}, - "north": {"uv": [3.5, 4.125, 3.625, 4.625], "texture": "#all"}, - "south": {"uv": [4.125, 4.125, 4.25, 4.625], "texture": "#all"}, - "west": {"uv": [3.625, 4.125, 4.125, 4.625], "texture": "#all"}, - "east": {"uv": [3, 4.125, 3.5, 4.625], "texture": "#all"} - } - }, - { - "__comment": "LeftCable", - "from": [13, 3, 7], - "to": [14, 6, 9], - "faces": { - "down": {"uv": [4.375, 2.25, 4.5, 2.5], "texture": "#all"}, - "up": {"uv": [4.25, 2.25, 4.375, 2.5], "texture": "#all"}, - "north": {"uv": [4.25, 2.5, 4.375, 2.875], "texture": "#all"}, - "south": {"uv": [4.625, 2.5, 4.75, 2.875], "texture": "#all"}, - "west": {"uv": [4.375, 2.5, 4.625, 2.875], "texture": "#all"}, - "east": {"uv": [4, 2.5, 4.25, 2.875], "texture": "#all"} - } - }, - { - "__comment": "Core", - "from": [3, 4, 3], - "to": [13, 12, 13], - "faces": { - "down": {"uv": [2.5, 0, 3.75, 1.25], "texture": "#all"}, - "up": {"uv": [1.25, 0, 2.5, 1.25], "texture": "#all"}, - "north": {"uv": [1.25, 1.25, 2.5, 2.25], "texture": "#all"}, - "south": {"uv": [3.75, 1.25, 5, 2.25], "texture": "#all"}, - "west": {"uv": [2.5, 1.25, 3.75, 2.25], "texture": "#all"}, - "east": {"uv": [0, 1.25, 1.25, 2.25], "texture": "#all"} - } - }, - { - "__comment": "CoreStart", - "from": [6, 3, 6], - "to": [10, 4, 10], - "faces": { - "down": {"uv": [6, 0, 6.5, 0.5], "texture": "#all"}, - "up": {"uv": [5.5, 0, 6, 0.5], "texture": "#all"}, - "north": {"uv": [5.5, 0.5, 6, 0.625], "texture": "#all"}, - "south": {"uv": [6.5, 0.5, 7, 0.625], "texture": "#all"}, - "west": {"uv": [6, 0.5, 6.5, 0.625], "texture": "#all"}, - "east": {"uv": [5, 0.5, 5.5, 0.625], "texture": "#all"} - } - }, - { - "__comment": "RightConnector", - "from": [3, 3, 7], - "to": [6, 4, 9], - "faces": { - "down": {"uv": [5.625, 1.25, 6, 1.5], "texture": "#all"}, - "up": {"uv": [5.25, 1.25, 5.625, 1.5], "texture": "#all"}, - "north": {"uv": [5.25, 1.5, 5.625, 1.625], "texture": "#all"}, - "south": {"uv": [5.875, 1.5, 6.25, 1.625], "texture": "#all"}, - "west": {"uv": [5.625, 1.5, 5.875, 1.625], "texture": "#all"}, - "east": {"uv": [5, 1.5, 5.25, 1.625], "texture": "#all"} - } - }, - { - "__comment": "EnergyTube", - "from": [7, 6, 13], - "to": [9, 8, 15], - "faces": { - "down": {"uv": [2.25, 4.5, 2.5, 4.75], "texture": "#all"}, - "up": {"uv": [2, 4.5, 2.25, 4.75], "texture": "#all"}, - "north": {"uv": [2, 4.75, 2.25, 5], "texture": "#all"}, - "south": {"uv": [2.5, 4.75, 2.75, 5], "texture": "#all"}, - "west": {"uv": [2.25, 4.75, 2.5, 5], "texture": "#all"}, - "east": {"uv": [1.75, 4.75, 2, 5], "texture": "#all"} - } - }, - { - "__comment": "LeftConnector", - "from": [10, 3, 7], - "to": [13, 4, 9], - "faces": { - "down": {"uv": [5.625, 1.25, 6, 1.5], "texture": "#all"}, - "up": {"uv": [5.25, 1.25, 5.625, 1.5], "texture": "#all"}, - "north": {"uv": [5.25, 1.5, 5.625, 1.625], "texture": "#all"}, - "south": {"uv": [5.875, 1.5, 6.25, 1.625], "texture": "#all"}, - "west": {"uv": [5.625, 1.5, 5.875, 1.625], "texture": "#all"}, - "east": {"uv": [5, 1.5, 5.25, 1.625], "texture": "#all"} - } - }, - { - "__comment": "Keyboard", - "from": [4, 5, 0], - "to": [12, 6, 3], - "faces": { - "down": {"uv": [6.375, 1.625, 7.375, 2], "texture": "#all"}, - "up": {"uv": [5.375, 1.625, 6.375, 2], "texture": "#all"}, - "north": {"uv": [5.375, 2, 6.375, 2.125], "texture": "#all"}, - "south": {"uv": [6.75, 2, 7.75, 2.125], "texture": "#all"}, - "west": {"uv": [6.375, 2, 6.75, 2.125], "texture": "#all"}, - "east": {"uv": [5, 2, 5.375, 2.125], "texture": "#all"} - } - }, - { - "__comment": "EnergyInput", - "from": [5, 4, 15], - "to": [11, 10, 16], - "faces": { - "down": {"uv": [0.875, 4.5, 1.625, 4.625], "texture": "#all"}, - "up": {"uv": [0.125, 4.5, 0.875, 4.625], "texture": "#all"}, - "north": {"uv": [0.125, 4.625, 0.875, 5.375], "texture": "#all"}, - "south": {"uv": [1, 4.625, 1.75, 5.375], "texture": "#all"}, - "west": {"uv": [0.875, 4.625, 1, 5.375], "texture": "#all"}, - "east": {"uv": [0, 4.625, 0.125, 5.375], "texture": "#all"} - } - }, - { - "__comment": "RightThing", - "from": [2, 6, 6], - "to": [3, 10, 10], - "faces": { - "down": {"uv": [3.625, 3.625, 3.75, 4.125], "texture": "#all"}, - "up": {"uv": [3.5, 3.625, 3.625, 4.125], "texture": "#all"}, - "north": {"uv": [3.5, 4.125, 3.625, 4.625], "texture": "#all"}, - "south": {"uv": [4.125, 4.125, 4.25, 4.625], "texture": "#all"}, - "west": {"uv": [3.625, 4.125, 4.125, 4.625], "texture": "#all"}, - "east": {"uv": [3, 4.125, 3.5, 4.625], "texture": "#all"} - } - }, - { - "__comment": "FluidOutput", - "from": [4, 12, 4], + "__comment": "ringTop", + "from": [4, 14, 4], "to": [12, 15, 12], "faces": { - "down": {"uv": [2, 2.25, 3, 3.25], "texture": "#all"}, - "up": {"uv": [1, 2.25, 2, 3.25], "texture": "#all"}, - "north": {"uv": [1, 3.25, 2, 3.625], "texture": "#all"}, - "south": {"uv": [3, 3.25, 4, 3.625], "texture": "#all"}, - "west": {"uv": [2, 3.25, 3, 3.625], "texture": "#all"}, - "east": {"uv": [0, 3.25, 1, 3.625], "texture": "#all"} + "down": {"uv": [6, 11, 4, 13], "texture": "#all"}, + "up": {"uv": [4, 13, 2, 11], "texture": "#all"}, + "north": {"uv": [2, 13, 4, 13.25], "texture": "#all"}, + "south": {"uv": [6, 13, 8, 13.25], "texture": "#all"}, + "west": {"uv": [4, 13, 6, 13.25], "texture": "#all"}, + "east": {"uv": [0, 13, 2, 13.25], "texture": "#all"} } }, { - "__comment": "RightCable", - "from": [2, 3, 7], - "to": [3, 6, 9], + "__comment": "rod1", + "from": [10, 10, 12], + "to": [11, 11, 15], "faces": { - "down": {"uv": [4.375, 2.25, 4.5, 2.5], "texture": "#all"}, - "up": {"uv": [4.25, 2.25, 4.375, 2.5], "texture": "#all"}, - "north": {"uv": [4.25, 2.5, 4.375, 2.875], "texture": "#all"}, - "south": {"uv": [4.625, 2.5, 4.75, 2.875], "texture": "#all"}, - "west": {"uv": [4.375, 2.5, 4.625, 2.875], "texture": "#all"}, - "east": {"uv": [4, 2.5, 4.25, 2.875], "texture": "#all"} + "down": {"uv": [1.25, 0, 1, 0.75], "texture": "#all"}, + "up": {"uv": [1, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1, 1], "texture": "#all"}, + "south": {"uv": [1.75, 0.75, 2, 1], "texture": "#all"}, + "west": {"uv": [1, 0.75, 1.75, 1], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 1], "texture": "#all"} } }, { - "__comment": "PumpBase", - "from": [5, -1, 5], + "__comment": "ringBottom", + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "down": {"uv": [6, 13.25, 4, 15.25], "texture": "#all"}, + "up": {"uv": [4, 15.25, 2, 13.25], "texture": "#all"}, + "north": {"uv": [2, 15.25, 4, 15.5], "texture": "#all"}, + "south": {"uv": [6, 15.25, 8, 15.5], "texture": "#all"}, + "west": {"uv": [4, 15.25, 6, 15.5], "texture": "#all"}, + "east": {"uv": [0, 15.25, 2, 15.5], "texture": "#all"} + } + }, + { + "__comment": "portTop", + "from": [3, 15, 3], + "to": [13, 16, 13], + "faces": { + "down": {"uv": [7.5, 5.25, 5, 7.75], "texture": "#all"}, + "up": {"uv": [5, 7.75, 2.5, 5.25], "texture": "#all"}, + "north": {"uv": [2.5, 7.75, 5, 8], "texture": "#all"}, + "south": {"uv": [7.5, 7.75, 10, 8], "texture": "#all"}, + "west": {"uv": [5, 7.75, 7.5, 8], "texture": "#all"}, + "east": {"uv": [0, 7.75, 2.5, 8], "texture": "#all"} + } + }, + { + "__comment": "portBack", + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "down": {"uv": [13.25, 0, 11.25, 0.25], "texture": "#all"}, + "up": {"uv": [11.25, 0.25, 9.25, 0], "texture": "#all"}, + "north": {"uv": [9.25, 0.25, 11.25, 2.25], "texture": "#all"}, + "south": {"uv": [11.5, 0.25, 13.5, 2.25], "texture": "#all"}, + "west": {"uv": [11.25, 0.25, 11.5, 2.25], "texture": "#all"}, + "east": {"uv": [9, 0.25, 9.25, 2.25], "texture": "#all"} + } + }, + { + "__comment": "ringTank", + "from": [2.5, 13, 2.5], + "to": [13.5, 14, 13.5], + "faces": { + "down": {"uv": [8.25, 8, 5.5, 10.75], "texture": "#all"}, + "up": {"uv": [5.5, 10.75, 2.75, 8], "texture": "#all"}, + "north": {"uv": [2.75, 10.75, 5.5, 11], "texture": "#all"}, + "south": {"uv": [8.25, 10.75, 11, 11], "texture": "#all"}, + "west": {"uv": [5.5, 10.75, 8.25, 11], "texture": "#all"}, + "east": {"uv": [0, 10.75, 2.75, 11], "texture": "#all"} + } + }, + { + "__comment": "Connector", + "from": [5.5, 5.5, 11], + "to": [10.5, 10.5, 15], + "faces": { + "down": {"uv": [12.5, 2.25, 11.25, 3.25], "texture": "#all"}, + "up": {"uv": [11.25, 3.25, 10, 2.25], "texture": "#all"}, + "north": {"uv": [10, 3.25, 11.25, 4.5], "texture": "#all"}, + "south": {"uv": [12.25, 3.25, 13.5, 4.5], "texture": "#all"}, + "west": {"uv": [11.25, 3.25, 12.25, 4.5], "texture": "#all"}, + "east": {"uv": [9, 3.25, 10, 4.5], "texture": "#all"} + } + }, + { + "__comment": "rod4", + "from": [5, 5, 12], + "to": [6, 6, 15], + "faces": { + "down": {"uv": [1.25, 0, 1, 0.75], "texture": "#all"}, + "up": {"uv": [1, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1, 1], "texture": "#all"}, + "south": {"uv": [1.75, 0.75, 2, 1], "texture": "#all"}, + "west": {"uv": [1, 0.75, 1.75, 1], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 1], "texture": "#all"} + } + }, + { + "__comment": "pipeToggle", + "from": [5, -8, 5], "to": [11, 0, 11], "faces": { - "down": {"uv": [1.5, 3.625, 2.25, 4.375], "texture": "#all"}, - "up": {"uv": [0.75, 3.625, 1.5, 4.375], "texture": "#all"}, - "north": {"uv": [0.75, 4.375, 1.5, 4.5], "texture": "#all"}, - "south": {"uv": [2.25, 4.375, 3, 4.5], "texture": "#all"}, - "west": {"uv": [1.5, 4.375, 2.25, 4.5], "texture": "#all"}, - "east": {"uv": [0, 4.375, 0.75, 4.5], "texture": "#all"} + "down": {"uv": [12.5, 11, 11, 12.5], "texture": "#all"}, + "up": {"uv": [11, 12.5, 9.5, 11], "texture": "#all"}, + "north": {"uv": [9.5, 12.5, 11, 14.5], "texture": "#all"}, + "south": {"uv": [12.5, 12.5, 14, 14.5], "texture": "#all"}, + "west": {"uv": [11, 12.5, 12.5, 14.5], "texture": "#all"}, + "east": {"uv": [8, 12.5, 9.5, 14.5], "texture": "#all"} + } + }, + { + "__comment": "bearingLeft", + "from": [12, 6, 6], + "to": [13, 10, 10], + "faces": { + "down": {"uv": [12.5, 6.5, 12.25, 7.5], "texture": "#all"}, + "up": {"uv": [12.25, 7.5, 12, 6.5], "texture": "#all"}, + "north": {"uv": [12, 7.5, 12.25, 8.5], "texture": "#all"}, + "south": {"uv": [13.25, 7.5, 13.5, 8.5], "texture": "#all"}, + "west": {"uv": [12.25, 7.5, 13.25, 8.5], "texture": "#all"}, + "east": {"uv": [11, 7.5, 12, 8.5], "texture": "#all"} + } + }, + { + "__comment": "rod2", + "from": [5, 10, 12], + "to": [6, 11, 15], + "faces": { + "down": {"uv": [1.25, 0, 1, 0.75], "texture": "#all"}, + "up": {"uv": [1, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1, 1], "texture": "#all"}, + "south": {"uv": [1.75, 0.75, 2, 1], "texture": "#all"}, + "west": {"uv": [1, 0.75, 1.75, 1], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 1], "texture": "#all"} + } + }, + { + "__comment": "tank", + "from": [3.5, 1, 3.5], + "to": [12.5, 13, 12.5], + "faces": { + "down": {"uv": [6.75, 0, 4.5, 2.25], "texture": "#all"}, + "up": {"uv": [4.5, 2.25, 2.25, 0], "texture": "#all"}, + "north": {"uv": [2.25, 2.25, 4.5, 5.25], "texture": "#all"}, + "south": {"uv": [6.75, 2.25, 9, 5.25], "texture": "#all"}, + "west": {"uv": [4.5, 2.25, 6.75, 5.25], "texture": "#all"}, + "east": {"uv": [0, 2.25, 2.25, 5.25], "texture": "#all"} + } + }, + { + "__comment": "connectorRing", + "from": [4.5, 4.5, 13], + "to": [11.5, 11.5, 14], + "faces": { + "down": {"uv": [13.75, 4.5, 12, 4.75], "texture": "#all"}, + "up": {"uv": [12, 4.75, 10.25, 4.5], "texture": "#all"}, + "north": {"uv": [10.25, 4.75, 12, 6.5], "texture": "#all"}, + "south": {"uv": [12.25, 4.75, 14, 6.5], "texture": "#all"}, + "west": {"uv": [12, 4.75, 12.25, 6.5], "texture": "#all"}, + "east": {"uv": [10, 4.75, 10.25, 6.5], "texture": "#all"} + } + }, + { + "__comment": "rod3", + "from": [10, 5, 12], + "to": [11, 6, 15], + "faces": { + "down": {"uv": [1.25, 0, 1, 0.75], "texture": "#all"}, + "up": {"uv": [1, 0.75, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.75, 1, 1], "texture": "#all"}, + "south": {"uv": [1.75, 0.75, 2, 1], "texture": "#all"}, + "west": {"uv": [1, 0.75, 1.75, 1], "texture": "#all"}, + "east": {"uv": [0, 0.75, 0.75, 1], "texture": "#all"} + } + }, + { + "__comment": "bearingRight", + "from": [3, 6, 6], + "to": [4, 10, 10], + "faces": { + "down": {"uv": [12.5, 6.5, 12.25, 7.5], "texture": "#all"}, + "up": {"uv": [12.25, 7.5, 12, 6.5], "texture": "#all"}, + "north": {"uv": [12, 7.5, 12.25, 8.5], "texture": "#all"}, + "south": {"uv": [13.25, 7.5, 13.5, 8.5], "texture": "#all"}, + "west": {"uv": [12.25, 7.5, 13.25, 8.5], "texture": "#all"}, + "east": {"uv": [11, 7.5, 12, 8.5], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/fluidic_plenisher", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/gas_tank.json b/src/main/resources/assets/mekanism/models/block/gas_tank.json index bb3fd0578..fac88c3c0 100644 --- a/src/main/resources/assets/mekanism/models/block/gas_tank.json +++ b/src/main/resources/assets/mekanism/models/block/gas_tank.json @@ -1,99 +1,138 @@ { "elements": [ { - "__comment": "Panel1", - "from": [5.5, -1, 11.5], - "to": [10.5, 12, 12.5], + "__comment": "rim3", + "from": [4, 13, 11], + "to": [12, 16, 12], "faces": { - "down": {"uv": [1.5, 5.5, 2.75, 5.75], "texture": "#all"}, - "up": {"uv": [0.25, 5.5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.25, 5.75, 1.5, 9], "texture": "#all"}, - "south": {"uv": [1.75, 5.75, 3, 9], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 1.75, 9], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.25, 9], "texture": "#all"} + "down": {"uv": [15.25, 1.25, 13.25, 1.5], "texture": "#all"}, + "up": {"uv": [13.25, 1.5, 11.25, 1.25], "texture": "#all"}, + "north": {"uv": [11.25, 1.5, 13.25, 2.25], "texture": "#all"}, + "south": {"uv": [13.5, 1.5, 15.5, 2.25], "texture": "#all"}, + "west": {"uv": [13.25, 1.5, 13.5, 2.25], "texture": "#all"}, + "east": {"uv": [11, 1.5, 11.25, 2.25], "texture": "#all"} } }, { - "__comment": "Tank", - "from": [4.5, -1, 4.5], - "to": [11.5, 13, 11.5], + "__comment": "rim4", + "from": [4, 13, 5], + "to": [5, 16, 11], "faces": { - "down": {"uv": [3.5, 0, 5.25, 1.75], "texture": "#all"}, - "up": {"uv": [1.75, 0, 3.5, 1.75], "texture": "#all"}, - "north": {"uv": [1.75, 1.75, 3.5, 5.25], "texture": "#all"}, - "south": {"uv": [5.25, 1.75, 7, 5.25], "texture": "#all"}, - "west": {"uv": [3.5, 1.75, 5.25, 5.25], "texture": "#all"}, - "east": {"uv": [0, 1.75, 1.75, 5.25], "texture": "#all"} + "down": {"uv": [9.5, 0, 9.25, 1.5], "texture": "#all"}, + "up": {"uv": [9.25, 1.5, 9, 0], "texture": "#all"}, + "north": {"uv": [9, 1.5, 9.25, 2.25], "texture": "#all"}, + "south": {"uv": [10.75, 1.5, 11, 2.25], "texture": "#all"}, + "west": {"uv": [9.25, 1.5, 10.75, 2.25], "texture": "#all"}, + "east": {"uv": [7.5, 1.5, 9, 2.25], "texture": "#all"} } }, { - "__comment": "Panel3", - "from": [5.5, -1, 3.5], - "to": [10.5, 12, 4.5], + "__comment": "rim5", + "from": [4, 13, 4], + "to": [6, 16, 5], "faces": { - "down": {"uv": [1.5, 5.5, 2.75, 5.75], "texture": "#all"}, - "up": {"uv": [0.25, 5.5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.25, 5.75, 1.5, 9], "texture": "#all"}, - "south": {"uv": [1.75, 5.75, 3, 9], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 1.75, 9], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.25, 9], "texture": "#all"} + "down": {"uv": [1.25, 1, 0.75, 1.25], "texture": "#all"}, + "up": {"uv": [0.75, 1.25, 0.25, 1], "texture": "#all"}, + "north": {"uv": [0.25, 1.25, 0.75, 2], "texture": "#all"}, + "south": {"uv": [1, 1.25, 1.5, 2], "texture": "#all"}, + "west": {"uv": [0.75, 1.25, 1, 2], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.25, 2], "texture": "#all"} } }, { - "__comment": "Top", - "from": [7, 13, 7], - "to": [9, 15, 9], + "__comment": "valve", + "from": [6.5, 14.5, 6.5], + "to": [9.5, 15.5, 9.5], "faces": { - "down": {"uv": [4.25, 5.5, 4.75, 6], "texture": "#all"}, - "up": {"uv": [3.75, 5.5, 4.25, 6], "texture": "#all"}, - "north": {"uv": [3.75, 6, 4.25, 6.5], "texture": "#all"}, - "south": {"uv": [4.75, 6, 5.25, 6.5], "texture": "#all"}, - "west": {"uv": [4.25, 6, 4.75, 6.5], "texture": "#all"}, - "east": {"uv": [3.25, 6, 3.75, 6.5], "texture": "#all"} + "down": {"uv": [13.75, 0, 13, 0.75], "texture": "#all"}, + "up": {"uv": [13, 0.75, 12.25, 0], "texture": "#all"}, + "north": {"uv": [12.25, 0.75, 13, 1], "texture": "#all"}, + "south": {"uv": [13.75, 0.75, 14.5, 1], "texture": "#all"}, + "west": {"uv": [13, 0.75, 13.75, 1], "texture": "#all"}, + "east": {"uv": [11.5, 0.75, 12.25, 1], "texture": "#all"} } }, { - "__comment": "Panel2", - "from": [11.5, -1, 5.5], - "to": [12.5, 12, 10.5], + "__comment": "rim1", + "from": [10, 13, 4], + "to": [12, 16, 5], "faces": { - "down": {"uv": [1.5, 9.25, 1.75, 10.5], "texture": "#all"}, - "up": {"uv": [1.25, 9.25, 1.5, 10.5], "texture": "#all"}, - "north": {"uv": [1.25, 10.5, 1.5, 13.75], "texture": "#all"}, - "south": {"uv": [2.75, 10.5, 3, 13.75], "texture": "#all"}, - "west": {"uv": [1.5, 10.5, 2.75, 13.75], "texture": "#all"}, - "east": {"uv": [0, 10.5, 1.25, 13.75], "texture": "#all"} + "down": {"uv": [1.25, 0, 0.75, 0.25], "texture": "#all"}, + "up": {"uv": [0.75, 0.25, 0.25, 0], "texture": "#all"}, + "north": {"uv": [0.25, 0.25, 0.75, 1], "texture": "#all"}, + "south": {"uv": [1, 0.25, 1.5, 1], "texture": "#all"}, + "west": {"uv": [0.75, 0.25, 1, 1], "texture": "#all"}, + "east": {"uv": [0, 0.25, 0.25, 1], "texture": "#all"} } }, { - "__comment": "Exit", - "from": [9, 13.8, 7.5], - "to": [10, 14.8, 8.5], + "__comment": "tank", + "from": [3, 1.5, 3], + "to": [13, 13.5, 13], "faces": { - "down": {"uv": [6, 5.5, 6.25, 5.75], "texture": "#all"}, - "up": {"uv": [5.75, 5.5, 6, 5.75], "texture": "#all"}, - "north": {"uv": [5.75, 5.75, 6, 6], "texture": "#all"}, - "south": {"uv": [6.25, 5.75, 6.5, 6], "texture": "#all"}, - "west": {"uv": [6, 5.75, 6.25, 6], "texture": "#all"}, - "east": {"uv": [5.5, 5.75, 5.75, 6], "texture": "#all"} + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#all"}, + "up": {"uv": [5, 2.5, 2.5, 0], "texture": "#all"}, + "north": {"uv": [2.5, 2.5, 5, 5.5], "texture": "#all"}, + "south": {"uv": [7.5, 2.5, 10, 5.5], "texture": "#all"}, + "west": {"uv": [5, 2.5, 7.5, 5.5], "texture": "#all"}, + "east": {"uv": [0, 2.5, 2.5, 5.5], "texture": "#all"} } }, { - "__comment": "Panel4", - "from": [3.5, -1, 5.5], - "to": [4.5, 12, 10.5], + "__comment": "tankBase", + "from": [3.5, 0.5, 3.5], + "to": [12.5, 1.5, 12.5], "faces": { - "down": {"uv": [1.5, 9.25, 1.75, 10.5], "texture": "#all"}, - "up": {"uv": [1.25, 9.25, 1.5, 10.5], "texture": "#all"}, - "north": {"uv": [1.25, 10.5, 1.5, 13.75], "texture": "#all"}, - "south": {"uv": [2.75, 10.5, 3, 13.75], "texture": "#all"}, - "west": {"uv": [1.5, 10.5, 2.75, 13.75], "texture": "#all"}, - "east": {"uv": [0, 10.5, 1.25, 13.75], "texture": "#all"} + "down": {"uv": [6.75, 5.5, 4.5, 7.75], "texture": "#all"}, + "up": {"uv": [4.5, 7.75, 2.25, 5.5], "texture": "#all"}, + "north": {"uv": [2.25, 7.75, 4.5, 8], "texture": "#all"}, + "south": {"uv": [6.75, 7.75, 9, 8], "texture": "#all"}, + "west": {"uv": [4.5, 7.75, 6.75, 8], "texture": "#all"}, + "east": {"uv": [0, 7.75, 2.25, 8], "texture": "#all"} + } + }, + { + "__comment": "valveBase", + "from": [7, 13.5, 7], + "to": [9, 14.5, 9], + "faces": { + "down": {"uv": [11, 0, 10.5, 0.5], "texture": "#all"}, + "up": {"uv": [10.5, 0.5, 10, 0], "texture": "#all"}, + "north": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#all"}, + "south": {"uv": [11, 0.5, 11.5, 0.75], "texture": "#all"}, + "west": {"uv": [10.5, 0.5, 11, 0.75], "texture": "#all"}, + "east": {"uv": [9.5, 0.5, 10, 0.75], "texture": "#all"} + } + }, + { + "__comment": "rim0", + "from": [6, 13, 4], + "to": [10, 14, 5], + "faces": { + "down": {"uv": [2.25, 2, 1.25, 2.25], "texture": "#all"}, + "up": {"uv": [1.25, 2.25, 0.25, 2], "texture": "#all"}, + "north": {"uv": [0.25, 2.25, 1.25, 2.5], "texture": "#all"}, + "south": {"uv": [1.5, 2.25, 2.5, 2.5], "texture": "#all"}, + "west": {"uv": [1.25, 2.25, 1.5, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2.25, 0.25, 2.5], "texture": "#all"} + } + }, + { + "__comment": "rim2", + "from": [11, 13, 5], + "to": [12, 16, 11], + "faces": { + "down": {"uv": [9.5, 0, 9.25, 1.5], "texture": "#all"}, + "up": {"uv": [9.25, 1.5, 9, 0], "texture": "#all"}, + "north": {"uv": [9, 1.5, 9.25, 2.25], "texture": "#all"}, + "south": {"uv": [10.75, 1.5, 11, 2.25], "texture": "#all"}, + "west": {"uv": [9.25, 1.5, 10.75, 2.25], "texture": "#all"}, + "east": {"uv": [7.5, 1.5, 9, 2.25], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/gas_tank_basic", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/laser.json b/src/main/resources/assets/mekanism/models/block/laser.json index c37eac781..69fbcf406 100644 --- a/src/main/resources/assets/mekanism/models/block/laser.json +++ b/src/main/resources/assets/mekanism/models/block/laser.json @@ -1,255 +1,268 @@ { "elements": [ { - "__comment": "RightOuterRail", - "from": [14, 4, 1], - "to": [15, 6, 15], + "__comment": "rod1", + "from": [4.2, 3, 9], + "to": [5.2, 8, 10], "faces": { - "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, - "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, - "north": {"uv": [9, 10.75, 9.25, 11.25], "texture": "#all"}, - "south": {"uv": [12.75, 10.75, 13, 11.25], "texture": "#all"}, - "west": {"uv": [9.25, 10.75, 12.75, 11.25], "texture": "#all"}, - "east": {"uv": [5.5, 10.75, 9, 11.25], "texture": "#all"} + "down": {"uv": [0.75, 2.25, 0.5, 2.5], "texture": "#all"}, + "up": {"uv": [0.5, 2.5, 0.25, 2.25], "texture": "#all"}, + "north": {"uv": [0.25, 2.5, 0.5, 3.75], "texture": "#all"}, + "south": {"uv": [0.75, 2.5, 1, 3.75], "texture": "#all"}, + "west": {"uv": [0.5, 2.5, 0.75, 3.75], "texture": "#all"}, + "east": {"uv": [0, 2.5, 0.25, 3.75], "texture": "#all"} } }, { - "__comment": "LaserDecor2", - "from": [5, 5.3, 6], - "to": [6, 9.3, 10], + "__comment": "fin7", + "from": [11, 4, 4], + "to": [12, 5, 12], "faces": { - "down": {"uv": [12.25, 4.5, 12.5, 5.5], "texture": "#all"}, - "up": {"uv": [12, 4.5, 12.25, 5.5], "texture": "#all"}, - "north": {"uv": [12, 5.5, 12.25, 6.5], "texture": "#all"}, - "south": {"uv": [13.25, 5.5, 13.5, 6.5], "texture": "#all"}, - "west": {"uv": [12.25, 5.5, 13.25, 6.5], "texture": "#all"}, - "east": {"uv": [11, 5.5, 12, 6.5], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LaserDecor", - "from": [10, 5.3, 6], - "to": [11, 9.3, 10], + "__comment": "body", + "from": [5, 2, 4], + "to": [11, 9, 12], "faces": { - "down": {"uv": [12.25, 4.5, 12.5, 5.5], "texture": "#all"}, - "up": {"uv": [12, 4.5, 12.25, 5.5], "texture": "#all"}, - "north": {"uv": [12, 5.5, 12.25, 6.5], "texture": "#all"}, - "south": {"uv": [13.25, 5.5, 13.5, 6.5], "texture": "#all"}, - "west": {"uv": [12.25, 5.5, 13.25, 6.5], "texture": "#all"}, - "east": {"uv": [11, 5.5, 12, 6.5], "texture": "#all"} + "down": {"uv": [13, 0, 11.5, 2], "texture": "#all"}, + "up": {"uv": [11.5, 2, 10, 0], "texture": "#all"}, + "north": {"uv": [10, 2, 11.5, 3.75], "texture": "#all"}, + "south": {"uv": [13.5, 2, 15, 3.75], "texture": "#all"}, + "west": {"uv": [11.5, 2, 13.5, 3.75], "texture": "#all"}, + "east": {"uv": [8, 2, 10, 3.75], "texture": "#all"} } }, { - "__comment": "LeftInnerRail", - "from": [3, 4, 1], - "to": [4, 6, 15], + "__comment": "fin8", + "from": [11, 2, 4], + "to": [12, 3, 12], "faces": { - "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, - "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, - "north": {"uv": [9, 10.75, 9.25, 11.25], "texture": "#all"}, - "south": {"uv": [12.75, 10.75, 13, 11.25], "texture": "#all"}, - "west": {"uv": [9.25, 10.75, 12.75, 11.25], "texture": "#all"}, - "east": {"uv": [5.5, 10.75, 9, 11.25], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LowerCache", - "from": [2, 4, 3], - "to": [14, 5, 13], + "__comment": "fin6", + "from": [11, 6, 4], + "to": [12, 7, 12], "faces": { - "down": {"uv": [5.5, 4.5, 8.5, 7], "texture": "#all"}, - "up": {"uv": [2.5, 4.5, 5.5, 7], "texture": "#all"}, - "north": {"uv": [2.5, 7, 5.5, 7.25], "texture": "#all"}, - "south": {"uv": [8, 7, 11, 7.25], "texture": "#all"}, - "west": {"uv": [5.5, 7, 8, 7.25], "texture": "#all"}, - "east": {"uv": [0, 7, 2.5, 7.25], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LaserCable2", - "from": [9, 6.5, 4], - "to": [10, 12.5, 5], + "__comment": "wire", + "from": [8.5, 8, 7.5], + "to": [9.5, 14, 8.5], "faces": { - "down": {"uv": [5, 10.75, 5.25, 11], "texture": "#all"}, - "up": {"uv": [4.75, 10.75, 5, 11], "texture": "#all"}, - "north": {"uv": [4.75, 11, 5, 12.5], "texture": "#all"}, - "south": {"uv": [5.25, 11, 5.5, 12.5], "texture": "#all"}, - "west": {"uv": [5, 11, 5.25, 12.5], "texture": "#all"}, - "east": {"uv": [4.5, 11, 4.75, 12.5], "texture": "#all"} + "down": {"uv": [3.25, 2.25, 3, 2.5], "texture": "#all"}, + "up": {"uv": [3, 2.5, 2.75, 2.25], "texture": "#all"}, + "north": {"uv": [2.75, 2.5, 3, 4], "texture": "#all"}, + "south": {"uv": [3.25, 2.5, 3.5, 4], "texture": "#all"}, + "west": {"uv": [3, 2.5, 3.25, 4], "texture": "#all"}, + "east": {"uv": [2.5, 2.5, 2.75, 4], "texture": "#all"} } }, { - "__comment": "LeftBottomDecor", - "from": [0, 0, 3], - "to": [1, 4, 13], + "__comment": "fin5", + "from": [11, 8, 4], + "to": [12, 9, 12], "faces": { - "down": {"uv": [2.75, 7.25, 3, 9.75], "texture": "#all"}, - "up": {"uv": [2.5, 7.25, 2.75, 9.75], "texture": "#all"}, - "north": {"uv": [2.5, 9.75, 2.75, 10.75], "texture": "#all"}, - "south": {"uv": [5.25, 9.75, 5.5, 10.75], "texture": "#all"}, - "west": {"uv": [2.75, 9.75, 5.25, 10.75], "texture": "#all"}, - "east": {"uv": [0, 9.75, 2.5, 10.75], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LaserCable4", - "from": [6, 6.5, 4], - "to": [7, 12.5, 5], + "__comment": "shaft", + "from": [6.5, 9, 6.5], + "to": [9.5, 11, 9.5], "faces": { - "down": {"uv": [5, 10.75, 5.25, 11], "texture": "#all"}, - "up": {"uv": [4.75, 10.75, 5, 11], "texture": "#all"}, - "north": {"uv": [4.75, 11, 5, 12.5], "texture": "#all"}, - "south": {"uv": [5.25, 11, 5.5, 12.5], "texture": "#all"}, - "west": {"uv": [5, 11, 5.25, 12.5], "texture": "#all"}, - "east": {"uv": [4.5, 11, 4.75, 12.5], "texture": "#all"} + "down": {"uv": [2.25, 4.5, 1.5, 5.25], "texture": "#all"}, + "up": {"uv": [1.5, 5.25, 0.75, 4.5], "texture": "#all"}, + "north": {"uv": [0.75, 5.25, 1.5, 5.75], "texture": "#all"}, + "south": {"uv": [2.25, 5.25, 3, 5.75], "texture": "#all"}, + "west": {"uv": [1.5, 5.25, 2.25, 5.75], "texture": "#all"}, + "east": {"uv": [0, 5.25, 0.75, 5.75], "texture": "#all"} } }, { - "__comment": "LaserTip", - "from": [7, 11.5, 7], - "to": [9, 14.5, 9], + "__comment": "center", + "from": [7, 1, 7], + "to": [9, 16, 9], "faces": { - "down": {"uv": [8.5, 11.25, 9, 11.75], "texture": "#all"}, - "up": {"uv": [8, 11.25, 8.5, 11.75], "texture": "#all"}, - "north": {"uv": [8, 11.75, 8.5, 12.5], "texture": "#all"}, - "south": {"uv": [9, 11.75, 9.5, 12.5], "texture": "#all"}, - "west": {"uv": [8.5, 11.75, 9, 12.5], "texture": "#all"}, - "east": {"uv": [7.5, 11.75, 8, 12.5], "texture": "#all"} + "down": {"uv": [6, 2.25, 5.5, 2.75], "texture": "#all"}, + "up": {"uv": [5.5, 2.75, 5, 2.25], "texture": "#all"}, + "north": {"uv": [5, 2.75, 5.5, 6.5], "texture": "#all"}, + "south": {"uv": [6, 2.75, 6.5, 6.5], "texture": "#all"}, + "west": {"uv": [5.5, 2.75, 6, 6.5], "texture": "#all"}, + "east": {"uv": [4.5, 2.75, 5, 6.5], "texture": "#all"} } }, { - "__comment": "LaserCable1", - "from": [9, 11.5, 5], - "to": [10, 12.5, 8], + "__comment": "fin2", + "from": [4, 4, 4], + "to": [5, 5, 12], "faces": { - "down": {"uv": [6.5, 11.25, 6.75, 12], "texture": "#all"}, - "up": {"uv": [6.25, 11.25, 6.5, 12], "texture": "#all"}, - "north": {"uv": [6.25, 12, 6.5, 12.25], "texture": "#all"}, - "south": {"uv": [7.25, 12, 7.5, 12.25], "texture": "#all"}, - "west": {"uv": [6.5, 12, 7.25, 12.25], "texture": "#all"}, - "east": {"uv": [5.5, 12, 6.25, 12.25], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "RightInnerRail", - "from": [12, 4, 1], - "to": [13, 6, 15], + "__comment": "fin4", + "from": [4, 8, 4], + "to": [5, 9, 12], "faces": { - "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, - "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, - "north": {"uv": [9, 10.75, 9.25, 11.25], "texture": "#all"}, - "south": {"uv": [12.75, 10.75, 13, 11.25], "texture": "#all"}, - "west": {"uv": [9.25, 10.75, 12.75, 11.25], "texture": "#all"}, - "east": {"uv": [5.5, 10.75, 9, 11.25], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "RightTopDecor", - "from": [15, 4, 4], - "to": [16, 5, 12], + "__comment": "rod3", + "from": [10.8, 3, 9], + "to": [11.8, 8, 10], "faces": { - "down": {"uv": [2.25, 10.75, 2.5, 12.75], "texture": "#all"}, - "up": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, - "north": {"uv": [2, 12.75, 2.25, 13], "texture": "#all"}, - "south": {"uv": [4.25, 12.75, 4.5, 13], "texture": "#all"}, - "west": {"uv": [2.25, 12.75, 4.25, 13], "texture": "#all"}, - "east": {"uv": [0, 12.75, 2, 13], "texture": "#all"} + "down": {"uv": [0.75, 2.25, 0.5, 2.5], "texture": "#all"}, + "up": {"uv": [0.5, 2.5, 0.25, 2.25], "texture": "#all"}, + "north": {"uv": [0.25, 2.5, 0.5, 3.75], "texture": "#all"}, + "south": {"uv": [0.75, 2.5, 1, 3.75], "texture": "#all"}, + "west": {"uv": [0.5, 2.5, 0.75, 3.75], "texture": "#all"}, + "east": {"uv": [0, 2.5, 0.25, 3.75], "texture": "#all"} } }, { - "__comment": "Base", - "from": [1, 0, 1], - "to": [15, 4, 15], + "__comment": "port", + "from": [4, 0, 4], + "to": [12, 1, 12], "faces": { - "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#all"}, - "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#all"}, - "north": {"uv": [3.5, 3.5, 7, 4.5], "texture": "#all"}, - "south": {"uv": [10.5, 3.5, 14, 4.5], "texture": "#all"}, - "west": {"uv": [7, 3.5, 10.5, 4.5], "texture": "#all"}, - "east": {"uv": [0, 3.5, 3.5, 4.5], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.25], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.25], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.25], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.25], "texture": "#all"} } }, { - "__comment": "HigherCache", - "from": [2, 5.5, 3], - "to": [14, 6.5, 13], + "__comment": "connector", + "from": [5, 1, 5], + "to": [11, 2, 11], "faces": { - "down": {"uv": [5.5, 4.5, 8.5, 7], "texture": "#all"}, - "up": {"uv": [2.5, 4.5, 5.5, 7], "texture": "#all"}, - "north": {"uv": [2.5, 7, 5.5, 7.25], "texture": "#all"}, - "south": {"uv": [8, 7, 11, 7.25], "texture": "#all"}, - "west": {"uv": [5.5, 7, 8, 7.25], "texture": "#all"}, - "east": {"uv": [0, 7, 2.5, 7.25], "texture": "#all"} + "down": {"uv": [12.5, 3.75, 11, 5.25], "texture": "#all"}, + "up": {"uv": [11, 5.25, 9.5, 3.75], "texture": "#all"}, + "north": {"uv": [9.5, 5.25, 11, 5.5], "texture": "#all"}, + "south": {"uv": [12.5, 5.25, 14, 5.5], "texture": "#all"}, + "west": {"uv": [11, 5.25, 12.5, 5.5], "texture": "#all"}, + "east": {"uv": [8, 5.25, 9.5, 5.5], "texture": "#all"} } }, { - "__comment": "LaserCable3", - "from": [6, 11.5, 5], - "to": [7, 12.5, 8], + "__comment": "rod2", + "from": [4.2, 3, 6], + "to": [5.2, 8, 7], "faces": { - "down": {"uv": [6.5, 11.25, 6.75, 12], "texture": "#all"}, - "up": {"uv": [6.25, 11.25, 6.5, 12], "texture": "#all"}, - "north": {"uv": [6.25, 12, 6.5, 12.25], "texture": "#all"}, - "south": {"uv": [7.25, 12, 7.5, 12.25], "texture": "#all"}, - "west": {"uv": [6.5, 12, 7.25, 12.25], "texture": "#all"}, - "east": {"uv": [5.5, 12, 6.25, 12.25], "texture": "#all"} + "down": {"uv": [0.75, 2.25, 0.5, 2.5], "texture": "#all"}, + "up": {"uv": [0.5, 2.5, 0.25, 2.25], "texture": "#all"}, + "north": {"uv": [0.25, 2.5, 0.5, 3.75], "texture": "#all"}, + "south": {"uv": [0.75, 2.5, 1, 3.75], "texture": "#all"}, + "west": {"uv": [0.5, 2.5, 0.75, 3.75], "texture": "#all"}, + "east": {"uv": [0, 2.5, 0.25, 3.75], "texture": "#all"} } }, { - "__comment": "RightBottomDecor", - "from": [15, 0, 3], - "to": [16, 4, 13], + "__comment": "fin3", + "from": [4, 6, 4], + "to": [5, 7, 12], "faces": { - "down": {"uv": [2.75, 7.25, 3, 9.75], "texture": "#all"}, - "up": {"uv": [2.5, 7.25, 2.75, 9.75], "texture": "#all"}, - "north": {"uv": [2.5, 9.75, 2.75, 10.75], "texture": "#all"}, - "south": {"uv": [5.25, 9.75, 5.5, 10.75], "texture": "#all"}, - "west": {"uv": [2.75, 9.75, 5.25, 10.75], "texture": "#all"}, - "east": {"uv": [0, 9.75, 2.5, 10.75], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LeftOuterRail", - "from": [1, 4, 1], - "to": [2, 6, 15], + "__comment": "fin1", + "from": [4, 2, 4], + "to": [5, 3, 12], "faces": { - "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, - "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, - "north": {"uv": [9, 10.75, 9.25, 11.25], "texture": "#all"}, - "south": {"uv": [12.75, 10.75, 13, 11.25], "texture": "#all"}, - "west": {"uv": [9.25, 10.75, 12.75, 11.25], "texture": "#all"}, - "east": {"uv": [5.5, 10.75, 9, 11.25], "texture": "#all"} + "down": {"uv": [2.5, 2.25, 2.25, 4.25], "texture": "#all"}, + "up": {"uv": [2.25, 4.25, 2, 2.25], "texture": "#all"}, + "north": {"uv": [2, 4.25, 2.25, 4.5], "texture": "#all"}, + "south": {"uv": [4.25, 4.25, 4.5, 4.5], "texture": "#all"}, + "west": {"uv": [2.25, 4.25, 4.25, 4.5], "texture": "#all"}, + "east": {"uv": [0, 4.25, 2, 4.5], "texture": "#all"} } }, { - "__comment": "LeftTopDecor", - "from": [0, 4, 4], - "to": [1, 5, 12], + "__comment": "ring2", + "from": [6, 11, 6], + "to": [10, 12, 10], "faces": { - "down": {"uv": [2.25, 10.75, 2.5, 12.75], "texture": "#all"}, - "up": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, - "north": {"uv": [2, 12.75, 2.25, 13], "texture": "#all"}, - "south": {"uv": [4.25, 12.75, 4.5, 13], "texture": "#all"}, - "west": {"uv": [2.25, 12.75, 4.25, 13], "texture": "#all"}, - "east": {"uv": [0, 12.75, 2, 13], "texture": "#all"} + "down": {"uv": [3, 5.75, 2, 6.75], "texture": "#all"}, + "up": {"uv": [2, 6.75, 1, 5.75], "texture": "#all"}, + "north": {"uv": [1, 6.75, 2, 7], "texture": "#all"}, + "south": {"uv": [3, 6.75, 4, 7], "texture": "#all"}, + "west": {"uv": [2, 6.75, 3, 7], "texture": "#all"}, + "east": {"uv": [0, 6.75, 1, 7], "texture": "#all"} } }, { - "__comment": "LaserBase", - "from": [5, 6.5, 5], - "to": [11, 11.5, 11], + "__comment": "ring1", + "from": [6, 13, 6], + "to": [10, 14, 10], "faces": { - "down": {"uv": [3, 13, 4.5, 14.5], "texture": "#all"}, - "up": {"uv": [1.5, 13, 3, 14.5], "texture": "#all"}, - "north": {"uv": [1.5, 14.5, 3, 15.75], "texture": "#all"}, - "south": {"uv": [4.5, 14.5, 6, 15.75], "texture": "#all"}, - "west": {"uv": [3, 14.5, 4.5, 15.75], "texture": "#all"}, - "east": {"uv": [0, 14.5, 1.5, 15.75], "texture": "#all"} + "down": {"uv": [3, 5.75, 2, 6.75], "texture": "#all"}, + "up": {"uv": [2, 6.75, 1, 5.75], "texture": "#all"}, + "north": {"uv": [1, 6.75, 2, 7], "texture": "#all"}, + "south": {"uv": [3, 6.75, 4, 7], "texture": "#all"}, + "west": {"uv": [2, 6.75, 3, 7], "texture": "#all"}, + "east": {"uv": [0, 6.75, 1, 7], "texture": "#all"} + } + }, + { + "__comment": "rod4", + "from": [10.8, 3, 6], + "to": [11.8, 8, 7], + "faces": { + "down": {"uv": [0.75, 2.25, 0.5, 2.5], "texture": "#all"}, + "up": {"uv": [0.5, 2.5, 0.25, 2.25], "texture": "#all"}, + "north": {"uv": [0.25, 2.5, 0.5, 3.75], "texture": "#all"}, + "south": {"uv": [0.75, 2.5, 1, 3.75], "texture": "#all"}, + "west": {"uv": [0.5, 2.5, 0.75, 3.75], "texture": "#all"}, + "east": {"uv": [0, 2.5, 0.25, 3.75], "texture": "#all"} } } ], "textures": { "all": "mekanism:blocks/models/laser", - "particle": "mekanism:blocks/SteelCasing" + "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/laser_amplifier.json b/src/main/resources/assets/mekanism/models/block/laser_amplifier.json index 33935e2e8..61b436e22 100644 --- a/src/main/resources/assets/mekanism/models/block/laser_amplifier.json +++ b/src/main/resources/assets/mekanism/models/block/laser_amplifier.json @@ -1,12 +1,25 @@ { "elements": [ { - "__comment": "Base", - "from": [1, 0, 1], - "to": [15, 14, 15], + "__comment": "S1", + "from": [0, 3, 3], + "to": [1, 13, 13], "faces": { - "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#all"}, - "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#all"}, + "down": {"uv": [3, 9.75, 2.75, 12.25], "texture": "#all"}, + "up": {"uv": [2.75, 12.25, 2.5, 9.75], "texture": "#all"}, + "north": {"uv": [2.5, 12.25, 2.75, 14.75], "texture": "#all"}, + "south": {"uv": [5.25, 12.25, 5.5, 14.75], "texture": "#all"}, + "west": {"uv": [2.75, 12.25, 5.25, 14.75], "texture": "#all"}, + "east": {"uv": [0, 12.25, 2.5, 14.75], "texture": "#all"} + } + }, + { + "__comment": "Base", + "from": [1, 1, 1], + "to": [15, 15, 15], + "faces": { + "down": {"uv": [10.5, 0, 7, 3.5], "texture": "#all"}, + "up": {"uv": [7, 3.5, 3.5, 0], "texture": "#all"}, "north": {"uv": [3.5, 3.5, 7, 7], "texture": "#all"}, "south": {"uv": [10.5, 3.5, 14, 7], "texture": "#all"}, "west": {"uv": [7, 3.5, 10.5, 7], "texture": "#all"}, @@ -15,24 +28,11 @@ }, { "__comment": "S6", - "from": [3, 14, 3], - "to": [13, 15, 13], + "from": [3, 15, 3], + "to": [13, 16, 13], "faces": { - "down": {"uv": [5, 7, 7.5, 9.5], "texture": "#all"}, - "up": {"uv": [2.5, 7, 5, 9.5], "texture": "#all"}, - "north": {"uv": [2.5, 9.5, 5, 9.75], "texture": "#all"}, - "south": {"uv": [7.5, 9.5, 10, 9.75], "texture": "#all"}, - "west": {"uv": [5, 9.5, 7.5, 9.75], "texture": "#all"}, - "east": {"uv": [0, 9.5, 2.5, 9.75], "texture": "#all"} - } - }, - { - "__comment": "S4", - "from": [3, -1, 3], - "to": [13, 0, 13], - "faces": { - "down": {"uv": [5, 7, 7.5, 9.5], "texture": "#all"}, - "up": {"uv": [2.5, 7, 5, 9.5], "texture": "#all"}, + "down": {"uv": [7.5, 7, 5, 9.5], "texture": "#all"}, + "up": {"uv": [5, 9.5, 2.5, 7], "texture": "#all"}, "north": {"uv": [2.5, 9.5, 5, 9.75], "texture": "#all"}, "south": {"uv": [7.5, 9.5, 10, 9.75], "texture": "#all"}, "west": {"uv": [5, 9.5, 7.5, 9.75], "texture": "#all"}, @@ -41,11 +41,37 @@ }, { "__comment": "S2", - "from": [3, 2, 15], - "to": [13, 12, 16], + "from": [3, 3, 15], + "to": [13, 13, 16], "faces": { - "down": {"uv": [8.25, 9.75, 10.75, 10], "texture": "#all"}, - "up": {"uv": [5.75, 9.75, 8.25, 10], "texture": "#all"}, + "down": {"uv": [10.75, 9.75, 8.25, 10], "texture": "#all"}, + "up": {"uv": [8.25, 10, 5.75, 9.75], "texture": "#all"}, + "north": {"uv": [5.75, 10, 8.25, 12.5], "texture": "#all"}, + "south": {"uv": [8.5, 10, 11, 12.5], "texture": "#all"}, + "west": {"uv": [8.25, 10, 8.5, 12.5], "texture": "#all"}, + "east": {"uv": [5.5, 10, 5.75, 12.5], "texture": "#all"} + } + }, + { + "__comment": "S4", + "from": [3, 0, 3], + "to": [13, 1, 13], + "faces": { + "down": {"uv": [7.5, 7, 5, 9.5], "texture": "#all"}, + "up": {"uv": [5, 9.5, 2.5, 7], "texture": "#all"}, + "north": {"uv": [2.5, 9.5, 5, 9.75], "texture": "#all"}, + "south": {"uv": [7.5, 9.5, 10, 9.75], "texture": "#all"}, + "west": {"uv": [5, 9.5, 7.5, 9.75], "texture": "#all"}, + "east": {"uv": [0, 9.5, 2.5, 9.75], "texture": "#all"} + } + }, + { + "__comment": "S5", + "from": [3, 3, 0], + "to": [13, 13, 1], + "faces": { + "down": {"uv": [10.75, 9.75, 8.25, 10], "texture": "#all"}, + "up": {"uv": [8.25, 10, 5.75, 9.75], "texture": "#all"}, "north": {"uv": [5.75, 10, 8.25, 12.5], "texture": "#all"}, "south": {"uv": [8.5, 10, 11, 12.5], "texture": "#all"}, "west": {"uv": [8.25, 10, 8.5, 12.5], "texture": "#all"}, @@ -54,46 +80,20 @@ }, { "__comment": "S3", - "from": [0, 2, 3], - "to": [1, 12, 13], + "from": [15, 3, 3], + "to": [16, 13, 13], "faces": { - "down": {"uv": [2.75, 9.75, 3, 12.25], "texture": "#all"}, - "up": {"uv": [2.5, 9.75, 2.75, 12.25], "texture": "#all"}, + "down": {"uv": [3, 9.75, 2.75, 12.25], "texture": "#all"}, + "up": {"uv": [2.75, 12.25, 2.5, 9.75], "texture": "#all"}, "north": {"uv": [2.5, 12.25, 2.75, 14.75], "texture": "#all"}, "south": {"uv": [5.25, 12.25, 5.5, 14.75], "texture": "#all"}, "west": {"uv": [2.75, 12.25, 5.25, 14.75], "texture": "#all"}, "east": {"uv": [0, 12.25, 2.5, 14.75], "texture": "#all"} } - }, - { - "__comment": "S1", - "from": [15, 2, 3], - "to": [16, 12, 13], - "faces": { - "down": {"uv": [2.75, 9.75, 3, 12.25], "texture": "#all"}, - "up": {"uv": [2.5, 9.75, 2.75, 12.25], "texture": "#all"}, - "north": {"uv": [2.5, 12.25, 2.75, 14.75], "texture": "#all"}, - "south": {"uv": [5.25, 12.25, 5.5, 14.75], "texture": "#all"}, - "west": {"uv": [2.75, 12.25, 5.25, 14.75], "texture": "#all"}, - "east": {"uv": [0, 12.25, 2.5, 14.75], "texture": "#all"} - } - }, - { - "__comment": "S5", - "from": [3, 2, 0], - "to": [13, 12, 1], - "faces": { - "down": {"uv": [8.25, 9.75, 10.75, 10], "texture": "#all"}, - "up": {"uv": [5.75, 9.75, 8.25, 10], "texture": "#all"}, - "north": {"uv": [5.75, 10, 8.25, 12.5], "texture": "#all"}, - "south": {"uv": [8.5, 10, 11, 12.5], "texture": "#all"}, - "west": {"uv": [8.25, 10, 8.5, 12.5], "texture": "#all"}, - "east": {"uv": [5.5, 10, 5.75, 12.5], "texture": "#all"} - } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/laser_amplifier", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/logistical_sorter.json b/src/main/resources/assets/mekanism/models/block/logistical_sorter.json index 4ca1ef4c0..119e1f7cb 100644 --- a/src/main/resources/assets/mekanism/models/block/logistical_sorter.json +++ b/src/main/resources/assets/mekanism/models/block/logistical_sorter.json @@ -1,281 +1,346 @@ { "elements": [ { - "__comment": "BL1Block2", - "from": [3, 3.5, 9.473333], - "to": [4, 5.5, 11.473333], + "__comment": "portBackLarge", + "from": [2, 2, 15], + "to": [14, 14, 16], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [3.125, 0, 1.625, 0.125], "texture": "#all"}, + "up": {"uv": [1.625, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 1.625, 1.625], "texture": "#all"}, + "south": {"uv": [1.75, 0.125, 3.25, 1.625], "texture": "#all"}, + "west": {"uv": [1.625, 0.125, 1.75, 1.625], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 1.625], "texture": "#all"} } }, { - "__comment": "DecorPlate", - "from": [13, 3, 4], - "to": [14, 11, 12], + "__comment": "ring6", + "from": [4.5, 4.5, 11], + "to": [11.5, 11.5, 12], "faces": { - "down": {"uv": [1.75, 3.625, 1.875, 4.625], "texture": "#all"}, - "up": {"uv": [1.625, 3.625, 1.75, 4.625], "texture": "#all"}, - "north": {"uv": [1.625, 4.625, 1.75, 5.625], "texture": "#all"}, - "south": {"uv": [2.75, 4.625, 2.875, 5.625], "texture": "#all"}, - "west": {"uv": [1.75, 4.625, 2.75, 5.625], "texture": "#all"}, - "east": {"uv": [0.625, 4.625, 1.625, 5.625], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } }, { - "__comment": "LeftPlate", - "from": [2, 4, 10], - "to": [14, 10, 11], + "__comment": "panel2", + "from": [4, 6.5, 3.5], + "to": [5, 9.5, 11.5], "faces": { - "down": {"uv": [5.75, 0.625, 7.25, 0.75], "texture": "#all"}, - "up": {"uv": [4.25, 0.625, 5.75, 0.75], "texture": "#all"}, - "north": {"uv": [4.25, 0.75, 5.75, 1.5], "texture": "#all"}, - "south": {"uv": [5.875, 0.75, 7.375, 1.5], "texture": "#all"}, - "west": {"uv": [5.75, 0.75, 5.875, 1.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.75, 4.25, 1.5], "texture": "#all"} + "down": {"uv": [6.25, 2.75, 6.125, 3.75], "texture": "#all"}, + "up": {"uv": [6.125, 3.75, 6, 2.75], "texture": "#all"}, + "north": {"uv": [6, 3.75, 6.125, 4.125], "texture": "#all"}, + "south": {"uv": [7.125, 3.75, 7.25, 4.125], "texture": "#all"}, + "west": {"uv": [6.125, 3.75, 7.125, 4.125], "texture": "#all"}, + "east": {"uv": [5, 3.75, 6, 4.125], "texture": "#all"} } }, { - "__comment": "RightPlate", - "from": [2, 4, 5], - "to": [14, 10, 6], + "__comment": "pistonConnector1", + "from": [7, 3, 4], + "to": [9, 5, 5], "faces": { - "down": {"uv": [5.75, 0.625, 7.25, 0.75], "texture": "#all"}, - "up": {"uv": [4.25, 0.625, 5.75, 0.75], "texture": "#all"}, - "north": {"uv": [4.25, 0.75, 5.75, 1.5], "texture": "#all"}, - "south": {"uv": [5.875, 0.75, 7.375, 1.5], "texture": "#all"}, - "west": {"uv": [5.75, 0.75, 5.875, 1.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.75, 4.25, 1.5], "texture": "#all"} + "down": {"uv": [1.875, 4.125, 1.625, 4.25], "texture": "#all"}, + "up": {"uv": [1.625, 4.25, 1.375, 4.125], "texture": "#all"}, + "north": {"uv": [1.375, 4.25, 1.625, 4.5], "texture": "#all"}, + "south": {"uv": [1.75, 4.25, 2, 4.5], "texture": "#all"}, + "west": {"uv": [1.625, 4.25, 1.75, 4.5], "texture": "#all"}, + "east": {"uv": [1.25, 4.25, 1.375, 4.5], "texture": "#all"} } }, { - "__comment": "TL1Block1", - "from": [12, 8.5, 9.473333], - "to": [13, 10.5, 11.473333], + "__comment": "pistonBrace2", + "from": [7, 10.5, 1], + "to": [9, 12.5, 4], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [0.875, 4.125, 0.625, 4.5], "texture": "#all"}, + "up": {"uv": [0.625, 4.5, 0.375, 4.125], "texture": "#all"}, + "north": {"uv": [0.375, 4.5, 0.625, 4.75], "texture": "#all"}, + "south": {"uv": [1, 4.5, 1.25, 4.75], "texture": "#all"}, + "west": {"uv": [0.625, 4.5, 1, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4.5, 0.375, 4.75], "texture": "#all"} } }, { - "__comment": "PoleBR", - "from": [4, 3.8, 10.2], - "to": [12, 4.8, 11.2], + "__comment": "ring1", + "from": [4.5, 4.5, 1], + "to": [11.5, 11.5, 2], "faces": { - "down": {"uv": [6.125, 0, 7.125, 0.125], "texture": "#all"}, - "up": {"uv": [5.125, 0, 6.125, 0.125], "texture": "#all"}, - "north": {"uv": [5.125, 0.125, 6.125, 0.25], "texture": "#all"}, - "south": {"uv": [6.25, 0.125, 7.25, 0.25], "texture": "#all"}, - "west": {"uv": [6.125, 0.125, 6.25, 0.25], "texture": "#all"}, - "east": {"uv": [5, 0.125, 5.125, 0.25], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } }, { - "__comment": "TopPlate", - "from": [2, 9, 6], - "to": [14, 10, 10], + "__comment": "pistonConnector2", + "from": [7, 11, 4], + "to": [9, 13, 5], "faces": { - "down": {"uv": [9.5, 0.875, 11, 1.375], "texture": "#all"}, - "up": {"uv": [8, 0.875, 9.5, 1.375], "texture": "#all"}, - "north": {"uv": [8, 1.375, 9.5, 1.5], "texture": "#all"}, - "south": {"uv": [10, 1.375, 11.5, 1.5], "texture": "#all"}, - "west": {"uv": [9.5, 1.375, 10, 1.5], "texture": "#all"}, - "east": {"uv": [7.5, 1.375, 8, 1.5], "texture": "#all"} + "down": {"uv": [1.875, 4.125, 1.625, 4.25], "texture": "#all"}, + "up": {"uv": [1.625, 4.25, 1.375, 4.125], "texture": "#all"}, + "north": {"uv": [1.375, 4.25, 1.625, 4.5], "texture": "#all"}, + "south": {"uv": [1.75, 4.25, 2, 4.5], "texture": "#all"}, + "west": {"uv": [1.625, 4.25, 1.75, 4.5], "texture": "#all"}, + "east": {"uv": [1.25, 4.25, 1.375, 4.5], "texture": "#all"} } }, { - "__comment": "BL1Block1", - "from": [12, 3.5, 9.473333], - "to": [13, 5.5, 11.473333], + "__comment": "ring7", + "from": [4.5, 4.5, 13], + "to": [11.5, 11.5, 14], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } }, { - "__comment": "RightThing", - "from": [13.5, 1, 2], - "to": [14.5, 13, 3], + "__comment": "connectorBack", + "from": [3, 3, 14], + "to": [13, 13, 15], "faces": { - "down": {"uv": [0.25, 3.625, 0.375, 3.75], "texture": "#all"}, - "up": {"uv": [0.125, 3.625, 0.25, 3.75], "texture": "#all"}, - "north": {"uv": [0.125, 3.75, 0.25, 5.25], "texture": "#all"}, - "south": {"uv": [0.375, 3.75, 0.5, 5.25], "texture": "#all"}, - "west": {"uv": [0.25, 3.75, 0.375, 5.25], "texture": "#all"}, - "east": {"uv": [0, 3.75, 0.125, 5.25], "texture": "#all"} + "down": {"uv": [5.875, 0, 4.625, 0.125], "texture": "#all"}, + "up": {"uv": [4.625, 0.125, 3.375, 0], "texture": "#all"}, + "north": {"uv": [3.375, 0.125, 4.625, 1.375], "texture": "#all"}, + "south": {"uv": [4.75, 0.125, 6, 1.375], "texture": "#all"}, + "west": {"uv": [4.625, 0.125, 4.75, 1.375], "texture": "#all"}, + "east": {"uv": [3.25, 0.125, 3.375, 1.375], "texture": "#all"} } }, { - "__comment": "Base", - "from": [14, 0, 1], - "to": [16, 14, 15], + "__comment": "pistonBar1", + "from": [7.5, 3.5, 5.01], + "to": [8.5, 4.5, 10.01], "faces": { - "down": {"uv": [2, 0, 2.25, 1.75], "texture": "#all"}, - "up": {"uv": [1.75, 0, 2, 1.75], "texture": "#all"}, - "north": {"uv": [1.75, 1.75, 2, 3.5], "texture": "#all"}, - "south": {"uv": [3.75, 1.75, 4, 3.5], "texture": "#all"}, - "west": {"uv": [2, 1.75, 3.75, 3.5], "texture": "#all"}, - "east": {"uv": [0, 1.75, 1.75, 3.5], "texture": "#all"} + "down": {"uv": [0.875, 2.5, 0.75, 3.125], "texture": "#all"}, + "up": {"uv": [0.75, 3.125, 0.625, 2.5], "texture": "#all"}, + "north": {"uv": [0.625, 3.125, 0.75, 3.25], "texture": "#all"}, + "south": {"uv": [1.375, 3.125, 1.5, 3.25], "texture": "#all"}, + "west": {"uv": [0.75, 3.125, 1.375, 3.25], "texture": "#all"}, + "east": {"uv": [0, 3.125, 0.625, 3.25], "texture": "#all"} } }, { - "__comment": "PoleBL", - "from": [4, 3.8, 4.8], - "to": [12, 4.8, 5.8], + "__comment": "led1", + "from": [11.5, 7.5, 6.5], + "to": [12.5, 8.5, 7.5], "faces": { - "down": {"uv": [6.125, 0, 7.125, 0.125], "texture": "#all"}, - "up": {"uv": [5.125, 0, 6.125, 0.125], "texture": "#all"}, - "north": {"uv": [5.125, 0.125, 6.125, 0.25], "texture": "#all"}, - "south": {"uv": [6.25, 0.125, 7.25, 0.25], "texture": "#all"}, - "west": {"uv": [6.125, 0.125, 6.25, 0.25], "texture": "#all"}, - "east": {"uv": [5, 0.125, 5.125, 0.25], "texture": "#all"} + "down": {"uv": [5.375, 2.75, 5.25, 2.875], "texture": "#all"}, + "up": {"uv": [5.25, 2.875, 5.125, 2.75], "texture": "#all"}, + "north": {"uv": [5.125, 2.875, 5.25, 3], "texture": "#all"}, + "south": {"uv": [5.375, 2.875, 5.5, 3], "texture": "#all"}, + "west": {"uv": [5.25, 2.875, 5.375, 3], "texture": "#all"}, + "east": {"uv": [5, 2.875, 5.125, 3], "texture": "#all"} } }, { - "__comment": "BR1Block1", - "from": [12, 3.5, 4.5], - "to": [13, 5.5, 6.5], + "__comment": "ring3", + "from": [4.5, 4.5, 5], + "to": [11.5, 11.5, 6], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } }, { - "__comment": "TR1Block2", - "from": [3, 8.5, 4.5], - "to": [4, 10.5, 6.5], + "__comment": "led2", + "from": [11.5, 7.5, 4.5], + "to": [12.5, 8.5, 5.5], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [5.375, 2.75, 5.25, 2.875], "texture": "#all"}, + "up": {"uv": [5.25, 2.875, 5.125, 2.75], "texture": "#all"}, + "north": {"uv": [5.125, 2.875, 5.25, 3], "texture": "#all"}, + "south": {"uv": [5.375, 2.875, 5.5, 3], "texture": "#all"}, + "west": {"uv": [5.25, 2.875, 5.375, 3], "texture": "#all"}, + "east": {"uv": [5, 2.875, 5.125, 3], "texture": "#all"} } }, { - "__comment": "TL1Block2", - "from": [3, 8.5, 9.473333], - "to": [4, 10.5, 11.473333], + "__comment": "pistonBase2", + "from": [7, 11, 9.01], + "to": [9, 13, 14.01], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [1.125, 1.625, 0.875, 2.25], "texture": "#all"}, + "up": {"uv": [0.875, 2.25, 0.625, 1.625], "texture": "#all"}, + "north": {"uv": [0.625, 2.25, 0.875, 2.5], "texture": "#all"}, + "south": {"uv": [1.5, 2.25, 1.75, 2.5], "texture": "#all"}, + "west": {"uv": [0.875, 2.25, 1.5, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2.25, 0.625, 2.5], "texture": "#all"} } }, { - "__comment": "BR1Block2", - "from": [3, 3.5, 4.5], - "to": [4, 5.5, 6.5], + "__comment": "portFront", + "from": [3, 3, 0], + "to": [13, 13, 1], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [8.625, 0, 7.375, 0.125], "texture": "#all"}, + "up": {"uv": [7.375, 0.125, 6.125, 0], "texture": "#all"}, + "north": {"uv": [6.125, 0.125, 7.375, 1.375], "texture": "#all"}, + "south": {"uv": [7.5, 0.125, 8.75, 1.375], "texture": "#all"}, + "west": {"uv": [7.375, 0.125, 7.5, 1.375], "texture": "#all"}, + "east": {"uv": [6, 0.125, 6.125, 1.375], "texture": "#all"} } }, { - "__comment": "BottomPlate", - "from": [2, 4, 6], - "to": [14, 5, 10], + "__comment": "pipe", + "from": [5, 5, 1], + "to": [11, 11, 15], "faces": { - "down": {"uv": [9.5, 0.875, 11, 1.375], "texture": "#all"}, - "up": {"uv": [8, 0.875, 9.5, 1.375], "texture": "#all"}, - "north": {"uv": [8, 1.375, 9.5, 1.5], "texture": "#all"}, - "south": {"uv": [10, 1.375, 11.5, 1.5], "texture": "#all"}, - "west": {"uv": [9.5, 1.375, 10, 1.5], "texture": "#all"}, - "east": {"uv": [7.5, 1.375, 8, 1.5], "texture": "#all"} + "down": {"uv": [3.25, 1.625, 2.5, 3.375], "texture": "#all"}, + "up": {"uv": [2.5, 3.375, 1.75, 1.625], "texture": "#all"}, + "north": {"uv": [1.75, 3.375, 2.5, 4.125], "texture": "#all"}, + "south": {"uv": [4.25, 3.375, 5, 4.125], "texture": "#all"}, + "west": {"uv": [2.5, 3.375, 4.25, 4.125], "texture": "#all"}, + "east": {"uv": [0, 3.375, 1.75, 4.125], "texture": "#all"} } }, { - "__comment": "PoleTR", - "from": [4, 9.2, 10.2], - "to": [12, 10.2, 11.2], + "__comment": "pistonBrace1", + "from": [7, 3.5, 1], + "to": [9, 5.5, 4], "faces": { - "down": {"uv": [6.125, 0, 7.125, 0.125], "texture": "#all"}, - "up": {"uv": [5.125, 0, 6.125, 0.125], "texture": "#all"}, - "north": {"uv": [5.125, 0.125, 6.125, 0.25], "texture": "#all"}, - "south": {"uv": [6.25, 0.125, 7.25, 0.25], "texture": "#all"}, - "west": {"uv": [6.125, 0.125, 6.25, 0.25], "texture": "#all"}, - "east": {"uv": [5, 0.125, 5.125, 0.25], "texture": "#all"} + "down": {"uv": [0.875, 4.125, 0.625, 4.5], "texture": "#all"}, + "up": {"uv": [0.625, 4.5, 0.375, 4.125], "texture": "#all"}, + "north": {"uv": [0.375, 4.5, 0.625, 4.75], "texture": "#all"}, + "south": {"uv": [1, 4.5, 1.25, 4.75], "texture": "#all"}, + "west": {"uv": [0.625, 4.5, 1, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4.5, 0.375, 4.75], "texture": "#all"} } }, { - "__comment": "PoleTL", - "from": [4, 9.2, 4.8], - "to": [12, 10.2, 5.8], + "__comment": "pistonBar2", + "from": [7.5, 11.5, 5.01], + "to": [8.5, 12.5, 10.01], "faces": { - "down": {"uv": [6.125, 0, 7.125, 0.125], "texture": "#all"}, - "up": {"uv": [5.125, 0, 6.125, 0.125], "texture": "#all"}, - "north": {"uv": [5.125, 0.125, 6.125, 0.25], "texture": "#all"}, - "south": {"uv": [6.25, 0.125, 7.25, 0.25], "texture": "#all"}, - "west": {"uv": [6.125, 0.125, 6.25, 0.25], "texture": "#all"}, - "east": {"uv": [5, 0.125, 5.125, 0.25], "texture": "#all"} + "down": {"uv": [0.875, 2.5, 0.75, 3.125], "texture": "#all"}, + "up": {"uv": [0.75, 3.125, 0.625, 2.5], "texture": "#all"}, + "north": {"uv": [0.625, 3.125, 0.75, 3.25], "texture": "#all"}, + "south": {"uv": [1.375, 3.125, 1.5, 3.25], "texture": "#all"}, + "west": {"uv": [0.75, 3.125, 1.375, 3.25], "texture": "#all"}, + "east": {"uv": [0, 3.125, 0.625, 3.25], "texture": "#all"} } }, { - "__comment": "PipeBase", - "from": [0, 3, 4], - "to": [3, 11, 12], + "__comment": "ring4", + "from": [4.5, 4.5, 7], + "to": [11.5, 11.5, 8], "faces": { - "down": {"uv": [5.5, 1.625, 5.875, 2.625], "texture": "#all"}, - "up": {"uv": [5.125, 1.625, 5.5, 2.625], "texture": "#all"}, - "north": {"uv": [5.125, 2.625, 5.5, 3.625], "texture": "#all"}, - "south": {"uv": [6.5, 2.625, 6.875, 3.625], "texture": "#all"}, - "west": {"uv": [5.5, 2.625, 6.5, 3.625], "texture": "#all"}, - "east": {"uv": [4.125, 2.625, 5.125, 3.625], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } }, { - "__comment": "TR1Block1", - "from": [12, 8.5, 4.5], - "to": [13, 10.5, 6.5], + "__comment": "led4", + "from": [3.5, 7.5, 6.5], + "to": [4.5, 8.5, 7.5], "faces": { - "down": {"uv": [4.5, 0, 4.625, 0.25], "texture": "#all"}, - "up": {"uv": [4.375, 0, 4.5, 0.25], "texture": "#all"}, - "north": {"uv": [4.375, 0.25, 4.5, 0.5], "texture": "#all"}, - "south": {"uv": [4.75, 0.25, 4.875, 0.5], "texture": "#all"}, - "west": {"uv": [4.5, 0.25, 4.75, 0.5], "texture": "#all"}, - "east": {"uv": [4.125, 0.25, 4.375, 0.5], "texture": "#all"} + "down": {"uv": [5.375, 2.75, 5.25, 2.875], "texture": "#all"}, + "up": {"uv": [5.25, 2.875, 5.125, 2.75], "texture": "#all"}, + "north": {"uv": [5.125, 2.875, 5.25, 3], "texture": "#all"}, + "south": {"uv": [5.375, 2.875, 5.5, 3], "texture": "#all"}, + "west": {"uv": [5.25, 2.875, 5.375, 3], "texture": "#all"}, + "east": {"uv": [5, 2.875, 5.125, 3], "texture": "#all"} } }, { - "__comment": "LeftThing", - "from": [13.5, 1, 13], - "to": [14.5, 13, 14], + "__comment": "ring2", + "from": [4.5, 4.5, 3], + "to": [11.5, 11.5, 4], "faces": { - "down": {"uv": [0.25, 3.625, 0.375, 3.75], "texture": "#all"}, - "up": {"uv": [0.125, 3.625, 0.25, 3.75], "texture": "#all"}, - "north": {"uv": [0.125, 3.75, 0.25, 5.25], "texture": "#all"}, - "south": {"uv": [0.375, 3.75, 0.5, 5.25], "texture": "#all"}, - "west": {"uv": [0.25, 3.75, 0.375, 5.25], "texture": "#all"}, - "east": {"uv": [0, 3.75, 0.125, 5.25], "texture": "#all"} + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} + } + }, + { + "__comment": "pistonBase1", + "from": [7, 3, 9.01], + "to": [9, 5, 14.01], + "faces": { + "down": {"uv": [1.125, 1.625, 0.875, 2.25], "texture": "#all"}, + "up": {"uv": [0.875, 2.25, 0.625, 1.625], "texture": "#all"}, + "north": {"uv": [0.625, 2.25, 0.875, 2.5], "texture": "#all"}, + "south": {"uv": [1.5, 2.25, 1.75, 2.5], "texture": "#all"}, + "west": {"uv": [0.875, 2.25, 1.5, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2.25, 0.625, 2.5], "texture": "#all"} + } + }, + { + "__comment": "panel1", + "from": [11, 6.5, 3.5], + "to": [12, 9.5, 11.5], + "faces": { + "down": {"uv": [6.25, 2.75, 6.125, 3.75], "texture": "#all"}, + "up": {"uv": [6.125, 3.75, 6, 2.75], "texture": "#all"}, + "north": {"uv": [6, 3.75, 6.125, 4.125], "texture": "#all"}, + "south": {"uv": [7.125, 3.75, 7.25, 4.125], "texture": "#all"}, + "west": {"uv": [6.125, 3.75, 7.125, 4.125], "texture": "#all"}, + "east": {"uv": [5, 3.75, 6, 4.125], "texture": "#all"} + } + }, + { + "__comment": "led3", + "from": [3.5, 7.5, 4.5], + "to": [4.5, 8.5, 5.5], + "faces": { + "down": {"uv": [5.375, 2.75, 5.25, 2.875], "texture": "#all"}, + "up": {"uv": [5.25, 2.875, 5.125, 2.75], "texture": "#all"}, + "north": {"uv": [5.125, 2.875, 5.25, 3], "texture": "#all"}, + "south": {"uv": [5.375, 2.875, 5.5, 3], "texture": "#all"}, + "west": {"uv": [5.25, 2.875, 5.375, 3], "texture": "#all"}, + "east": {"uv": [5, 2.875, 5.125, 3], "texture": "#all"} + } + }, + { + "__comment": "portBack", + "from": [4, 4, 16], + "to": [12, 12, 17], + "faces": { + "down": {"uv": [5.375, 1.375, 4.375, 1.5], "texture": "#all"}, + "up": {"uv": [4.375, 1.5, 3.375, 1.375], "texture": "#all"}, + "north": {"uv": [3.375, 1.5, 4.375, 2.5], "texture": "#all"}, + "south": {"uv": [4.5, 1.5, 5.5, 2.5], "texture": "#all"}, + "west": {"uv": [4.375, 1.5, 4.5, 2.5], "texture": "#all"}, + "east": {"uv": [3.25, 1.5, 3.375, 2.5], "texture": "#all"} + } + }, + { + "__comment": "ring5", + "from": [4.5, 4.5, 9], + "to": [11.5, 11.5, 10], + "faces": { + "down": {"uv": [7.375, 1.375, 6.5, 1.5], "texture": "#all"}, + "up": {"uv": [6.5, 1.5, 5.625, 1.375], "texture": "#all"}, + "north": {"uv": [5.625, 1.5, 6.5, 2.375], "texture": "#all"}, + "south": {"uv": [6.625, 1.5, 7.5, 2.375], "texture": "#all"}, + "west": {"uv": [6.5, 1.5, 6.625, 2.375], "texture": "#all"}, + "east": {"uv": [5.5, 1.5, 5.625, 2.375], "texture": "#all"} } } ], "textures": { - "all": "...", - "particle": "..." + "all": "mekanism:blocks/models/logistical_sorter", + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/machine.json b/src/main/resources/assets/mekanism/models/block/machine.json index 00db8803e..635c3be56 100644 --- a/src/main/resources/assets/mekanism/models/block/machine.json +++ b/src/main/resources/assets/mekanism/models/block/machine.json @@ -4,9 +4,9 @@ "particle": "#sides", "down": "#sides", "up": "#sides", - "north": "#front", + "north": "#sides", "east": "#sides", - "south": "#sides", + "south": "#front", "west": "#sides" } } diff --git a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json index 87c07d2f3..bd21bfaf8 100644 --- a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json @@ -1,333 +1,229 @@ { "elements": [ { - "__comment": "BackPlate", - "from": [1, 1, 14], - "to": [15, 13, 16], + "__comment": "plate2", + "from": [1, 8, 1], + "to": [15, 11, 15], "faces": { - "down": {"uv": [2, 2.375, 3.75, 2.625], "texture": "#all"}, - "up": {"uv": [0.25, 2.375, 2, 2.625], "texture": "#all"}, - "north": {"uv": [0.25, 2.625, 2, 4.125], "texture": "#all"}, - "south": {"uv": [2.25, 2.625, 4, 4.125], "texture": "#all"}, - "west": {"uv": [2, 2.625, 2.25, 4.125], "texture": "#all"}, - "east": {"uv": [0, 2.625, 0.25, 4.125], "texture": "#all"} + "down": {"uv": [5.25, 4.625, 3.5, 6.375], "texture": "#all"}, + "up": {"uv": [3.5, 6.375, 1.75, 4.625], "texture": "#all"}, + "north": {"uv": [1.75, 6.375, 3.5, 6.75], "texture": "#all"}, + "south": {"uv": [5.25, 6.375, 7, 6.75], "texture": "#all"}, + "west": {"uv": [3.5, 6.375, 5.25, 6.75], "texture": "#all"}, + "east": {"uv": [0, 6.375, 1.75, 6.75], "texture": "#all"} } }, { - "__comment": "TopPanel", - "from": [1, 11, 11], - "to": [15, 13, 14], + "__comment": "connector2", + "from": [4, 10.5, 5], + "to": [5, 15.5, 8], "faces": { - "down": {"uv": [6.25, 2.375, 8, 2.75], "texture": "#all"}, - "up": {"uv": [4.5, 2.375, 6.25, 2.75], "texture": "#all"}, - "north": {"uv": [4.5, 2.75, 6.25, 3], "texture": "#all"}, - "south": {"uv": [6.625, 2.75, 8.375, 3], "texture": "#all"}, - "west": {"uv": [6.25, 2.75, 6.625, 3], "texture": "#all"}, - "east": {"uv": [4.125, 2.75, 4.5, 3], "texture": "#all"} + "down": {"uv": [0.625, 1, 0.5, 1.375], "texture": "#all"}, + "up": {"uv": [0.5, 1.375, 0.375, 1], "texture": "#all"}, + "north": {"uv": [0.375, 1.375, 0.5, 2], "texture": "#all"}, + "south": {"uv": [0.875, 1.375, 1, 2], "texture": "#all"}, + "west": {"uv": [0.5, 1.375, 0.875, 2], "texture": "#all"}, + "east": {"uv": [0, 1.375, 0.375, 2], "texture": "#all"} } }, { - "__comment": "TopChamber", - "from": [2.5, 7, 2], - "to": [13.5, 8, 7], + "__comment": "divider", + "from": [1.5, 7, 1.5], + "to": [14.5, 8, 15.5], "faces": { - "down": {"uv": [12.75, 1.5, 14.125, 2.125], "texture": "#all"}, - "up": {"uv": [11.375, 1.5, 12.75, 2.125], "texture": "#all"}, - "north": {"uv": [11.375, 2.125, 12.75, 2.25], "texture": "#all"}, - "south": {"uv": [13.375, 2.125, 14.75, 2.25], "texture": "#all"}, - "west": {"uv": [12.75, 2.125, 13.375, 2.25], "texture": "#all"}, - "east": {"uv": [10.75, 2.125, 11.375, 2.25], "texture": "#all"} + "down": {"uv": [13.25, 2.5, 11.625, 4.25], "texture": "#all"}, + "up": {"uv": [11.625, 4.25, 10, 2.5], "texture": "#all"}, + "north": {"uv": [10, 4.25, 11.625, 4.375], "texture": "#all"}, + "south": {"uv": [13.375, 4.25, 15, 4.375], "texture": "#all"}, + "west": {"uv": [11.625, 4.25, 13.375, 4.375], "texture": "#all"}, + "east": {"uv": [8.25, 4.25, 10, 4.375], "texture": "#all"} } }, { - "__comment": "BackChamber", - "from": [2.5, 1, 7], - "to": [13.5, 7, 8], + "__comment": "sideRight", + "from": [0, 4, 8], + "to": [1, 15, 15], "faces": { - "down": {"uv": [10.75, 0, 12.125, 0.125], "texture": "#all"}, - "up": {"uv": [9.375, 0, 10.75, 0.125], "texture": "#all"}, - "north": {"uv": [9.375, 0.125, 10.75, 0.875], "texture": "#all"}, - "south": {"uv": [10.875, 0.125, 12.25, 0.875], "texture": "#all"}, - "west": {"uv": [10.75, 0.125, 10.875, 0.875], "texture": "#all"}, - "east": {"uv": [9.25, 0.125, 9.375, 0.875], "texture": "#all"} + "down": {"uv": [9.125, 0, 9, 0.875], "texture": "#all"}, + "up": {"uv": [9, 0.875, 8.875, 0], "texture": "#all"}, + "north": {"uv": [8.875, 0.875, 9, 2.25], "texture": "#all"}, + "south": {"uv": [9.875, 0.875, 10, 2.25], "texture": "#all"}, + "west": {"uv": [9, 0.875, 9.875, 2.25], "texture": "#all"}, + "east": {"uv": [8, 0.875, 8.875, 2.25], "texture": "#all"} } }, { - "__comment": "ConnectorWireLeft", - "from": [4.5, 9, 4], - "to": [5.5, 12, 5], + "__comment": "tapBase1", + "from": [10.5, 10.5, 13], + "to": [12.5, 11.5, 15], "faces": { - "down": {"uv": [8.75, 3, 8.875, 3.125], "texture": "#all"}, - "up": {"uv": [8.625, 3, 8.75, 3.125], "texture": "#all"}, - "north": {"uv": [8.625, 3.125, 8.75, 3.5], "texture": "#all"}, - "south": {"uv": [8.875, 3.125, 9, 3.5], "texture": "#all"}, - "west": {"uv": [8.75, 3.125, 8.875, 3.5], "texture": "#all"}, - "east": {"uv": [8.5, 3.125, 8.625, 3.5], "texture": "#all"} + "down": {"uv": [1.25, 0, 1, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0.25, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.25, 1, 0.375], "texture": "#all"}, + "south": {"uv": [1.25, 0.25, 1.5, 0.375], "texture": "#all"}, + "west": {"uv": [1, 0.25, 1.25, 0.375], "texture": "#all"}, + "east": {"uv": [0.5, 0.25, 0.75, 0.375], "texture": "#all"} } }, { - "__comment": "LeftChamber", - "from": [1.5, 1, 2], - "to": [2.5, 7, 7], + "__comment": "tap2", + "from": [3.5, 11.5, 4], + "to": [5.5, 12.5, 15], "faces": { - "down": {"uv": [8.375, 0, 8.5, 0.625], "texture": "#all"}, - "up": {"uv": [8.25, 0, 8.375, 0.625], "texture": "#all"}, - "north": {"uv": [8.25, 0.625, 8.375, 1.375], "texture": "#all"}, - "south": {"uv": [9, 0.625, 9.125, 1.375], "texture": "#all"}, - "west": {"uv": [8.375, 0.625, 9, 1.375], "texture": "#all"}, - "east": {"uv": [7.625, 0.625, 8.25, 1.375], "texture": "#all"} + "down": {"uv": [11.875, 1, 11.625, 2.375], "texture": "#all"}, + "up": {"uv": [11.625, 2.375, 11.375, 1], "texture": "#all"}, + "north": {"uv": [11.375, 2.375, 11.625, 2.5], "texture": "#all"}, + "south": {"uv": [13, 2.375, 13.25, 2.5], "texture": "#all"}, + "west": {"uv": [11.625, 2.375, 13, 2.5], "texture": "#all"}, + "east": {"uv": [10, 2.375, 11.375, 2.5], "texture": "#all"} } }, { - "__comment": "Cable4", - "from": [3.5, 4.5, 8], - "to": [4.5, 5.5, 15], + "__comment": "tapBase2", + "from": [3.5, 10.5, 13], + "to": [5.5, 11.5, 15], "faces": { - "down": {"uv": [14.125, 2.375, 14.25, 3.25], "texture": "#all"}, - "up": {"uv": [14, 2.375, 14.125, 3.25], "texture": "#all"}, - "north": {"uv": [14, 3.25, 14.125, 3.375], "texture": "#all"}, - "south": {"uv": [15, 3.25, 15.125, 3.375], "texture": "#all"}, - "west": {"uv": [14.125, 3.25, 15, 3.375], "texture": "#all"}, - "east": {"uv": [13.125, 3.25, 14, 3.375], "texture": "#all"} + "down": {"uv": [1.25, 0, 1, 0.25], "texture": "#all"}, + "up": {"uv": [1, 0.25, 0.75, 0], "texture": "#all"}, + "north": {"uv": [0.75, 0.25, 1, 0.375], "texture": "#all"}, + "south": {"uv": [1.25, 0.25, 1.5, 0.375], "texture": "#all"}, + "west": {"uv": [1, 0.25, 1.25, 0.375], "texture": "#all"}, + "east": {"uv": [0.5, 0.25, 0.75, 0.375], "texture": "#all"} } }, { - "__comment": "TopPanelDec", - "from": [1.5, 10.5, 13.5], - "to": [14.5, 11.5, 14.5], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 4, 16], "faces": { - "down": {"uv": [5.875, 3.5, 7.5, 3.625], "texture": "#all"}, - "up": {"uv": [4.25, 3.5, 5.875, 3.625], "texture": "#all"}, - "north": {"uv": [4.25, 3.625, 5.875, 3.75], "texture": "#all"}, - "south": {"uv": [6, 3.625, 7.625, 3.75], "texture": "#all"}, - "west": {"uv": [5.875, 3.625, 6, 3.75], "texture": "#all"}, - "east": {"uv": [4.125, 3.625, 4.25, 3.75], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.5], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.5], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} } }, { - "__comment": "FCDoor", - "from": [3.5, 2, 0.5], - "to": [12.5, 6, 1.5], + "__comment": "back", + "from": [0, 4, 15], + "to": [16, 16, 16], "faces": { - "down": {"uv": [13.625, 0, 14.75, 0.125], "texture": "#all"}, - "up": {"uv": [12.5, 0, 13.625, 0.125], "texture": "#all"}, - "north": {"uv": [12.5, 0.125, 13.625, 0.625], "texture": "#all"}, - "south": {"uv": [13.75, 0.125, 14.875, 0.625], "texture": "#all"}, - "west": {"uv": [13.625, 0.125, 13.75, 0.625], "texture": "#all"}, - "east": {"uv": [12.375, 0.125, 12.5, 0.625], "texture": "#all"} + "down": {"uv": [9.375, 2.5, 7.375, 2.625], "texture": "#all"}, + "up": {"uv": [7.375, 2.625, 5.375, 2.5], "texture": "#all"}, + "north": {"uv": [5.375, 2.625, 7.375, 4.125], "texture": "#all"}, + "south": {"uv": [7.5, 2.625, 9.5, 4.125], "texture": "#all"}, + "west": {"uv": [7.375, 2.625, 7.5, 4.125], "texture": "#all"}, + "east": {"uv": [5.25, 2.625, 5.375, 4.125], "texture": "#all"} } }, { - "__comment": "Cable1", - "from": [3.5, 2.5, 8], - "to": [4.5, 3.5, 15], + "__comment": "top", + "from": [0, 15, 8], + "to": [16, 16, 15], "faces": { - "down": {"uv": [14.125, 2.375, 14.25, 3.25], "texture": "#all"}, - "up": {"uv": [14, 2.375, 14.125, 3.25], "texture": "#all"}, - "north": {"uv": [14, 3.25, 14.125, 3.375], "texture": "#all"}, - "south": {"uv": [15, 3.25, 15.125, 3.375], "texture": "#all"}, - "west": {"uv": [14.125, 3.25, 15, 3.375], "texture": "#all"}, - "east": {"uv": [13.125, 3.25, 14, 3.375], "texture": "#all"} + "down": {"uv": [14.875, 0, 12.875, 0.875], "texture": "#all"}, + "up": {"uv": [12.875, 0.875, 10.875, 0], "texture": "#all"}, + "north": {"uv": [10.875, 0.875, 12.875, 1], "texture": "#all"}, + "south": {"uv": [13.75, 0.875, 15.75, 1], "texture": "#all"}, + "west": {"uv": [12.875, 0.875, 13.75, 1], "texture": "#all"}, + "east": {"uv": [10, 0.875, 10.875, 1], "texture": "#all"} } }, { - "__comment": "Cable3", - "from": [11, 3, 8], - "to": [13, 5, 15], + "__comment": "plate1", + "from": [1, 12, 1], + "to": [15, 15, 15], "faces": { - "down": {"uv": [11.875, 2.375, 12.125, 3.25], "texture": "#all"}, - "up": {"uv": [11.625, 2.375, 11.875, 3.25], "texture": "#all"}, - "north": {"uv": [11.625, 3.25, 11.875, 3.5], "texture": "#all"}, - "south": {"uv": [12.75, 3.25, 13, 3.5], "texture": "#all"}, - "west": {"uv": [11.875, 3.25, 12.75, 3.5], "texture": "#all"}, - "east": {"uv": [10.75, 3.25, 11.625, 3.5], "texture": "#all"} + "down": {"uv": [5.25, 2.5, 3.5, 4.25], "texture": "#all"}, + "up": {"uv": [3.5, 4.25, 1.75, 2.5], "texture": "#all"}, + "north": {"uv": [1.75, 4.25, 3.5, 4.625], "texture": "#all"}, + "south": {"uv": [5.25, 4.25, 7, 4.625], "texture": "#all"}, + "west": {"uv": [3.5, 4.25, 5.25, 4.625], "texture": "#all"}, + "east": {"uv": [0, 4.25, 1.75, 4.625], "texture": "#all"} } }, { - "__comment": "ConnectorWireRight", - "from": [10.5, 9, 4], - "to": [11.5, 12, 5], + "__comment": "plate3", + "from": [1, 4, 1], + "to": [15, 7, 15], "faces": { - "down": {"uv": [8.75, 3, 8.875, 3.125], "texture": "#all"}, - "up": {"uv": [8.625, 3, 8.75, 3.125], "texture": "#all"}, - "north": {"uv": [8.625, 3.125, 8.75, 3.5], "texture": "#all"}, - "south": {"uv": [8.875, 3.125, 9, 3.5], "texture": "#all"}, - "west": {"uv": [8.75, 3.125, 8.875, 3.5], "texture": "#all"}, - "east": {"uv": [8.5, 3.125, 8.625, 3.5], "texture": "#all"} + "down": {"uv": [5.25, 4.625, 3.5, 6.375], "texture": "#all"}, + "up": {"uv": [3.5, 6.375, 1.75, 4.625], "texture": "#all"}, + "north": {"uv": [1.75, 6.375, 3.5, 6.75], "texture": "#all"}, + "south": {"uv": [5.25, 6.375, 7, 6.75], "texture": "#all"}, + "west": {"uv": [3.5, 6.375, 5.25, 6.75], "texture": "#all"}, + "east": {"uv": [0, 6.375, 1.75, 6.75], "texture": "#all"} } }, { - "__comment": "ConnectorWireTop", - "from": [5.5, 11, 4], - "to": [10.5, 12, 5], + "__comment": "sideLeft", + "from": [15, 4, 8], + "to": [16, 15, 15], "faces": { - "down": {"uv": [9.25, 3.625, 9.875, 3.75], "texture": "#all"}, - "up": {"uv": [8.625, 3.625, 9.25, 3.75], "texture": "#all"}, - "north": {"uv": [8.625, 3.75, 9.25, 3.875], "texture": "#all"}, - "south": {"uv": [9.375, 3.75, 10, 3.875], "texture": "#all"}, - "west": {"uv": [9.25, 3.75, 9.375, 3.875], "texture": "#all"}, - "east": {"uv": [8.5, 3.75, 8.625, 3.875], "texture": "#all"} + "down": {"uv": [9.125, 0, 9, 0.875], "texture": "#all"}, + "up": {"uv": [9, 0.875, 8.875, 0], "texture": "#all"}, + "north": {"uv": [8.875, 0.875, 9, 2.25], "texture": "#all"}, + "south": {"uv": [9.875, 0.875, 10, 2.25], "texture": "#all"}, + "west": {"uv": [9, 0.875, 9.875, 2.25], "texture": "#all"}, + "east": {"uv": [8, 0.875, 8.875, 2.25], "texture": "#all"} } }, { - "__comment": "ConnectorLeft", - "from": [3.5, 8, 3], - "to": [6.5, 9, 6], + "__comment": "bar1", + "from": [13.5, 11, 1.5], + "to": [14.5, 12, 2.5], "faces": { - "down": {"uv": [9.25, 2.375, 9.625, 2.75], "texture": "#all"}, - "up": {"uv": [8.875, 2.375, 9.25, 2.75], "texture": "#all"}, - "north": {"uv": [8.875, 2.75, 9.25, 2.875], "texture": "#all"}, - "south": {"uv": [9.625, 2.75, 10, 2.875], "texture": "#all"}, - "west": {"uv": [9.25, 2.75, 9.625, 2.875], "texture": "#all"}, - "east": {"uv": [8.5, 2.75, 8.875, 2.875], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "Cable2", - "from": [3, 3, 8], - "to": [5, 5, 15], + "__comment": "tap1", + "from": [10.5, 11.5, 4], + "to": [12.5, 12.5, 15], "faces": { - "down": {"uv": [11.875, 2.375, 12.125, 3.25], "texture": "#all"}, - "up": {"uv": [11.625, 2.375, 11.875, 3.25], "texture": "#all"}, - "north": {"uv": [11.625, 3.25, 11.875, 3.5], "texture": "#all"}, - "south": {"uv": [12.75, 3.25, 13, 3.5], "texture": "#all"}, - "west": {"uv": [11.875, 3.25, 12.75, 3.5], "texture": "#all"}, - "east": {"uv": [10.75, 3.25, 11.625, 3.5], "texture": "#all"} + "down": {"uv": [11.875, 1, 11.625, 2.375], "texture": "#all"}, + "up": {"uv": [11.625, 2.375, 11.375, 1], "texture": "#all"}, + "north": {"uv": [11.375, 2.375, 11.625, 2.5], "texture": "#all"}, + "south": {"uv": [13, 2.375, 13.25, 2.5], "texture": "#all"}, + "west": {"uv": [11.625, 2.375, 13, 2.5], "texture": "#all"}, + "east": {"uv": [10, 2.375, 11.375, 2.5], "texture": "#all"} } }, { - "__comment": "FCRight", - "from": [12.5, 2, 1], - "to": [13.5, 6, 2], + "__comment": "bar2", + "from": [1.5, 11, 1.5], + "to": [2.5, 12, 2.5], "faces": { - "down": {"uv": [7.875, 1.375, 8, 1.5], "texture": "#all"}, - "up": {"uv": [7.75, 1.375, 7.875, 1.5], "texture": "#all"}, - "north": {"uv": [7.75, 1.5, 7.875, 2], "texture": "#all"}, - "south": {"uv": [8, 1.5, 8.125, 2], "texture": "#all"}, - "west": {"uv": [7.875, 1.5, 8, 2], "texture": "#all"}, - "east": {"uv": [7.625, 1.5, 7.75, 2], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "FCBottom", - "from": [2.5, 1, 1], - "to": [13.5, 2, 2], + "__comment": "connector1", + "from": [11, 10.5, 5], + "to": [12, 15.5, 8], "faces": { - "down": {"uv": [13.875, 0.75, 15.25, 0.875], "texture": "#all"}, - "up": {"uv": [12.5, 0.75, 13.875, 0.875], "texture": "#all"}, - "north": {"uv": [12.5, 0.875, 13.875, 1], "texture": "#all"}, - "south": {"uv": [14, 0.875, 15.375, 1], "texture": "#all"}, - "west": {"uv": [13.875, 0.875, 14, 1], "texture": "#all"}, - "east": {"uv": [12.375, 0.875, 12.5, 1], "texture": "#all"} - } - }, - { - "__comment": "Cable6", - "from": [11.5, 4.5, 8], - "to": [12.5, 5.5, 15], - "faces": { - "down": {"uv": [14.125, 2.375, 14.25, 3.25], "texture": "#all"}, - "up": {"uv": [14, 2.375, 14.125, 3.25], "texture": "#all"}, - "north": {"uv": [14, 3.25, 14.125, 3.375], "texture": "#all"}, - "south": {"uv": [15, 3.25, 15.125, 3.375], "texture": "#all"}, - "west": {"uv": [14.125, 3.25, 15, 3.375], "texture": "#all"}, - "east": {"uv": [13.125, 3.25, 14, 3.375], "texture": "#all"} - } - }, - { - "__comment": "TopPanelExtr", - "from": [1, 12, 10], - "to": [15, 13, 11], - "faces": { - "down": {"uv": [6, 3.125, 7.75, 3.25], "texture": "#all"}, - "up": {"uv": [4.25, 3.125, 6, 3.25], "texture": "#all"}, - "north": {"uv": [4.25, 3.25, 6, 3.375], "texture": "#all"}, - "south": {"uv": [6.125, 3.25, 7.875, 3.375], "texture": "#all"}, - "west": {"uv": [6, 3.25, 6.125, 3.375], "texture": "#all"}, - "east": {"uv": [4.125, 3.25, 4.25, 3.375], "texture": "#all"} - } - }, - { - "__comment": "ConnectorRight", - "from": [9.5, 8, 3], - "to": [12.5, 9, 6], - "faces": { - "down": {"uv": [9.25, 2.375, 9.625, 2.75], "texture": "#all"}, - "up": {"uv": [8.875, 2.375, 9.25, 2.75], "texture": "#all"}, - "north": {"uv": [8.875, 2.75, 9.25, 2.875], "texture": "#all"}, - "south": {"uv": [9.625, 2.75, 10, 2.875], "texture": "#all"}, - "west": {"uv": [9.25, 2.75, 9.625, 2.875], "texture": "#all"}, - "east": {"uv": [8.5, 2.75, 8.875, 2.875], "texture": "#all"} - } - }, - { - "__comment": "RightChamber", - "from": [13.5, 1, 2], - "to": [14.5, 7, 7], - "faces": { - "down": {"uv": [8.375, 0, 8.5, 0.625], "texture": "#all"}, - "up": {"uv": [8.25, 0, 8.375, 0.625], "texture": "#all"}, - "north": {"uv": [8.25, 0.625, 8.375, 1.375], "texture": "#all"}, - "south": {"uv": [9, 0.625, 9.125, 1.375], "texture": "#all"}, - "west": {"uv": [8.375, 0.625, 9, 1.375], "texture": "#all"}, - "east": {"uv": [7.625, 0.625, 8.25, 1.375], "texture": "#all"} - } - }, - { - "__comment": "Cable5", - "from": [11.5, 2.5, 8], - "to": [12.5, 3.5, 15], - "faces": { - "down": {"uv": [14.125, 2.375, 14.25, 3.25], "texture": "#all"}, - "up": {"uv": [14, 2.375, 14.125, 3.25], "texture": "#all"}, - "north": {"uv": [14, 3.25, 14.125, 3.375], "texture": "#all"}, - "south": {"uv": [15, 3.25, 15.125, 3.375], "texture": "#all"}, - "west": {"uv": [14.125, 3.25, 15, 3.375], "texture": "#all"}, - "east": {"uv": [13.125, 3.25, 14, 3.375], "texture": "#all"} - } - }, - { - "__comment": "FCTop", - "from": [2.5, 6, 1], - "to": [13.5, 7, 2], - "faces": { - "down": {"uv": [13.875, 0.75, 15.25, 0.875], "texture": "#all"}, - "up": {"uv": [12.5, 0.75, 13.875, 0.875], "texture": "#all"}, - "north": {"uv": [12.5, 0.875, 13.875, 1], "texture": "#all"}, - "south": {"uv": [14, 0.875, 15.375, 1], "texture": "#all"}, - "west": {"uv": [13.875, 0.875, 14, 1], "texture": "#all"}, - "east": {"uv": [12.375, 0.875, 12.5, 1], "texture": "#all"} - } - }, - { - "__comment": "FCLeft", - "from": [2.5, 2, 1], - "to": [3.5, 6, 2], - "faces": { - "down": {"uv": [7.875, 1.375, 8, 1.5], "texture": "#all"}, - "up": {"uv": [7.75, 1.375, 7.875, 1.5], "texture": "#all"}, - "north": {"uv": [7.75, 1.5, 7.875, 2], "texture": "#all"}, - "south": {"uv": [8, 1.5, 8.125, 2], "texture": "#all"}, - "west": {"uv": [7.875, 1.5, 8, 2], "texture": "#all"}, - "east": {"uv": [7.625, 1.5, 7.75, 2], "texture": "#all"} - } - }, - { - "__comment": "Base", - "from": [1, -1, 0], - "to": [15, 1, 16], - "faces": { - "down": {"uv": [3.75, 0, 5.5, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 3.75, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 3.75, 2.25], "texture": "#all"}, - "south": {"uv": [5.75, 2, 7.5, 2.25], "texture": "#all"}, - "west": {"uv": [3.75, 2, 5.75, 2.25], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.25], "texture": "#all"} + "down": {"uv": [0.625, 1, 0.5, 1.375], "texture": "#all"}, + "up": {"uv": [0.5, 1.375, 0.375, 1], "texture": "#all"}, + "north": {"uv": [0.375, 1.375, 0.5, 2], "texture": "#all"}, + "south": {"uv": [0.875, 1.375, 1, 2], "texture": "#all"}, + "west": {"uv": [0.5, 1.375, 0.875, 2], "texture": "#all"}, + "east": {"uv": [0, 1.375, 0.375, 2], "texture": "#all"} } } ], "textures": { "all": "mekanism:blocks/models/metallurgic_infuser", - "particle": "mekanism:blocks/SteelCasing" + "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/nothing.json b/src/main/resources/assets/mekanism/models/block/nothing.json index a06f6162a..9d63879e3 100644 --- a/src/main/resources/assets/mekanism/models/block/nothing.json +++ b/src/main/resources/assets/mekanism/models/block/nothing.json @@ -4,14 +4,7 @@ "__comment": "nothing", "from": [0, 0, 0], "to": [0, 0, 0], - "faces": { - "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, - "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, - "north": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "south": {"uv": [2.25, 5, 3, 5.75], "texture": "#all"}, - "west": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "east": {"uv": [0, 5, 0.75, 5.75], "texture": "#all"} - } + "faces": {} } ] } diff --git a/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json b/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json index b435fc97c..6028d5558 100644 --- a/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json +++ b/src/main/resources/assets/mekanism/models/block/pressurized_reaction_chamber.json @@ -1,255 +1,138 @@ { "elements": [ { - "__comment": "PoleRF", - "from": [2, 9, 1], - "to": [3, 15, 2], + "__comment": "frontDivider1", + "from": [13, 3.5, 0.5], + "to": [15, 15.5, 6.5], "faces": { - "down": {"uv": [5, 5.25, 5.125, 5.375], "texture": "#all"}, - "up": {"uv": [4.875, 5.25, 5, 5.375], "texture": "#all"}, - "north": {"uv": [4.875, 5.375, 5, 6.125], "texture": "#all"}, - "south": {"uv": [5.125, 5.375, 5.25, 6.125], "texture": "#all"}, - "west": {"uv": [5, 5.375, 5.125, 6.125], "texture": "#all"}, - "east": {"uv": [4.75, 5.375, 4.875, 6.125], "texture": "#all"} + "down": {"uv": [7.75, 2.5, 7.5, 3.25], "texture": "#all"}, + "up": {"uv": [7.5, 3.25, 7.25, 2.5], "texture": "#all"}, + "north": {"uv": [7.25, 3.25, 7.5, 4.75], "texture": "#all"}, + "south": {"uv": [8.25, 3.25, 8.5, 4.75], "texture": "#all"}, + "west": {"uv": [7.5, 3.25, 8.25, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 3.25, 7.25, 4.75], "texture": "#all"} } }, { - "__comment": "CoreBase", - "from": [3, 0, 2], - "to": [13, 1, 13], + "__comment": "body", + "from": [0, 4, 6], + "to": [16, 16, 16], "faces": { - "down": {"uv": [10.625, 0, 11.875, 1.375], "texture": "#all"}, - "up": {"uv": [9.375, 0, 10.625, 1.375], "texture": "#all"}, - "north": {"uv": [9.375, 1.375, 10.625, 1.5], "texture": "#all"}, - "south": {"uv": [12, 1.375, 13.25, 1.5], "texture": "#all"}, - "west": {"uv": [10.625, 1.375, 12, 1.5], "texture": "#all"}, - "east": {"uv": [8, 1.375, 9.375, 1.5], "texture": "#all"} + "down": {"uv": [5.25, 2.5, 3.25, 3.75], "texture": "#all"}, + "up": {"uv": [3.25, 3.75, 1.25, 2.5], "texture": "#all"}, + "north": {"uv": [1.25, 3.75, 3.25, 5.25], "texture": "#all"}, + "south": {"uv": [4.5, 3.75, 6.5, 5.25], "texture": "#all"}, + "west": {"uv": [3.25, 3.75, 4.5, 5.25], "texture": "#all"}, + "east": {"uv": [0, 3.75, 1.25, 5.25], "texture": "#all"} } }, { - "__comment": "Core", - "from": [2, 1, 1], - "to": [14, 9, 14], + "__comment": "frontDivider2", + "from": [10, 3.5, 0.5], + "to": [12, 15.5, 6.5], "faces": { - "down": {"uv": [3.125, 2.125, 4.625, 3.75], "texture": "#all"}, - "up": {"uv": [1.625, 2.125, 3.125, 3.75], "texture": "#all"}, - "north": {"uv": [1.625, 3.75, 3.125, 4.75], "texture": "#all"}, - "south": {"uv": [4.75, 3.75, 6.25, 4.75], "texture": "#all"}, - "west": {"uv": [3.125, 3.75, 4.75, 4.75], "texture": "#all"}, - "east": {"uv": [0, 3.75, 1.625, 4.75], "texture": "#all"} + "down": {"uv": [7.75, 2.5, 7.5, 3.25], "texture": "#all"}, + "up": {"uv": [7.5, 3.25, 7.25, 2.5], "texture": "#all"}, + "north": {"uv": [7.25, 3.25, 7.5, 4.75], "texture": "#all"}, + "south": {"uv": [8.25, 3.25, 8.5, 4.75], "texture": "#all"}, + "west": {"uv": [7.5, 3.25, 8.25, 4.75], "texture": "#all"}, + "east": {"uv": [6.5, 3.25, 7.25, 4.75], "texture": "#all"} } }, { - "__comment": "GasConnector", - "from": [1, 6, 7], - "to": [15, 8, 9], + "__comment": "bar1", + "from": [12, 5, 1], + "to": [13, 6, 6], "faces": { - "down": {"uv": [4.75, 4.75, 6.5, 5], "texture": "#all"}, - "up": {"uv": [3, 4.75, 4.75, 5], "texture": "#all"}, - "north": {"uv": [3, 5, 4.75, 5.25], "texture": "#all"}, - "south": {"uv": [5, 5, 6.75, 5.25], "texture": "#all"}, - "west": {"uv": [4.75, 5, 5, 5.25], "texture": "#all"}, - "east": {"uv": [2.75, 5, 3, 5.25], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.625], "texture": "#all"}, + "up": {"uv": [0.75, 0.625, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.625, 0.75, 0.75], "texture": "#all"}, + "south": {"uv": [1.375, 0.625, 1.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.75, 0.625, 1.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.625, 0.75], "texture": "#all"} } }, { - "__comment": "GasRight", - "from": [0, 4, 5], - "to": [1, 10, 11], + "__comment": "bar5", + "from": [12, 13, 1], + "to": [13, 14, 6], "faces": { - "down": {"uv": [8.875, 1.5, 9, 2.25], "texture": "#all"}, - "up": {"uv": [8.75, 1.5, 8.875, 2.25], "texture": "#all"}, - "north": {"uv": [8.75, 2.25, 8.875, 3], "texture": "#all"}, - "south": {"uv": [9.625, 2.25, 9.75, 3], "texture": "#all"}, - "west": {"uv": [8.875, 2.25, 9.625, 3], "texture": "#all"}, - "east": {"uv": [8, 2.25, 8.75, 3], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.625], "texture": "#all"}, + "up": {"uv": [0.75, 0.625, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.625, 0.75, 0.75], "texture": "#all"}, + "south": {"uv": [1.375, 0.625, 1.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.75, 0.625, 1.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.625, 0.75], "texture": "#all"} } }, { - "__comment": "CenterCore", - "from": [6, 9, 5], - "to": [10, 10, 9], + "__comment": "bar2", + "from": [12, 7, 1], + "to": [13, 8, 6], "faces": { - "down": {"uv": [11.5, 1.5, 12, 2], "texture": "#all"}, - "up": {"uv": [11, 1.5, 11.5, 2], "texture": "#all"}, - "north": {"uv": [11, 2, 11.5, 2.125], "texture": "#all"}, - "south": {"uv": [12, 2, 12.5, 2.125], "texture": "#all"}, - "west": {"uv": [11.5, 2, 12, 2.125], "texture": "#all"}, - "east": {"uv": [10.5, 2, 11, 2.125], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.625], "texture": "#all"}, + "up": {"uv": [0.75, 0.625, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.625, 0.75, 0.75], "texture": "#all"}, + "south": {"uv": [1.375, 0.625, 1.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.75, 0.625, 1.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.625, 0.75], "texture": "#all"} } }, { - "__comment": "PoleL", - "from": [13, 14, 2], - "to": [14, 15, 13], + "__comment": "front", + "from": [1, 4, 1], + "to": [10, 15, 6], "faces": { - "down": {"uv": [1.5, 7.125, 1.625, 8.5], "texture": "#all"}, - "up": {"uv": [1.375, 7.125, 1.5, 8.5], "texture": "#all"}, - "north": {"uv": [1.375, 8.5, 1.5, 8.625], "texture": "#all"}, - "south": {"uv": [2.875, 8.5, 3, 8.625], "texture": "#all"}, - "west": {"uv": [1.5, 8.5, 2.875, 8.625], "texture": "#all"}, - "east": {"uv": [0, 8.5, 1.375, 8.625], "texture": "#all"} + "down": {"uv": [8.875, 0, 7.75, 0.625], "texture": "#all"}, + "up": {"uv": [7.75, 0.625, 6.625, 0], "texture": "#all"}, + "north": {"uv": [6.625, 0.625, 7.75, 2], "texture": "#all"}, + "south": {"uv": [8.375, 0.625, 9.5, 2], "texture": "#all"}, + "west": {"uv": [7.75, 0.625, 8.375, 2], "texture": "#all"}, + "east": {"uv": [6, 0.625, 6.625, 2], "texture": "#all"} } }, { - "__comment": "PoleFL", - "from": [13, 9, 1], - "to": [14, 15, 2], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 4, 16], "faces": { - "down": {"uv": [5, 5.25, 5.125, 5.375], "texture": "#all"}, - "up": {"uv": [4.875, 5.25, 5, 5.375], "texture": "#all"}, - "north": {"uv": [4.875, 5.375, 5, 6.125], "texture": "#all"}, - "south": {"uv": [5.125, 5.375, 5.25, 6.125], "texture": "#all"}, - "west": {"uv": [5, 5.375, 5.125, 6.125], "texture": "#all"}, - "east": {"uv": [4.75, 5.375, 4.875, 6.125], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.5], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.5], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.5], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.5], "texture": "#all"} } }, { - "__comment": "TubeThing", - "from": [7, 9, 1], - "to": [9, 11, 7], + "__comment": "bar3", + "from": [12, 9, 1], + "to": [13, 10, 6], "faces": { - "down": {"uv": [3.75, 5.25, 4, 6], "texture": "#all"}, - "up": {"uv": [3.5, 5.25, 3.75, 6], "texture": "#all"}, - "north": {"uv": [3.5, 6, 3.75, 6.25], "texture": "#all"}, - "south": {"uv": [4.5, 6, 4.75, 6.25], "texture": "#all"}, - "west": {"uv": [3.75, 6, 4.5, 6.25], "texture": "#all"}, - "east": {"uv": [2.75, 6, 3.5, 6.25], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.625], "texture": "#all"}, + "up": {"uv": [0.75, 0.625, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.625, 0.75, 0.75], "texture": "#all"}, + "south": {"uv": [1.375, 0.625, 1.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.75, 0.625, 1.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.625, 0.75], "texture": "#all"} } }, { - "__comment": "Base", - "from": [0, -1, 0], - "to": [16, 0, 16], + "__comment": "bar4", + "from": [12, 11, 1], + "to": [13, 12, 6], "faces": { - "down": {"uv": [4, 0, 6, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 4, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} - } - }, - { - "__comment": "PoleLB", - "from": [13, 9, 13], - "to": [14, 15, 14], - "faces": { - "down": {"uv": [5, 5.25, 5.125, 5.375], "texture": "#all"}, - "up": {"uv": [4.875, 5.25, 5, 5.375], "texture": "#all"}, - "north": {"uv": [4.875, 5.375, 5, 6.125], "texture": "#all"}, - "south": {"uv": [5.125, 5.375, 5.25, 6.125], "texture": "#all"}, - "west": {"uv": [5, 5.375, 5.125, 6.125], "texture": "#all"}, - "east": {"uv": [4.75, 5.375, 4.875, 6.125], "texture": "#all"} - } - }, - { - "__comment": "BackCore", - "from": [7, 9, 9], - "to": [9, 10, 14], - "faces": { - "down": {"uv": [0.875, 6.375, 1.125, 7], "texture": "#all"}, - "up": {"uv": [0.625, 6.375, 0.875, 7], "texture": "#all"}, - "north": {"uv": [0.625, 7, 0.875, 7.125], "texture": "#all"}, - "south": {"uv": [1.5, 7, 1.75, 7.125], "texture": "#all"}, - "west": {"uv": [0.875, 7, 1.5, 7.125], "texture": "#all"}, - "east": {"uv": [0, 7, 0.625, 7.125], "texture": "#all"} - } - }, - { - "__comment": "PoleR", - "from": [2, 14, 2], - "to": [3, 15, 13], - "faces": { - "down": {"uv": [1.5, 7.125, 1.625, 8.5], "texture": "#all"}, - "up": {"uv": [1.375, 7.125, 1.5, 8.5], "texture": "#all"}, - "north": {"uv": [1.375, 8.5, 1.5, 8.625], "texture": "#all"}, - "south": {"uv": [2.875, 8.5, 3, 8.625], "texture": "#all"}, - "west": {"uv": [1.5, 8.5, 2.875, 8.625], "texture": "#all"}, - "east": {"uv": [0, 8.5, 1.375, 8.625], "texture": "#all"} - } - }, - { - "__comment": "GasLeft", - "from": [15, 4, 5], - "to": [16, 10, 11], - "faces": { - "down": {"uv": [8.875, 1.5, 9, 2.25], "texture": "#all"}, - "up": {"uv": [8.75, 1.5, 8.875, 2.25], "texture": "#all"}, - "north": {"uv": [8.75, 2.25, 8.875, 3], "texture": "#all"}, - "south": {"uv": [9.625, 2.25, 9.75, 3], "texture": "#all"}, - "west": {"uv": [8.875, 2.25, 9.625, 3], "texture": "#all"}, - "east": {"uv": [8, 2.25, 8.75, 3], "texture": "#all"} - } - }, - { - "__comment": "BackConnector", - "from": [7, 5, 14], - "to": [9, 10, 15], - "faces": { - "down": {"uv": [10.125, 1.5, 10.375, 1.625], "texture": "#all"}, - "up": {"uv": [9.875, 1.5, 10.125, 1.625], "texture": "#all"}, - "north": {"uv": [9.875, 1.625, 10.125, 2.25], "texture": "#all"}, - "south": {"uv": [10.25, 1.625, 10.5, 2.25], "texture": "#all"}, - "west": {"uv": [10.125, 1.625, 10.25, 2.25], "texture": "#all"}, - "east": {"uv": [9.75, 1.625, 9.875, 2.25], "texture": "#all"} - } - }, - { - "__comment": "FrontPanel", - "from": [3, 2, 0], - "to": [13, 14, 1], - "faces": { - "down": {"uv": [1.375, 4.75, 2.625, 4.875], "texture": "#all"}, - "up": {"uv": [0.125, 4.75, 1.375, 4.875], "texture": "#all"}, - "north": {"uv": [0.125, 4.875, 1.375, 6.375], "texture": "#all"}, - "south": {"uv": [1.5, 4.875, 2.75, 6.375], "texture": "#all"}, - "west": {"uv": [1.375, 4.875, 1.5, 6.375], "texture": "#all"}, - "east": {"uv": [0, 4.875, 0.125, 6.375], "texture": "#all"} - } - }, - { - "__comment": "PoleBR", - "from": [2, 9, 13], - "to": [3, 15, 14], - "faces": { - "down": {"uv": [5, 5.25, 5.125, 5.375], "texture": "#all"}, - "up": {"uv": [4.875, 5.25, 5, 5.375], "texture": "#all"}, - "north": {"uv": [4.875, 5.375, 5, 6.125], "texture": "#all"}, - "south": {"uv": [5.125, 5.375, 5.25, 6.125], "texture": "#all"}, - "west": {"uv": [5, 5.375, 5.125, 6.125], "texture": "#all"}, - "east": {"uv": [4.75, 5.375, 4.875, 6.125], "texture": "#all"} - } - }, - { - "__comment": "FluidBack", - "from": [4, 3, 15], - "to": [12, 11, 16], - "faces": { - "down": {"uv": [7.375, 3, 8.375, 3.125], "texture": "#all"}, - "up": {"uv": [6.375, 3, 7.375, 3.125], "texture": "#all"}, - "north": {"uv": [6.375, 3.125, 7.375, 4.125], "texture": "#all"}, - "south": {"uv": [7.5, 3.125, 8.5, 4.125], "texture": "#all"}, - "west": {"uv": [7.375, 3.125, 7.5, 4.125], "texture": "#all"}, - "east": {"uv": [6.25, 3.125, 6.375, 4.125], "texture": "#all"} - } - }, - { - "__comment": "TopPanel", - "from": [3, 14, 1], - "to": [13, 15, 14], - "faces": { - "down": {"uv": [2.875, 8.625, 4.125, 10.25], "texture": "#all"}, - "up": {"uv": [1.625, 8.625, 2.875, 10.25], "texture": "#all"}, - "north": {"uv": [1.625, 10.25, 2.875, 10.375], "texture": "#all"}, - "south": {"uv": [4.5, 10.25, 5.75, 10.375], "texture": "#all"}, - "west": {"uv": [2.875, 10.25, 4.5, 10.375], "texture": "#all"}, - "east": {"uv": [0, 10.25, 1.625, 10.375], "texture": "#all"} + "down": {"uv": [0.875, 0, 0.75, 0.625], "texture": "#all"}, + "up": {"uv": [0.75, 0.625, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.625, 0.75, 0.75], "texture": "#all"}, + "south": {"uv": [1.375, 0.625, 1.5, 0.75], "texture": "#all"}, + "west": {"uv": [0.75, 0.625, 1.375, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.625, 0.625, 0.75], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/pressurized_reaction_chamber", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/quantum_entangloporter.json b/src/main/resources/assets/mekanism/models/block/quantum_entangloporter.json new file mode 100644 index 000000000..90a7bc1ce --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/quantum_entangloporter.json @@ -0,0 +1,541 @@ +{ + "elements": [ + { + "__comment": "frame3", + "from": [13, 3, 13], + "to": [15, 13, 15], + "faces": { + "down": {"uv": [1.75, 3.625, 1.5, 3.875], "texture": "#all"}, + "up": {"uv": [1.5, 3.875, 1.25, 3.625], "texture": "#all"}, + "north": {"uv": [1.25, 3.875, 1.5, 5.125], "texture": "#all"}, + "south": {"uv": [1.75, 3.875, 2, 5.125], "texture": "#all"}, + "west": {"uv": [1.5, 3.875, 1.75, 5.125], "texture": "#all"}, + "east": {"uv": [1, 3.875, 1.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "energyCubeCore", + "from": [6, 6, 6], + "to": [10, 10, 10], + "faces": { + "down": {"uv": [1.5, 5.125, 1, 5.625], "texture": "#all"}, + "up": {"uv": [1, 5.625, 0.5, 5.125], "texture": "#all"}, + "north": {"uv": [0.5, 5.625, 1, 6.125], "texture": "#all"}, + "south": {"uv": [1.5, 5.625, 2, 6.125], "texture": "#all"}, + "west": {"uv": [1, 5.625, 1.5, 6.125], "texture": "#all"}, + "east": {"uv": [0, 5.625, 0.5, 6.125], "texture": "#all"} + } + }, + { + "__comment": "corner2", + "from": [0, 13, 0], + "to": [3, 16, 3], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "frameEdge2", + "from": [0.5, 3, 0.5], + "to": [1.5, 13, 1.5], + "faces": { + "down": {"uv": [0.375, 2, 0.25, 2.125], "texture": "#all"}, + "up": {"uv": [0.25, 2.125, 0.125, 2], "texture": "#all"}, + "north": {"uv": [0.125, 2.125, 0.25, 3.375], "texture": "#all"}, + "south": {"uv": [0.375, 2.125, 0.5, 3.375], "texture": "#all"}, + "west": {"uv": [0.25, 2.125, 0.375, 3.375], "texture": "#all"}, + "east": {"uv": [0, 2.125, 0.125, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frame6", + "from": [13, 1, 3], + "to": [15, 3, 13], + "faces": { + "down": {"uv": [6.75, 3.625, 6.5, 4.875], "texture": "#all"}, + "up": {"uv": [6.5, 4.875, 6.25, 3.625], "texture": "#all"}, + "north": {"uv": [6.25, 4.875, 6.5, 5.125], "texture": "#all"}, + "south": {"uv": [7.75, 4.875, 8, 5.125], "texture": "#all"}, + "west": {"uv": [6.5, 4.875, 7.75, 5.125], "texture": "#all"}, + "east": {"uv": [5, 4.875, 6.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "frameEdge6", + "from": [14.5, 0.5, 3], + "to": [15.5, 1.5, 13], + "faces": { + "down": {"uv": [2, 2, 1.875, 3.25], "texture": "#all"}, + "up": {"uv": [1.875, 3.25, 1.75, 2], "texture": "#all"}, + "north": {"uv": [1.75, 3.25, 1.875, 3.375], "texture": "#all"}, + "south": {"uv": [3.125, 3.25, 3.25, 3.375], "texture": "#all"}, + "west": {"uv": [1.875, 3.25, 3.125, 3.375], "texture": "#all"}, + "east": {"uv": [0.5, 3.25, 1.75, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frameEdge7", + "from": [0.5, 0.5, 3], + "to": [1.5, 1.5, 13], + "faces": { + "down": {"uv": [2, 2, 1.875, 3.25], "texture": "#all"}, + "up": {"uv": [1.875, 3.25, 1.75, 2], "texture": "#all"}, + "north": {"uv": [1.75, 3.25, 1.875, 3.375], "texture": "#all"}, + "south": {"uv": [3.125, 3.25, 3.25, 3.375], "texture": "#all"}, + "west": {"uv": [1.875, 3.25, 3.125, 3.375], "texture": "#all"}, + "east": {"uv": [0.5, 3.25, 1.75, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frameEdge1", + "from": [14.5, 3, 0.5], + "to": [15.5, 13, 1.5], + "faces": { + "down": {"uv": [0.375, 2, 0.25, 2.125], "texture": "#all"}, + "up": {"uv": [0.25, 2.125, 0.125, 2], "texture": "#all"}, + "north": {"uv": [0.125, 2.125, 0.25, 3.375], "texture": "#all"}, + "south": {"uv": [0.375, 2.125, 0.5, 3.375], "texture": "#all"}, + "west": {"uv": [0.25, 2.125, 0.375, 3.375], "texture": "#all"}, + "east": {"uv": [0, 2.125, 0.125, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frame10", + "from": [13, 13, 3], + "to": [15, 15, 13], + "faces": { + "down": {"uv": [3.75, 3.625, 3.5, 4.875], "texture": "#all"}, + "up": {"uv": [3.5, 4.875, 3.25, 3.625], "texture": "#all"}, + "north": {"uv": [3.25, 4.875, 3.5, 5.125], "texture": "#all"}, + "south": {"uv": [4.75, 4.875, 5, 5.125], "texture": "#all"}, + "west": {"uv": [3.5, 4.875, 4.75, 5.125], "texture": "#all"}, + "east": {"uv": [2, 4.875, 3.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "frameEdge10", + "from": [14.5, 14.5, 3], + "to": [15.5, 15.5, 13], + "faces": { + "down": {"uv": [2, 2, 1.875, 3.25], "texture": "#all"}, + "up": {"uv": [1.875, 3.25, 1.75, 2], "texture": "#all"}, + "north": {"uv": [1.75, 3.25, 1.875, 3.375], "texture": "#all"}, + "south": {"uv": [3.125, 3.25, 3.25, 3.375], "texture": "#all"}, + "west": {"uv": [1.875, 3.25, 3.125, 3.375], "texture": "#all"}, + "east": {"uv": [0.5, 3.25, 1.75, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frameEdge8", + "from": [3, 0.5, 14.5], + "to": [13, 1.5, 15.5], + "faces": { + "down": {"uv": [3.125, 3.375, 1.875, 3.5], "texture": "#all"}, + "up": {"uv": [1.875, 3.5, 0.625, 3.375], "texture": "#all"}, + "north": {"uv": [0.625, 3.5, 1.875, 3.625], "texture": "#all"}, + "south": {"uv": [2, 3.5, 3.25, 3.625], "texture": "#all"}, + "west": {"uv": [1.875, 3.5, 2, 3.625], "texture": "#all"}, + "east": {"uv": [0.5, 3.5, 0.625, 3.625], "texture": "#all"} + } + }, + { + "__comment": "frameEdge3", + "from": [14.5, 3, 14.5], + "to": [15.5, 13, 15.5], + "faces": { + "down": {"uv": [0.375, 2, 0.25, 2.125], "texture": "#all"}, + "up": {"uv": [0.25, 2.125, 0.125, 2], "texture": "#all"}, + "north": {"uv": [0.125, 2.125, 0.25, 3.375], "texture": "#all"}, + "south": {"uv": [0.375, 2.125, 0.5, 3.375], "texture": "#all"}, + "west": {"uv": [0.25, 2.125, 0.375, 3.375], "texture": "#all"}, + "east": {"uv": [0, 2.125, 0.125, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frameEdge9", + "from": [3, 14.5, 0.5], + "to": [13, 15.5, 1.5], + "faces": { + "down": {"uv": [3.125, 3.375, 1.875, 3.5], "texture": "#all"}, + "up": {"uv": [1.875, 3.5, 0.625, 3.375], "texture": "#all"}, + "north": {"uv": [0.625, 3.5, 1.875, 3.625], "texture": "#all"}, + "south": {"uv": [2, 3.5, 3.25, 3.625], "texture": "#all"}, + "west": {"uv": [1.875, 3.5, 2, 3.625], "texture": "#all"}, + "east": {"uv": [0.5, 3.5, 0.625, 3.625], "texture": "#all"} + } + }, + { + "__comment": "portRight", + "from": [0, 4, 4], + "to": [1, 12, 12], + "faces": { + "down": {"uv": [1.25, 0, 1.125, 1], "texture": "#all"}, + "up": {"uv": [1.125, 1, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 1, 1.125, 2], "texture": "#all"}, + "south": {"uv": [2.125, 1, 2.25, 2], "texture": "#all"}, + "west": {"uv": [1.125, 1, 2.125, 2], "texture": "#all"}, + "east": {"uv": [0, 1, 1, 2], "texture": "#all"} + } + }, + { + "__comment": "portLeft", + "from": [15, 4, 4], + "to": [16, 12, 12], + "faces": { + "down": {"uv": [1.25, 0, 1.125, 1], "texture": "#all"}, + "up": {"uv": [1.125, 1, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 1, 1.125, 2], "texture": "#all"}, + "south": {"uv": [2.125, 1, 2.25, 2], "texture": "#all"}, + "west": {"uv": [1.125, 1, 2.125, 2], "texture": "#all"}, + "east": {"uv": [0, 1, 1, 2], "texture": "#all"} + } + }, + { + "__comment": "frame12", + "from": [3, 13, 13], + "to": [13, 15, 15], + "faces": { + "down": {"uv": [4.75, 6.625, 3.5, 6.875], "texture": "#all"}, + "up": {"uv": [3.5, 6.875, 2.25, 6.625], "texture": "#all"}, + "north": {"uv": [2.25, 6.875, 3.5, 7.125], "texture": "#all"}, + "south": {"uv": [3.75, 6.875, 5, 7.125], "texture": "#all"}, + "west": {"uv": [3.5, 6.875, 3.75, 7.125], "texture": "#all"}, + "east": {"uv": [2, 6.875, 2.25, 7.125], "texture": "#all"} + } + }, + { + "__comment": "frame2", + "from": [1, 3, 1], + "to": [3, 13, 3], + "faces": { + "down": {"uv": [0.75, 3.625, 0.5, 3.875], "texture": "#all"}, + "up": {"uv": [0.5, 3.875, 0.25, 3.625], "texture": "#all"}, + "north": {"uv": [0.25, 3.875, 0.5, 5.125], "texture": "#all"}, + "south": {"uv": [0.75, 3.875, 1, 5.125], "texture": "#all"}, + "west": {"uv": [0.5, 3.875, 0.75, 5.125], "texture": "#all"}, + "east": {"uv": [0, 3.875, 0.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "corner4", + "from": [0, 13, 13], + "to": [3, 16, 16], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "frameEdge11", + "from": [0.5, 14.5, 3], + "to": [1.5, 15.5, 13], + "faces": { + "down": {"uv": [2, 2, 1.875, 3.25], "texture": "#all"}, + "up": {"uv": [1.875, 3.25, 1.75, 2], "texture": "#all"}, + "north": {"uv": [1.75, 3.25, 1.875, 3.375], "texture": "#all"}, + "south": {"uv": [3.125, 3.25, 3.25, 3.375], "texture": "#all"}, + "west": {"uv": [1.875, 3.25, 3.125, 3.375], "texture": "#all"}, + "east": {"uv": [0.5, 3.25, 1.75, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frame1", + "from": [13, 3, 1], + "to": [15, 13, 3], + "faces": { + "down": {"uv": [0.75, 3.625, 0.5, 3.875], "texture": "#all"}, + "up": {"uv": [0.5, 3.875, 0.25, 3.625], "texture": "#all"}, + "north": {"uv": [0.25, 3.875, 0.5, 5.125], "texture": "#all"}, + "south": {"uv": [0.75, 3.875, 1, 5.125], "texture": "#all"}, + "west": {"uv": [0.5, 3.875, 0.75, 5.125], "texture": "#all"}, + "east": {"uv": [0, 3.875, 0.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "frame11", + "from": [1, 13, 3], + "to": [3, 15, 13], + "faces": { + "down": {"uv": [3.75, 3.625, 3.5, 4.875], "texture": "#all"}, + "up": {"uv": [3.5, 4.875, 3.25, 3.625], "texture": "#all"}, + "north": {"uv": [3.25, 4.875, 3.5, 5.125], "texture": "#all"}, + "south": {"uv": [4.75, 4.875, 5, 5.125], "texture": "#all"}, + "west": {"uv": [3.5, 4.875, 4.75, 5.125], "texture": "#all"}, + "east": {"uv": [2, 4.875, 3.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "portTop", + "from": [4, 15, 4], + "to": [12, 16, 12], + "faces": { + "down": {"uv": [7.5, 0, 6.5, 1], "texture": "#all"}, + "up": {"uv": [6.5, 1, 5.5, 0], "texture": "#all"}, + "north": {"uv": [5.5, 1, 6.5, 1.125], "texture": "#all"}, + "south": {"uv": [7.5, 1, 8.5, 1.125], "texture": "#all"}, + "west": {"uv": [6.5, 1, 7.5, 1.125], "texture": "#all"}, + "east": {"uv": [4.5, 1, 5.5, 1.125], "texture": "#all"} + } + }, + { + "__comment": "frameEdge4", + "from": [0.5, 3, 14.5], + "to": [1.5, 13, 15.5], + "faces": { + "down": {"uv": [0.375, 2, 0.25, 2.125], "texture": "#all"}, + "up": {"uv": [0.25, 2.125, 0.125, 2], "texture": "#all"}, + "north": {"uv": [0.125, 2.125, 0.25, 3.375], "texture": "#all"}, + "south": {"uv": [0.375, 2.125, 0.5, 3.375], "texture": "#all"}, + "west": {"uv": [0.25, 2.125, 0.375, 3.375], "texture": "#all"}, + "east": {"uv": [0, 2.125, 0.125, 3.375], "texture": "#all"} + } + }, + { + "__comment": "frameEdge5", + "from": [3, 0.5, 0.5], + "to": [13, 1.5, 1.5], + "faces": { + "down": {"uv": [3.125, 3.375, 1.875, 3.5], "texture": "#all"}, + "up": {"uv": [1.875, 3.5, 0.625, 3.375], "texture": "#all"}, + "north": {"uv": [0.625, 3.5, 1.875, 3.625], "texture": "#all"}, + "south": {"uv": [2, 3.5, 3.25, 3.625], "texture": "#all"}, + "west": {"uv": [1.875, 3.5, 2, 3.625], "texture": "#all"}, + "east": {"uv": [0.5, 3.5, 0.625, 3.625], "texture": "#all"} + } + }, + { + "__comment": "frame8", + "from": [3, 1, 13], + "to": [13, 3, 15], + "faces": { + "down": {"uv": [4.75, 6.125, 3.5, 6.375], "texture": "#all"}, + "up": {"uv": [3.5, 6.375, 2.25, 6.125], "texture": "#all"}, + "north": {"uv": [2.25, 6.375, 3.5, 6.625], "texture": "#all"}, + "south": {"uv": [3.75, 6.375, 5, 6.625], "texture": "#all"}, + "west": {"uv": [3.5, 6.375, 3.75, 6.625], "texture": "#all"}, + "east": {"uv": [2, 6.375, 2.25, 6.625], "texture": "#all"} + } + }, + { + "__comment": "portFront", + "from": [4, 4, 0], + "to": [12, 12, 1], + "faces": { + "down": {"uv": [4.375, 0, 3.375, 0.125], "texture": "#all"}, + "up": {"uv": [3.375, 0.125, 2.375, 0], "texture": "#all"}, + "north": {"uv": [2.375, 0.125, 3.375, 1.125], "texture": "#all"}, + "south": {"uv": [3.5, 0.125, 4.5, 1.125], "texture": "#all"}, + "west": {"uv": [3.375, 0.125, 3.5, 1.125], "texture": "#all"}, + "east": {"uv": [2.25, 0.125, 2.375, 1.125], "texture": "#all"} + } + }, + { + "__comment": "corner1", + "from": [13, 13, 0], + "to": [16, 16, 3], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "corner3", + "from": [13, 13, 13], + "to": [16, 16, 16], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "frame4", + "from": [1, 3, 13], + "to": [3, 13, 15], + "faces": { + "down": {"uv": [1.75, 3.625, 1.5, 3.875], "texture": "#all"}, + "up": {"uv": [1.5, 3.875, 1.25, 3.625], "texture": "#all"}, + "north": {"uv": [1.25, 3.875, 1.5, 5.125], "texture": "#all"}, + "south": {"uv": [1.75, 3.875, 2, 5.125], "texture": "#all"}, + "west": {"uv": [1.5, 3.875, 1.75, 5.125], "texture": "#all"}, + "east": {"uv": [1, 3.875, 1.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "portRightLarge", + "from": [0, 3, 3], + "to": [1, 13, 13], + "faces": { + "down": {"uv": [10, 0, 9.875, 1.25], "texture": "#all"}, + "up": {"uv": [9.875, 1.25, 9.75, 0], "texture": "#all"}, + "north": {"uv": [9.75, 1.25, 9.875, 2.5], "texture": "#all"}, + "south": {"uv": [11.125, 1.25, 11.25, 2.5], "texture": "#all"}, + "west": {"uv": [9.875, 1.25, 11.125, 2.5], "texture": "#all"}, + "east": {"uv": [8.5, 1.25, 9.75, 2.5], "texture": "#all"} + } + }, + { + "__comment": "portLeftLarge", + "from": [15, 3, 3], + "to": [16, 13, 13], + "faces": { + "down": {"uv": [10, 0, 9.875, 1.25], "texture": "#all"}, + "up": {"uv": [9.875, 1.25, 9.75, 0], "texture": "#all"}, + "north": {"uv": [9.75, 1.25, 9.875, 2.5], "texture": "#all"}, + "south": {"uv": [11.125, 1.25, 11.25, 2.5], "texture": "#all"}, + "west": {"uv": [9.875, 1.25, 11.125, 2.5], "texture": "#all"}, + "east": {"uv": [8.5, 1.25, 9.75, 2.5], "texture": "#all"} + } + }, + { + "__comment": "corner6", + "from": [0, 0, 0], + "to": [3, 3, 3], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "frameEdge12", + "from": [3, 14.5, 14.5], + "to": [13, 15.5, 15.5], + "faces": { + "down": {"uv": [3.125, 3.375, 1.875, 3.5], "texture": "#all"}, + "up": {"uv": [1.875, 3.5, 0.625, 3.375], "texture": "#all"}, + "north": {"uv": [0.625, 3.5, 1.875, 3.625], "texture": "#all"}, + "south": {"uv": [2, 3.5, 3.25, 3.625], "texture": "#all"}, + "west": {"uv": [1.875, 3.5, 2, 3.625], "texture": "#all"}, + "east": {"uv": [0.5, 3.5, 0.625, 3.625], "texture": "#all"} + } + }, + { + "__comment": "portBottom", + "from": [4, 0, 4], + "to": [12, 1, 12], + "faces": { + "down": {"uv": [7.5, 1.125, 6.5, 2.125], "texture": "#all"}, + "up": {"uv": [6.5, 2.125, 5.5, 1.125], "texture": "#all"}, + "north": {"uv": [5.5, 2.125, 6.5, 2.25], "texture": "#all"}, + "south": {"uv": [7.5, 2.125, 8.5, 2.25], "texture": "#all"}, + "west": {"uv": [6.5, 2.125, 7.5, 2.25], "texture": "#all"}, + "east": {"uv": [4.5, 2.125, 5.5, 2.25], "texture": "#all"} + } + }, + { + "__comment": "frame5", + "from": [3, 1, 1], + "to": [13, 3, 3], + "faces": { + "down": {"uv": [4.75, 5.625, 3.5, 5.875], "texture": "#all"}, + "up": {"uv": [3.5, 5.875, 2.25, 5.625], "texture": "#all"}, + "north": {"uv": [2.25, 5.875, 3.5, 6.125], "texture": "#all"}, + "south": {"uv": [3.75, 5.875, 5, 6.125], "texture": "#all"}, + "west": {"uv": [3.5, 5.875, 3.75, 6.125], "texture": "#all"}, + "east": {"uv": [2, 5.875, 2.25, 6.125], "texture": "#all"} + } + }, + { + "__comment": "frame7", + "from": [1, 1, 3], + "to": [3, 3, 13], + "faces": { + "down": {"uv": [6.75, 3.625, 6.5, 4.875], "texture": "#all"}, + "up": {"uv": [6.5, 4.875, 6.25, 3.625], "texture": "#all"}, + "north": {"uv": [6.25, 4.875, 6.5, 5.125], "texture": "#all"}, + "south": {"uv": [7.75, 4.875, 8, 5.125], "texture": "#all"}, + "west": {"uv": [6.5, 4.875, 7.75, 5.125], "texture": "#all"}, + "east": {"uv": [5, 4.875, 6.25, 5.125], "texture": "#all"} + } + }, + { + "__comment": "corner8", + "from": [0, 0, 13], + "to": [3, 3, 16], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "frame9", + "from": [3, 13, 1], + "to": [13, 15, 3], + "faces": { + "down": {"uv": [4.75, 5.125, 3.5, 5.375], "texture": "#all"}, + "up": {"uv": [3.5, 5.375, 2.25, 5.125], "texture": "#all"}, + "north": {"uv": [2.25, 5.375, 3.5, 5.625], "texture": "#all"}, + "south": {"uv": [3.75, 5.375, 5, 5.625], "texture": "#all"}, + "west": {"uv": [3.5, 5.375, 3.75, 5.625], "texture": "#all"}, + "east": {"uv": [2, 5.375, 2.25, 5.625], "texture": "#all"} + } + }, + { + "__comment": "corner5", + "from": [13, 0, 0], + "to": [16, 3, 3], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "corner7", + "from": [13, 0, 13], + "to": [16, 3, 16], + "faces": { + "down": {"uv": [1.125, 6.125, 0.75, 6.5], "texture": "#all"}, + "up": {"uv": [0.75, 6.5, 0.375, 6.125], "texture": "#all"}, + "north": {"uv": [0.375, 6.5, 0.75, 6.875], "texture": "#all"}, + "south": {"uv": [1.125, 6.5, 1.5, 6.875], "texture": "#all"}, + "west": {"uv": [0.75, 6.5, 1.125, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.5, 0.375, 6.875], "texture": "#all"} + } + }, + { + "__comment": "portBack", + "from": [4, 4, 15], + "to": [12, 12, 16], + "faces": { + "down": {"uv": [4.375, 1.125, 3.375, 1.25], "texture": "#all"}, + "up": {"uv": [3.375, 1.25, 2.375, 1.125], "texture": "#all"}, + "north": {"uv": [2.375, 1.25, 3.375, 2.25], "texture": "#all"}, + "south": {"uv": [3.5, 1.25, 4.5, 2.25], "texture": "#all"}, + "west": {"uv": [3.375, 1.25, 3.5, 2.25], "texture": "#all"}, + "east": {"uv": [2.25, 1.25, 2.375, 2.25], "texture": "#all"} + } + } + ], + "textures": { + "all": "...", + "particle": "..." + } +} diff --git a/src/main/resources/assets/mekanism/models/block/resistive_heater.json b/src/main/resources/assets/mekanism/models/block/resistive_heater.json new file mode 100644 index 000000000..f59e980c4 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/resistive_heater.json @@ -0,0 +1,268 @@ +{ + "elements": [ + { + "__comment": "wallRight", + "from": [13, 7, 0], + "to": [16, 16, 16], + "faces": { + "down": {"uv": [2.75, 2.875, 2.375, 4.875], "texture": "#all"}, + "up": {"uv": [2.375, 4.875, 2, 2.875], "texture": "#all"}, + "north": {"uv": [2, 4.875, 2.375, 6], "texture": "#all"}, + "south": {"uv": [4.375, 4.875, 4.75, 6], "texture": "#all"}, + "west": {"uv": [2.375, 4.875, 4.375, 6], "texture": "#all"}, + "east": {"uv": [0, 4.875, 2, 6], "texture": "#all"} + } + }, + { + "__comment": "portLeft", + "from": [-0.00999999999999979, 4, 4], + "to": [0.99, 12, 12], + "faces": { + "down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"}, + "up": {"uv": [7.125, 1, 7, 0], "texture": "#all"}, + "north": {"uv": [7, 1, 7.125, 2], "texture": "#all"}, + "south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"}, + "west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"}, + "east": {"uv": [6, 1, 7, 2], "texture": "#all"} + } + }, + { + "__comment": "bar4", + "from": [4, 13.5, 1.5], + "to": [5, 14.5, 14.5], + "faces": { + "down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"}, + "up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"}, + "north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"}, + "south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"}, + "west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"}, + "east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"} + } + }, + { + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 7, 16], + "faces": { + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.875], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.875], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.875], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.875], "texture": "#all"} + } + }, + { + "__comment": "fin1", + "from": [3, 6.5, 0.5], + "to": [13, 15.5, 1.5], + "faces": { + "down": {"uv": [5.375, 6, 4.125, 6.125], "texture": "#all"}, + "up": {"uv": [4.125, 6.125, 2.875, 6], "texture": "#all"}, + "north": {"uv": [2.875, 6.125, 4.125, 7.25], "texture": "#all"}, + "south": {"uv": [4.25, 6.125, 5.5, 7.25], "texture": "#all"}, + "west": {"uv": [4.125, 6.125, 4.25, 7.25], "texture": "#all"}, + "east": {"uv": [2.75, 6.125, 2.875, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin8", + "from": [3, 6.5, 11.5], + "to": [13, 15.5, 12.5], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "center", + "from": [5, 6.5, 7.5], + "to": [11, 12.5, 8.5], + "faces": { + "down": {"uv": [1.625, 0, 0.875, 0.125], "texture": "#all"}, + "up": {"uv": [0.875, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.875, 0.875], "texture": "#all"}, + "south": {"uv": [1, 0.125, 1.75, 0.875], "texture": "#all"}, + "west": {"uv": [0.875, 0.125, 1, 0.875], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.875], "texture": "#all"} + } + }, + { + "__comment": "fin10", + "from": [3, 6.5, 14.5], + "to": [13, 15.5, 15.5], + "faces": { + "down": {"uv": [7.375, 4.75, 6.125, 4.875], "texture": "#all"}, + "up": {"uv": [6.125, 4.875, 4.875, 4.75], "texture": "#all"}, + "north": {"uv": [4.875, 4.875, 6.125, 6], "texture": "#all"}, + "south": {"uv": [6.25, 4.875, 7.5, 6], "texture": "#all"}, + "west": {"uv": [6.125, 4.875, 6.25, 6], "texture": "#all"}, + "east": {"uv": [4.75, 4.875, 4.875, 6], "texture": "#all"} + } + }, + { + "__comment": "bar1", + "from": [11, 13.5, 1.5], + "to": [12, 14.5, 14.5], + "faces": { + "down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"}, + "up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"}, + "north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"}, + "south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"}, + "west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"}, + "east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"} + } + }, + { + "__comment": "portRight", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], + "faces": { + "down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"}, + "up": {"uv": [7.125, 1, 7, 0], "texture": "#all"}, + "north": {"uv": [7, 1, 7.125, 2], "texture": "#all"}, + "south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"}, + "west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"}, + "east": {"uv": [6, 1, 7, 2], "texture": "#all"} + } + }, + { + "__comment": "wallLeft", + "from": [0, 7, 0], + "to": [3, 16, 16], + "faces": { + "down": {"uv": [2.75, 2.875, 2.375, 4.875], "texture": "#all"}, + "up": {"uv": [2.375, 4.875, 2, 2.875], "texture": "#all"}, + "north": {"uv": [2, 4.875, 2.375, 6], "texture": "#all"}, + "south": {"uv": [4.375, 4.875, 4.75, 6], "texture": "#all"}, + "west": {"uv": [2.375, 4.875, 4.375, 6], "texture": "#all"}, + "east": {"uv": [0, 4.875, 2, 6], "texture": "#all"} + } + }, + { + "__comment": "fin5", + "from": [3, 6.5, 6.5], + "to": [13, 15.5, 7.5], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin3", + "from": [3, 6.5, 3.5], + "to": [13, 15.5, 4.5], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin4", + "from": [3, 6.5, 5], + "to": [13, 15.5, 6], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin9", + "from": [3, 6.5, 13], + "to": [13, 15.5, 14], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin2", + "from": [3, 6.5, 2], + "to": [13, 15.5, 3], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "bar2", + "from": [9, 13.5, 1.5], + "to": [10, 14.5, 14.5], + "faces": { + "down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"}, + "up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"}, + "north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"}, + "south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"}, + "west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"}, + "east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"} + } + }, + { + "__comment": "fin6", + "from": [3, 6.5, 8.5], + "to": [13, 15.5, 9.5], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "fin7", + "from": [3, 6.5, 10], + "to": [13, 15.5, 11], + "faces": { + "down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"}, + "up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"}, + "north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"}, + "south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"}, + "west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"}, + "east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"} + } + }, + { + "__comment": "bar3", + "from": [6, 13.5, 1.5], + "to": [7, 14.5, 14.5], + "faces": { + "down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"}, + "up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"}, + "north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"}, + "south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"}, + "west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"}, + "east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"} + } + } + ], + "textures": { + "all": "...", + "particle": "..." + } +} diff --git a/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json b/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json index 23b02967b..c8a7b478b 100644 --- a/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json +++ b/src/main/resources/assets/mekanism/models/block/rotary_condensentrator.json @@ -1,333 +1,294 @@ { "elements": [ { - "__comment": "GasBottleLid2", - "from": [9, 11, 9], - "to": [15, 12, 15], + "__comment": "tube5", + "from": [7, 7, 13], + "to": [9, 8, 14], "faces": { - "down": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "up": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.75, 5.75, 1.5, 5.875], "texture": "#all"}, - "south": {"uv": [2.25, 5.75, 3, 5.875], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 2.25, 5.875], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.75, 5.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "LiquidOutput", - "from": [4, 3, 0], - "to": [12, 11, 1], + "__comment": "support4", + "from": [1, 14, 14], + "to": [2, 15, 15], "faces": { - "down": {"uv": [5.625, 2.75, 6.625, 2.875], "texture": "#all"}, - "up": {"uv": [4.625, 2.75, 5.625, 2.875], "texture": "#all"}, - "north": {"uv": [4.625, 2.875, 5.625, 3.875], "texture": "#all"}, - "south": {"uv": [5.75, 2.875, 6.75, 3.875], "texture": "#all"}, - "west": {"uv": [5.625, 2.875, 5.75, 3.875], "texture": "#all"}, - "east": {"uv": [4.5, 2.875, 4.625, 3.875], "texture": "#all"} + "down": {"uv": [1.25, 0, 1.125, 0.125], "texture": "#all"}, + "up": {"uv": [1.125, 0.125, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 0.125, 1.125, 0.25], "texture": "#all"}, + "south": {"uv": [1.25, 0.125, 1.375, 0.25], "texture": "#all"}, + "west": {"uv": [1.125, 0.125, 1.25, 0.25], "texture": "#all"}, + "east": {"uv": [0.875, 0.125, 1, 0.25], "texture": "#all"} } }, { - "__comment": "LiqBottle1", - "from": [2, 0, 2], - "to": [6, 11, 6], + "__comment": "tube2", + "from": [7, 9, 2], + "to": [9, 10, 3], "faces": { - "down": {"uv": [4.125, 6, 4.625, 6.5], "texture": "#all"}, - "up": {"uv": [3.625, 6, 4.125, 6.5], "texture": "#all"}, - "north": {"uv": [3.625, 6.5, 4.125, 7.875], "texture": "#all"}, - "south": {"uv": [4.625, 6.5, 5.125, 7.875], "texture": "#all"}, - "west": {"uv": [4.125, 6.5, 4.625, 7.875], "texture": "#all"}, - "east": {"uv": [3.125, 6.5, 3.625, 7.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "GasBottleDecor4", - "from": [1.5, 9, 9.5], - "to": [6.5, 10, 14.5], + "__comment": "pipe", + "from": [7.01, 5, 5], + "to": [9.01, 11, 11], "faces": { - "down": {"uv": [1.25, 4.125, 1.875, 4.75], "texture": "#all"}, - "up": {"uv": [0.625, 4.125, 1.25, 4.75], "texture": "#all"}, - "north": {"uv": [0.625, 4.75, 1.25, 4.875], "texture": "#all"}, - "south": {"uv": [1.875, 4.75, 2.5, 4.875], "texture": "#all"}, - "west": {"uv": [1.25, 4.75, 1.875, 4.875], "texture": "#all"}, - "east": {"uv": [0, 4.75, 0.625, 4.875], "texture": "#all"} + "down": {"uv": [1.25, 0.5, 1, 1.25], "texture": "#all"}, + "up": {"uv": [1, 1.25, 0.75, 0.5], "texture": "#all"}, + "north": {"uv": [0.75, 1.25, 1, 2], "texture": "#all"}, + "south": {"uv": [1.75, 1.25, 2, 2], "texture": "#all"}, + "west": {"uv": [1, 1.25, 1.75, 2], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.75, 2], "texture": "#all"} } }, { - "__comment": "LiqBottleBot2", - "from": [9, -1, 1], - "to": [15, 0, 7], + "__comment": "support3", + "from": [1, 14, 1], + "to": [2, 15, 2], "faces": { - "down": {"uv": [4.625, 5, 5.375, 5.75], "texture": "#all"}, - "up": {"uv": [3.875, 5, 4.625, 5.75], "texture": "#all"}, - "north": {"uv": [3.875, 5.75, 4.625, 5.875], "texture": "#all"}, - "south": {"uv": [5.375, 5.75, 6.125, 5.875], "texture": "#all"}, - "west": {"uv": [4.625, 5.75, 5.375, 5.875], "texture": "#all"}, - "east": {"uv": [3.125, 5.75, 3.875, 5.875], "texture": "#all"} + "down": {"uv": [1.25, 0, 1.125, 0.125], "texture": "#all"}, + "up": {"uv": [1.125, 0.125, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 0.125, 1.125, 0.25], "texture": "#all"}, + "south": {"uv": [1.25, 0.125, 1.375, 0.25], "texture": "#all"}, + "west": {"uv": [1.125, 0.125, 1.25, 0.25], "texture": "#all"}, + "east": {"uv": [0.875, 0.125, 1, 0.25], "texture": "#all"} } }, { - "__comment": "LiqBottleDecor3", - "from": [1.5, 1, 1.5], - "to": [6.5, 2, 6.5], + "__comment": "middle", + "from": [0, 13, 0], + "to": [16, 14, 16], "faces": { - "down": {"uv": [4.375, 4.125, 5, 4.75], "texture": "#all"}, - "up": {"uv": [3.75, 4.125, 4.375, 4.75], "texture": "#all"}, - "north": {"uv": [3.75, 4.75, 4.375, 4.875], "texture": "#all"}, - "south": {"uv": [5, 4.75, 5.625, 4.875], "texture": "#all"}, - "west": {"uv": [4.375, 4.75, 5, 4.875], "texture": "#all"}, - "east": {"uv": [3.125, 4.75, 3.75, 4.875], "texture": "#all"} + "down": {"uv": [6, 2.125, 4, 4.125], "texture": "#all"}, + "up": {"uv": [4, 4.125, 2, 2.125], "texture": "#all"}, + "north": {"uv": [2, 4.125, 4, 4.25], "texture": "#all"}, + "south": {"uv": [6, 4.125, 8, 4.25], "texture": "#all"}, + "west": {"uv": [4, 4.125, 6, 4.25], "texture": "#all"}, + "east": {"uv": [0, 4.125, 2, 4.25], "texture": "#all"} } }, { - "__comment": "MidSection3", - "from": [6, 6, 1], - "to": [10, 8, 15], + "__comment": "bridge", + "from": [4, 14, 4], + "to": [12, 15, 12], "faces": { - "down": {"uv": [2.25, 0, 2.75, 1.75], "texture": "#all"}, - "up": {"uv": [1.75, 0, 2.25, 1.75], "texture": "#all"}, - "north": {"uv": [1.75, 1.75, 2.25, 2], "texture": "#all"}, - "south": {"uv": [4, 1.75, 4.5, 2], "texture": "#all"}, - "west": {"uv": [2.25, 1.75, 4, 2], "texture": "#all"}, - "east": {"uv": [0, 1.75, 1.75, 2], "texture": "#all"} + "down": {"uv": [11, 0, 10, 1], "texture": "#all"}, + "up": {"uv": [10, 1, 9, 0], "texture": "#all"}, + "north": {"uv": [9, 1, 10, 1.125], "texture": "#all"}, + "south": {"uv": [11, 1, 12, 1.125], "texture": "#all"}, + "west": {"uv": [10, 1, 11, 1.125], "texture": "#all"}, + "east": {"uv": [8, 1, 9, 1.125], "texture": "#all"} } }, { - "__comment": "LiqBottleDecor1", - "from": [9.5, 1, 1.5], - "to": [14.5, 2, 6.5], + "__comment": "tankLeft", + "from": [9, 5, 1], + "to": [15, 13, 15], "faces": { - "down": {"uv": [4.375, 4.125, 5, 4.75], "texture": "#all"}, - "up": {"uv": [3.75, 4.125, 4.375, 4.75], "texture": "#all"}, - "north": {"uv": [3.75, 4.75, 4.375, 4.875], "texture": "#all"}, - "south": {"uv": [5, 4.75, 5.625, 4.875], "texture": "#all"}, - "west": {"uv": [4.375, 4.75, 5, 4.875], "texture": "#all"}, - "east": {"uv": [3.125, 4.75, 3.75, 4.875], "texture": "#all"} + "down": {"uv": [11.25, 1.125, 10.5, 2.875], "texture": "#all"}, + "up": {"uv": [10.5, 2.875, 9.75, 1.125], "texture": "#all"}, + "north": {"uv": [9.75, 2.875, 10.5, 3.875], "texture": "#all"}, + "south": {"uv": [12.25, 2.875, 13, 3.875], "texture": "#all"}, + "west": {"uv": [10.5, 2.875, 12.25, 3.875], "texture": "#all"}, + "east": {"uv": [8, 2.875, 9.75, 3.875], "texture": "#all"} } }, { - "__comment": "GasBottleDecor3", - "from": [1.5, 1, 9.5], - "to": [6.5, 2, 14.5], + "__comment": "portRight", + "from": [-0.00999999999999979, 3, 3], + "to": [0.99, 13, 13], "faces": { - "down": {"uv": [1.25, 4.125, 1.875, 4.75], "texture": "#all"}, - "up": {"uv": [0.625, 4.125, 1.25, 4.75], "texture": "#all"}, - "north": {"uv": [0.625, 4.75, 1.25, 4.875], "texture": "#all"}, - "south": {"uv": [1.875, 4.75, 2.5, 4.875], "texture": "#all"}, - "west": {"uv": [1.25, 4.75, 1.875, 4.875], "texture": "#all"}, - "east": {"uv": [0, 4.75, 0.625, 4.875], "texture": "#all"} + "down": {"uv": [11.75, 3.875, 11.625, 5.125], "texture": "#all"}, + "up": {"uv": [11.625, 5.125, 11.5, 3.875], "texture": "#all"}, + "north": {"uv": [11.5, 5.125, 11.625, 6.375], "texture": "#all"}, + "south": {"uv": [12.875, 5.125, 13, 6.375], "texture": "#all"}, + "west": {"uv": [11.625, 5.125, 12.875, 6.375], "texture": "#all"}, + "east": {"uv": [10.25, 5.125, 11.5, 6.375], "texture": "#all"} } }, { - "__comment": "LiqBottleLid2", - "from": [9, 11, 1], - "to": [15, 12, 7], + "__comment": "portLeft", + "from": [15.01, 4, 4], + "to": [16.01, 12, 12], "faces": { - "down": {"uv": [4.625, 5, 5.375, 5.75], "texture": "#all"}, - "up": {"uv": [3.875, 5, 4.625, 5.75], "texture": "#all"}, - "north": {"uv": [3.875, 5.75, 4.625, 5.875], "texture": "#all"}, - "south": {"uv": [5.375, 5.75, 6.125, 5.875], "texture": "#all"}, - "west": {"uv": [4.625, 5.75, 5.375, 5.875], "texture": "#all"}, - "east": {"uv": [3.125, 5.75, 3.875, 5.875], "texture": "#all"} + "down": {"uv": [9.25, 3.875, 9.125, 4.875], "texture": "#all"}, + "up": {"uv": [9.125, 4.875, 9, 3.875], "texture": "#all"}, + "north": {"uv": [9, 4.875, 9.125, 5.875], "texture": "#all"}, + "south": {"uv": [10.125, 4.875, 10.25, 5.875], "texture": "#all"}, + "west": {"uv": [9.125, 4.875, 10.125, 5.875], "texture": "#all"}, + "east": {"uv": [8, 4.875, 9, 5.875], "texture": "#all"} } }, { - "__comment": "GasBottleLid1", - "from": [1, 11, 9], - "to": [7, 12, 15], + "__comment": "tankRight", + "from": [1, 5, 1], + "to": [7, 13, 15], "faces": { - "down": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "up": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.75, 5.75, 1.5, 5.875], "texture": "#all"}, - "south": {"uv": [2.25, 5.75, 3, 5.875], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 2.25, 5.875], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.75, 5.875], "texture": "#all"} + "down": {"uv": [11.25, 1.125, 10.5, 2.875], "texture": "#all"}, + "up": {"uv": [10.5, 2.875, 9.75, 1.125], "texture": "#all"}, + "north": {"uv": [9.75, 2.875, 10.5, 3.875], "texture": "#all"}, + "south": {"uv": [12.25, 2.875, 13, 3.875], "texture": "#all"}, + "west": {"uv": [10.5, 2.875, 12.25, 3.875], "texture": "#all"}, + "east": {"uv": [8, 2.875, 9.75, 3.875], "texture": "#all"} } }, { - "__comment": "GasInput", - "from": [5, 4, 15], - "to": [11, 10, 16], + "__comment": "tube8", + "from": [7, 5, 13], + "to": [9, 6, 14], "faces": { - "down": {"uv": [0.875, 3, 1.625, 3.125], "texture": "#all"}, - "up": {"uv": [0.125, 3, 0.875, 3.125], "texture": "#all"}, - "north": {"uv": [0.125, 3.125, 0.875, 3.875], "texture": "#all"}, - "south": {"uv": [1, 3.125, 1.75, 3.875], "texture": "#all"}, - "west": {"uv": [0.875, 3.125, 1, 3.875], "texture": "#all"}, - "east": {"uv": [0, 3.125, 0.125, 3.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "GasBottleDecor1", - "from": [9.5, 1, 9.5], - "to": [14.5, 2, 14.5], + "__comment": "tube6", + "from": [7, 9, 13], + "to": [9, 10, 14], "faces": { - "down": {"uv": [1.25, 4.125, 1.875, 4.75], "texture": "#all"}, - "up": {"uv": [0.625, 4.125, 1.25, 4.75], "texture": "#all"}, - "north": {"uv": [0.625, 4.75, 1.25, 4.875], "texture": "#all"}, - "south": {"uv": [1.875, 4.75, 2.5, 4.875], "texture": "#all"}, - "west": {"uv": [1.25, 4.75, 1.875, 4.875], "texture": "#all"}, - "east": {"uv": [0, 4.75, 0.625, 4.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "LiqBottleBot1", - "from": [1, -1, 1], - "to": [7, 0, 7], + "__comment": "shaft", + "from": [7.5, 11, 7.5], + "to": [8.5, 13, 8.5], "faces": { - "down": {"uv": [4.625, 5, 5.375, 5.75], "texture": "#all"}, - "up": {"uv": [3.875, 5, 4.625, 5.75], "texture": "#all"}, - "north": {"uv": [3.875, 5.75, 4.625, 5.875], "texture": "#all"}, - "south": {"uv": [5.375, 5.75, 6.125, 5.875], "texture": "#all"}, - "west": {"uv": [4.625, 5.75, 5.375, 5.875], "texture": "#all"}, - "east": {"uv": [3.125, 5.75, 3.875, 5.875], "texture": "#all"} + "down": {"uv": [1.875, 0, 1.75, 0.125], "texture": "#all"}, + "up": {"uv": [1.75, 0.125, 1.625, 0], "texture": "#all"}, + "north": {"uv": [1.625, 0.125, 1.75, 0.375], "texture": "#all"}, + "south": {"uv": [1.875, 0.125, 2, 0.375], "texture": "#all"}, + "west": {"uv": [1.75, 0.125, 1.875, 0.375], "texture": "#all"}, + "east": {"uv": [1.5, 0.125, 1.625, 0.375], "texture": "#all"} } }, { - "__comment": "GasBottleDecor2", - "from": [9.5, 9, 9.5], - "to": [14.5, 10, 14.5], + "__comment": "tube1", + "from": [7, 11, 2], + "to": [9, 12, 3], "faces": { - "down": {"uv": [1.25, 4.125, 1.875, 4.75], "texture": "#all"}, - "up": {"uv": [0.625, 4.125, 1.25, 4.75], "texture": "#all"}, - "north": {"uv": [0.625, 4.75, 1.25, 4.875], "texture": "#all"}, - "south": {"uv": [1.875, 4.75, 2.5, 4.875], "texture": "#all"}, - "west": {"uv": [1.25, 4.75, 1.875, 4.875], "texture": "#all"}, - "east": {"uv": [0, 4.75, 0.625, 4.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "MidSection2", - "from": [5, -1, 1], - "to": [11, 6, 9], + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 5, 16], "faces": { - "down": {"uv": [6.375, 0, 7.125, 1], "texture": "#all"}, - "up": {"uv": [5.625, 0, 6.375, 1], "texture": "#all"}, - "north": {"uv": [5.625, 1, 6.375, 1.875], "texture": "#all"}, - "south": {"uv": [7.375, 1, 8.125, 1.875], "texture": "#all"}, - "west": {"uv": [6.375, 1, 7.375, 1.875], "texture": "#all"}, - "east": {"uv": [4.625, 1, 5.625, 1.875], "texture": "#all"} + "down": {"uv": [6, 4.25, 4, 6.25], "texture": "#all"}, + "up": {"uv": [4, 6.25, 2, 4.25], "texture": "#all"}, + "north": {"uv": [2, 6.25, 4, 6.875], "texture": "#all"}, + "south": {"uv": [6, 6.25, 8, 6.875], "texture": "#all"}, + "west": {"uv": [4, 6.25, 6, 6.875], "texture": "#all"}, + "east": {"uv": [0, 6.25, 2, 6.875], "texture": "#all"} } }, { - "__comment": "LiqBottleDecor4", - "from": [1.5, 9, 1.5], - "to": [6.5, 10, 6.5], + "__comment": "support1", + "from": [14, 14, 14], + "to": [15, 15, 15], "faces": { - "down": {"uv": [4.375, 4.125, 5, 4.75], "texture": "#all"}, - "up": {"uv": [3.75, 4.125, 4.375, 4.75], "texture": "#all"}, - "north": {"uv": [3.75, 4.75, 4.375, 4.875], "texture": "#all"}, - "south": {"uv": [5, 4.75, 5.625, 4.875], "texture": "#all"}, - "west": {"uv": [4.375, 4.75, 5, 4.875], "texture": "#all"}, - "east": {"uv": [3.125, 4.75, 3.75, 4.875], "texture": "#all"} + "down": {"uv": [1.25, 0, 1.125, 0.125], "texture": "#all"}, + "up": {"uv": [1.125, 0.125, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 0.125, 1.125, 0.25], "texture": "#all"}, + "south": {"uv": [1.25, 0.125, 1.375, 0.25], "texture": "#all"}, + "west": {"uv": [1.125, 0.125, 1.25, 0.25], "texture": "#all"}, + "east": {"uv": [0.875, 0.125, 1, 0.25], "texture": "#all"} } }, { - "__comment": "GasBottleBot2", - "from": [9, -1, 9], - "to": [15, 0, 15], + "__comment": "tube3", + "from": [7, 7, 2], + "to": [9, 8, 3], "faces": { - "down": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "up": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.75, 5.75, 1.5, 5.875], "texture": "#all"}, - "south": {"uv": [2.25, 5.75, 3, 5.875], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 2.25, 5.875], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.75, 5.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "LiqBottle2", - "from": [10, 0, 2], - "to": [14, 11, 6], + "__comment": "tube7", + "from": [7, 11, 13], + "to": [9, 12, 14], "faces": { - "down": {"uv": [4.125, 6, 4.625, 6.5], "texture": "#all"}, - "up": {"uv": [3.625, 6, 4.125, 6.5], "texture": "#all"}, - "north": {"uv": [3.625, 6.5, 4.125, 7.875], "texture": "#all"}, - "south": {"uv": [4.625, 6.5, 5.125, 7.875], "texture": "#all"}, - "west": {"uv": [4.125, 6.5, 4.625, 7.875], "texture": "#all"}, - "east": {"uv": [3.125, 6.5, 3.625, 7.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "GasBottleBot1", - "from": [1, -1, 9], - "to": [7, 0, 15], + "__comment": "top", + "from": [0, 15, 0], + "to": [16, 16, 16], "faces": { - "down": {"uv": [1.5, 5, 2.25, 5.75], "texture": "#all"}, - "up": {"uv": [0.75, 5, 1.5, 5.75], "texture": "#all"}, - "north": {"uv": [0.75, 5.75, 1.5, 5.875], "texture": "#all"}, - "south": {"uv": [2.25, 5.75, 3, 5.875], "texture": "#all"}, - "west": {"uv": [1.5, 5.75, 2.25, 5.875], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.75, 5.875], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} } }, { - "__comment": "MidSection1", - "from": [6, 0, 9], - "to": [10, 5, 15], + "__comment": "support2", + "from": [14, 14, 1], + "to": [15, 15, 2], "faces": { - "down": {"uv": [3.125, 2.5, 3.625, 3.25], "texture": "#all"}, - "up": {"uv": [2.625, 2.5, 3.125, 3.25], "texture": "#all"}, - "north": {"uv": [2.625, 3.25, 3.125, 3.875], "texture": "#all"}, - "south": {"uv": [3.875, 3.25, 4.375, 3.875], "texture": "#all"}, - "west": {"uv": [3.125, 3.25, 3.875, 3.875], "texture": "#all"}, - "east": {"uv": [1.875, 3.25, 2.625, 3.875], "texture": "#all"} + "down": {"uv": [1.25, 0, 1.125, 0.125], "texture": "#all"}, + "up": {"uv": [1.125, 0.125, 1, 0], "texture": "#all"}, + "north": {"uv": [1, 0.125, 1.125, 0.25], "texture": "#all"}, + "south": {"uv": [1.25, 0.125, 1.375, 0.25], "texture": "#all"}, + "west": {"uv": [1.125, 0.125, 1.25, 0.25], "texture": "#all"}, + "east": {"uv": [0.875, 0.125, 1, 0.25], "texture": "#all"} } }, { - "__comment": "LiqBottleDecor2", - "from": [9.5, 9, 1.5], - "to": [14.5, 10, 6.5], + "__comment": "tube4", + "from": [7, 5, 2], + "to": [9, 6, 3], "faces": { - "down": {"uv": [4.375, 4.125, 5, 4.75], "texture": "#all"}, - "up": {"uv": [3.75, 4.125, 4.375, 4.75], "texture": "#all"}, - "north": {"uv": [3.75, 4.75, 4.375, 4.875], "texture": "#all"}, - "south": {"uv": [5, 4.75, 5.625, 4.875], "texture": "#all"}, - "west": {"uv": [4.375, 4.75, 5, 4.875], "texture": "#all"}, - "east": {"uv": [3.125, 4.75, 3.75, 4.875], "texture": "#all"} - } - }, - { - "__comment": "GasBottle2", - "from": [10, 0, 10], - "to": [14, 11, 14], - "faces": { - "down": {"uv": [1, 6, 1.5, 6.5], "texture": "#all"}, - "up": {"uv": [0.5, 6, 1, 6.5], "texture": "#all"}, - "north": {"uv": [0.5, 6.5, 1, 7.875], "texture": "#all"}, - "south": {"uv": [1.5, 6.5, 2, 7.875], "texture": "#all"}, - "west": {"uv": [1, 6.5, 1.5, 7.875], "texture": "#all"}, - "east": {"uv": [0, 6.5, 0.5, 7.875], "texture": "#all"} - } - }, - { - "__comment": "GasBottle1", - "from": [2, 0, 10], - "to": [6, 11, 14], - "faces": { - "down": {"uv": [1, 6, 1.5, 6.5], "texture": "#all"}, - "up": {"uv": [0.5, 6, 1, 6.5], "texture": "#all"}, - "north": {"uv": [0.5, 6.5, 1, 7.875], "texture": "#all"}, - "south": {"uv": [1.5, 6.5, 2, 7.875], "texture": "#all"}, - "west": {"uv": [1, 6.5, 1.5, 7.875], "texture": "#all"}, - "east": {"uv": [0, 6.5, 0.5, 7.875], "texture": "#all"} - } - }, - { - "__comment": "LiqBottleLid1", - "from": [1, 11, 1], - "to": [7, 12, 7], - "faces": { - "down": {"uv": [4.625, 5, 5.375, 5.75], "texture": "#all"}, - "up": {"uv": [3.875, 5, 4.625, 5.75], "texture": "#all"}, - "north": {"uv": [3.875, 5.75, 4.625, 5.875], "texture": "#all"}, - "south": {"uv": [5.375, 5.75, 6.125, 5.875], "texture": "#all"}, - "west": {"uv": [4.625, 5.75, 5.375, 5.875], "texture": "#all"}, - "east": {"uv": [3.125, 5.75, 3.875, 5.875], "texture": "#all"} + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#all"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#all"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#all"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/rotary_condensentrator", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/security_desk.json b/src/main/resources/assets/mekanism/models/block/security_desk.json new file mode 100644 index 000000000..064f57cea --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/security_desk.json @@ -0,0 +1,138 @@ +{ + "elements": [ + { + "__comment": "keyboard", + "from": [3, 12.5, 2], + "to": [13, 13.5, 7], + "faces": { + "down": {"uv": [11.125, 3.375, 9.875, 4], "texture": "#all"}, + "up": {"uv": [9.875, 4, 8.625, 3.375], "texture": "#all"}, + "north": {"uv": [8.625, 4, 9.875, 4.125], "texture": "#all"}, + "south": {"uv": [10.5, 4, 11.75, 4.125], "texture": "#all"}, + "west": {"uv": [9.875, 4, 10.5, 4.125], "texture": "#all"}, + "east": {"uv": [8, 4, 8.625, 4.125], "texture": "#all"} + } + }, + { + "__comment": "standBase", + "from": [4, 13, 10], + "to": [12, 14, 14], + "faces": { + "down": {"uv": [10.5, 2.75, 9.5, 3.25], "texture": "#all"}, + "up": {"uv": [9.5, 3.25, 8.5, 2.75], "texture": "#all"}, + "north": {"uv": [8.5, 3.25, 9.5, 3.375], "texture": "#all"}, + "south": {"uv": [10, 3.25, 11, 3.375], "texture": "#all"}, + "west": {"uv": [9.5, 3.25, 10, 3.375], "texture": "#all"}, + "east": {"uv": [8, 3.25, 8.5, 3.375], "texture": "#all"} + } + }, + { + "__comment": "deskTop", + "from": [0, 6, 0], + "to": [16, 13, 16], + "faces": { + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.875], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.875], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.875], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.875], "texture": "#all"} + } + }, + { + "__comment": "monitorBack", + "from": [2, 16, 12], + "to": [14, 22, 13], + "faces": { + "down": {"uv": [13.375, 0, 11.875, 0.125], "texture": "#all"}, + "up": {"uv": [11.875, 0.125, 10.375, 0], "texture": "#all"}, + "north": {"uv": [10.375, 0.125, 11.875, 0.875], "texture": "#all"}, + "south": {"uv": [12, 0.125, 13.5, 0.875], "texture": "#all"}, + "west": {"uv": [11.875, 0.125, 12, 0.875], "texture": "#all"}, + "east": {"uv": [10.25, 0.125, 10.375, 0.875], "texture": "#all"} + } + }, + { + "__comment": "deskBase", + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "down": {"uv": [6, 4.75, 4, 6.75], "texture": "#all"}, + "up": {"uv": [4, 6.75, 2, 4.75], "texture": "#all"}, + "north": {"uv": [2, 6.75, 4, 7.375], "texture": "#all"}, + "south": {"uv": [6, 6.75, 8, 7.375], "texture": "#all"}, + "west": {"uv": [4, 6.75, 6, 7.375], "texture": "#all"}, + "east": {"uv": [0, 6.75, 2, 7.375], "texture": "#all"} + } + }, + { + "__comment": "monitor", + "from": [1, 14, 10], + "to": [15, 24, 12], + "faces": { + "down": {"uv": [11.75, 1.25, 10, 1.5], "texture": "#all"}, + "up": {"uv": [10, 1.5, 8.25, 1.25], "texture": "#all"}, + "north": {"uv": [8.25, 1.5, 10, 2.75], "texture": "#all"}, + "south": {"uv": [10.25, 1.5, 12, 2.75], "texture": "#all"}, + "west": {"uv": [10, 1.5, 10.25, 2.75], "texture": "#all"}, + "east": {"uv": [8, 1.5, 8.25, 2.75], "texture": "#all"} + } + }, + { + "__comment": "deskMiddle", + "from": [1, 5, 1], + "to": [15, 6, 15], + "faces": { + "down": {"uv": [5.25, 2.875, 3.5, 4.625], "texture": "#all"}, + "up": {"uv": [3.5, 4.625, 1.75, 2.875], "texture": "#all"}, + "north": {"uv": [1.75, 4.625, 3.5, 4.75], "texture": "#all"}, + "south": {"uv": [5.25, 4.625, 7, 4.75], "texture": "#all"}, + "west": {"uv": [3.5, 4.625, 5.25, 4.75], "texture": "#all"}, + "east": {"uv": [0, 4.625, 1.75, 4.75], "texture": "#all"} + } + }, + { + "__comment": "standNeck", + "from": [7, 14, 13], + "to": [9, 21, 14], + "faces": { + "down": {"uv": [12.625, 0.875, 12.375, 1], "texture": "#all"}, + "up": {"uv": [12.375, 1, 12.125, 0.875], "texture": "#all"}, + "north": {"uv": [12.125, 1, 12.375, 1.875], "texture": "#all"}, + "south": {"uv": [12.5, 1, 12.75, 1.875], "texture": "#all"}, + "west": {"uv": [12.375, 1, 12.5, 1.875], "texture": "#all"}, + "east": {"uv": [12, 1, 12.125, 1.875], "texture": "#all"} + } + }, + { + "__comment": "monitorScreen", + "from": [1.5, 14.5, 9.99], + "to": [14.5, 23.5, 11.99], + "faces": { + "down": {"uv": [11.5, 4.125, 9.875, 4.375], "texture": "#all"}, + "up": {"uv": [9.875, 4.375, 8.25, 4.125], "texture": "#all"}, + "north": {"uv": [8.25, 4.375, 9.875, 5.5], "texture": "#all"}, + "south": {"uv": [10.125, 4.375, 11.75, 5.5], "texture": "#all"}, + "west": {"uv": [9.875, 4.375, 10.125, 5.5], "texture": "#all"}, + "east": {"uv": [8, 4.375, 8.25, 5.5], "texture": "#all"} + } + }, + { + "__comment": "led", + "from": [2, 13.5, 10.5], + "to": [3, 14.5, 11.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + } + ], + "textures": { + "all": "...", + "particle": "..." + } +} diff --git a/src/main/resources/assets/mekanism/models/block/seismic_vibrator.json b/src/main/resources/assets/mekanism/models/block/seismic_vibrator.json index 3bef47496..50a9ab33c 100644 --- a/src/main/resources/assets/mekanism/models/block/seismic_vibrator.json +++ b/src/main/resources/assets/mekanism/models/block/seismic_vibrator.json @@ -1,190 +1,593 @@ { "elements": [ { - "__comment": "PoleBR", - "from": [3, 0, 12], - "to": [4, 13, 13], + "__comment": "baseBack", + "from": [0, 0, 13], + "to": [16, 5, 16], "faces": { - "down": {"uv": [0.25, 3.25, 0.375, 3.375], "texture": "#all"}, - "up": {"uv": [0.125, 3.25, 0.25, 3.375], "texture": "#all"}, - "north": {"uv": [0.125, 3.375, 0.25, 5], "texture": "#all"}, - "south": {"uv": [0.375, 3.375, 0.5, 5], "texture": "#all"}, - "west": {"uv": [0.25, 3.375, 0.375, 5], "texture": "#all"}, - "east": {"uv": [0, 3.375, 0.125, 5], "texture": "#all"} + "down": {"uv": [4.375, 3.25, 2.375, 3.625], "texture": "#all"}, + "up": {"uv": [2.375, 3.625, 0.375, 3.25], "texture": "#all"}, + "north": {"uv": [0.375, 3.625, 2.375, 4.25], "texture": "#all"}, + "south": {"uv": [2.75, 3.625, 4.75, 4.25], "texture": "#all"}, + "west": {"uv": [2.375, 3.625, 2.75, 4.25], "texture": "#all"}, + "east": {"uv": [0, 3.625, 0.375, 4.25], "texture": "#all"} } }, { - "__comment": "PoleRF", - "from": [3, 0, 3], - "to": [4, 13, 4], + "__comment": "top", + "from": [0, 30, 0], + "to": [16, 32, 16], "faces": { - "down": {"uv": [0.25, 3.25, 0.375, 3.375], "texture": "#all"}, - "up": {"uv": [0.125, 3.25, 0.25, 3.375], "texture": "#all"}, - "north": {"uv": [0.125, 3.375, 0.25, 5], "texture": "#all"}, - "south": {"uv": [0.375, 3.375, 0.5, 5], "texture": "#all"}, - "west": {"uv": [0.25, 3.375, 0.375, 5], "texture": "#all"}, - "east": {"uv": [0, 3.375, 0.125, 5], "texture": "#all"} + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 2.25], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 2.25], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 2.25], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 2.25], "texture": "#all"} } }, { - "__comment": "Cable", - "from": [5, 13, 5], - "to": [11, 15, 11], + "__comment": "pole3", + "from": [0.5, 5, 0.5], + "to": [1.5, 30, 1.5], "faces": { - "down": {"uv": [9.5, 1.875, 10.25, 2.625], "texture": "#all"}, - "up": {"uv": [8.75, 1.875, 9.5, 2.625], "texture": "#all"}, - "north": {"uv": [8.75, 2.625, 9.5, 2.875], "texture": "#all"}, - "south": {"uv": [10.25, 2.625, 11, 2.875], "texture": "#all"}, - "west": {"uv": [9.5, 2.625, 10.25, 2.875], "texture": "#all"}, - "east": {"uv": [8, 2.625, 8.75, 2.875], "texture": "#all"} + "down": {"uv": [0.375, 4.25, 0.25, 4.375], "texture": "#all"}, + "up": {"uv": [0.25, 4.375, 0.125, 4.25], "texture": "#all"}, + "north": {"uv": [0.125, 4.375, 0.25, 7.5], "texture": "#all"}, + "south": {"uv": [0.375, 4.375, 0.5, 7.5], "texture": "#all"}, + "west": {"uv": [0.25, 4.375, 0.375, 7.5], "texture": "#all"}, + "east": {"uv": [0, 4.375, 0.125, 7.5], "texture": "#all"} } }, { - "__comment": "TopPanel", - "from": [4, 11, 4], - "to": [12, 12, 12], + "__comment": "rivet3", + "from": [11.5, 28.5, 7.5], + "to": [12.5, 29.5, 8.5], "faces": { - "down": {"uv": [2, 2.125, 3, 3.125], "texture": "#all"}, - "up": {"uv": [1, 2.125, 2, 3.125], "texture": "#all"}, - "north": {"uv": [1, 3.125, 2, 3.25], "texture": "#all"}, - "south": {"uv": [3, 3.125, 4, 3.25], "texture": "#all"}, - "west": {"uv": [2, 3.125, 3, 3.25], "texture": "#all"}, - "east": {"uv": [0, 3.125, 1, 3.25], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "PoleL", - "from": [12, 12, 4], - "to": [13, 13, 12], + "__comment": "frameRight5", + "from": [0.515, -2, 0.5], + "to": [1.515, 17, 1.5], "faces": { - "down": {"uv": [1.625, 3.25, 1.75, 4.25], "texture": "#all"}, - "up": {"uv": [1.5, 3.25, 1.625, 4.25], "texture": "#all"}, - "north": {"uv": [1.5, 4.25, 1.625, 4.375], "texture": "#all"}, - "south": {"uv": [2.625, 4.25, 2.75, 4.375], "texture": "#all"}, - "west": {"uv": [1.625, 4.25, 2.625, 4.375], "texture": "#all"}, - "east": {"uv": [0.5, 4.25, 1.5, 4.375], "texture": "#all"} + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} } }, { - "__comment": "Tower", - "from": [6, 0, 6], - "to": [10, 11, 10], + "__comment": "shaft2", + "from": [6.5, 18, 6.5], + "to": [9.5, 29, 9.5], "faces": { - "down": {"uv": [9, 0, 9.5, 0.5], "texture": "#all"}, - "up": {"uv": [8.5, 0, 9, 0.5], "texture": "#all"}, - "north": {"uv": [8.5, 0.5, 9, 1.875], "texture": "#all"}, - "south": {"uv": [9.5, 0.5, 10, 1.875], "texture": "#all"}, - "west": {"uv": [9, 0.5, 9.5, 1.875], "texture": "#all"}, - "east": {"uv": [8, 0.5, 8.5, 1.875], "texture": "#all"} + "down": {"uv": [3.125, 4.25, 2.75, 4.625], "texture": "#all"}, + "up": {"uv": [2.75, 4.625, 2.375, 4.25], "texture": "#all"}, + "north": {"uv": [2.375, 4.625, 2.75, 6], "texture": "#all"}, + "south": {"uv": [3.125, 4.625, 3.5, 6], "texture": "#all"}, + "west": {"uv": [2.75, 4.625, 3.125, 6], "texture": "#all"}, + "east": {"uv": [2, 4.625, 2.375, 6], "texture": "#all"} } }, { - "__comment": "PoleLB", - "from": [12, 0, 12], - "to": [13, 13, 13], + "__comment": "frameBack4", + "from": [14.5, -2, 14.49], + "to": [15.5, 17, 15.49], "faces": { - "down": {"uv": [0.25, 3.25, 0.375, 3.375], "texture": "#all"}, - "up": {"uv": [0.125, 3.25, 0.25, 3.375], "texture": "#all"}, - "north": {"uv": [0.125, 3.375, 0.25, 5], "texture": "#all"}, - "south": {"uv": [0.375, 3.375, 0.5, 5], "texture": "#all"}, - "west": {"uv": [0.25, 3.375, 0.375, 5], "texture": "#all"}, - "east": {"uv": [0, 3.375, 0.125, 5], "texture": "#all"} + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} } }, { - "__comment": "Base", - "from": [0, -1, 0], - "to": [16, 0, 16], + "__comment": "conduit", + "from": [6, 5, 14], + "to": [10, 30, 16], "faces": { - "down": {"uv": [4, 0, 6, 2], "texture": "#all"}, - "up": {"uv": [2, 0, 4, 2], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 2.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 2.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 2.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 2.125], "texture": "#all"} + "down": {"uv": [9.25, 0, 8.75, 0.25], "texture": "#all"}, + "up": {"uv": [8.75, 0.25, 8.25, 0], "texture": "#all"}, + "north": {"uv": [8.25, 0.25, 8.75, 3.375], "texture": "#all"}, + "south": {"uv": [9, 0.25, 9.5, 3.375], "texture": "#all"}, + "west": {"uv": [8.75, 0.25, 9, 3.375], "texture": "#all"}, + "east": {"uv": [8, 0.25, 8.25, 3.375], "texture": "#all"} } }, { - "__comment": "PoleFL", - "from": [12, 0, 3], - "to": [13, 13, 4], + "__comment": "frameLeft5", + "from": [14.485, -2, 0.5], + "to": [15.485, 17, 1.5], "faces": { - "down": {"uv": [0.25, 3.25, 0.375, 3.375], "texture": "#all"}, - "up": {"uv": [0.125, 3.25, 0.25, 3.375], "texture": "#all"}, - "north": {"uv": [0.125, 3.375, 0.25, 5], "texture": "#all"}, - "south": {"uv": [0.375, 3.375, 0.5, 5], "texture": "#all"}, - "west": {"uv": [0.25, 3.375, 0.375, 5], "texture": "#all"}, - "east": {"uv": [0, 3.375, 0.125, 5], "texture": "#all"} + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} } }, { - "__comment": "Keyboard", - "from": [4, 4, 0], - "to": [12, 5, 3], + "__comment": "rivet6", + "from": [3.5, 28.5, 3.5], + "to": [4.5, 29.5, 4.5], "faces": { - "down": {"uv": [1.375, 5.875, 2.375, 6.25], "texture": "#all"}, - "up": {"uv": [0.375, 5.875, 1.375, 6.25], "texture": "#all"}, - "north": {"uv": [0.375, 6.25, 1.375, 6.375], "texture": "#all"}, - "south": {"uv": [1.75, 6.25, 2.75, 6.375], "texture": "#all"}, - "west": {"uv": [1.375, 6.25, 1.75, 6.375], "texture": "#all"}, - "east": {"uv": [0, 6.25, 0.375, 6.375], "texture": "#all"} + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} } }, { - "__comment": "PoleR", - "from": [3, 12, 4], - "to": [4, 13, 12], + "__comment": "pole4", + "from": [0.5, 5, 14.5], + "to": [1.5, 30, 15.5], "faces": { - "down": {"uv": [1.625, 3.25, 1.75, 4.25], "texture": "#all"}, - "up": {"uv": [1.5, 3.25, 1.625, 4.25], "texture": "#all"}, - "north": {"uv": [1.5, 4.25, 1.625, 4.375], "texture": "#all"}, - "south": {"uv": [2.625, 4.25, 2.75, 4.375], "texture": "#all"}, - "west": {"uv": [1.625, 4.25, 2.625, 4.375], "texture": "#all"}, - "east": {"uv": [0.5, 4.25, 1.5, 4.375], "texture": "#all"} + "down": {"uv": [0.375, 4.25, 0.25, 4.375], "texture": "#all"}, + "up": {"uv": [0.25, 4.375, 0.125, 4.25], "texture": "#all"}, + "north": {"uv": [0.125, 4.375, 0.25, 7.5], "texture": "#all"}, + "south": {"uv": [0.375, 4.375, 0.5, 7.5], "texture": "#all"}, + "west": {"uv": [0.25, 4.375, 0.375, 7.5], "texture": "#all"}, + "east": {"uv": [0, 4.375, 0.125, 7.5], "texture": "#all"} } }, { - "__comment": "ScreenFront", - "from": [4, 6, 2], - "to": [12, 12, 3], + "__comment": "arm3", + "from": [7, 15, 11], + "to": [9, 17, 15], "faces": { - "down": {"uv": [1.125, 5, 2.125, 5.125], "texture": "#all"}, - "up": {"uv": [0.125, 5, 1.125, 5.125], "texture": "#all"}, - "north": {"uv": [0.125, 5.125, 1.125, 5.875], "texture": "#all"}, - "south": {"uv": [1.25, 5.125, 2.25, 5.875], "texture": "#all"}, - "west": {"uv": [1.125, 5.125, 1.25, 5.875], "texture": "#all"}, - "east": {"uv": [0, 5.125, 0.125, 5.875], "texture": "#all"} + "down": {"uv": [1, 0.75, 0.75, 1.25], "texture": "#all"}, + "up": {"uv": [0.75, 1.25, 0.5, 0.75], "texture": "#all"}, + "north": {"uv": [0.5, 1.25, 0.75, 1.5], "texture": "#all"}, + "south": {"uv": [1.25, 1.25, 1.5, 1.5], "texture": "#all"}, + "west": {"uv": [0.75, 1.25, 1.25, 1.5], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.5, 1.5], "texture": "#all"} } }, { - "__comment": "Vibrator", + "__comment": "frameBack1", + "from": [0.5, 11, 14.49], + "to": [1.5, 30, 15.49], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "frameLeft1", + "from": [14.49, 11, 14.5], + "to": [15.49, 30, 15.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "rivet5", + "from": [11.5, 28.5, 11.5], + "to": [12.5, 29.5, 12.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "rivet9", + "from": [3.5, 28.5, 9.5], + "to": [4.5, 29.5, 10.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "frameRight1", + "from": [0.515, 11, 0.5], + "to": [1.515, 30, 1.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "frameRight3", + "from": [0.5, 17, 1.5], + "to": [1.5, 18, 14.5], + "faces": { + "down": {"uv": [9.875, 3.375, 9.75, 5], "texture": "#all"}, + "up": {"uv": [9.75, 5, 9.625, 3.375], "texture": "#all"}, + "north": {"uv": [9.625, 5, 9.75, 5.125], "texture": "#all"}, + "south": {"uv": [11.375, 5, 11.5, 5.125], "texture": "#all"}, + "west": {"uv": [9.75, 5, 11.375, 5.125], "texture": "#all"}, + "east": {"uv": [8, 5, 9.625, 5.125], "texture": "#all"} + } + }, + { + "__comment": "rivet2", + "from": [11.5, 28.5, 5.5], + "to": [12.5, 29.5, 6.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "frameBack5", + "from": [0.5, -2, 14.49], + "to": [1.5, 17, 15.49], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "baseRight", + "from": [0, 0, 3], + "to": [3, 5, 13], + "faces": { + "down": {"uv": [6.75, 2.25, 6.375, 3.5], "texture": "#all"}, + "up": {"uv": [6.375, 3.5, 6, 2.25], "texture": "#all"}, + "north": {"uv": [6, 3.5, 6.375, 4.125], "texture": "#all"}, + "south": {"uv": [7.625, 3.5, 8, 4.125], "texture": "#all"}, + "west": {"uv": [6.375, 3.5, 7.625, 4.125], "texture": "#all"}, + "east": {"uv": [4.75, 3.5, 6, 4.125], "texture": "#all"} + } + }, + { + "__comment": "rivet1", + "from": [11.5, 28.5, 3.5], + "to": [12.5, 29.5, 4.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "plate3", "from": [4, 0, 4], - "to": [12, 4, 12], + "to": [12, 2, 12], "faces": { - "down": {"uv": [6, 2.125, 7, 3.125], "texture": "#all"}, - "up": {"uv": [5, 2.125, 6, 3.125], "texture": "#all"}, - "north": {"uv": [5, 3.125, 6, 3.625], "texture": "#all"}, - "south": {"uv": [7, 3.125, 8, 3.625], "texture": "#all"}, - "west": {"uv": [6, 3.125, 7, 3.625], "texture": "#all"}, - "east": {"uv": [4, 3.125, 5, 3.625], "texture": "#all"} + "down": {"uv": [7.5, 5.25, 6.5, 6.25], "texture": "#all"}, + "up": {"uv": [6.5, 6.25, 5.5, 5.25], "texture": "#all"}, + "north": {"uv": [5.5, 6.25, 6.5, 6.5], "texture": "#all"}, + "south": {"uv": [7.5, 6.25, 8.5, 6.5], "texture": "#all"}, + "west": {"uv": [6.5, 6.25, 7.5, 6.5], "texture": "#all"}, + "east": {"uv": [4.5, 6.25, 5.5, 6.5], "texture": "#all"} } }, { - "__comment": "TowerTop", - "from": [7, 12, 7], - "to": [9, 13, 9], + "__comment": "shaft1", + "from": [7, 3, 7], + "to": [9, 18, 9], "faces": { - "down": {"uv": [10.5, 0, 10.75, 0.25], "texture": "#all"}, - "up": {"uv": [10.25, 0, 10.5, 0.25], "texture": "#all"}, - "north": {"uv": [10.25, 0.25, 10.5, 0.375], "texture": "#all"}, - "south": {"uv": [10.75, 0.25, 11, 0.375], "texture": "#all"}, - "west": {"uv": [10.5, 0.25, 10.75, 0.375], "texture": "#all"}, - "east": {"uv": [10, 0.25, 10.25, 0.375], "texture": "#all"} + "down": {"uv": [1.75, 4.25, 1.5, 4.5], "texture": "#all"}, + "up": {"uv": [1.5, 4.5, 1.25, 4.25], "texture": "#all"}, + "north": {"uv": [1.25, 4.5, 1.5, 6.375], "texture": "#all"}, + "south": {"uv": [1.75, 4.5, 2, 6.375], "texture": "#all"}, + "west": {"uv": [1.5, 4.5, 1.75, 6.375], "texture": "#all"}, + "east": {"uv": [1, 4.5, 1.25, 6.375], "texture": "#all"} + } + }, + { + "__comment": "motor", + "from": [5, 25, 5], + "to": [11, 29, 15], + "faces": { + "down": {"uv": [12.25, 1.625, 11.5, 2.875], "texture": "#all"}, + "up": {"uv": [11.5, 2.875, 10.75, 1.625], "texture": "#all"}, + "north": {"uv": [10.75, 2.875, 11.5, 3.375], "texture": "#all"}, + "south": {"uv": [12.75, 2.875, 13.5, 3.375], "texture": "#all"}, + "west": {"uv": [11.5, 2.875, 12.75, 3.375], "texture": "#all"}, + "east": {"uv": [9.5, 2.875, 10.75, 3.375], "texture": "#all"} + } + }, + { + "__comment": "plate1", + "from": [3, 29, 3], + "to": [13, 30, 15], + "faces": { + "down": {"uv": [13.5, 0, 12.25, 1.5], "texture": "#all"}, + "up": {"uv": [12.25, 1.5, 11, 0], "texture": "#all"}, + "north": {"uv": [11, 1.5, 12.25, 1.625], "texture": "#all"}, + "south": {"uv": [13.75, 1.5, 15, 1.625], "texture": "#all"}, + "west": {"uv": [12.25, 1.5, 13.75, 1.625], "texture": "#all"}, + "east": {"uv": [9.5, 1.5, 11, 1.625], "texture": "#all"} + } + }, + { + "__comment": "arm2", + "from": [6, 15, 6], + "to": [10, 17, 10], + "faces": { + "down": {"uv": [7.5, 0.75, 7, 1.25], "texture": "#all"}, + "up": {"uv": [7, 1.25, 6.5, 0.75], "texture": "#all"}, + "north": {"uv": [6.5, 1.25, 7, 1.5], "texture": "#all"}, + "south": {"uv": [7.5, 1.25, 8, 1.5], "texture": "#all"}, + "west": {"uv": [7, 1.25, 7.5, 1.5], "texture": "#all"}, + "east": {"uv": [6, 1.25, 6.5, 1.5], "texture": "#all"} + } + }, + { + "__comment": "frameBack3", + "from": [1.5, 17, 14.5], + "to": [14.5, 18, 15.5], + "faces": { + "down": {"uv": [7.875, 6.5, 6.25, 6.625], "texture": "#all"}, + "up": {"uv": [6.25, 6.625, 4.625, 6.5], "texture": "#all"}, + "north": {"uv": [4.625, 6.625, 6.25, 6.75], "texture": "#all"}, + "south": {"uv": [6.375, 6.625, 8, 6.75], "texture": "#all"}, + "west": {"uv": [6.25, 6.625, 6.375, 6.75], "texture": "#all"}, + "east": {"uv": [4.5, 6.625, 4.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "frameRight2", + "from": [0.51, 11, 14.5], + "to": [1.51, 30, 15.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "rivet4", + "from": [11.5, 28.5, 9.5], + "to": [12.5, 29.5, 10.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "pole2", + "from": [14.5, 5, 14.5], + "to": [15.5, 30, 15.5], + "faces": { + "down": {"uv": [0.375, 4.25, 0.25, 4.375], "texture": "#all"}, + "up": {"uv": [0.25, 4.375, 0.125, 4.25], "texture": "#all"}, + "north": {"uv": [0.125, 4.375, 0.25, 7.5], "texture": "#all"}, + "south": {"uv": [0.375, 4.375, 0.5, 7.5], "texture": "#all"}, + "west": {"uv": [0.25, 4.375, 0.375, 7.5], "texture": "#all"}, + "east": {"uv": [0, 4.375, 0.125, 7.5], "texture": "#all"} + } + }, + { + "__comment": "frameLeft2", + "from": [14.485, 11, 0.5], + "to": [15.485, 30, 1.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "baseFront", + "from": [0, 0, 0], + "to": [16, 5, 3], + "faces": { + "down": {"uv": [4.375, 2.25, 2.375, 2.625], "texture": "#all"}, + "up": {"uv": [2.375, 2.625, 0.375, 2.25], "texture": "#all"}, + "north": {"uv": [0.375, 2.625, 2.375, 3.25], "texture": "#all"}, + "south": {"uv": [2.75, 2.625, 4.75, 3.25], "texture": "#all"}, + "west": {"uv": [2.375, 2.625, 2.75, 3.25], "texture": "#all"}, + "east": {"uv": [0, 2.625, 0.375, 3.25], "texture": "#all"} + } + }, + { + "__comment": "frameLeft4", + "from": [14.49, -2, 14.5], + "to": [15.49, 17, 15.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "arm1", + "from": [6.5, 15, 10], + "to": [9.5, 17, 14], + "faces": { + "down": {"uv": [8.25, 4.125, 7.875, 4.625], "texture": "#all"}, + "up": {"uv": [7.875, 4.625, 7.5, 4.125], "texture": "#all"}, + "north": {"uv": [7.5, 4.625, 7.875, 4.875], "texture": "#all"}, + "south": {"uv": [8.375, 4.625, 8.75, 4.875], "texture": "#all"}, + "west": {"uv": [7.875, 4.625, 8.375, 4.875], "texture": "#all"}, + "east": {"uv": [7, 4.625, 7.5, 4.875], "texture": "#all"} + } + }, + { + "__comment": "rivet10", + "from": [3.5, 28.5, 11.5], + "to": [4.5, 29.5, 12.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "baseLeft", + "from": [13, 0, 3], + "to": [16, 5, 13], + "faces": { + "down": {"uv": [6.75, 2.25, 6.375, 3.5], "texture": "#all"}, + "up": {"uv": [6.375, 3.5, 6, 2.25], "texture": "#all"}, + "north": {"uv": [6, 3.5, 6.375, 4.125], "texture": "#all"}, + "south": {"uv": [7.625, 3.5, 8, 4.125], "texture": "#all"}, + "west": {"uv": [6.375, 3.5, 7.625, 4.125], "texture": "#all"}, + "east": {"uv": [4.75, 3.5, 6, 4.125], "texture": "#all"} + } + }, + { + "__comment": "plate2", + "from": [6, 1, 6], + "to": [10, 3, 10], + "faces": { + "down": {"uv": [7.5, 0, 7, 0.5], "texture": "#all"}, + "up": {"uv": [7, 0.5, 6.5, 0], "texture": "#all"}, + "north": {"uv": [6.5, 0.5, 7, 0.75], "texture": "#all"}, + "south": {"uv": [7.5, 0.5, 8, 0.75], "texture": "#all"}, + "west": {"uv": [7, 0.5, 7.5, 0.75], "texture": "#all"}, + "east": {"uv": [6, 0.5, 6.5, 0.75], "texture": "#all"} + } + }, + { + "__comment": "frameLeft3", + "from": [14.5, 17, 1.5], + "to": [15.5, 18, 14.5], + "faces": { + "down": {"uv": [9.875, 3.375, 9.75, 5], "texture": "#all"}, + "up": {"uv": [9.75, 5, 9.625, 3.375], "texture": "#all"}, + "north": {"uv": [9.625, 5, 9.75, 5.125], "texture": "#all"}, + "south": {"uv": [11.375, 5, 11.5, 5.125], "texture": "#all"}, + "west": {"uv": [9.75, 5, 11.375, 5.125], "texture": "#all"}, + "east": {"uv": [8, 5, 9.625, 5.125], "texture": "#all"} + } + }, + { + "__comment": "frameRight4", + "from": [0.51, -2, 14.5], + "to": [1.51, 17, 15.5], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} + } + }, + { + "__comment": "rivet7", + "from": [3.5, 28.5, 5.5], + "to": [4.5, 29.5, 6.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "port", + "from": [4, 4, 15.01], + "to": [12, 12, 16.01], + "faces": { + "down": {"uv": [6.875, 4.125, 5.875, 4.25], "texture": "#all"}, + "up": {"uv": [5.875, 4.25, 4.875, 4.125], "texture": "#all"}, + "north": {"uv": [4.875, 4.25, 5.875, 5.25], "texture": "#all"}, + "south": {"uv": [6, 4.25, 7, 5.25], "texture": "#all"}, + "west": {"uv": [5.875, 4.25, 6, 5.25], "texture": "#all"}, + "east": {"uv": [4.75, 4.25, 4.875, 5.25], "texture": "#all"} + } + }, + { + "__comment": "pole1", + "from": [14.5, 5, 0.5], + "to": [15.5, 30, 1.5], + "faces": { + "down": {"uv": [0.375, 4.25, 0.25, 4.375], "texture": "#all"}, + "up": {"uv": [0.25, 4.375, 0.125, 4.25], "texture": "#all"}, + "north": {"uv": [0.125, 4.375, 0.25, 7.5], "texture": "#all"}, + "south": {"uv": [0.375, 4.375, 0.5, 7.5], "texture": "#all"}, + "west": {"uv": [0.25, 4.375, 0.375, 7.5], "texture": "#all"}, + "east": {"uv": [0, 4.375, 0.125, 7.5], "texture": "#all"} + } + }, + { + "__comment": "rivet8", + "from": [3.5, 28.5, 7.5], + "to": [4.5, 29.5, 8.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "frameBack2", + "from": [14.5, 11, 14.49], + "to": [15.5, 30, 15.49], + "faces": { + "down": {"uv": [0.875, 4.25, 0.75, 4.375], "texture": "#all"}, + "up": {"uv": [0.75, 4.375, 0.625, 4.25], "texture": "#all"}, + "north": {"uv": [0.625, 4.375, 0.75, 6.75], "texture": "#all"}, + "south": {"uv": [0.875, 4.375, 1, 6.75], "texture": "#all"}, + "west": {"uv": [0.75, 4.375, 0.875, 6.75], "texture": "#all"}, + "east": {"uv": [0.5, 4.375, 0.625, 6.75], "texture": "#all"} } } ], "textures": { - "all": "...", + "all": "mekanism:blocks/models/seismic_vibrator", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json b/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json new file mode 100644 index 000000000..a64483144 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json @@ -0,0 +1,619 @@ +{ + "elements": [ + { + "__comment": "support5", + "from": [0.5, 4, 6.5], + "to": [1.5, 5, 7.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "tube2c", + "from": [5, 14, 12], + "to": [6, 15, 13], + "faces": { + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} + } + }, + { + "__comment": "panelBraceRight2", + "from": [1, 27.5, 12], + "to": [6, 28.5, 14], + "faces": { + "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, + "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, + "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, + "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, + "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, + "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} + } + }, + { + "__comment": "support7", + "from": [0.5, 4, 10.5], + "to": [1.5, 5, 11.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support12", + "from": [14.5, 4, 8.5], + "to": [15.5, 5, 9.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "panelBraceLeft2", + "from": [10, 27.5, 12], + "to": [15, 28.5, 14], + "faces": { + "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, + "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, + "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, + "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, + "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, + "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} + } + }, + { + "__comment": "tube2a", + "from": [10, 14, 12], + "to": [11, 15, 13], + "faces": { + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} + } + }, + { + "__comment": "panel3", + "from": [10.75, 27.95, 0], + "to": [16.75, 28.95, 16], + "faces": { + "down": {"uv": [14, 4, 13.25, 6], "texture": "#all"}, + "up": {"uv": [13.25, 6, 12.5, 4], "texture": "#all"}, + "north": {"uv": [12.5, 6, 13.25, 6.125], "texture": "#all"}, + "south": {"uv": [15.25, 6, 16, 6.125], "texture": "#all"}, + "west": {"uv": [13.25, 6, 15.25, 6.125], "texture": "#all"}, + "east": {"uv": [10.5, 6, 12.5, 6.125], "texture": "#all"} + } + }, + { + "__comment": "support13", + "from": [14.5, 4, 6.5], + "to": [15.5, 5, 7.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "panelBraceRight1", + "from": [1, 27.5, 2], + "to": [6, 28.5, 4], + "faces": { + "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, + "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, + "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, + "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, + "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, + "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} + } + }, + { + "__comment": "tank", + "from": [0, 5, 0], + "to": [16, 14, 16], + "faces": { + "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, + "north": {"uv": [2, 2, 4, 3.125], "texture": "#all"}, + "south": {"uv": [6, 2, 8, 3.125], "texture": "#all"}, + "west": {"uv": [4, 2, 6, 3.125], "texture": "#all"}, + "east": {"uv": [0, 2, 2, 3.125], "texture": "#all"} + } + }, + { + "__comment": "panelBrace", + "from": [7, 25.8, 6], + "to": [9, 27.8, 15], + "faces": { + "down": {"uv": [8.625, 2.25, 8.375, 3.375], "texture": "#all"}, + "up": {"uv": [8.375, 3.375, 8.125, 2.25], "texture": "#all"}, + "north": {"uv": [8.125, 3.375, 8.375, 3.625], "texture": "#all"}, + "south": {"uv": [9.5, 3.375, 9.75, 3.625], "texture": "#all"}, + "west": {"uv": [8.375, 3.375, 9.5, 3.625], "texture": "#all"}, + "east": {"uv": [7, 3.375, 8.125, 3.625], "texture": "#all"} + } + }, + { + "__comment": "support4", + "from": [0.5, 4, 4.5], + "to": [1.5, 5, 5.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "laser", + "from": [7.5, 24.9, 7], + "to": [8.5, 26.9, 8], + "faces": { + "down": {"uv": [0.875, 0, 0.75, 0.125], "texture": "#all"}, + "up": {"uv": [0.75, 0.125, 0.625, 0], "texture": "#all"}, + "north": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, + "south": {"uv": [0.875, 0.125, 1, 0.375], "texture": "#all"}, + "west": {"uv": [0.75, 0.125, 0.875, 0.375], "texture": "#all"}, + "east": {"uv": [0.5, 0.125, 0.625, 0.375], "texture": "#all"} + } + }, + { + "__comment": "panel1", + "from": [-0.75, 27.95, 0], + "to": [5.25, 28.95, 16], + "faces": { + "down": {"uv": [14, 4, 13.25, 6], "texture": "#all"}, + "up": {"uv": [13.25, 6, 12.5, 4], "texture": "#all"}, + "north": {"uv": [12.5, 6, 13.25, 6.125], "texture": "#all"}, + "south": {"uv": [15.25, 6, 16, 6.125], "texture": "#all"}, + "west": {"uv": [13.25, 6, 15.25, 6.125], "texture": "#all"}, + "east": {"uv": [10.5, 6, 12.5, 6.125], "texture": "#all"} + } + }, + { + "__comment": "support15", + "from": [14.5, 4, 2.5], + "to": [15.5, 5, 3.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support8", + "from": [0.5, 4, 12.5], + "to": [1.5, 5, 13.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "laserBeamToggle", + "from": [7.5, 13.9, 7], + "to": [8.5, 24.9, 8], + "faces": { + "down": {"uv": [1.875, 0, 1.75, 0.125], "texture": "#all"}, + "up": {"uv": [1.75, 0.125, 1.625, 0], "texture": "#all"}, + "north": {"uv": [1.625, 0.125, 1.75, 1.5], "texture": "#all"}, + "south": {"uv": [1.875, 0.125, 2, 1.5], "texture": "#all"}, + "west": {"uv": [1.75, 0.125, 1.875, 1.5], "texture": "#all"}, + "east": {"uv": [1.5, 0.125, 1.625, 1.5], "texture": "#all"} + } + }, + { + "__comment": "brace2", + "from": [6, 13.5, 0.9], + "to": [7, 14.5, 2.9], + "faces": { + "down": {"uv": [0.5, 1.375, 0.375, 1.625], "texture": "#all"}, + "up": {"uv": [0.375, 1.625, 0.25, 1.375], "texture": "#all"}, + "north": {"uv": [0.25, 1.625, 0.375, 1.75], "texture": "#all"}, + "south": {"uv": [0.625, 1.625, 0.75, 1.75], "texture": "#all"}, + "west": {"uv": [0.375, 1.625, 0.625, 1.75], "texture": "#all"}, + "east": {"uv": [0, 1.625, 0.25, 1.75], "texture": "#all"} + } + }, + { + "__comment": "support9", + "from": [14.5, 4, 14.5], + "to": [15.5, 5, 15.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "hole2", + "from": [6.5, 14, 5.5], + "to": [7.5, 16, 6.5], + "faces": { + "down": {"uv": [0.375, 0.75, 0.25, 0.875], "texture": "#all"}, + "up": {"uv": [0.25, 0.875, 0.125, 0.75], "texture": "#all"}, + "north": {"uv": [0.125, 0.875, 0.25, 1.125], "texture": "#all"}, + "south": {"uv": [0.375, 0.875, 0.5, 1.125], "texture": "#all"}, + "west": {"uv": [0.25, 0.875, 0.375, 1.125], "texture": "#all"}, + "east": {"uv": [0, 0.875, 0.125, 1.125], "texture": "#all"} + } + }, + { + "__comment": "panel2", + "from": [5, 28, 0], + "to": [11, 29, 16], + "faces": { + "down": {"uv": [14, 1.875, 13.25, 3.875], "texture": "#all"}, + "up": {"uv": [13.25, 3.875, 12.5, 1.875], "texture": "#all"}, + "north": {"uv": [12.5, 3.875, 13.25, 4], "texture": "#all"}, + "south": {"uv": [15.25, 3.875, 16, 4], "texture": "#all"}, + "west": {"uv": [13.25, 3.875, 15.25, 4], "texture": "#all"}, + "east": {"uv": [10.5, 3.875, 12.5, 4], "texture": "#all"} + } + }, + { + "__comment": "port", + "from": [4, 4, -0.00999999999999979], + "to": [12, 12, 0.99], + "faces": { + "down": {"uv": [2.125, 5.625, 1.125, 5.75], "texture": "#all"}, + "up": {"uv": [1.125, 5.75, 0.125, 5.625], "texture": "#all"}, + "north": {"uv": [0.125, 5.75, 1.125, 6.75], "texture": "#all"}, + "south": {"uv": [1.25, 5.75, 2.25, 6.75], "texture": "#all"}, + "west": {"uv": [1.125, 5.75, 1.25, 6.75], "texture": "#all"}, + "east": {"uv": [0, 5.75, 0.125, 6.75], "texture": "#all"} + } + }, + { + "__comment": "support16", + "from": [14.5, 4, 0.5], + "to": [15.5, 5, 1.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "portConnector", + "from": [5, 4, 0.99], + "to": [11, 5, 1.99], + "faces": { + "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, + "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, + "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, + "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, + "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, + "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} + } + }, + { + "__comment": "support10", + "from": [14.5, 4, 12.5], + "to": [15.5, 5, 13.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support14", + "from": [14.5, 4, 4.5], + "to": [15.5, 5, 5.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support1", + "from": [0.5, 4, 0.5], + "to": [1.5, 5, 1.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support11", + "from": [14.5, 4, 10.5], + "to": [15.5, 5, 11.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support6", + "from": [0.5, 4, 8.5], + "to": [1.5, 5, 9.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "support2", + "from": [0.5, 4, 14.5], + "to": [1.5, 5, 15.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "tube1a", + "from": [10, 14, 10], + "to": [11, 15, 11], + "faces": { + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} + } + }, + { + "__comment": "tube2b", + "from": [5, 15, 12], + "to": [11, 16, 13], + "faces": { + "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, + "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, + "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, + "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, + "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, + "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} + } + }, + { + "__comment": "base", + "from": [0, 0, 0], + "to": [16, 4, 16], + "faces": { + "down": {"uv": [6, 3.125, 4, 5.125], "texture": "#all"}, + "up": {"uv": [4, 5.125, 2, 3.125], "texture": "#all"}, + "north": {"uv": [2, 5.125, 4, 5.625], "texture": "#all"}, + "south": {"uv": [6, 5.125, 8, 5.625], "texture": "#all"}, + "west": {"uv": [4, 5.125, 6, 5.625], "texture": "#all"}, + "east": {"uv": [0, 5.125, 2, 5.625], "texture": "#all"} + } + }, + { + "__comment": "tube1b", + "from": [5, 15, 10], + "to": [11, 16, 11], + "faces": { + "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, + "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, + "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, + "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, + "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, + "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} + } + }, + { + "__comment": "support3", + "from": [0.5, 4, 2.5], + "to": [1.5, 5, 3.5], + "faces": { + "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, + "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, + "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, + "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, + "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} + } + }, + { + "__comment": "hole4", + "from": [6.5, 14, 6.5], + "to": [9.5, 16, 7.5], + "faces": { + "down": {"uv": [0.875, 0.375, 0.5, 0.5], "texture": "#all"}, + "up": {"uv": [0.5, 0.5, 0.125, 0.375], "texture": "#all"}, + "north": {"uv": [0.125, 0.5, 0.5, 0.75], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 1, 0.75], "texture": "#all"}, + "west": {"uv": [0.5, 0.5, 0.625, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.125, 0.75], "texture": "#all"} + } + }, + { + "__comment": "conduit", + "from": [7, 13.5, 7], + "to": [9, 14.5, 14], + "faces": { + "down": {"uv": [7.375, 0, 7.125, 0.875], "texture": "#all"}, + "up": {"uv": [7.125, 0.875, 6.875, 0], "texture": "#all"}, + "north": {"uv": [6.875, 0.875, 7.125, 1], "texture": "#all"}, + "south": {"uv": [8, 0.875, 8.25, 1], "texture": "#all"}, + "west": {"uv": [7.125, 0.875, 8, 1], "texture": "#all"}, + "east": {"uv": [6, 0.875, 6.875, 1], "texture": "#all"} + } + }, + { + "__comment": "hole1", + "from": [6.5, 14, 4.5], + "to": [9.5, 16, 5.5], + "faces": { + "down": {"uv": [0.875, 0.375, 0.5, 0.5], "texture": "#all"}, + "up": {"uv": [0.5, 0.5, 0.125, 0.375], "texture": "#all"}, + "north": {"uv": [0.125, 0.5, 0.5, 0.75], "texture": "#all"}, + "south": {"uv": [0.625, 0.5, 1, 0.75], "texture": "#all"}, + "west": {"uv": [0.5, 0.5, 0.625, 0.75], "texture": "#all"}, + "east": {"uv": [0, 0.5, 0.125, 0.75], "texture": "#all"} + } + }, + { + "__comment": "platform", + "from": [5, 12, 3], + "to": [11, 15, 9], + "faces": { + "down": {"uv": [4.5, 5.625, 3.75, 6.375], "texture": "#all"}, + "up": {"uv": [3.75, 6.375, 3, 5.625], "texture": "#all"}, + "north": {"uv": [3, 6.375, 3.75, 6.75], "texture": "#all"}, + "south": {"uv": [4.5, 6.375, 5.25, 6.75], "texture": "#all"}, + "west": {"uv": [3.75, 6.375, 4.5, 6.75], "texture": "#all"}, + "east": {"uv": [2.25, 6.375, 3, 6.75], "texture": "#all"} + } + }, + { + "__comment": "bridge", + "from": [2, 4, 2], + "to": [14, 5, 15], + "faces": { + "down": {"uv": [12.75, 0.125, 11.25, 1.75], "texture": "#all"}, + "up": {"uv": [11.25, 1.75, 9.75, 0.125], "texture": "#all"}, + "north": {"uv": [9.75, 1.75, 11.25, 1.875], "texture": "#all"}, + "south": {"uv": [12.875, 1.75, 14.375, 1.875], "texture": "#all"}, + "west": {"uv": [11.25, 1.75, 12.875, 1.875], "texture": "#all"}, + "east": {"uv": [8.125, 1.75, 9.75, 1.875], "texture": "#all"} + } + }, + { + "__comment": "pole", + "from": [6, 14, 14], + "to": [10, 29, 16], + "faces": { + "down": {"uv": [15.75, 0, 15.25, 0.25], "texture": "#all"}, + "up": {"uv": [15.25, 0.25, 14.75, 0], "texture": "#all"}, + "north": {"uv": [14.75, 0.25, 15.25, 2.125], "texture": "#all"}, + "south": {"uv": [15.5, 0.25, 16, 2.125], "texture": "#all"}, + "west": {"uv": [15.25, 0.25, 15.5, 2.125], "texture": "#all"}, + "east": {"uv": [14.5, 0.25, 14.75, 2.125], "texture": "#all"} + } + }, + { + "__comment": "panelBraceLeft1", + "from": [10, 27.5, 2], + "to": [15, 28.5, 4], + "faces": { + "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, + "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, + "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, + "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, + "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, + "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} + } + }, + { + "__comment": "brace1", + "from": [9, 13.5, 0.9], + "to": [10, 14.5, 2.9], + "faces": { + "down": {"uv": [0.5, 1.375, 0.375, 1.625], "texture": "#all"}, + "up": {"uv": [0.375, 1.625, 0.25, 1.375], "texture": "#all"}, + "north": {"uv": [0.25, 1.625, 0.375, 1.75], "texture": "#all"}, + "south": {"uv": [0.625, 1.625, 0.75, 1.75], "texture": "#all"}, + "west": {"uv": [0.375, 1.625, 0.625, 1.75], "texture": "#all"}, + "east": {"uv": [0, 1.625, 0.25, 1.75], "texture": "#all"} + } + }, + { + "__comment": "tube1c", + "from": [5, 14, 10], + "to": [6, 15, 11], + "faces": { + "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, + "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, + "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, + "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, + "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, + "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} + } + }, + { + "__comment": "panelBase", + "from": [5, 27, 1], + "to": [11, 28, 15], + "faces": { + "down": {"uv": [6.75, 5.625, 6, 7.375], "texture": "#all"}, + "up": {"uv": [6, 7.375, 5.25, 5.625], "texture": "#all"}, + "north": {"uv": [5.25, 7.375, 6, 7.5], "texture": "#all"}, + "south": {"uv": [7.75, 7.375, 8.5, 7.5], "texture": "#all"}, + "west": {"uv": [6, 7.375, 7.75, 7.5], "texture": "#all"}, + "east": {"uv": [3.5, 7.375, 5.25, 7.5], "texture": "#all"} + } + }, + { + "__comment": "hole3", + "from": [8.5, 14, 5.5], + "to": [9.5, 16, 6.5], + "faces": { + "down": {"uv": [0.375, 0.75, 0.25, 0.875], "texture": "#all"}, + "up": {"uv": [0.25, 0.875, 0.125, 0.75], "texture": "#all"}, + "north": {"uv": [0.125, 0.875, 0.25, 1.125], "texture": "#all"}, + "south": {"uv": [0.375, 0.875, 0.5, 1.125], "texture": "#all"}, + "west": {"uv": [0.25, 0.875, 0.375, 1.125], "texture": "#all"}, + "east": {"uv": [0, 0.875, 0.125, 1.125], "texture": "#all"} + } + } + ], + "textures": { + "all": "mekanism:blocks/models/solar_neutron_activator", + "particle": "..." + } +} diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chargepad.png b/src/main/resources/assets/mekanism/textures/blocks/models/chargepad.png new file mode 100644 index 0000000000000000000000000000000000000000..8da4e6ca045c8fdb9ba4b2c83cddd1fde7f1532d GIT binary patch literal 3389 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png new file mode 100644 index 0000000000000000000000000000000000000000..02805a3132a2a0d8dfc3b5d2cc9714d310b5ebac GIT binary patch literal 4964 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 J)!7H$`8VE`>1+T1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_oxidizer.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_oxidizer.png new file mode 100644 index 0000000000000000000000000000000000000000..483c0e2895b9e40b54af4c57432b339b5757b1db GIT binary patch literal 5578 zcmeHL`8(8I|No$P)a`cDK0;Y4S+f?#(yb&FEsS-hh3q55U>IA43K?4=lHAH*imYR1 zT0|OSh%qwEVC>6GmN6J(o~h@0o}a&e!1r^m&vnjqu5+Dp-tX6Yd7XEv<0V^}9iSZm z0La*#v$+BQVxplK@GnVG=Mnn)wy2Z5X>V%-2!FK~`0^~#jP#vzu3-SMbJwq549G9s zFPfCPYj^RC)W|l4zfOo3#)_i>U=PI3#`;?1;KFlKhDUfryF+-67%|et_}u;^Z`IG@ zhwtEmWEa#1&dmq9Ub=nup^9N?$C0cjHs|-&7S79StnWM`>z!G}N^#2GgD%)+V$`Cw zTVuZoDsfRFu!wEzEyfHT4yMhxI}JNg7q((vIfqjP_*q6XuaJ3a3W3Tw7rC`QrBKCT zqWBBvR}y-9dd}L|lr6($q$GIhgmXO6#b7REsJvFQ=o} z=q6{(9tLK!ukYIETGw;4og8X<8-j!9owaFQpf~IkU|nnf(SycTZEG)Vm86@LuxJE78S*>b~m1UXJw?6^p5Ew^fe4=37pS z_62}=$q{*5hi=s2)He{jV|H$K`Q%p zcDoW%YtT<+xc_enAfAd5Gv^J3ZP#om>ONhJJoWAxL(ERaE;_G8r{uoce2ebt-vSX# z*lvQoj?e;aQ{#q-qe6rg!Y}(^yBWB)!wT{CF+8R0(fnkj>Rly$48nE&Qf4^p>o?tt z=cXK>Vl?2DM&mxKg^EJMQ)$T1&@1(c_4$5SZnwym72@wmPs;ng!An>`5FH%(UiCt{ zxS>UHt-U<1^(y#qhpzMtD4B;1AvMqEKXw#8Yy192^3KG!oRpNtnDtP1X$~~w5()8; zGE7ZZBj#n{h)`3aKP~9=|Kx0Z6>M?f!cusEHhZ_-gFyCd7$UE= z+B(wasaoRXEA+Kz4_IO6I839APWmD8X#r{PVY1c4?$IgG(~MGjQ}jlwLlh@2Mu*Hj@}`^{Eg<@4a0cUmo>ygwU?Ad10rE^ zl}%Yq(an2-HrKgqbQD2PP$N#V(bH%b@2$JVw|oSaYa>b9rKdx-7ssx;mJ}x|qZ%E% zRQcb&VLa2OmMNAQDJkRv6WsxJT>x#ci+jIaYPz{u2=hItWIM9B@7X;>+Ux%u9BmX| zVwrG3e{I*0pdXG8pM$S94RZIRikH9T>za#G+RIrwHw>X%78JnejjyEG_^Ft(-_2Ja zwoA;-f#8no&f&0o?~*$pi*E|m@P<-#M}r>*nE&v%rt+8xU0DGht_N-ZgP+Xx?#Rw& zdo3Q*r=Na7zA^73?axM`3)-HQ$t7qdcH*}wCA#J0mji)$)XVH3w-`0Aj7{P zI&xj(@I`Uer|JU$25}<{n`95?Sxn>kcu$GHEROOxWv7~L4L3GoGv4WHVnacBbkMg! zs>g5;U{RiTwsfv!(d$5BUv+g7Wz^szg>|C&f7=_dy$*QjE5uW@hmj)~aXf4kL%YUQ zhfcyGI&?0cW-WiU5;8#Lld~05XxD|;g-Ek+-;lUj*o2qF&xkVVn2nk8AoVwNK%ac1 z_rlQaCsBSe)ZzfG-^K?R#@`rq4s6izF$Q=LOwm;0a`;aM_8VzO70RZbFs$A(m^I#u znSB#S87N&#QZ>yuVS&S zTk|%GikaDe<){}sw{%-Bf?&a{+N|I>``8(06fS=SXAI|ULkJP|=N-fRU^2&~we03H zQ)@2z7Um~mlrx?o;_yD8dZ|yI% zo2y>-Mo3j1co@rHt;-p4-8@(RI|#^JcWLA@sy2)M)+No49f(~yo_aKuZ7j|cZ=?=P z5sGfKsXuJMR(>Ry>X59mT`>Y9QV_(Mp&r;zwEt>tcY%wY8;RO1%Z%#!0-Y-njHP?sG)AV@GfgUX3w(53l!As_zD{1Agcb87=I)qBbBz?Lt-ZN5 zk@1y90V(*Rb|{}Vx5#Qwu6X!D45+-V5I=dAV!nLAdTe^RQEriK) zX3C49-?w7-6ip7y#`*hKUzouq ze;A-g=s(T6YJ7{z3v6RgQECna)9b4i)~-P-%d1OQnHJ1UEQFhUM^BUiL>r*hAz&GP+qWiuv*V>6m z62(*mR&pfMNyn}RycP3j-S_?wK5s99mC2c<`>mH9sjWudEAlb?W(X!SOqFZ8kd-X~ ziL(&22b!vS1P^NvTWbtACs~dL9N3KU;mdf@hE;()(w}EUp5hA#j*>?6?BZ+wu+rRa zr)38)x6=@Rgr;70CNLYv$%c*d(Pji^mD&T-NP>u3Y*)B{(@w*SwD;yU6h2Rj zw1M*JDojmDQ8bI#ZKz=g04}khc*?q<(LKDj^R(vVwgRJpc1~u5cV;*g^`@gn443wa zM(SmUfoK(u;K+jY1C*J9!vG6sPn|q4D$(ALER`O;7{$VLM@VY9)UUgzU@V_ z+R{EX4!Lnyd0a?-d?gj0lPh#byH0p5aNb)|X;ECo`+e!NIAV*BwEnme$Qx(#+l}2N zjujYe?85cpCpXem`m+ltw6K759ZRge7Zsuu^W`68>+^O7#-m*DhA=hED@-I@?Y-g` zkyKCi638OWe>3dvnO$^sqPrkgJD#K39lSeg^4$pGQ6)?6y2VsKueWe0j1x{TZqw*s z_{BZi68oXklGH{^znd>q7V*_?Kq+o>@vND2A-TuE64QR3fBa-dIHDudPtx^Zd;};I z6P@e#T1yg4+O2BYygAEu;BlAH-AhVq(Hntq-HyuVcZ`Du`<&uTf*D%x%eVCDU#>)n z^|4Su5wOuK7r?`8tNXth+Vk`AxIJV=^%8ZzVG74N zlIiXMO$gMESF5R99bTPUpAuP!@j+%nhkBWPw-$y?h~&TNE;P0|)%zPhQX?;2@T!m3vYqh1 z(UbcGH!Kr5{x$P#>!$Ye%?B$A?y~U?7VBy%?EP}yg<(#f($@9xVUQeRDDwHLiII`h z$?7UhU-7p94+s{TmSP6~bjtyo#=PL+Tkrbj+D$L7S9g*OL1|A53LeD?9+fUagb_6h zX?+1^%c!Sd3!p|LfjRv{f6Rm#6XxV9wJ4tbLb|9sPTM3g0Iy4am5uM zxbIdV@b>sA*Wy5iRX~5GUxCegx2m&cS5g;;OJjqjoKqz4G$6&G$b~wbn|j}FHll5{ z%~HUN+YKK$Uv}j!nnEU@5v|VRc0`%fy9Am&^I8p6ihAmI&YKU2_=!zxM+3v3QQ2(m zE({KzQXDYo=S5teUEJts0W!!I&3}$y z9JUb!g9jyI(+~P(jwcOwc3$Z0>S~*x4{VaTo;sMYX9?)u-nDf-s#Ia=LlJlxKG1Le zxXO7wmDyjw^{;d5^RGM8V4$zBzw*atbKtsD03a$bh-wKpBO;6^CnxiQt%|;y~$K-g-}X zk`LdolW)x(NKePsJ9-3)Lan*X3p#hid#>4iDp%m!0L7{v7KIz&`nzl1+ct1S)QSH7 z>NaKJid7|%=f64DE_HJ_KVWg$a_w@ZdzdzAF>7&^6SrCF0>OcV2-H6_q#&a|I=1&U zn^tnEs%_U`x#RuDwr9`k9T#7@wd2k>!laeB$yX%7ap6O5-{0_-X0}+&E!5^L2Nq0E zIQsfnfp{cX7*jU24{&k53Y@u#*E2TdOk$lemoe1*xh4UAi*eE^*y691DLLrU^7%0n zsh^)igdQUP3`{4^#%`$)~D{XiRqQT{zex#J@(b zI5=%SRGNckSkj8sP|mVI?iGp1<*K{e^DOc%T2(|-H*Zid2IBW@0sEN^&p!0=ZVe{a`Bf5j3K-e7WsGaj)_?9AuLGc9Q+ zTfo3{mZW1YDJVL+ISAgch)15x0yG!J4h0By-r6}8T2NF3M@=>jAGw6ji5Bw+#ogmk zoS^NC;=oGAWavm;9c7GKj6YbwChj4|Oq505878kyXzG6XM+Ww#c(do@!23ngS}z3p z@S?&aPJ{W+i!FM_AR)KyTFDKfYi%}Vn7tJ}^IbhxLPAR}2O9Q?t7+@uiW}d*O$3do j>hk~J|3L%J`-HMxusc#jV%~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_washer.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_washer.png new file mode 100644 index 0000000000000000000000000000000000000000..cabb77ab4313647e25d41923f1cf866b4be8e71f GIT binary patch literal 5945 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/digital_miner.png b/src/main/resources/assets/mekanism/textures/blocks/models/digital_miner.png index a5f4bd998b2d798b27d52c1e63fc5b5d6111e5eb..632b4a689cf973de931d3c89070ab0d94a7fd1b1 100644 GIT binary patch literal 22417 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 wMYR2tJ^`=)-;e)Yn*RSd^nZ#&1z_G9@Gt<8 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png b/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png index f881af1fe17ccddbe2ca2fec6e3dad5f83463814..3e17f00ad6a1fa4e931d4c3e50acf7ed4ddb1cc3 100644 GIT binary patch literal 5627 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 DYa3}a1c4C+$WvAYx+k(e3#3?{Uq8L33Nx+6;_ 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 a->36L=R@hufDZmI2Ef(|VM#IfO87VIltu*r diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/electrolytic_separator.png b/src/main/resources/assets/mekanism/textures/blocks/models/electrolytic_separator.png index 1e369ee9a7d0d4468c74fd9413823657d8637a30..c6593abbec7e1b3a6d3e08d7f9c8af4c647270d3 100644 GIT binary patch literal 4166 zcmds4eOyv!`#(mHwqD1om6h0VE6bXxYnlpF6PeXAEn~ic%TiOr#6$!^t<`+Vkvbzy zg|cQzN@l(yV9P{vzD<$x4VN#dh=hs=N92e5eV*t4=ild?&-vWv-1oV!>w90<_deJ6 zq@FpA*|2uUS^xkxczo~X4FD#_TN7Z7sj&$lJ_#{4rWa0P+yKMM$>tYl8+$&v`n_)q z0Ib`*a+v^m`P+@1X4gD^K${J(-udZatCwU+GXQMr_Ha9Pj@+jh^p6SVTA7>ZA` zKK;sj%cG;K*L-R9MfBh0Z8zIOcVB&fpZ@cCJ&ZqbDV<$Xf~$P-S&nVzg>`Q)nyn5; zKLWn6I|g6%84b=%WdUm1xI4`XbotVh{U>|h-3H>E?>UvNk2VO)`S6E1$(F&ONGa#zuA1|%Y>O) zS(bwU^8sSE@k?khjmDRcz;gHQ-J1$`#{`&& zGd=V~pfB=n>?wu+3@?SxcAyOTZfh75uyRBe2Ul5?Qc9Y4zO;La$AMYebe6*34f5i$ zC7k*x%|a{>tCcN|G4Xqp{-^VuGV4zp2rdWB>;d3)J8%mfNVbA9k#x~O2D|KJiJ^x8FTrY9Z;y9 zqoXADR7myMQBxr3op}RWVn)UfS_v_y7+)ekXA2%_-fvAsJbaRGJ!@0(@%HO}Np!^B z1_yI5u=e&PZWpNPKto-b`=+aQ8M!lEZ3mzu8P5dv9ah&n=D_XA1hIxb+p;$sDUir) zHqa2)EwN=Z1ozM5iiiWpb6?R@uTm^+`SaehbanhdU2H^a2etSgD8h?CTFQ{9qfO3< z;;vE9qVZn8OZLrz)&kuqlEiN2B02E7aga}AaeL>SX97TK&X6)rO4|m7O6lMg$r>fq zlH|YfA^pLd6Vdkf5M=ZSP^ydug585GVPXFEdKI>jHGVC;%Qr<(C+T;K+&0m zs?bhF@_L}5CIq0ru~6QZs|L0wb%?;}WaZj<658fph!<3RcfW?Rl!kUj;?14Dp6f@F zh*LdJM{8med4V)P89RqYFSr>{d#rkeP9u3Hi`Mmcw4LWM~v-=_DKvJ|Nq|+Q( z{YSe-23iZ>%GLBXq||@dMw6frz-y+&OGE;b-LyZ!k=?sBY*RA#)UIvI@sl+0nL7b1 zB~cxSW4FXGBbjddo3b4Q@MMzNej>%Kxs3%PX~GgNyary0Qrc*K-E}0Zeh8zXZILRe z()k5Nf1t?T{fFFNf5n0y#iH}$#HB^mXbr7LpY4hCnCg~2^`co?nV+Zbh5(1k%##>H zMs)b^Jh>Ww;X?)?$IJSmk*^)A7Qa4@_&V(<()4do;v;mg&FLabV*_-{0@%nzSCPk~ z1&)JFw#xU@Kp9^6a&+vs=nWi%ai4G3tRH@xW79%oi8ROpJf^`RSy5(CQcYj(33PoS z>(gvaf%(Q{h6S8owg2^B+fxT>qOIVt_K-!{)9*`>JiNR!^oncI&VS(DX$6R&k{>0Q z{4?`NH{}s+EC*ZCF5+{ii^hfuF&FUfs{_G8^HJS!E&i+X@xmsyVMqC*wU9aI`?HZJ zl{-ddEUH1U@i;gW6MPVdD+}b^t+zD<{v0LH?n#}tpI)J4!xjez2Oqb_R$F0yzSm*D z`}fT>%`z-a{e7`Rox4~p!#2v}K*2iCqSxVu*|Ap06)Dy!T;LBqT_n*Hq?TCi0BD%5 z==jkdV+stH?}D6Z+}`6_qa5!}J81cpJ3n=~kS#Oh-flH=`rXXZ_X?00^%3a=t(=%zd0%TC}SVtj( zS8Nr;$9W!4^u3GVv$R_6#lc%0CFG_|e^h3FOnEnjLPHsod&llu$?Bfizx8?aW#_ht z2v{KHpb)F3dL}0l=m=9L*w#oFLyW#a1f-K*=2D&obn4v?^vW)1U(E@@ej;A}3W+iasz2BxSIJTN8GfaoD-*6B zOnaCThf1&wuk@=2|E7BR_|)@>gfMjws{kPK6gx89XX}i(%V@2*R%NUn*CjK5bHdlX z^nAK;KHBSLl#50#39k&R^eaDfmLW7~@GZjcxauT3;I=*F-cyX%7CSq;^2={4t<&!1 z<%LV}U+;u)&A{o^Z0qL&0ZcBJuT;rjw>aK!3;XuI@!iZNwI6KIfS9ii_%@5LEnrb) z+iI-S$TR}ITX@oFc|BnD(#eIH5S{)oQ8eOF-{$`PMv@^c2~g$XU8X1Gnwz@h7QKtWJmTgW*d@l5zu zbQdy{u(cNS*|hNflcSkrBGG=&-n|u>zR)3Xk$+bjMO&bUZn4?+cGQ{XS6_{rJw3lD>UQM*m<{Nr`b){tT1(r?Bbn%}MaZo}P2m6V2c+I@a$o zAD`gIT7Wu9b->*gW`#JsGW6Uxy$@{{{y0TT_e~lU-!Ms3F0Oe#xIKwb84x#i+-?i#vwGBxY;dv+1fr_o7#7U^@hOZp$-95abHS z;VIU{FvB9Dm60wrgg@YKE{h2bs0%KOR6g<7Ee#!=(oPgHQfl&nLy@hQ%%ix^n)+=x z3JYRgMhaPWBhlT*M^!w=Q8A_YsgFCDW`3I{R;|A|o_v_X)#5GDz4C->HImt)-$%r| zePx8&)YQ~_`T3Di>@MjEUxHuPJ1(W+6Tqqk*rBkU>FMeD-BQ%Et=2kiftheeowT{( zOc;)S<;ua{-rhc_e@vqwof|WK6ckbSp~9WZB(m}B+644fg!D)rw;;A4QD0(a#F@5! zcu9LDu4OWv=j7t}(dZ!PNia|=;9>UQU4|mG(GM)H>as{7)_t$pwzDUEH`c?hu4=gB z02HvDnFk^!BW0fuTJ4gM;v1sZ?@mE<%}Wtne$~FSo%fP;RRx+je|pbLdqOnn+vO#e zrf%k}G4(B{n%>^D=bbIXuMqdUcEH)O>DtV1-OTfu3FSCTGGaGmd-$j%Z+;*aRHq|# ze2|`F$Y9hW*xv2{f zZLB5EZLG_sER7@@U||Td>+Pla#PL6KOB_C%+D3P^zuaaZ3FCy_vqj6X!?m@w7afBL zarw%J{RGJ%LH?7*A{YQ*%=Jg1Ke`^*d3!Ss!7jVbl5l2a6)?*;9hEGXje|o18ZRO~ z$}ujWmIPBTZi2bK>sHwwJP3_GW>gD{d&JvZX}W6?!HYuF)#0OmiF!*H{*Ks!tKQF* z>6gVEY<4qwcC^K)@Q9<$chwPF3`WV>qAGBThPPOsLpqw?k*@={5_<$;-yT!gWXTs< zl&Pl{7N`{|@{M^CJO?g&e3EITvsT9Pgpc<1`ALwKx`wpKw3lg5N)lsZ54U`?1u8DX z3J|TU6t52 zu__|+xTv~+q@%46FzUBk_l?>_vm#)dC!i=1cWx#(30|Zd|DZ6;cYFHxDxs1%lkmW# zP*eI6U9TNj>zs&prswoesvySMO;(W3MC(;BqdtejH(DYG4rfsx{fQ1?F*IGoME(qC z6N_UIStd?Xb~&Fm6eJC(sH1Vq&Xy;e|82oN+a!$c2bH%MxOg<4T|FnwI(zX?ebfE3 zE+U4dCyp!fVd*++b+k>%jJk*+Ts5*p33ZidIuP9TEexp$Fs65#F6}*Ki-grLFsOHci8SS9jFfKHIBIMO)r zK6{P@o;$48MlaS239$)%67H$*DpolU4Z{9I!pyQRW_ke3BPK$wk5^Jbar9VUWrPRb z87qXpfb*v$?~>p`oU8(1P?lBdHK0 zu&b*8<9-JA0zm$M`Opw@6aPADAUfli@yqhRb=)A+eRa6s?gUsJ*wMq^0(*QAAMmR@&Nbty(2Uxru6RVzf1D zQ!{9V*n0%Qug~ZA{14BIbFMdMe6F)zoOlx>?Q0A-82|vdrmLf2_6MW>BlNU?^jDR~ zeEap@wquVKc{j8Gh?8gJ^zjzbq`!-XyE{u)@Tf<(>4#x`^xB0O1Vz|kSra#6! zYxQrm(w&jr>u6{9Av>dTU{Ef@(_zoe4<>!dH4CEo`fY}m&05jHRDM*OuFSGAy?QS54&jj0eapKkqaz*K$J7}7fxC}G zuXA`+B(lOK%=P;8Bu!H;=X7!&VPqqamMe4;*$kIjriIMdkC{2v7Pe`xXlMu;aolzs z|EPz+n&ir)e{0c_QxcZxj(zd9@3FLi@d&FIAyhGGu`Bj=hFkE z`4kle>iBu%4v#Avwn~2T{RX{$JG`BVhT*9Y}whka@5aw z&fCHj$ne?2um*j57tD2+S(rA5cB0ebdu(|ihs{i0TCtg2cjx4RU`g=9?4^GaLg2Xx zqB`;0uZ+KS{gwsQj!@4w4FxFja`tiGk=RiO|*Mj&xTZSD-O8BAdG z-m=q(yX-)$Te;blvSBt^4qI^ChMo73Hh_PK7moznpF5(XtD$BQLbaK#|I%WH{qORo zayzzmReCDnQt5%1hDkSwUbc&*!oZ!>$F%JWVlf6eE;qq3)J5-)I@?|-T#aY; za)ODl$oTmU*Frx=*3Iv3+n1Cz8s)5&ncMJ`O-y^@&QC9Eph0D2BwNAaSDaE?rSUIb zyimUF?d{Djw~8$)D#A7z2JOyIPPX0C_2q7I|zvHxq!& zcq4d=zW0=0;qTP|&$CfU`jfKlu(@0-yq6If7R?Uc;KHF=`RdtTLjXnHn^kFg4tA|< zVu+p@znn+y#v@n!37EB^nkCQj<8g-<9&WUep**OmRRFJ%*CAaS^!fL$|9ZE5n5;r2L~+%r6o`z+Q+%lweWuYBmn;73R!j zDgsjQ7vFKO{8xUsI+MU?VC8|>3^y&|3M9$&&^8#jrXEYYVz!@=B(=oHm_E!AdXleS zuqaD&SHnP3ZGL>lb86!7X&Vdr!CDlTsh-}Yq-U5>M0|u z)!@IMq{{{AqB^^XT;*xPgnhCA75Jmvj&|?gt=Nrb3oGr$(0!L-x^ulScsSW_{c9Yv zkKSVPd2fcq3w!U6k_d>CWEwb1+&toNZM>kuUjohiHlc+o9qV8ayPSTUo{4@paU3=m zN9jQm;DOVcWrm&nd(Ow1y>l(-iSc^@*hS z)2k(wS^zrzq0;Nit(F1eVgbr`zK`Hgy!a}eIiPRmsCnIa^QSkDB5)UGID+ySm0O8l z8EiM<&c)T9RufgyWqqZn1;dNg5+OiVervdyL2mq6XdKfJ*(6Tx zmUUBlC^Ts8K==JYU48vqgXuM8da+~aUen+yqW(Lq1DFD3Q)y7xk#c&^muL zGsP%fx;v}6vyzd%edk)k<8)8TF@Xai*To5EBFQbNPCezlJ%7TwfgWzjK8o34!7UXK zBv7UKGDYwG%P7^io?4=Od?;-(>^qOQw3r~pfbk_XW>h<9DcAMrp6C|a zf}(n)uZt{|L)vzPad0L*2O~aYc#Fz;qQK?F60>5$C~qq;{v@)C82^OrFjqK zg3_Q1I!n z7z%lJj7DoFZ^<)1n_v`8i>d`JF{`EO#k~A5J7diL87W@kEwy)AjcN>Zr+bg>>`A;o z=R9X+#E^&G{m@r#jq~8YMrpouAM$)Rd)EM4DV?q0??|^d?veq(#P-_+OQ9;^3is+K z!oXvi9YWLBch{_m`_lgk9i4~Q4%BNlr_w*Wl~ZkThbB^7+mZA&>C2% zJ^3N5#66mgPyf?Z45VvpQ$2&a?YZ-k@r>SRh}N~<(Gp`()*$GR=i8&aLRWJ2oD}O$`LE#@V_EAORcdCaYv*KT!$*2u`gCXUY0lT*w2 zfY5*d*$RsIa~LF?k+_P!Nz|cgiw#d5IfR#LRO!m_9p{eR5V|HzA+F zy|3WB1OOq|BqxrqTJW;*e2LcHypI6lx9O7eXlxV#ji=nZK0NZO;gba_`}qOy0|};k zqze@lNguC6o#SE6ZZX_m_uIy_^bBgCfGR7BWk`{GF$?CzH3oHBmuI?O`OO>p zZlZmF5EZ^PkskghpM`G9fZ!uTh$9mNI666^=j;J3jjp-%PAQjl#ElKuz7-uvi+3zy z{l0j+&gF*s>l8}F%z5Nqc{8W}bWcbi+13 zP^D!i#;^-ds<1Hnx6S2ysAeLl<|-9AZl*-lV-ai^!GK&shm|&z)nDnA5xcXR{3fx~IG_It{QmeIlQ7 z7IrWBFH|DqT6{QbP>->?M~#FU+^Kti(p9q<@Tn7VE-I(LrNZN5sjK`{&KMr2VUcoApUEPm*rXgF(+#VRwwc2~f?IP=ME6 zVp->rUGBkIKqp7F12|z2!d=L&G8=^5wi!*{k1l;xzN?!PTb$ zBcGUO{K)du&jkRk%G%JDJyny?cW=V@-^Z)^gUL<~grkfH=Pb}?Q7);ozGIre0(hzc zt3>qTH=#%Z9X3n7g@ZrSo#YZ#?PipXDfA%7UN{)s{Ub3uZY%v2=v9)=J;eN>T=J@_!XWrb5&~HH zk+{JP7=ZUyxB6iv6e=#$SZZwIZVVwZ!hT8l}Idkr|Rl&t5fjnvr>$QWr` z<--^gW?CK675J40FrkQb7pZ|MQ9gbTy4MD%BrF{~!AUk;DK1 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/fluid_tank.png b/src/main/resources/assets/mekanism/textures/blocks/models/fluid_tank.png new file mode 100644 index 0000000000000000000000000000000000000000..1a44fa00b0f37ef83cea2b8fd589210e17d0ec71 GIT binary patch literal 2879 zcmb7GX;@QN8a_!_d~m@Tw-E}Yac1fUNmw)qgh&Z$WL0t4!I)e^fb16tktOJKTu|c_ zt56ZJ>eRXr1wnSO6{#YkD27l41r10Lq%l#6lDWaH&pa|ud(Mxu-0ywA_j}Lx~zsp$O{0>-?^dTaCl$rI3Yn}V2*z%KI9xszH(J|>!*bbF zT$o27AyDWGC2-fu#Lz}rP$)~5#3HkCG;gezl!6fOAef1j@{;)yij<0*A6?%pwwr*p*}#q6f*%)nhrUX)26BU;L!$JxkpO%*9lIG?j5OeTEGMS7gxZ+)1oskGTDh^TlwgjH=11(?j&L+e#yp$=#6I}@AlHLaf z2LAt09`8f61l|CB)cZ+dNocwd!f${if)p_edARsR=2Sw8uNY#&0&%E7ko?}okOToN zkR%9%SYO{s*RYGjxO}!CO|oPX6BtNg@Fg&l&w?0qDh^?B;d0p&I+@_^zS@JlnoRd2 z68${B^!4>4ySn>&xV!qexe`e4v2+0|g$MEB_gMBvtk0BKb35>aNM<@D=B7gI)nWk; zJ6Se`JGGXTQ}VsTvZvNUni7jg#Nf@3`p8HT~-y z09Y#-be~XZ_wfCC{@k#+*3V*C1j|6Xzm~v`*x7r2n7!?r^qjRKr;y`wVMgrd>llId zKL0+5ORzuraxK;tHFKsz@41IFyxFPjMSBKDRIjr-5?phuSJ-Q^+Y779pDP@x-OIQv z7Hh6?puJd8-yrC1NX&lFl#^&0xnFxeE-o_iltCF=f6CC>+R9R{{Kn3tX*>L;$D)vy z-5@LOsY~DJ&|8yodb~m5L>uv0;@^WFEPc$#JobHXaV4eaJgeo@n*{fzlq@c%z3A)& zKy7dhok}xZsvqm$ktX}1 zF~Z3+)-$VSyoNNPf6;iQR2|ol5dpvMC`%I!-aHyx|L31+wg>Lu?^}E}!)ntKlK<^_G;89lk} zd1qn|4(vG$rN?Hg6y*nK`lnBJDdJvdHyQWub}oIzYArD7wW?05>6=hzj)a>?ZY|zH zbyXv6d4$TvIl4xjsxRr-`jt<|d_YD{;ln;VYH$tdPvyT9sh-|Ckb5@Eq1a6ZKamtN z6mjdU*57#fN(VhgPgi4h=D7!5c5z$iiI+iV0w%^ewJs%HJ`$Nj#;`Hdpv?WFXzy(U^SmvB;h( zUvb46b#A)){=PYc%KW3cf3}XKWm>hLIH&JV?rENJr2kQc_{rE89=d_zMPcYj>!xi6 z5VW`LXT6#d+@KK^%`R497JGV6lgI4b5xvFO=%1~myy|;&eW5bT)~nSpE-JdIuNcp> zYrHUQ;QVcWZ*MsW`0;Ysx0e})+jqVBYCo0tHAAqYY3oH9`$Z2e?LXe$%fIeZVB)HT z%wf@k;i}Q+3p1;2@SKNrMS^R=!&k@F?Ts6EL$w!@-MU8xZm<-X@(?O0@jV2{KRJ@c z>|wnopwMBo5YuZ*}v9!j=-Ywi4$JG%^yiNCrN@rZDyrt9X-dszu zY+J|r9_hfV%GO?iW{o8Xs6DJTiBeBhj4s)^Y-j2eC}z;3ev z3C%59(?el+Aa#eWQ|UfsbamP3o~FmGhfepJ9$n2FdO5Dw9vOCyu9sDGj@_HL$`Twn z3p$!}7t}9X3PQmu4jL;1YU{4twzjtQ$vu%sVY112637e6qDN7ednjP?au8L52J=0^ z84Q>QO04CMh@j0!Bdn2SmF?zPNE_^6{$trZD#F^7u?eU#UD`eQZWr1uLe0SEpnDW` zJ@LeMXhgzwj%^bKVVOjxZUuKyavRXKz1pbCc|l=~R&Ft8K<9szWT;%4Q>qNNmT75}}#~ zRsnzpvw<7{3xGBMEd|^uyZB&xWl@Bb7L?-kmlFHm3Kv1Bd9?OEr^VFFuMY-N0}Y605=zopp(zf zn)G8Z(H3jCYp#THi6TE3VaCh`y1VAWQ2_o|Er>dUK~$auHQkt<^(n|k9yD0nKEq7- zKe9hj$sfF$to{#TKH4@l@SU$y2mIFk-yijRQh$PZ@emDV1w1$Pb~=>rm@C%}s Jez|$ue*qT>Ne=)3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/fluidic_plenisher.png b/src/main/resources/assets/mekanism/textures/blocks/models/fluidic_plenisher.png new file mode 100644 index 0000000000000000000000000000000000000000..5af7e3d926e28261b280064526f548409c19d482 GIT binary patch literal 4582 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 a6Nmvlv(|}Ox6WGZ0JG~>#x>W_xc>q89q20n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_basic.png b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_basic.png new file mode 100644 index 0000000000000000000000000000000000000000..57e6cd57b2ae2227ff5adc06f0e1beec0414343d GIT binary patch literal 2639 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_elite.png b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_elite.png new file mode 100644 index 0000000000000000000000000000000000000000..549e32bb6b3539fe33229435a9d18155dc656f05 GIT binary patch literal 2676 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/laser.png b/src/main/resources/assets/mekanism/textures/blocks/models/laser.png index 161cd258deb0b8263a0edd1354190ac6d55ded7b..93b8bd438d848cfd1bc279a3413aa68c94d99efb 100644 GIT binary patch literal 2275 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter.png b/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter.png new file mode 100644 index 0000000000000000000000000000000000000000..6effe12e81f513747129fabe0a59d385098bbdc8 GIT binary patch literal 3084 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 s124Q@ZVw^D+f!=75{(!2ZVcbGynhq literal 4558 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/pressurized_reaction_chamber.png b/src/main/resources/assets/mekanism/textures/blocks/models/pressurized_reaction_chamber.png new file mode 100644 index 0000000000000000000000000000000000000000..8f9d343db59cbcab2c9618999402e7383a03f763 GIT binary patch literal 4502 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/seismic_vibrator.png b/src/main/resources/assets/mekanism/textures/blocks/models/seismic_vibrator.png new file mode 100644 index 0000000000000000000000000000000000000000..50e718261e800a6296e270e3a37e0b360163cfec GIT binary patch literal 7381 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 YnvazNasKN-`vD0s(lgU7*LHmQKZe^+A^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/solar_neutron_activator.png b/src/main/resources/assets/mekanism/textures/blocks/models/solar_neutron_activator.png new file mode 100644 index 0000000000000000000000000000000000000000..159ad186587b1b789be912ba3e3ee8f90f0a3ad5 GIT binary patch literal 6249 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 ZYv!>$xqcOQuJsoke9hjn{)*qj{{bddB-sD} literal 0 HcmV?d00001