From 58c1236ab5a5d732a5661f485655af0e3c634664 Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 1 Apr 2022 19:07:06 +0200 Subject: [PATCH] finished classic cable --- src/main/java/com/hbm/lib/Library.java | 1 + src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 4 +- .../hbm/render/block/RenderCableClassic.java | 260 ++++++++++++++++-- .../render/util/RenderAccessoryUtility.java | 4 + src/main/resources/assets/hbm/lang/de_DE.lang | 1 + src/main/resources/assets/hbm/lang/en_US.lang | 1 + .../hbm/textures/blocks/red_cable_classic.png | Bin 297 -> 231 bytes .../hbm/textures/models/capes/CapeVaer.png | Bin 0 -> 12782 bytes src/main/resources/mcmod.info | 2 +- 10 files changed, 254 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/capes/CapeVaer.png diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 72ad14fd5..6d93c8f8b 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -75,6 +75,7 @@ public class Library { public static String FrizzleFrazzle = "fc4cc2ee-12e8-4097-b26a-1c6cb1b96531"; public static String the_NCR = "28ae585f-4431-4491-9ce8-3def6126e3c6"; public static String Barnaby99_x = "711aaf78-a862-4b7e-921a-216349716e9a"; + public static String Ma118 = "1121cb7a-8773-491f-8e2b-221290c93d81"; public static Set contributors = Sets.newHashSet(new String[] { "06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 9235430d4..26cba2c9b 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4186)"; + public static final String VERSION = "1.0.27 BETA (4191)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index ab51cbad6..118a58068 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -242,7 +242,9 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.cable_detector, 1), new Object[] { "S", "W", 'S', REDSTONE.dust(), 'W', ModBlocks.red_wire_coated }); addRecipeAuto(new ItemStack(ModBlocks.cable_diode, 1), new Object[] { " Q ", "CAC", " Q ", 'Q', NETHERQUARTZ.gem(), 'C', ModBlocks.red_cable, 'A', AL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_detector, 1), new Object[] { "IRI", "CTC", "IRI", 'I', ModItems.plate_polymer, 'R', REDSTONE.dust(), 'C', ModItems.wire_red_copper, 'T', ModItems.coil_tungsten }); - addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.red_cable), 16), new Object[] { " W ", "RRR", " W ", 'W', ModItems.plate_polymer, 'R', ModItems.wire_red_copper }); + addRecipeAuto(new ItemStack(ModBlocks.red_cable, 16), new Object[] { " W ", "RRR", " W ", 'W', ModItems.plate_polymer, 'R', ModItems.wire_red_copper }); + addShapelessAuto(new ItemStack(ModBlocks.red_cable_classic, 1), new Object[] { ModBlocks.red_cable }); + addShapelessAuto(new ItemStack(ModBlocks.red_cable, 1), new Object[] { ModBlocks.red_cable_classic }); addRecipeAuto(new ItemStack(ModBlocks.red_connector, 4), new Object[] { "C", "I", "S", 'C', ModItems.coil_copper, 'I', ModItems.plate_polymer, 'S', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.red_pylon, 4), new Object[] { "CWC", "PWP", " T ", 'C', ModItems.coil_copper, 'W', KEY_PLANKS, 'P', ModItems.plate_polymer, 'T', ModBlocks.red_wire_coated }); addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.oil_duct_solid), 16), new Object[] { "SPS", "P P", "SPS", 'S', STEEL.ingot(), 'P', IRON.plate() }); diff --git a/src/main/java/com/hbm/render/block/RenderCableClassic.java b/src/main/java/com/hbm/render/block/RenderCableClassic.java index 3440824b1..00c55223a 100644 --- a/src/main/java/com/hbm/render/block/RenderCableClassic.java +++ b/src/main/java/com/hbm/render/block/RenderCableClassic.java @@ -1,5 +1,7 @@ package com.hbm.render.block; +import org.lwjgl.opengl.GL11; + import com.hbm.blocks.network.BlockCable; import com.hbm.lib.Library; @@ -13,7 +15,139 @@ import net.minecraft.world.IBlockAccess; public class RenderCableClassic implements ISimpleBlockRenderingHandler { @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { } + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + + GL11.glPushMatrix(); + GL11.glScaled(1.25D, 1.25D, 1.25D); + GL11.glTranslated(-0.5, -0.5, -0.5); + IIcon iicon = block.getIcon(0, 0); + + double uv_cL = iicon.getMinU(); + double uv_cR = iicon.getInterpolatedU(5); + double uv_cT = iicon.getMinV(); + double uv_cB = iicon.getInterpolatedV(5); + + double uv_sL = iicon.getInterpolatedU(5); + double uv_sR = iicon.getInterpolatedU(10); + double uv_sT = iicon.getMinV(); + double uv_sB = iicon.getInterpolatedV(5); + + double pos_nil = 0D; + double pos_one = 1D; + double pos_min = 0.34375D; + double pos_max = 0.65625D; + + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setColorOpaque_F(1F, 1F, 1F); + tessellator.setNormal(0F, 1F, 0F); + tessellator.addVertexWithUV(pos_max, pos_max, pos_min, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_min, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_max, uv_cR, uv_cB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_max, pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_max, pos_min, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_max, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_max, pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_one, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_max, pos_nil, uv_sR, uv_sT); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0F, -1F, 0F); + tessellator.addVertexWithUV(pos_min, pos_min, pos_min, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_min, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_max, uv_cR, uv_cB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_min, pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_min, pos_max, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_min, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_one, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_nil, uv_sR, uv_sT); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1F, 0F, 0F); + tessellator.addVertexWithUV(pos_max, pos_min, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_one, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_max, pos_max, pos_nil, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_one, pos_max, pos_min, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_one, pos_max, pos_max, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_one, pos_min, pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_one, pos_min, pos_min, uv_cR, uv_cB); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0F, 0F); + tessellator.addVertexWithUV(pos_min, pos_max, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_max, pos_one, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_max, pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_nil, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_max, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_min, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_min, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_max, uv_cR, uv_cB); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0F, 0F, 1F); + tessellator.addVertexWithUV(pos_max, pos_max, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_min, pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_max, pos_max, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_max, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_one, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_one, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_one, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_max, pos_min, pos_one, uv_cR, uv_cB); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0F, 0F, -1F); + tessellator.addVertexWithUV(pos_max, pos_min, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_max, pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_one, pos_min, pos_min, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_min, pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_min, pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(pos_nil, pos_max, pos_min, uv_sR, uv_sT); + tessellator.addVertexWithUV(pos_min, pos_max, pos_nil, uv_cR, uv_cT); + tessellator.addVertexWithUV(pos_max, pos_max, pos_nil, uv_cL, uv_cT); + tessellator.addVertexWithUV(pos_max, pos_min, pos_nil, uv_cL, uv_cB); + tessellator.addVertexWithUV(pos_min, pos_min, pos_nil, uv_cR, uv_cB); + tessellator.draw(); + + GL11.glPopMatrix(); + } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { @@ -36,10 +170,6 @@ public class RenderCableClassic implements ISimpleBlockRenderingHandler { boolean pZ = Library.canConnect(world, x, y, z + 1, Library.NEG_Z); boolean nZ = Library.canConnect(world, x, y, z - 1, Library.POS_Z); - double spanU = iicon.getMaxU() - iicon.getMinU(); - double spanV = iicon.getMaxV() - iicon.getMinV(); - double px = 0.0625D; - double uv_cL = iicon.getMinU(); double uv_cR = iicon.getInterpolatedU(5); double uv_cT = iicon.getMinV(); @@ -52,16 +182,14 @@ public class RenderCableClassic implements ISimpleBlockRenderingHandler { double pos_nil = 0D; double pos_one = 1D; - double pos_min = px * 5.5D; - double pos_max = px * 10.5D; + double pos_min = 0.34375D; + double pos_max = 0.65625D; float topColor = 1.0F; float brightColor = 0.8F; float darkColor = 0.6F; float bottomColor = 0.5F; - //TODO: all that manual tessellator crap - //this is a lot less tedious than it looks when you draw a 3D cube to take the vertex positions from if(!pY) { tessellator.setColorOpaque_F(topColor, topColor, topColor); @@ -133,22 +261,94 @@ public class RenderCableClassic implements ISimpleBlockRenderingHandler { tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_cL, uv_cT); tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_cL, uv_cB); tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_cR, uv_cB); + } else { + tessellator.setColorOpaque_F(topColor, topColor, topColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_max, z + pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_max, z + pos_min, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(brightColor, brightColor, brightColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_max, z + pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_min, z + pos_min, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(bottomColor, bottomColor, bottomColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_min, z + pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_min, z + pos_max, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(brightColor, brightColor, brightColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_min, z + pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_one, y + pos_max, z + pos_max, uv_sR, uv_sT); } if(!nX) { tessellator.setColorOpaque_F(darkColor, darkColor, darkColor); - tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_cL, uv_cT); - tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_cR, uv_cT); - tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_cR, uv_cB); - tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_cR, uv_cT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_cL, uv_cT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_cL, uv_cB); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_cR, uv_cB); + } else { + tessellator.setColorOpaque_F(topColor, topColor, topColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_max, z + pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_max, z + pos_max, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(brightColor, brightColor, brightColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_min, z + pos_min, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_max, z + pos_min, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(bottomColor, bottomColor, bottomColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_min, z + pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_min, z + pos_min, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(brightColor, brightColor, brightColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_max, z + pos_max, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_nil, y + pos_min, z + pos_max, uv_sR, uv_sT); } if(!pZ) { tessellator.setColorOpaque_F(brightColor, brightColor, brightColor); - tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_cL, uv_cT); - tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_cR, uv_cT); - tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_cR, uv_cB); - tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_cR, uv_cT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_cL, uv_cT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_cL, uv_cB); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_cR, uv_cB); + } else { + tessellator.setColorOpaque_F(topColor, topColor, topColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_one, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(darkColor, darkColor, darkColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_one, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(bottomColor, bottomColor, bottomColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_one, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(darkColor, darkColor, darkColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_max, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_max, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_one, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_one, uv_sR, uv_sT); } if(!nZ) { @@ -157,6 +357,30 @@ public class RenderCableClassic implements ISimpleBlockRenderingHandler { tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_min, uv_cL, uv_cT); tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_cL, uv_cB); tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_cR, uv_cB); + } else { + tessellator.setColorOpaque_F(topColor, topColor, topColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_nil, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(darkColor, darkColor, darkColor); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_max, z + pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_nil, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(bottomColor, bottomColor, bottomColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_min, y + pos_min, z + pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_nil, uv_sR, uv_sT); + + tessellator.setColorOpaque_F(darkColor, darkColor, darkColor); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_min, uv_sL, uv_sT); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_min, uv_sL, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_min, z + pos_nil, uv_sR, uv_sB); + tessellator.addVertexWithUV(x + pos_max, y + pos_max, z + pos_nil, uv_sR, uv_sT); } return true; @@ -164,7 +388,7 @@ public class RenderCableClassic implements ISimpleBlockRenderingHandler { @Override public boolean shouldRender3DInInventory(int modelId) { - return false; + return true; } @Override diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index b0d165e51..9b0278752 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -42,6 +42,7 @@ public class RenderAccessoryUtility { private static ResourceLocation tankish = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeTankish.png"); private static ResourceLocation frizzlefrazzle = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeFrizzleFrazzle.png"); private static ResourceLocation pheo = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapePheo.png"); + private static ResourceLocation vaer = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeVaer.png"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -115,6 +116,9 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.Barnaby99_x)) { return pheo; } + if(uuid.equals(Library.Ma118)) { + return vaer; + } if(Library.contributors.contains(uuid)) { return wiki; } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index c02f5c7e4..e61347c6d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3508,6 +3508,7 @@ tile.reactor_hatch.name=Kraftwerkszugriffsluke tile.reactor_inserter.name=Reaktor-Brennstoffeinlass tile.red_barrel.name=Explosives Fass tile.red_cable.name=Rotes Kupferkabel +tile.red_cable_classic.name=Rotes Kupferkabel (Klassisch) tile.red_connector.name=Stromverbindungsstück tile.red_pylon.name=Strommasten tile.red_pylon_large.name=Hochspannungsmasten diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 6891f4595..a36e920ad 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3881,6 +3881,7 @@ tile.reactor_hatch.name=Reactor Access Hatch tile.reactor_inserter.name=Reactor Fuel Inserter tile.red_barrel.name=Explosive Barrel tile.red_cable.name=Red Copper Cable +tile.red_cable_classic.name=Red Copper Cable (Classic) tile.red_connector.name=Electricity Connector tile.red_pylon.name=Electricity Pole tile.red_pylon_large.name=Large Electricity Pylon diff --git a/src/main/resources/assets/hbm/textures/blocks/red_cable_classic.png b/src/main/resources/assets/hbm/textures/blocks/red_cable_classic.png index 569be69e972e9b5a0e6be03616be78811e654c48..a1ba54be630c596962ba629e219a054556011db9 100644 GIT binary patch delta 187 zcmV;s07U<(0_OpcG=H8+L_t(IjqQ-J4Z=VSMc?@@aTAFN=oldbAe!t%PsdO<08_95 zO{9xY7Yam(5P=#gud`);J==9%H>Q+$qN>d6IWb1}-U|T7Yoza?uHn2pP*v45;G9E5 zJ_Z6vN(ohH+YR1>nc=-Bgz$5DG8hK9Ty8iAP1BHbCWL^9P&7(m9LMDVRpqqZzkW~( pW`>zP6h+86FQ4$$Z)N3gxC8n-FDvPb!wUca002ovPDHLkV1hocPs0EJ delta 253 zcmVGrAU`5 zMdr}}9zb;*Z|A&dlIYm8*qo;(z`MrgrN(jWL!)2!VS4!!QiX zqrCqdIGtd#fwzYpP19T}7=yLT^JZg=gaF&^9nOJ>;GDyIzbY;roX>DPeqju>ZA(fC z?>*L9a?YqOeg%98f!F(|>l@^Zh#(?Ui`J4-S~U0u|A(qRkT`KG{y=NF^3Yf zqBUy>Vu+!}h?s)}=jXfUu65U4XRUkg|HoQZR>JSi`|iEpy`SgVJK9iRhYKtS27y3a zx)1LggFvjWKp>WT97lmqu61=C{(;5ESVt37*e$#OykT?JfM|d~CGnh0dv@Uc@#haM zeLx`Y#=~EhA0OSQAkd8n-TNA*FKww~$3A}^*lAnUaeZVNsB@AKoX7|uYeQfoM7Pv zfigZ{0I`BVpKr3=1A$%{zXfps548(F-)VTAslV;goAFw##k|tfM*W@Kty_fnDbAqM zhu)k)7j-OJ_GqO~Tfpk?ya*^r=$mKPpRPR7KfwaJEX@CZF7^NS{Z}`1&r3>5hVt3X zX>qS+Z#SjAFL4``RoBx$CVEy@D@t{8n&C=dO4MPkDtC>7?G0F6|NJNs%ey-*CT5ls4zy?2Q(-7qxHMbuZ81iRGhwE+O_O60N!$_{O zuduMHKV-@3jg}Z{2akHWfLPe5S`baOqr1HnEGd};!=^wnM$Pa+j58JQTT+2kwu*em zk98j|HB);TLP?TQpyFvuU71=Qj0%taTp(PR#M*sT*M0>t?-c53fWXA4pO1bgfDDt-3?kPynqxYx;R)JkHt)-enpQ#7)) z*a?D!3lXtp`cWdYYSLhLPN$xVLLK4BCYb$ChO$4EG=q9CpE!DTyW6oNalPnotipAM zIH>_JrZ~eLZ1LJ{p(%17?)CAL+*;6IVhuzH^DPBlhI+h;c=4ID30lzBqrt(LosP%) z(3gqgGF=erV(9QqM|Y-kdX--ozm(~7{+h&&q~SuO@)!jOsP2zCIeLi&aj1{Vh>G|F zhTTE*_D1sc_&=zpE$=c#L7?+tjLRU;k?MiP{vt0fA;pUP={Bp@wVD0IER$DO6)qof zE`#0Bp()FgY)aU53Zm)wez%;0*SLF^Rb_<~6jM!!^qGTAJ9Sxuu5s^r#>{s4r0Qe20qsB4_y&bMxk?pLcK1prA@6_XnG1 z-~hUOR-kX{J}8mUjlK%+=A#0;rkf)*-r0%LcH`_B<(~}vX@s}YS$~$TA%p0^FL-d? z6ME4x(PEQsb@gSz#?N|*qn_kbEe^0X;q)z0|H+{P-MQ_^toeqE|m(Wq5%<1HG1yY=mj$4Q3li8F9RKmo?%AD$&EE zEvG<(&dzxFDEj=6YgeiZ*kYgvB?J3WEblmaM_`+jpKGi4F4YrxE2J8-J;h1i5C4;Y zo@9>!+xnW!((0Ih0!95k*S|9uXsYo)SRA?=qPWShDt+?WjaGVr0|^ey>bfMTL#mNr zE(ETlAhHv1h<$m}@=f5oB|KXa^!lv~UK`+j~V`koUUCM zwJD?N(=N^RotZ}Q^^Gzd(a??Qq)p{8!`&#Ls&%$xNzQ6jBPzF|L>HxE<>7<=gjOI1 zMPDzTJDa~I$+74~2r4(q+1EHWJe3zK_VLqWz`Uoh7OWZmRdARo^d5U-iiU;pc~W&i znWN*g9}7K;ICzy*vVxV1Kv64L?<4MYWM7W6fjQJPtp1;7#^!o9^8q@bWJCW^N3u3I zYx@4xNEN88p8=1Dd$hZ@(OEyNBeQHd|K@PH=;1} zCVP-K)Lx~(Nb|8VqX-*%N9ne=pq)t9A_f#<#C-vCrD1@3le_>_*mhc zVnzB3k~!a}oEdN~?=CEMW}?ini)c5PPp)AuS?Dd1N86m6j{9}>EKrN@OILvMuIKXR zxf-(HfYQs4SoEMXTrWkUbmUbFlBCgWXr;XKD9L9y|L6zl(R9Q0S&@-Se5}~Hj-)CO zOm-VNQt4jOx#8Qv-87%l`B>3b>`hOs#{9^c8kET;qLX8li9DZR2OGKM#Y{V1tR&RD zK*wUY^6=IkZ8-ztNAWe7PR1;?L$?X0MKJ6k<2s9CY{G0_k&@gkM z$45p2dZ*01Xv-XkfM}>YOR+z1LrS@ORZ#OAlrPlvwEUYh5C$AkfR0o`LHNsIev5oA z)7sZWs{Q>4ogPa5zRt8W_rEmrAjp^SpWK)y}aqc_2+3^KE zC2hO-)!NNP%ocvV2T{veFRVeaX4OBSKEJqe7btjCSa;7+v844+IHy>#mdf8@gUs8mqeJltpHNH9L&hh> zyZBlYJ`7Bsj5sDx*UtsIcSCXubSJ2tPvAYQ+-*+5IZrU}%#FYTj{QsdT<22)p^=7! zrfRXG2YN%GJ0Vl|DZ@qSwYx=O!#n17R9Y*2IEZFRBQsk?>(=%0)P07{6~o&iwZq3M znezp9(FLxiE6@+7GhSVb0~JqypHjSnrHcfNdN0?m@`4;L0VvQg_?-v%P8Q>%PBpR? z9$pZIc7%hm?I|u)@|0MZuiM(F-;K>Sf@xv+T=Ey|QXPl+m*rOtDJT74x|dzFVRd|; z)w0twi*u1Z@Zd3YNDw8c={RwHK6~tTC8@jfVDcE_Nxy{EDW=eUqTV6q{C?9WUS&;G zJq~013;Z~8ZN}!T@jOBM1onuv0Gk+f!=t}EeZW~>frJ_eWJvG%UzNp#ivPRH8?a6!K~hIO?Qm~? zTi1;$(dQ?Lzw>XNiIK90i)4e&9JdFX!R&ImF4?2sz-Ml{j^05KR~i9GG)n-Aq(6mc z({R3Dn}@wfDnH*-COx!>bvDd4@Hf%P8Q&%4vK%V?#^xjYg7|fbT`>P0z1zrU+Di$eM&qTs0n%>3*hv7tCCytukwxdmPd`;G|snE z)W-w&a2K?!Km0LWVjr}g9><`^6w`yJP$q*|ONTkzfSiN-9<_6UnSq{IrN@K zyo(Av`7YG_S^Gd_{f9*S>x1nm&hkZvJ2yGrm6R_J^(px-OocD%Wb5D;vsy{31zi`E zkoO5);Gerz@?F9=_SbvpL+o9G4MP@3{`Zdh%7YYaXS9o?Pb^ppX>o51+@gMmwm|rA zLgL|-&(ETlLbmo9p22;%!Rpwn=zU4w2eeKup?&>>`h&9MPvRq-5ywWv9a^{XL8;0P zZ~YdDUF@~{&goRC$i=8UNn6OH`m@3NuSYz~TGnTW`@QP@GHK0~WPj!F+4TYd$)&;xmsf(rNwDfq9NXVI8(SDW-*PW|0oH^yy_Cnn)5p9P@R<;3Sr zU+iGS#Q|B1h4&MfgAH*!rKD}Cx0#1rd-BSOT01VZygV~EO0>Q5V;SqxEgqE#{kv6@ zg?Q$eFj@t!XZ6}}pia%zm3Yv3Yb*#C&=UFNfCi+};vy;m{KR&)C(VN#x|JOJa?6tN zy#S@_rxX>qogbddb(z$8GM^V6l|gLZTiK&~Bf9Hu_~zO8jd;l33l(5%JOnT%B`Iqn z&$ovChfeDJq~4Vf!TbBw9>*PB`QSOWRGFK;yvx>Vl5HkK4_@U`9LlqA9u2G`r+L4{ z3wTV{1ca80LnVN%=;>*)W`w7socV+MRqhUW-Rteohn2eQnkyr4EDkpQ637;KHHNky=I@ezC7$< z91W`%$RuCEQHZ!pad%tC19u!LL8IP5d;84r%ZEOB_z+|YHNd|Z*u9T8#c5~}$_C&> z-wTgSngY#Y&Onz;?FoT*$9mkp?t#J2xZRPMn?4nMH@~>ECJGf3e<$kFdW#lyn2ACJf^y){NaXY*+h>L^b(`wpH%Q zl#jVwV(3zN*S;p`5nP47INaq^WZX-WNVzlAQhxc@W)Dq-QY`qcF+{^^>Pe}nF!7M} z*fF1GuC0}Z*9w2r4}9qZ?b@+epN?8j1E@Myy}!Eobk7}!p24v0yD~uWKmYO6DNvEv z?O%uJD>cF9x^o<-*omU-jn;?Vf|TWr6bj zBGD5qFPN^mE#Ho+eGft~ytmv1?r$nXGp#G0XKw00Dl3z#9}O8Cl|5({V@k}`kaL&o z$)d;i>lhIXgM&R<(6>hgn=$C?KtjE247k{TA0C1XCvIV_Y+Nv~+G}O3MFGzy*fYHJT}~fRrY<3e@hGgdlCU||F%FFqnzALJ}ly&KY-3c+(3T2k?5DC zjZA0uDjQ}0AF~}kD9DHi+xn?wr`Q4Q2SShgZLd~37~E}%f1#GU`Sv4x%sV#?E~m2f zb;PKEj3qp{X3)}v#*CKLl@X<+EcB7r8&zXav6V+z%<*3@T}%fwnTMa> zx6 z_l`66qyNpma#2IKBR&{tWuaK|$byv|NBYOI@J*kr9vOYRnjw+nh)rrG9{u;V#yyqk zsThyR(W+%Xk1azXL3TBW>oG|p4r?T)fjn98Tsi=EsOw1RW*(WCJwNd#fG<+Yoy40( zP|U(O?HIM_o3v#41o_0Ig~u8`i7|ZHPcs>ig*}sb`o*@^`X%A^YI*c&YF%!+|KLY> z8f&&%QI!9Vl%azA=u3L{Uk(VuoKr0uA{(G;cw6b#oz5emSAVYMpZT7zTL!B$hqYFl~z91--fD1e$^%%aZ*d+gf+cu_v2e?8HKYs_mQfi$3CSCa41Lk|# z$^t%7mO9z9!;N9Ow{#wt0DK1LbF_S!#1C2-=S7VRK2SQJOf4RTp zmuU3kLRd-Dn900JgNchN^t$w=W{+!@$!W`ESI?*t)K|cCr)2V3pV)_NZ;i;RpkIi? zMX?PibXt?u@}=SXZ5Yunp44C9r3i#kDNqN>0ZrtY(2C4w3hx{dFc-!lFI?b;!Q{QRB!70;M= zlw0o2sbS|mWUYsFWq0VeTW!eV%n4MRomW-MY*)%mllg6&Pk_UGuga0BIa=*p8qTUx zf-99rY5R%L!OooL=yI>tSbu3Rn;?)^BEIWg2Ka8V4z0SwE;&_cfZG<^Y=TL$kmYPj z+ok5W`x}-yd5WZ=p4gpL8PcxX&Wa6~=3*>&$a(Y^+k3`NeDk>=p{^xd1;N3Hd53sQf3qY^f3!YJzF|q$K%se$ZOH67 zgj`aYEWXpD*HCLgSu}JgP{ijwhE1Qj>n5tVd2j7u}rFogG`XVL)oCp`GWc8^Mg-XUyY{5R1HrD&HFlIq4v^VkiKs%EqDBr2&& zK^hz^Qtex!uDbET?RNq`A=lNO%G-_U+n5R4j_5+(CD^qn_^dsv{P@gaWz5X^**5-e zf7|oz`h(h_OAlv)yKfv4YFEc<(SX0Ip~B`>Dy$}+{3gcM|8&qkrm`mQ&gT2Y?9S)I za=AoPBR=4KCp85)paUkoF*;q}ao&GZaoykpmp&V-tXrIKLd|1Aui+5Lc#6&LRV=-C^rGHUUjBWI~*-;He zV!iotRH*scK(Dg{PldD1`IJ1gYI)a#-s~xFj8E}x(cj`^x5@Ccw_4-t2YFaP55IoT z2l-P7ZJXmJcs?W!1JBSO>^%w|qx2P}iy#*B_s3TE$eV*B(aveEGNcMWo#y-!Uwk)G zMusB-iZ;U$MU+XFUu@xk2(Xnt^eIJQ4t0;dB7zv|lr$Oje(r-ZKxi1|M%=Gac=pdo za28GE*xU}C`NUr`?gHKP@SnC&d zT2;`>69H4V0W8HfEaVq&>Me)2oW&nAVEv)thbTqUn7!drymGgof~PxzeRAtMW z0qS=GLkDfc_5%(I!;N?vZ^_jS+087qQ%RUFu>tFlR8@}@%u%!#IYUPbhn9z148RAh zv*$}_HDx+tjoqq&Kb+}ECSMV8e}VagYB+xKP3?)WEw6PVb}R*Vv!%upIBUk8%TN#> zyE^h~CLF0?;({n9_8|j)U)dL#%uji_3^lKMH);~bNW~K^)U6WLvB&zWRUriU>2|-c z{jyEfNj62t0*C~{4lyRG)A|6=v=~_KWz5q%{u?d=9AW<`Vegx?44x2n;R-(Da>&OM zd|9rO0?h3^T*cFu0vVF!kvZ+iZjR8MgAj5*Tj@O4IrK`t$a^A-c3!k^ zPj+1CrOlq56GaNXoL?MMeZ=&-0*@NXK zPLIv@L}H$+NhOhnG`ICuj)1bfpQFU9m5#f*dKN5_fjm9-`|`)25|_QH8nMvllrs$B zpn`fgv%4G#;1Kw+Y%WRkeR$Qmkh zRIB4cjZ9{}(}SPZ-(C0~+?*~kAF|qb%(DP)`z1})#_ziAjDBOGUle!H8}+`8vbb`B zZy9MUFDt)9DmDNK0rG0G923r(0sAFUuz6fF6;NRvqI{P~e)Pg|u{r=`g9>e5O%Lw^ z*cY-pD-@PUcsko9V7p>|*ZE*p=e5!6Tg2NH%N}Dj!-tCQQV@VUwx}aos_#-!`s+c# zjD=jYTw7J4=d;NQVZ>`AXV|15JBv8~DB&sntzOG!yQ3^6^c!tUn>$QVDxgB^B}!52 z)K=f$x|XBKu9&9goppc;Fo`rUiA#x#-Mo|WIC*T^;s8|wh|{1*9N8S?=eg1+o;FV$ zSU6#ab8_wdQG)rAKP9fDrf*UlwY8K?_*wM|K8U6GGqi;Py&z;`8SgoY){6Rel!*7Q z>Jp)pm5uGzLxdEo2OsR6m_ClPII#Bht&zV#L#paUjFfx zYmM8U#Lmc0jz~4+MkbdyY4jw7eCZFX6Clk7-ToZ+U=k3tGQKZW{&rYp?i6N;lm5y4 zq@W*$I)joxO*wr7O977PMG1GI`{L7^)|tE~}&0b=^@EvKdN{!EejzDa{pKm*Jc z{y5g~;Ko6e*l5{e=qf6#C9?ngk}Jv5gphKRC~J?k>ergW>Y6q{drfl;Y0`^`V?f5< zlLEKWbfFC-qjF8+|X$YQ82eFCXiP@L=c zDkaVA^x{17R{-P)rA{j8*wG6niJBoO&2R8afUzuqW|*mb!HYzxq^X`aNEHACozGc> zwOA{A&#cqQ^lV`_vm*aYsqyMsri-9O|9;MS<#+3(h19_ic6BJHJhY(R0Q$2u)EVHR z_lz!I18M6I{Gu7<>Wg4bshB_3Eg=Hf!cEn8QRi8~C$)>y^KB?DA*NSHiT9Wiq8?}u z1=T9jFUdiyDtsFa_-jROpb_j`UjnGSW{I}|zCtg^pmg(gJGWO!NF8ld0>C+F=^&ww zHE;2Y{(zxD{XYZe&Jl;wH>H)1%D&f~ZmpV|mmCU*lWMB0I>h03Z1{F?-;Hp_JP;OX z4j@1BMFB_=K2j>rp{w*xMiW};rN-#An<;mQhCUeK%^r&(()gc|6q4Wof){B!wO4zw z=_oE%NMULG@M*(@1O<@n{;H0->mw{|fc!gC-n%W$H=({gNPKxVuk7U|GgR)#TF#@f zAH@_9RQ0i4%}ct4hU^LI#6WT*tRwH8lM$&82rs?|f7tJ_-@+kWhra)|6;kHQ;sfK# z6x7L~tC3=Rn(7QJz&r1_4M@?g&o-w8w#Rp}-^B$+>ogjOhkrN2%4;Fz^e~6Z_FN3m*We_J#FnPQ$w$gN&jc1P@;$^&-k;mo zHn`!om*u}EwGAwDIp#aZE7+i7$e+uKIiz9wR?Mvb*zP@xdZSD9Z|V7`uWt9H^*>sf zRHpe-X#0#-p~w{QG7(={OO=j3nP_5yHJ)il@xKCNmV>9(X0Y&B!Mk3-As?PP&h-lY zQ}P4Q*05+Rv|0Z~8t}A?)QUu3?Mm6f2M|s^N7v2FFrrU;%=YK|?W6{ z2fD2=?H+FJ zN~zlS--%vYgYqr~ZcloCOE-@?v6@|zpV)!@V&mkY?DvAd(SmBfp)7EeY@TV5X%yeX zT)1c-E&=T6rqaaP>myn+;nJsXuJ|qv^~G0UK=f?}XPiFKoV*Z5cZ@9(x$k}C!%E^ew`l zFS5Ah+8|n?85|wZ*A!_c^HZrF(nuCM4V}AG+2~LZ{EAQHoyt zRJvrrxBm>P{Z`d?&}M6LzHeFS40g^9C@q`w1n2mCIF>!w>+i!bK!7L?lUNOSEV6*& z;!E!MGO{w4Ru)Scq@~$*LFiZG#k|tPwlg;&kJb?mCRRzDyL2*TE>G{vU;zGPdc266 zSM1rzBJk`+jO-ead|vHoHJvGS<(dfiVz*3Wfg{J-99oCmw4$o#5aHLihC=AWpO2p| zFc~Z)=INe3$RFxomvh^MQ%4^(X%#i2eYkRzxq~;|1nTJn838d`JF2&pw=>3<&ikfaQo#mHUxCw%jwyGK< zu#hNj1?Snv0*mFuLXB)~Vs!{ZB~^Q{&}tBe$%p24+tQ5uibhWAY-5Htg3?3hFN8s_ z1O2E`w0^gzQosUnr|YV^74$FwF}T# z*u|{C0XYBzUcC$WDIw`Ii{Svi1|7V!;L~}d5YXOURYA5FrG=iip4*qINL*M@DCM0y z(g75uf2|e3&(J;JCLB^O)*^6sGW$pVpTWwIAZ2=Khx^a<9tOT%!o2VsR3C!Fxe>Pk z-fz0*CKmjJ-`JRmta*@rw$y$v5Oa#TWHISCfQABN5Z|hN0N5z=@B9lehjQEgz*e7? z1+-+4;1B*G(SK@oR3$E!aIRssDZQY(^P1_Sul;DK2cU27N(0;fyMf_+g|3qXE#_5r z6xNTEWqz2a2X)7TQB6hP*MOi7tqt{KF*Iqg3)#*07%Oc_3!6F~Ryk2RSRmP7XuEl( zU-14Rs^0{baYp4>;uZ&}B%ld^0OvYkVg4qfgkP(9lAF1-dRh^X_!4@Gq(I!&3s*bZ zJIhb&-)$j2bKJp4X8XPR)D}-SXEy<`V<0Ol=+*a4496?5)jFW~Yy=B9gw?M#b#bmkdtwSTyw4BS|7u%fRbfasTa-z)yw^n|z6+l_^> zk@%??zf-?>fTrnB@9Cu>mLmn8d%Md^5k0mwuLW zhWl5Kk%}&E9!(pIFX`TIZC(yQi8vjeM_98ilsg}7qP8#&jS4{%_cXHaxCR;IOA{6B3Yh~Zh8ESC0M|J;)>egWW zE{55at~%0PxBZlon&hN)lxGV8RK^4?%_A92BQXZ*)b3f;%~7AjQn#P@+;@5TgCe=S zUVZcP;mpNhyT$IfxWmqx;iM6N>#=a!-L(PpJ!B1asHA!PtU@RB2EW;WKye144G0g$ zp<>P2SN{8x$7(pc|0+PT-`N_KQ-}J}1l2~{lcb$(xYbp97VWPs(sOO_JHM@~{=h0c z@aA6$o9Oo^6rp*mHozS|afHt{lW-m50aSVX#x7;7-=!Srpzjz>%DayaEpxIC;l1iy zzp&M7nH1Z*nCR9lOan=@Dm_PMXKiNeT(em0IR_qq2h7=dN2(t7n7;s2eq^~8QAEyn zgWS5s1u(XR2hr?@sj~WNSME2TxcV}$+g@WN*&mBiLG)O~rS~zi#;m~j5X9}I70zw0 zXv=@FnTN*hU$0EJraz>R$)5EzHOyc}qpiI{C81lnr^0=F>F_q5!rW)gK-)QJ$CcN$ ziBf2M@rN)`^ffG^@)8_;*P{VM8O@H8u`F)bO%JWEPgR6o#hB(#6>atJf6yub+W7lY z&gdQFpdH+%+X&d}-LMPLtiO|9dq4i$I92+vd}qwhtGAAe7McVdqdj+f;qzzd5r6STQ(s zQagPk#9UK$WBxjl#fm|?A5Z{_OaDx-KR(?S@eFAi-admUkW#qoe#B%+1CFe}%l zxeA&O8;B2GZL4Rt7(0xbN6h{5_OloHgH6TU26Dk=*hd3aqs?p8n*RQ#IRi{{A zuU!eRCyg9v$CjQpQ0}suF(A{j5oA9CVKsPjb1;-oO#Jod6NjmpDHvG@YQ@-w(0Ar4 z6r?-sW(-%1D>7>~NUA~_&;z^k`Gp}@`y322bEz&VZD z#M0N3kMNWqOAly`UB7wZnPE(Y%Cm=nONYK_9=pe$kF}~8I-K-F3RjbB?bH#c+R9g_ zsWE_zfdndUy=cJCKrx^9VdiUn^g~vZH1QrbY^2U(MATlptxDc&gb4jZEV6Q*vkA-( zyAmMTi(=C-2pepafeo>nTidG!(kqqh%eDl+uK0vRNLh2UjDj{c$=`+irYgxquf=d1DRy8zq1_mocwr2Pz_E{loM z2!mq=`&(AZ`+q-;-LZ59Th+4guUwqMb`i9b$^d1~Q}|AATHuOC(9%9*jIp`X$uB(> zs!)l&fS>_^wj}+4`<0)Nd?`SnNC`XZ9#G!5f{Jct*XDMYADwHYch)N3RXQ=7^E5}# zUyGNu2*2mgn5(6e@RxL|A(sWCau!y@*|dRLJ7xA4Bmp};R1TFMd>r8CgsM;dcGJAD zlm6@jQ$l4tut$|BC)2h3V+&@LoF=N&kAsub-u41+%LMa-`2C+oemxvrk$>?UHu)}? zc734kdim?WnPGb!o>dfCJhffg!^6KK?1~o`x6&`F+P^&npjP#xEeY{2mcZfTuN~XB zF?Qv^04O9esob$6X~$?>p}@-7gH#c_QyZf<`J(mjZ-wRc9_m`E=Zn;5Sr5YMf&N!9 zAV+RvRIxBzd;C-ftgQ8Lc=*)AmUsMn9FZrte)1k(jmr_51}tr0BeeUK-M{fK*TC2o z4QNZ84W6XyjC4E*Sh(^C=#SNxR(h#3I^%(O*Rw4tV0r%)nE0dq@-u$;XM4vP^EqWv zZi_4O9%MDmcWZd7al~t65Ey%~8~#LOIlS?Dt4A9w%SPXRcvkMTxp-;>Ss=Oc$g8Fg zml^;ddGmnxMB1Cv3I52-Akg+EFm?6AZ{3OV2lE9}ekJ=p8zDP9W3bjhOi1n7KgvpS zS&xTH72Fn04*`N<={p%v98d@b!A^`V>c0M|0Zlm?D`*J}gf4GB%b-Eke*0g=*u3{=4O?GrTRIAa$`#p- zd^SKbdairrWd$&kO{zJ6qWvT=@|u=y^Kvp$!F{NBOsCM}M0h4j83W9^6+SXHGfM)1 zY=_;IbmiqA&HKB9^{`}Cg*<%-Wad5~pZ(9z|5)I^X#sH0(g6#h>}|gK=*5`BXLKLv K-!IgB68;}5o^X}` literal 0 HcmV?d00001 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index be645a79a..fe91e7960 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4186", + "version":"1.0.27_X4191", "mcversion": "1.7.10", "url": "", "updateUrl": "",