From b077a65624badb13f6793a0a321a23d30dc4aee0 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 15 Sep 2023 21:18:53 +0200 Subject: [PATCH] new telex model, sound adjustments --- src/main/java/com/hbm/blocks/ModBlocks.java | 4 +- .../java/com/hbm/blocks/ModSoundTypes.java | 10 +- .../com/hbm/items/machine/ItemFluidDuct.java | 2 + .../hbm/render/tileentity/RenderTelex.java | 7 +- .../network/TileEntityRadioTelex.java | 2 +- src/main/resources/assets/hbm/lang/de_DE.lang | 2 +- src/main/resources/assets/hbm/lang/en_US.lang | 2 +- .../assets/hbm/models/machines/telex.obj | 513 +++++++++++++++--- .../hbm/textures/models/machines/telex.png | Bin 1934 -> 3786 bytes 9 files changed, 456 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 8c6fb76c6..8a91ad707 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1814,8 +1814,8 @@ public class ModBlocks { c4 = new BlockC4().setBlockName("c4").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":c4"); fissure_bomb = new BlockFissureBomb().setBlockName("fissure_bomb").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.nukeTab).setHardness(0.0F).setBlockTextureName(RefStrings.MODID + ":fissure_bomb"); - pump_steam = new MachinePump().setBlockName("pump_steam").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pump_steam"); - pump_electric = new MachinePump().setBlockName("pump_electric").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pump_electric"); + pump_steam = new MachinePump().setBlockName("pump_steam").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_copper"); + pump_electric = new MachinePump().setBlockName("pump_electric").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); heater_firebox = new HeaterFirebox().setBlockName("heater_firebox").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); heater_oven = new HeaterOven().setBlockName("heater_oven").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":brick_fire"); diff --git a/src/main/java/com/hbm/blocks/ModSoundTypes.java b/src/main/java/com/hbm/blocks/ModSoundTypes.java index 544f70c1e..85f42f310 100644 --- a/src/main/java/com/hbm/blocks/ModSoundTypes.java +++ b/src/main/java/com/hbm/blocks/ModSoundTypes.java @@ -3,7 +3,11 @@ package com.hbm.blocks; import com.hbm.main.MainRegistry; import net.minecraft.block.Block; -class ModSoundTypes { - static final ModSoundType grate = ModSoundType.customStep(Block.soundTypeStone, "hbm:step.metalBlock", 0.5F, 1.0F); - static final ModSoundType pipe = ModSoundType.customDig(Block.soundTypeMetal, "hbm:block.pipePlaced", 0.85F, 0.65F).enveloped(MainRegistry.instance.rand).pitchFunction((in, rand, type) -> { if (type == ModSoundType.SubType.BREAK) in -= 0.15F; return type == ModSoundType.SubType.STEP ? in : in + rand.nextFloat() * 0.2F; }); +public class ModSoundTypes { + + public static final ModSoundType grate = ModSoundType.customStep(Block.soundTypeStone, "hbm:step.metalBlock", 0.5F, 1.0F); + public static final ModSoundType pipe = ModSoundType.customDig(Block.soundTypeMetal, "hbm:block.pipePlaced", 0.85F, 0.85F).enveloped(MainRegistry.instance.rand).pitchFunction((in, rand, type) -> { + if(type == ModSoundType.SubType.BREAK) in -= 0.15F; + return in + rand.nextFloat() * 0.2F; + }); } diff --git a/src/main/java/com/hbm/items/machine/ItemFluidDuct.java b/src/main/java/com/hbm/items/machine/ItemFluidDuct.java index 93413ee62..84fcb8ba1 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidDuct.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidDuct.java @@ -124,6 +124,8 @@ public class ItemFluidDuct extends Item { if(world.getTileEntity(x, y, z) instanceof TileEntityPipeBaseNT) { ((TileEntityPipeBaseNT) world.getTileEntity(x, y, z)).setType(Fluids.fromID(stack.getItemDamage())); } + + world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, ModBlocks.fluid_duct_neo.stepSound.func_150496_b(), (ModBlocks.fluid_duct_neo.stepSound.getVolume() + 1.0F) / 2.0F, ModBlocks.fluid_duct_neo.stepSound.getPitch() * 0.8F); return true; } diff --git a/src/main/java/com/hbm/render/tileentity/RenderTelex.java b/src/main/java/com/hbm/render/tileentity/RenderTelex.java index 5c3601e1a..9761d83e3 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTelex.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTelex.java @@ -19,7 +19,7 @@ public class RenderTelex extends TileEntitySpecialRenderer implements IItemRende GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y, z + 0.5); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_CULL_FACE); switch(tile.getBlockMetadata() - BlockDummyable.offset) { case 2: GL11.glRotatef(90, 0F, 1F, 0F); break; @@ -28,11 +28,10 @@ public class RenderTelex extends TileEntitySpecialRenderer implements IItemRende case 5: GL11.glRotatef(0, 0F, 1F, 0F); break; } - GL11.glTranslated(0, 0, 1); - bindTexture(ResourceManager.telex_tex); ResourceManager.telex.renderAll(); + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); } @@ -49,7 +48,7 @@ public class RenderTelex extends TileEntitySpecialRenderer implements IItemRende GL11.glScaled(6, 6, 6); } public void renderCommon() { - GL11.glTranslated(0, 0, 0.5); + GL11.glTranslated(0, 0, -0.5); bindTexture(ResourceManager.telex_tex); ResourceManager.telex.renderAll(); }}; diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java index 628e3e118..5f2e68975 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java @@ -237,7 +237,7 @@ public class TileEntityRadioTelex extends TileEntity implements INBTPacketReceiv yCoord, zCoord - 1, xCoord + 2, - yCoord + 1, + yCoord + 2, zCoord + 2 ); } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 64edc30b5..50a1f341b 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4269,7 +4269,7 @@ tile.pribris_radiating.name=Glühender RBMK-Schutt tile.pump_electric.name=Elektrische Grundwasserpumpe tile.pump_electric.desc=Nutzt Strom um Grundwasser hochzupumpen$Erzeugt bis zu 10.000mB/t$Muss unter Y:70 platziert werden tile.pump_steam.name=Dampfbetriebene Grundwasserpumpe -tile.pump_steam.desc=Nutzt Dampf um Grundwasser hochzupumpen$Erzeugt bis zu 10.000mB/t$Muss unter Y:70 platziert werden +tile.pump_steam.desc=Nutzt Dampf um Grundwasser hochzupumpen$Erzeugt bis zu 1.000mB/t$Muss unter Y:70 platziert werden tile.pwr_block.name=PWR tile.pwr_casing.name=PWR Druckbehälter tile.pwr_casing.desc=Muss alle internen Teile des PWRs abdecken$Platzierung: Hülle diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index ccccc5e67..d9255f011 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5246,7 +5246,7 @@ tile.pribris_radiating.name=Smoldering RBMK Debris tile.pump_electric.name=Electric Groundwater Pump tile.pump_electric.desc=Uses electricity to pump up groundwater$Generates up to 10,000mB/t$Needs to be placed below Y:70 tile.pump_steam.name=Steam-Powered Groundwater Pump -tile.pump_steam.desc=Uses steam to pump up groundwater$Generates up to 100mB/t$Needs to be placed below Y:70 +tile.pump_steam.desc=Uses steam to pump up groundwater$Generates up to 1,000mB/t$Needs to be placed below Y:70 tile.pwr_block.name=PWR tile.pwr_casing.name=PWR Pressure Vessel tile.pwr_casing.desc=Needs to cover all internal parts for the reactor to form$Placement: Casing diff --git a/src/main/resources/assets/hbm/models/machines/telex.obj b/src/main/resources/assets/hbm/models/machines/telex.obj index 4caa6310e..ae7237edb 100644 --- a/src/main/resources/assets/hbm/models/machines/telex.obj +++ b/src/main/resources/assets/hbm/models/machines/telex.obj @@ -1,86 +1,451 @@ -# Blender v2.76 (sub 0) OBJ File: 'telex.blend' +# Blender v2.79 (sub 0) OBJ File: '' # www.blender.org -o Cube_Cube.001 -v -0.500000 0.000000 0.500000 -v -0.500000 1.000000 0.500000 -v -0.500000 0.000000 -1.500000 -v -0.500000 1.000000 -1.500000 -v 0.500000 0.000000 0.500000 -v 0.500000 0.000000 -1.500000 -v 0.500000 0.625000 -1.500000 -v 0.500000 0.625000 0.500000 -v 0.125000 1.000000 -1.500000 -v 0.125000 1.000000 0.500000 -v 0.500000 0.625000 0.125000 -v 0.500000 0.625000 -0.750000 -v 0.125000 1.000000 -0.750000 -v 0.125000 0.625000 -0.750000 -v 0.125000 0.625000 0.125000 -v 0.125000 1.000000 0.125000 -vt -0.000000 0.500000 -vt -0.000000 0.250000 -vt 0.500000 0.250000 -vt 0.843750 0.250000 -vt 0.750000 0.156250 -vt 1.000000 -0.000000 -vt 0.093750 0.250000 -vt 0.093750 0.156250 -vt 0.312500 0.156250 -vt 0.500000 0.000000 +o Cube.001 +v 0.500000 0.000000 1.500000 +v 0.500000 0.625000 1.500000 +v 0.125000 1.000000 1.500000 +v -0.500000 1.000000 1.500000 +v -0.500000 0.000000 1.500000 +v 0.500000 0.000000 1.125000 +v 0.500000 0.625000 1.125000 +v 0.125000 1.000000 1.125000 +v 0.125000 0.625000 1.125000 +v -0.500000 1.000000 1.125000 +v 0.125000 0.625000 0.250000 +v 0.125000 1.000000 0.250000 +v 0.500000 0.625000 0.250000 +v 0.125000 1.000000 -0.500000 +v 0.500000 0.625000 -0.500000 +v 0.500000 0.000000 -0.500000 +v 0.500000 0.000000 0.250000 +v -0.500000 1.000000 0.250000 +v -0.500000 1.000000 -0.500000 +v -0.500000 0.000000 -0.500000 +v -0.500000 0.000000 0.250000 +v -0.500000 0.000000 1.125000 +v -0.187500 1.000000 -0.437500 +v -0.437500 1.000000 -0.437500 +v -0.437500 1.000000 0.062500 +v -0.187500 1.000000 0.062500 +v -0.187500 1.312500 -0.437500 +v -0.187500 1.312500 0.062500 +v -0.437500 1.312500 0.062500 +v -0.437500 1.312500 -0.437500 +v -0.375000 1.062500 0.062500 +v -0.312500 1.062500 0.062500 +v -0.312500 1.062500 0.125000 +v -0.375000 1.062500 0.187500 +v -0.312500 1.000000 0.062500 +v -0.312500 1.000000 0.125000 +v -0.375000 1.000000 0.062500 +v -0.375000 1.000000 0.187500 +v -0.125000 1.062500 0.125000 +v -0.125000 1.062500 0.187500 +v -0.125000 1.000000 0.125000 +v -0.125000 1.000000 0.187500 +v 0.000000 1.062500 0.125000 +v -0.062500 1.062500 0.125000 +v -0.062500 1.187500 0.125000 +v 0.000000 1.187500 0.125000 +v 0.062500 1.000000 0.250000 +v 0.062500 1.000000 0.062500 +v 0.062500 1.062500 0.062500 +v 0.062500 1.062500 0.250000 +v -0.125000 1.000000 0.062500 +v -0.125000 1.000000 0.250000 +v -0.125000 1.062500 0.250000 +v -0.125000 1.062500 0.062500 +v -0.062500 1.062500 0.187500 +v 0.000000 1.062500 0.187500 +v 0.000000 1.187500 0.187500 +v -0.062500 1.187500 0.187500 +v -0.093750 1.187500 0.093750 +v 0.031250 1.187500 0.093750 +v 0.031250 1.187500 0.218750 +v -0.093750 1.187500 0.218750 +v -0.093750 1.437500 0.093750 +v -0.093750 1.437500 0.218750 +v 0.031250 1.437500 0.218750 +v 0.031250 1.437500 0.093750 +v -0.312500 1.812500 0.000000 +v -0.375000 1.812500 0.000000 +v -0.375000 1.812500 -0.062500 +v -0.312500 1.812500 -0.062500 +v -0.375000 1.312500 -0.062500 +v -0.312500 1.312500 -0.062500 +v -0.312500 1.312500 0.000000 +v -0.375000 1.312500 0.000000 +v 0.312500 0.812500 -0.312500 +v 0.312500 0.812500 0.062500 +v 0.375000 0.875000 0.062500 +v 0.375000 0.875000 -0.312500 +v 0.562500 0.875000 0.062500 +v 0.562500 0.875000 -0.312500 +v 0.625000 0.812500 0.062500 +v 0.625000 0.812500 -0.312500 +v 0.625000 0.625000 0.062500 +v 0.625000 0.625000 -0.312500 +v 0.562500 0.562500 0.062500 +v 0.562500 0.562500 -0.312500 +v 0.562500 0.375000 0.062500 +v 0.562500 0.375000 -0.312500 +v 0.625000 0.312500 0.062500 +v 0.625000 0.312500 -0.312500 +v 0.625000 0.125000 0.062500 +v 0.625000 0.125000 -0.312500 +v 0.562500 0.062500 -0.312500 +v 0.562500 0.062500 0.062500 vt 0.656250 0.250000 -vt -0.000000 0.750000 +vt 0.500000 0.250000 +vt 0.500000 -0.000000 +vt 0.000000 -0.000000 +vt 0.093750 0.156250 +vt -0.000000 0.156250 +vt 0.093750 0.250000 vt 0.500000 0.500000 -vt 0.500000 0.156250 -vt 0.312500 0.250000 -vt 0.000000 0.156250 -vt -0.000000 0.000000 -vt 0.593750 0.343750 -vt 0.812500 0.343750 vt 0.593750 0.500000 vt 0.500000 0.593750 +vt 0.593750 0.500000 +vt 0.500000 0.343750 +vt 0.593750 0.343750 vt 0.687500 0.500000 +vt 0.593750 0.500000 vt 0.687500 0.593750 +vt 0.312500 0.156250 +vt 0.500000 0.250000 +vt 0.500000 0.156250 +vt 0.312500 0.156250 +vt 0.500000 -0.000000 +vt 0.500000 0.156250 +vt 0.093750 0.000000 vt 0.593750 0.250000 +vt 0.812500 0.343750 +vt 0.593750 0.343750 +vt 0.093750 0.156250 +vt 0.312500 0.250000 +vt 1.000000 0.343750 +vt 0.812500 0.500000 +vt 0.812500 0.343750 +vt 1.000000 -0.000000 +vt 0.843750 0.250000 +vt 0.750000 0.156250 +vt 0.093750 0.250000 +vt 0.312500 0.500000 +vt 0.312500 0.250000 +vt 0.093750 0.500000 +vt -0.000000 0.250000 +vt -0.000000 0.500000 +vt 0.500000 0.250000 +vt 0.500000 0.500000 +vt 0.093750 0.750000 +vt 0.312500 0.750000 +vt 0.093750 0.500000 +vt 0.285714 0.500000 +vt 0.000000 1.000000 +vt 0.285714 1.000000 +vt 0.250000 0.750000 +vt 0.125000 0.812500 +vt 0.250000 0.812500 +vt 0.312500 0.828125 +vt 0.250000 0.750000 +vt 0.312500 0.750000 +vt 0.187500 0.828125 +vt 0.250000 0.906250 +vt 0.187500 0.906250 +vt 0.187500 0.828125 +vt 0.062500 0.906250 +vt 0.187500 0.906250 +vt 0.125000 0.828125 +vt 0.000000 0.750000 +vt 0.125000 0.750000 +vt 0.437500 0.875000 +vt 0.421875 0.859375 +vt 0.437500 0.859375 +vt 0.437500 0.859375 +vt 0.453125 0.843750 +vt 0.437500 0.843750 +vt 0.437500 0.890625 +vt 0.406250 0.875000 +vt 0.406250 0.890625 +vt 0.406250 0.812500 +vt 0.406250 0.875000 +vt 0.100000 1.000000 +vt 0.000000 0.900000 +vt 0.000000 1.000000 +vt 0.437500 0.812500 +vt 0.421875 0.859375 +vt 0.390625 0.812500 +vt 0.406250 0.875000 +vt 0.406250 0.812500 +vt 0.406250 0.750000 +vt 0.390625 0.781250 +vt 0.390625 0.750000 +vt 0.453125 0.750000 +vt 0.406250 0.765625 +vt 0.406250 0.750000 +vt 0.406250 0.765625 +vt 0.453125 0.750000 +vt 0.453125 0.765625 +vt 0.453125 0.750000 +vt 0.406250 0.765625 +vt 0.406250 0.750000 +vt 0.406250 0.765625 +vt 0.453125 0.750000 +vt 0.453125 0.765625 +vt 0.421875 0.781250 +vt 0.406250 0.750000 +vt 0.421875 0.765625 +vt 0.453125 0.750000 +vt 0.437500 0.765625 +vt 0.453125 0.796875 +vt 0.437500 0.781250 +vt 0.406250 0.796875 +vt 0.390625 0.781250 +vt 0.406250 0.750000 +vt 0.406250 0.781250 +vt 0.390625 0.781250 +vt 0.406250 0.750000 +vt 0.406250 0.781250 +vt 0.390625 0.781250 +vt 0.406250 0.750000 +vt 0.406250 0.781250 +vt 0.437500 0.750000 +vt 0.406250 0.781250 +vt 0.406250 0.750000 +vt 0.343750 0.875000 +vt 0.375000 0.906250 +vt 0.343750 0.906250 +vt 0.343750 0.812500 +vt 0.312500 0.875000 +vt 0.312500 0.812500 +vt 0.312500 0.812500 +vt 0.343750 0.875000 +vt 0.343750 0.812500 +vt 0.312500 0.812500 +vt 0.343750 0.875000 +vt 0.343750 0.812500 +vt 0.468750 0.859375 +vt 0.484375 0.875000 +vt 0.484375 0.859375 +vt 0.484375 0.875000 +vt 0.468750 0.750000 +vt 0.484375 0.750000 +vt 0.484375 0.875000 +vt 0.468750 0.750000 +vt 0.484375 0.750000 +vt 0.484375 0.875000 +vt 0.468750 0.750000 +vt 0.484375 0.750000 +vt 0.468750 0.750000 +vt 0.484375 0.750000 +vt 0.687500 0.750000 +vt 0.781250 0.765625 +vt 0.781250 0.750000 +vt 0.687500 0.703125 +vt 0.781250 0.750000 +vt 0.781250 0.703125 +vt 0.687500 0.687500 +vt 0.781250 0.703125 +vt 0.781250 0.687500 +vt 0.687500 0.687500 +vt 0.781250 0.640625 +vt 0.781250 0.687500 +vt 0.687500 0.640625 +vt 0.781250 0.625000 +vt 0.687500 0.625000 +vt 0.781250 0.578125 +vt 0.781250 0.562500 +vt 0.687500 0.578125 +vt 0.687500 0.562500 +vt 0.687500 0.515625 +vt 0.781250 0.500000 +vt 0.687500 0.515625 +vt 0.781250 0.515625 vt 0.750000 -0.000000 +vt 0.750000 0.156250 +vt -0.000000 0.250000 +vt 0.500000 0.500000 +vt 0.312500 0.250000 +vt 0.312500 0.000000 +vt 0.812500 0.250000 +vt 0.312500 0.156250 +vt 1.000000 0.500000 +vt 0.750000 0.000000 vt 1.000000 0.250000 vt 0.500000 0.750000 -vt 1.000000 0.500000 -vt 0.500000 0.343750 -vt 1.000000 0.343750 -vt 0.812500 0.250000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.707100 0.707100 0.000000 -vn 0.000000 1.000000 0.000000 +vt 0.500000 0.500000 +vt 0.312500 0.500000 +vt 0.000000 0.500000 +vt -0.000000 0.750000 +vt 0.000000 0.500000 +vt 0.125000 0.750000 +vt 0.250000 0.828125 +vt 0.250000 0.828125 +vt 0.062500 0.828125 +vt 0.000000 0.828125 +vt 0.453125 0.859375 +vt 0.437500 0.875000 +vt 0.421875 0.812500 +vt 0.100000 0.900000 +vt 0.421875 0.812500 +vt 0.390625 0.875000 +vt 0.406250 0.781250 +vt 0.453125 0.765625 +vt 0.453125 0.765625 +vt 0.406250 0.750000 +vt 0.390625 0.750000 +vt 0.390625 0.750000 +vt 0.390625 0.750000 +vt 0.437500 0.781250 +vt 0.375000 0.875000 +vt 0.312500 0.875000 +vt 0.312500 0.875000 +vt 0.468750 0.875000 +vt 0.468750 0.875000 +vt 0.468750 0.875000 +vt 0.468750 0.875000 +vt 0.687500 0.765625 +vt 0.687500 0.750000 +vt 0.687500 0.703125 +vt 0.781250 0.515625 +vt 0.687500 0.500000 +vn 0.0000 0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.7071 0.7071 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 1.0000 0.0000 +vn -1.0000 -0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 +vn -0.7071 0.7071 0.0000 +vn 0.7071 -0.7071 0.0000 s off -f 4/1/1 3/2/1 1/3/1 -f 9/4/2 7/5/2 3/6/2 -f 16/7/3 15/8/3 14/9/3 -f 1/10/4 8/5/4 10/11/4 -f 3/12/5 6/1/5 5/13/5 -f 7/14/6 9/3/6 13/15/6 -f 10/2/6 8/16/6 11/8/6 -f 12/9/3 5/17/3 6/10/3 -f 16/18/7 13/19/7 2/13/7 -f 12/20/4 13/21/4 14/13/4 -f 11/20/2 15/22/2 16/23/2 -f 14/19/7 15/18/7 11/24/7 -f 2/13/1 4/1/1 1/3/1 -f 6/25/2 3/6/2 7/5/2 -f 4/26/2 9/4/2 3/6/2 -f 13/15/3 16/7/3 14/9/3 -f 10/11/4 2/3/4 1/10/4 -f 1/10/4 5/25/4 8/5/4 -f 1/27/5 3/12/5 5/13/5 -f 12/9/6 7/14/6 13/15/6 -f 16/7/6 10/2/6 11/8/6 -f 6/10/3 7/14/3 12/9/3 -f 12/9/3 11/8/3 5/17/3 -f 8/16/3 5/17/3 11/8/3 -f 4/28/7 2/13/7 13/19/7 -f 10/29/7 16/18/7 2/13/7 -f 13/19/7 9/30/7 4/28/7 -f 12/31/7 14/19/7 11/24/7 +f 3/1/1 4/2/1 5/3/1 +f 1/4/2 7/5/2 2/6/2 +f 8/7/3 2/6/3 7/5/3 +f 9/8/4 8/9/4 7/10/4 +f 10/11/5 3/12/5 8/13/5 +f 11/14/1 13/15/1 12/16/1 +f 12/17/3 15/18/3 14/19/3 +f 13/20/2 16/21/2 15/22/2 +f 6/23/2 13/20/2 7/5/2 +f 7/24/5 11/25/5 9/26/5 +f 9/27/2 12/28/2 8/7/2 +f 14/29/5 18/30/5 12/31/5 +f 20/32/4 14/33/4 15/34/4 +f 12/31/5 10/11/5 8/13/5 +f 22/35/6 18/36/6 21/37/6 +f 10/38/6 5/39/6 4/40/6 +f 20/41/6 18/36/6 19/42/6 +f 22/43/7 21/44/7 6/45/7 +f 26/46/7 24/47/7 23/48/7 +f 30/49/5 28/50/5 27/51/5 +f 30/52/4 23/53/4 24/54/4 +f 28/55/1 25/56/1 26/57/1 +f 29/58/6 24/59/6 25/60/6 +f 27/61/2 26/62/2 23/63/2 +f 31/64/5 33/65/5 32/66/5 +f 33/67/2 35/68/2 32/69/2 +f 38/70/6 31/71/6 37/72/6 +f 40/73/5 33/65/5 34/74/5 +f 42/75/2 39/76/2 40/77/2 +f 39/78/4 36/79/4 33/67/4 +f 38/80/1 40/81/1 34/82/1 +f 44/83/4 46/84/4 43/85/4 +f 48/86/2 50/87/2 47/88/2 +f 52/89/6 54/90/6 51/91/6 +f 51/92/4 49/93/4 48/94/4 +f 47/95/1 53/96/1 52/97/1 +f 44/98/5 53/99/5 55/100/5 +f 55/100/5 50/101/5 56/102/5 +f 56/102/5 49/103/5 43/104/5 +f 43/104/5 54/105/5 44/98/5 +f 56/106/1 58/107/1 55/108/1 +f 43/109/2 57/110/2 56/111/2 +f 55/112/6 45/113/6 44/114/6 +f 60/115/7 62/116/7 59/117/7 +f 64/118/5 66/119/5 63/120/5 +f 60/121/2 65/122/2 61/123/2 +f 62/124/6 63/125/6 59/126/6 +f 59/127/4 66/128/4 60/121/4 +f 61/123/1 64/118/1 62/129/1 +f 70/130/5 68/131/5 67/132/5 +f 69/133/4 72/134/4 71/135/4 +f 67/136/1 74/137/1 73/138/1 +f 70/139/2 73/140/2 72/141/2 +f 68/131/6 71/142/6 74/143/6 +f 76/144/8 78/145/8 75/146/8 +f 77/147/5 80/148/5 78/149/5 +f 79/150/3 82/151/3 80/152/3 +f 81/153/2 84/154/2 82/155/2 +f 83/156/9 86/157/9 84/154/9 +f 85/158/2 88/159/2 86/157/2 +f 90/160/3 87/161/3 89/162/3 +f 91/163/2 90/160/2 89/162/2 +f 92/164/9 94/165/9 93/166/9 +f 5/3/1 1/167/1 2/168/1 +f 2/168/1 3/1/1 5/3/1 +f 1/4/2 6/23/2 7/5/2 +f 8/7/3 3/169/3 2/6/3 +f 10/11/5 4/170/5 3/12/5 +f 12/17/3 13/171/3 15/18/3 +f 13/20/2 17/172/2 16/21/2 +f 6/23/2 17/172/2 13/20/2 +f 7/24/5 13/173/5 11/25/5 +f 9/27/2 11/174/2 12/28/2 +f 14/29/5 19/175/5 18/30/5 +f 15/34/4 16/176/4 20/32/4 +f 20/32/4 19/177/4 14/33/4 +f 12/31/5 18/30/5 10/11/5 +f 22/35/6 10/38/6 18/36/6 +f 10/38/6 22/35/6 5/39/6 +f 20/41/6 21/37/6 18/36/6 +f 20/178/7 16/179/7 17/180/7 +f 6/45/7 1/181/7 5/182/7 +f 20/178/7 17/180/7 21/44/7 +f 17/180/7 6/45/7 21/44/7 +f 5/182/7 22/43/7 6/45/7 +f 26/46/7 25/183/7 24/47/7 +f 30/49/5 29/184/5 28/50/5 +f 30/52/4 27/185/4 23/53/4 +f 28/55/1 29/186/1 25/56/1 +f 29/58/6 30/187/6 24/59/6 +f 27/61/2 28/188/2 26/62/2 +f 31/64/5 34/74/5 33/65/5 +f 33/67/2 36/189/2 35/68/2 +f 38/70/6 34/190/6 31/71/6 +f 40/73/5 39/191/5 33/65/5 +f 42/75/2 41/192/2 39/76/2 +f 39/78/4 41/193/4 36/79/4 +f 38/80/1 42/194/1 40/81/1 +f 44/83/4 45/195/4 46/84/4 +f 48/86/2 49/196/2 50/87/2 +f 52/89/6 53/99/6 54/90/6 +f 51/92/4 54/197/4 49/93/4 +f 47/95/1 50/198/1 53/96/1 +f 44/98/5 54/105/5 53/99/5 +f 55/100/5 53/99/5 50/101/5 +f 56/102/5 50/101/5 49/103/5 +f 43/104/5 49/103/5 54/105/5 +f 56/106/1 57/199/1 58/107/1 +f 43/109/2 46/200/2 57/110/2 +f 55/112/6 58/201/6 45/113/6 +f 60/115/7 61/202/7 62/116/7 +f 64/118/5 65/203/5 66/119/5 +f 60/121/2 66/128/2 65/122/2 +f 62/124/6 64/204/6 63/125/6 +f 59/127/4 63/205/4 66/128/4 +f 61/123/1 65/122/1 64/118/1 +f 70/130/5 69/206/5 68/131/5 +f 69/133/4 70/207/4 72/134/4 +f 67/136/1 68/208/1 74/137/1 +f 70/139/2 67/209/2 73/140/2 +f 68/131/6 69/206/6 71/142/6 +f 76/144/8 77/210/8 78/145/8 +f 77/147/5 79/211/5 80/148/5 +f 79/150/3 81/212/3 82/151/3 +f 81/153/2 83/156/2 84/154/2 +f 83/156/9 85/158/9 86/157/9 +f 85/158/2 87/161/2 88/159/2 +f 90/160/3 88/159/3 87/161/3 +f 91/163/2 92/213/2 90/160/2 +f 92/164/9 91/214/9 94/165/9 diff --git a/src/main/resources/assets/hbm/textures/models/machines/telex.png b/src/main/resources/assets/hbm/textures/models/machines/telex.png index 2ba7d96c7e4f48d504956a8c36ae14d690e44d34..3cc38b488511b12b6b3e305641af570a6168098c 100644 GIT binary patch delta 3785 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 delta 1918 zcmV-^2Z8v?9gYu>C4Xl@O+f$vv5yPl0UK8 zUuVA2x4k{y+4YhIF(rNKuCA)-ud2J})oP@XMjC0PkwzM6q>)A%X{3=x{(o}m+;X_^ z$x`@m=4kli#%%cY%48Q97lvVH&i5xLA_^L#6A=NMXUD_&>DR*bkKc^_pT3wZA@cOq z;wRk`mA^wVfPaEBA4M-{j7~&^Hb+{-Jwbs2xSsl_ke}uQ1&z@OgtY1o#(Z3Tjk_&} z)JJ`d1LiJhj7}h-?Vhd}gtcmd+dZb=c;-YeXpBxE19_2CBD5sniFqPv%pmcM6*NXC zPTC2AbOn`2E~$Rw|5XL>^GRC=xtMn)G7i#_!jE$L@SoAkj4ccQ%fS!K~=o$9;^2NlIm3iCI62U zVDsy%<$uQsgq*Yz^uz=oSB&@fiq{7ib1Jc_B6#wk7#^PJOAs<54_G0#DXpFYDYTk7 z>=my$fhPyN2x;=5Fbz-iQKB6{QYn1(hGF-Qp)^52;<@BOL3?R%Q>q|hPegr(!B1T?nac##t^S`u)go(SU} z({Ft0-(rQF@ZGPDmO604vb(1(irHsX^l177GBOsi~=F3JO61Ae%dzRq!*N zj(^ob8Xu1Us{yH{rKR$2d+OAwvQ>X>Zmz@T_Bz0yIhc#%KmmMJ9jwl0Q!i!h5cgFC zsZVMbJf41wm4FPSJW256$&>K-@#Bufl}MGHzI@#7vCO3-kRwRaf{&>s0qLMBUUrWK zipM_|0H^>?etUa6+`oT6_UqU^$-V6KIe&J#2c%FkA}(D>cYxxm{8M!80Nn%T=jY4S zeE9HTB>&*SgYf9lqpk#Vb}vxQuAQI)0M4QSF|}22{}i&PF^<$f-UGY?cFDoz#f)l;BX0Z4p# zc{y@fSy_p#^r~@+QH0kQy{c-Zo)vTi3L0HPGIf%cPP?xHup*F>4j`z^xV4Q^v&qpR;@pa`!oJR*QUKlLc7f_yzj{a&%a<9QSVKf1+*9x+ zR;?bJ=<0KQ=8et_G9Zuycl7D$>GI|1*s)^~jLCN5@Zs?7p+jN*$dPhf&+y!h&mnSp z3ULH!b&o*zdyI$|IaZ1iPUCgY(R+{PD68d&tJr>AJ@?{)aNt5Kwq5&Z?hh6@LJtDu76#L(Bh0ZH)OR>HKo z{-^B~ztc|MzaqT=p0pRkcK|Eogn4R62TmA!RS}eYuXw%sOK))w9S|c4$ok8RUS=5g zgtzbAd)l^l0Ja$0K3gQY7w`ev@~n;sYDYj)3Avp_;aTKf9^<<48h?)kP(>Xo!0zsD z`0K=pu(PuhwzjsS&IgWK630(1g&~$}q&rJGHd@WAEh^IJo`CEC!dg-1O~2oG6{O{4 z1dzWg7c0V;~_0e%7eNi3Ii3jA{M5OAG-Kl2YWzWg7+04=)ux&S&C0qE?2T*4_- zfHWQ*==%N6Kg{^@YY=04!Sn*O_;a@F90B}t@zS~eAoCA1es`e%0qg+3+4&7ot&oeS zF9L(iKg{@!0^DAkj^Fd&Uzy(Xdmj7EFAv8SfBN5DKGG2{dm4Z3?0B49q