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 000000000..8da4e6ca0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chargepad.png differ 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 000000000..02805a313 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png new file mode 100644 index 000000000..2a6e6ee75 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_infuser.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_infuser.png new file mode 100644 index 000000000..9fdfb0c43 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_infuser.png differ 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 000000000..483c0e289 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_oxidizer.png differ 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 000000000..cabb77ab4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_washer.png differ 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 a5f4bd998..632b4a689 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/digital_miner.png and b/src/main/resources/assets/mekanism/textures/blocks/models/digital_miner.png differ 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 f881af1fe..3e17f00ad 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png and b/src/main/resources/assets/mekanism/textures/blocks/models/electric_pump.png differ 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 1e369ee9a..c6593abbe 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/electrolytic_separator.png and b/src/main/resources/assets/mekanism/textures/blocks/models/electrolytic_separator.png differ 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 000000000..1a44fa00b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/fluid_tank.png differ 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 000000000..5af7e3d92 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/fluidic_plenisher.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_advanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_advanced.png new file mode 100644 index 000000000..05cdd1a01 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_advanced.png differ 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 000000000..57e6cd57b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_basic.png differ 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 000000000..549e32bb6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_elite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_ultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_ultimate.png new file mode 100644 index 000000000..0eeaaa5d1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_ultimate.png differ 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 161cd258d..93b8bd438 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/laser.png and b/src/main/resources/assets/mekanism/textures/blocks/models/laser.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png b/src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png new file mode 100644 index 000000000..5be9e22b2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/laser_amplifier.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/laser_tractor_beam.png b/src/main/resources/assets/mekanism/textures/blocks/models/laser_tractor_beam.png new file mode 100644 index 000000000..6afd07f26 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/laser_tractor_beam.png differ 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 000000000..6effe12e8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter_on.png b/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter_on.png new file mode 100644 index 000000000..fb3f88167 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/logistical_sorter_on.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/metallurgic_infuser.png b/src/main/resources/assets/mekanism/textures/blocks/models/metallurgic_infuser.png index e5402f785..e125916ad 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/metallurgic_infuser.png and b/src/main/resources/assets/mekanism/textures/blocks/models/metallurgic_infuser.png differ 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 000000000..8f9d343db Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/pressurized_reaction_chamber.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/rotary_condensentrator.png b/src/main/resources/assets/mekanism/textures/blocks/models/rotary_condensentrator.png new file mode 100644 index 000000000..56d8a27e6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/rotary_condensentrator.png differ 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 000000000..50e718261 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/seismic_vibrator.png differ 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 000000000..159ad1865 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/solar_neutron_activator.png differ