From 07c3c8e27b25a25234645918d6e75a33407259b3 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 10 Oct 2021 23:27:17 +0200 Subject: [PATCH] all sorts of fixes --- src/main/java/com/hbm/blocks/ModBlocks.java | 2 +- .../blocks/machine/MachineFrackingTower.java | 13 ++ .../java/com/hbm/crafting/ArmorRecipes.java | 2 +- .../ChunkRadiationHandlerSimple.java | 8 +- .../inventory/recipes/AssemblerRecipes.java | 2 +- .../inventory/recipes/anvil/AnvilRecipes.java | 168 +++++++++++++++--- .../com/hbm/items/armor/ArmorGasMask.java | 5 +- src/main/java/com/hbm/lib/HbmWorldGen.java | 2 +- src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 15 ++ .../java/com/hbm/main/CraftingManager.java | 15 +- .../hbm/render/item/ItemRenderLibrary.java | 12 ++ .../render/item/ItemRenderTransformer.java | 103 +++++++++++ .../tileentity/RenderFrackingTower.java | 5 +- .../java/com/hbm/tileentity/TileMappings.java | 2 + src/main/resources/assets/hbm/lang/de_DE.lang | 3 + src/main/resources/assets/hbm/lang/en_US.lang | 3 + .../hbm/textures/blocks/deco_steel_orig.png | Bin 0 -> 424 bytes .../assets/hbm/textures/items/cmb_sword.png | Bin 338 -> 1078 bytes src/main/resources/mcmod.info | 4 +- 20 files changed, 319 insertions(+), 47 deletions(-) create mode 100644 src/main/java/com/hbm/render/item/ItemRenderTransformer.java create mode 100644 src/main/resources/assets/hbm/textures/blocks/deco_steel_orig.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index fcb289f23..45365b596 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1527,7 +1527,7 @@ public class ModBlocks { steel_corner = new DecoBlock(Material.iron).setBlockName("steel_corner").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_corner"); steel_roof = new DecoBlock(Material.iron).setBlockName("steel_roof").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_roof"); steel_beam = new DecoBlock(Material.iron).setBlockName("steel_beam").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":steel_beam"); - steel_scaffold = new DecoBlock(Material.iron).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel"); + steel_scaffold = new DecoBlock(Material.iron).setBlockName("steel_scaffold").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":deco_steel_orig"); steel_grate = new BlockGrate(Material.iron).setBlockName("steel_grate").setStepSound(soundTypeGrate).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(5.0F); deco_pipe = new BlockPipe(Material.iron, RefStrings.MODID + ":pipe_side", 0).setBlockName("deco_pipe").setStepSound(soundTypeGrate).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(5.0F).setBlockTextureName(RefStrings.MODID + ":pipe_top"); diff --git a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java index 557721670..2eba48172 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java @@ -40,6 +40,19 @@ public class MachineFrackingTower extends BlockDummyable { @Override protected boolean checkRequirement(World world, int x, int y, int z, ForgeDirection dir, int o) { + + if(!MultiblockHandlerXR.checkSpace(world, x, y + 2, z, new int[] {1, 0, 3, 3, 3, 3}, x, y, z, dir)) return false; + + if(!MultiblockHandlerXR.checkSpace(world, x - 2, y + 2, z - 2, new int[] {-1, 2, 0, 1, 0, 1}, x, y, z, ForgeDirection.NORTH)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x - 2, y + 2, z + 3, new int[] {-1, 2, 0, 1, 0, 1}, x, y, z, ForgeDirection.NORTH)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x + 3, y + 2, z - 2, new int[] {-1, 2, 0, 1, 0, 1}, x, y, z, ForgeDirection.NORTH)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x + 3, y + 2, z + 3, new int[] {-1, 2, 0, 1, 0, 1}, x, y, z, ForgeDirection.NORTH)) return false; + + if(!MultiblockHandlerXR.checkSpace(world, x, y, z, new int[] {10, -4, 2, 2, 2, 2}, x, y, z, dir)) return false; + if(!MultiblockHandlerXR.checkSpace(world, x, y, z, new int[] {24, -9, 1, 1, 1, 1}, x, y, z, dir)) return false; + + if(!MultiblockHandlerXR.checkSpace(world, x, y + 15, z, new int[] {1, 0, 1, 1, -2, 3}, x, y, z, dir)) return false; + return super.checkRequirement(world, x, y, z, dir, o); } diff --git a/src/main/java/com/hbm/crafting/ArmorRecipes.java b/src/main/java/com/hbm/crafting/ArmorRecipes.java index 13555cf65..2e9251fc0 100644 --- a/src/main/java/com/hbm/crafting/ArmorRecipes.java +++ b/src/main/java/com/hbm/crafting/ArmorRecipes.java @@ -50,7 +50,7 @@ public class ArmorRecipes { addHelmet( ModItems.rag, ModItems.robes_helmet); addChest( ModItems.rag, ModItems.robes_plate); addLegs( ModItems.rag, ModItems.robes_legs); - addBoots( ModItems.plate_polymer, ModItems.robes_boots); + GameRegistry.addRecipe(new ItemStack(ModItems.robes_boots, 1), new Object[] { "R R", "P P", 'R', ModItems.rag, 'P', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.security_helmet, 1), new Object[] { "SSS", "IGI", 'S', "plateSteel", 'I', ModItems.plate_polymer, 'G', "paneGlass" })); GameRegistry.addRecipe(new ItemStack(ModItems.security_plate, 1), new Object[] { "KWK", "IKI", "WKW", 'K', ModItems.plate_kevlar, 'I', ModItems.ingot_polymer, 'W', new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java index 6247e33c7..a4b0d927d 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java @@ -10,6 +10,7 @@ import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -25,6 +26,7 @@ import net.minecraftforge.event.world.WorldEvent; public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { private HashMap perWorld = new HashMap(); + private static final float maxRad = 100_000F; @Override public float getRadiation(World world, int x, int y, int z) { @@ -33,7 +35,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { if(radWorld != null) { ChunkCoordIntPair coords = new ChunkCoordIntPair(x >> 4, z >> 4); Float rad = radWorld.radiation.get(coords); - return rad == null ? 0F : rad; + return rad == null ? 0F : MathHelper.clamp_float(rad, 0, maxRad); } return 0; @@ -48,7 +50,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { if(world.blockExists(x, 0, z)) { ChunkCoordIntPair coords = new ChunkCoordIntPair(x >> 4, z >> 4); - radWorld.radiation.put(coords, rad); + radWorld.radiation.put(coords, MathHelper.clamp_float(rad, 0, maxRad)); world.getChunkFromBlockCoords(x, z).isModified = true; } } @@ -92,7 +94,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { Float val = radiation.get(newCoord); float rad = val == null ? 0 : val; float newRad = rad + chunk.getValue() * percent; - newRad = Math.max(0F, newRad * 0.99F - 0.05F); + newRad = MathHelper.clamp_float(0F, newRad * 0.99F - 0.05F, maxRad); radiation.put(newCoord, newRad); } else { radiation.put(newCoord, chunk.getValue() * percent); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 47d58a62a..b1e36716d 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -295,7 +295,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.fusion_heater, 1), new AStack[] {new OreDictStack("ingotTungsten", 4), new OreDictStack("plateSteel", 2), new OreDictStack(OreDictManager.getReflector(), 2), new OreDictStack("plateCopper", 4), new ComparableStack(ModItems.magnetron, 1), new ComparableStack(ModItems.wire_advanced_alloy, 4), },150); makeRecipe(new ComparableStack(ModBlocks.watz_element, 1), new AStack[] {new OreDictStack("ingotTungsten", 4), new ComparableStack(ModItems.plate_advanced_alloy, 4), new ComparableStack(ModItems.rod_empty, 2), new ComparableStack(ModItems.wire_magnetized_tungsten, 2), new ComparableStack(ModItems.wire_advanced_alloy, 4), },200); makeRecipe(new ComparableStack(ModBlocks.watz_control, 1), new AStack[] {new OreDictStack("ingotTungsten", 4), new ComparableStack(ModItems.ingot_advanced_alloy, 4), new OreDictStack("ingotLead", 2), new ComparableStack(ModItems.wire_magnetized_tungsten, 4), new ComparableStack(ModItems.wire_advanced_alloy, 2), },250); - makeRecipe(new ComparableStack(ModBlocks.watz_cooler, 1), new AStack[] {new OreDictStack("ingotTungsten", 2), new OreDictStack("ingotSteel", 2), new OreDictStack("dustNiter", 4), },300); + makeRecipe(new ComparableStack(ModBlocks.watz_cooler, 1), new AStack[] {new OreDictStack("ingotTungsten", 2), new OreDictStack("ingotSteel", 2), new OreDictStack("dustSaltpeter", 4), },300); makeRecipe(new ComparableStack(ModBlocks.watz_end, 1), new AStack[] {new OreDictStack("ingotTungsten", 2), new OreDictStack("ingotLead", 2), new OreDictStack("ingotSteel", 3), },150); makeRecipe(new ComparableStack(ModBlocks.watz_hatch, 1), new AStack[] {new ComparableStack(ModBlocks.reinforced_brick, 1), new OreDictStack("plateTitanium", 6), },200); makeRecipe(new ComparableStack(ModBlocks.watz_conductor, 1), new AStack[] {new OreDictStack("ingotTungsten", 2), new OreDictStack("ingotLead", 2), new OreDictStack("ingotSteel", 2), new ComparableStack(ModItems.wire_red_copper, 6), new ComparableStack(ModItems.wire_magnetized_tungsten, 2), new ComparableStack(ModItems.fuse, 4), },250); diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 84817edfd..38bac90af 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -126,6 +126,9 @@ public class AnvilRecipes { constructionRecipes.add(new AnvilConstructionRecipe( new OreDictStack("plateCopper", 4), new AnvilOutput(new ItemStack(ModItems.board_copper))).setTier(1)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModItems.plate_steel, 2), + new AnvilOutput(new ItemStack(ModItems.hull_small_steel))).setTier(1)); constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModItems.coil_copper, 2), new AnvilOutput(new ItemStack(ModItems.coil_copper_torus))).setTier(1).setOverlay(OverlayType.CONSTRUCTION)); @@ -160,33 +163,42 @@ public class AnvilRecipes { new OreDictStack("ingotCopper", 8 * ukModifier), new ComparableStack(ModItems.motor, 2 * ukModifier), new ComparableStack(ModItems.circuit_aluminium, 1 * ukModifier) - }, - new AnvilOutput(new ItemStack(ModBlocks.machine_assembler))).setTier(2)); + }, new AnvilOutput(new ItemStack(ModBlocks.machine_assembler))).setTier(2)); constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModBlocks.brick_concrete, 64), new ComparableStack(Blocks.iron_bars, 128), new ComparableStack(ModBlocks.machine_condenser, 5), - }, - new AnvilOutput(new ItemStack(ModBlocks.machine_tower_small))).setTier(3)); + }, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_small))).setTier(3)); constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModBlocks.concrete_smooth, 128), new ComparableStack(ModBlocks.steel_scaffold, 32), new ComparableStack(ModBlocks.machine_condenser, 25), new ComparableStack(ModItems.pipes_steel, 2) - }, - new AnvilOutput(new ItemStack(ModBlocks.machine_tower_large))).setTier(4)); + }, new AnvilOutput(new ItemStack(ModBlocks.machine_tower_large))).setTier(4)); constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(Items.bone, 16), new ComparableStack(Items.leather, 4), new ComparableStack(Items.feather, 24) - }, - new AnvilOutput(new ItemStack(ModItems.wings_limp))).setTier(2)); + }, new AnvilOutput(new ItemStack(ModItems.wings_limp))).setTier(2)); + constructionRecipes.add(new AnvilConstructionRecipe( + new AStack[] { + new ComparableStack(ModItems.tank_steel, 1), + new ComparableStack(ModItems.plate_lead, 2), + new ComparableStack(ModItems.nuclear_waste, 10) + }, new AnvilOutput(new ItemStack(ModBlocks.yellow_barrel))).setTier(3)); + constructionRecipes.add(new AnvilConstructionRecipe( + new AStack[] { + new ComparableStack(ModItems.tank_steel, 1), + new ComparableStack(ModItems.plate_lead, 2), + new ComparableStack(ModItems.nuclear_waste_vitrified, 10) + }, new AnvilOutput(new ItemStack(ModBlocks.vitrified_barrel))).setTier(3)); + constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] {new OreDictStack("ingotDesh", 4), new OreDictStack("dustPolymer", 2), new ComparableStack(ModItems.ingot_dura_steel, 1)}, new AnvilOutput(new ItemStack(ModItems.plate_desh, 4))).setTier(3)); @@ -474,21 +486,6 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(Items.stick, 2)) }).setTier(2)); - if(GeneralConfig.enable528) { - constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 2)), - new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) - }).setTier(2)); - } else { - constructionRecipes.add(new AnvilConstructionRecipe( - new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 3)), - new AnvilOutput(new ItemStack(ModItems.plate_iron, 2)) - }).setTier(2)); - } - constructionRecipes.add(new AnvilConstructionRecipe( new ComparableStack(ModBlocks.machine_industrial_generator), new AnvilOutput[] { new AnvilOutput(new ItemStack(ModBlocks.machine_coal_off, 2)), @@ -501,6 +498,131 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(ModItems.plate_aluminium, 12)), new AnvilOutput(new ItemStack(ModItems.pipes_steel, 1)) }).setTier(2)); + + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_moderator), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModBlocks.block_graphite, 4)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_absorber), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModItems.ingot_boron, 8)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_reflector), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModItems.neutron_reflector, 8)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_control), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_absorber, 1)), + new AnvilOutput(new ItemStack(ModBlocks.block_graphite, 2)), + new AnvilOutput(new ItemStack(ModItems.motor, 2)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_control_mod), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_control, 1)), + new AnvilOutput(new ItemStack(ModBlocks.block_graphite, 4)), + new AnvilOutput(new ItemStack(ModItems.nugget_bismuth, 4)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_control_auto), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_control, 1)), + new AnvilOutput(new ItemStack(ModItems.circuit_targeting_tier1, 2)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_rod_reasim), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModItems.ingot_zirconium, 4)), + new AnvilOutput(new ItemStack(ModItems.hull_small_steel, 2)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_rod_reasim_mod), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_rod_reasim, 1)), + new AnvilOutput(new ItemStack(ModBlocks.block_graphite, 4)), + new AnvilOutput(new ItemStack(ModItems.ingot_tcalloy, 4)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_outgasser), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModBlocks.steel_grate, 6)), + new AnvilOutput(new ItemStack(ModItems.tank_steel, 1)), + new AnvilOutput(new ItemStack(Blocks.hopper, 1)) + }).setTier(4)); + + if(!GeneralConfig.enable528) { + + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_rod), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModItems.hull_small_steel, 2)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_rod_mod), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_rod, 1)), + new AnvilOutput(new ItemStack(ModBlocks.block_graphite, 4)), + new AnvilOutput(new ItemStack(ModItems.nugget_bismuth, 4)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.rbmk_boiler), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)), + new AnvilOutput(new ItemStack(ModItems.board_copper, 6)), + new AnvilOutput(new ItemStack(ModItems.pipes_steel, 2)) + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_reactor_small), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.ingot_steel, 6)), + new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1)), + new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1), 0.75F), + new AnvilOutput(new ItemStack(ModItems.scrap, 1)), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 4)), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 2), 0.75F), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 2), 0.5F), + new AnvilOutput(new ItemStack(ModItems.plate_copper, 3)), + new AnvilOutput(new ItemStack(ModItems.plate_copper, 1), 0.5F), + new AnvilOutput(new ItemStack(ModItems.ingot_lead, 8)), + new AnvilOutput(new ItemStack(ModItems.ingot_lead, 4), 0.75F), + new AnvilOutput(new ItemStack(ModItems.ingot_lead, 4), 0.5F), + new AnvilOutput(new ItemStack(ModItems.ingot_red_copper, 6)), + new AnvilOutput(new ItemStack(ModItems.circuit_copper, 8)), + new AnvilOutput(new ItemStack(ModItems.circuit_red_copper, 4)), + }).setTier(4)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 3)), + new AnvilOutput(new ItemStack(ModItems.plate_iron, 2)) + }).setTier(2)); + + } else { + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 2)), + new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)), + new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) + }).setTier(2)); + } + + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.machine_turbine), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.turbine_titanium, 2)), + new AnvilOutput(new ItemStack(ModItems.motor, 1)), + new AnvilOutput(new ItemStack(ModItems.tank_steel, 2)), + new AnvilOutput(new ItemStack(ModItems.plate_titanium, 4)) + }).setTier(3)); + + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.yellow_barrel), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.tank_steel, 1)), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 2)), + new AnvilOutput(new ItemStack(ModItems.nuclear_waste, 10)) + }).setTier(3)); + constructionRecipes.add(new AnvilConstructionRecipe( + new ComparableStack(ModBlocks.vitrified_barrel), new AnvilOutput[] { + new AnvilOutput(new ItemStack(ModItems.tank_steel, 1)), + new AnvilOutput(new ItemStack(ModItems.plate_lead, 2)), + new AnvilOutput(new ItemStack(ModItems.nuclear_waste_vitrified, 10)) + }).setTier(3)); } public static void pullFromAssembler(ComparableStack result, int tier) { diff --git a/src/main/java/com/hbm/items/armor/ArmorGasMask.java b/src/main/java/com/hbm/items/armor/ArmorGasMask.java index 81a9a50ba..ea7021df9 100644 --- a/src/main/java/com/hbm/items/armor/ArmorGasMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorGasMask.java @@ -23,7 +23,6 @@ import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -112,12 +111,12 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { if(this == ModItems.goggles || this == ModItems.gas_mask_m65) { int index = (int) ((double) stack.getItemDamage() / (double) stack.getMaxDamage() * 6D); - tex = this.googleBlur[index]; + tex = this.googleBlur[Math.min(index, 5)]; } if(this == ModItems.gas_mask) { int index = (int) ((double) stack.getItemDamage() / (double) stack.getMaxDamage() * 6D); - tex = this.maskBlur[index]; + tex = this.maskBlur[Math.min(index, 5)]; } if(tex == null) diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 8c8b0af3d..598cf286a 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -560,7 +560,7 @@ public class HbmWorldGen implements IWorldGenerator { } DungeonToolbox.generateOre(world, rand, i, j, 16, 8, 10, 50, ModBlocks.stone_porous); - OilSpot.generateOilSpot(world, randPosX, randPosZ, 10, 50); + OilSpot.generateOilSpot(world, randPosX, randPosZ, 5, 50); } if (GeneralConfig.enableNITAN) { diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 772e6394f..dd1a62d51 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 (4011)"; + public static final String VERSION = "1.0.27 BETA (4018)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 91328ecd6..5c2f7ba53 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -258,6 +258,21 @@ public class ClientProxy extends ServerProxy { for(Entry entry : ItemRenderLibrary.renderers.entrySet()) MinecraftForgeClient.registerItemRenderer(entry.getKey(), entry.getValue()); + //universal JSON translated items + MinecraftForgeClient.registerItemRenderer(ModItems.cmb_sword, new ItemRenderTransformer( + new double[] {0, -90, 55}, + new double[] {0, 7.0, 0}, + new double[] {1.7, 1.7, 0.85}, + + new double[] {-20, -90, -80}, + new double[] {1.13, 5.2, -0.26}, + new double[] {1.36, 1.36, 0.68}, + + new double[] {0, 0, 0}, + new double[] {0, 0, 0}, + new double[] {1.1, 1.1, 1.1})); + + //test crap MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_container), new ItemRenderTestContainer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_bomb_advanced), new ItemRenderTestBombAdvanced()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 5b9410372..ad96f8919 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -97,9 +97,6 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.particle_amat, 1), new Object[] { ModItems.particle_aproton, ModItems.particle_aelectron, ModItems.particle_empty }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canister_empty, 2), new Object[] { "S ", "AA", "AA", 'S', "plateSteel", 'A', "plateAluminum" })); - GameRegistry.addRecipe(new ItemStack(ModBlocks.yellow_barrel, 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.nuclear_waste, 'T', ModItems.tank_steel }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.vitrified_barrel, 1), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.nuclear_waste_vitrified, 'T', ModItems.tank_steel }); - GameRegistry.addRecipe(new ItemStack(ModItems.nuclear_waste, 8), new Object[] { "B", 'B', ModBlocks.yellow_barrel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_empty, 2), new Object[] { "S ", "AA", "AA", 'A', "plateSteel", 'S', "plateCopper" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.block_waste_painted, 1), new Object[] { "dyeYellow", ModBlocks.block_waste })); @@ -715,13 +712,13 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.spawn_ufo, 1), new Object[] { "MMM", "DCD", "MMM", 'M', ModItems.ingot_meteorite, 'D', ModItems.ingot_dineutronium, 'C', ModItems.coin_worm }); GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_alloy, 1), new Object[] { "WWW", "WCW", "WWW", 'W', ModItems.wire_advanced_alloy, 'C', ModBlocks.fusion_conductor }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_gold, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.coil_gold, 'C', ModBlocks.hadron_coil_alloy }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_neodymium, 1), new Object[] { " G ", "GCG", " G ", 'G', ModItems.powder_neodymium, 'C', ModBlocks.hadron_coil_gold }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hadron_coil_gold, 1), new Object[] { "PGP", "PCP", "PGP", 'G', "dustGold", 'C', ModBlocks.hadron_coil_alloy, 'P', "plateIron" })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_neodymium, 1), new Object[] { "G", "C", "G", 'G', ModItems.powder_neodymium, 'C', ModBlocks.hadron_coil_gold }); GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_magtung, 1), new Object[] { "WWW", "WCW", "WWW", 'W', ModItems.wire_magnetized_tungsten, 'C', ModBlocks.fwatz_conductor }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidium, 1), new Object[] { "WSW", "SCS", "WSW", 'W', ModItems.wire_schrabidium, 'S', ModItems.powder_schrabidium, 'C', ModBlocks.hadron_coil_magtung }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidate, 1), new Object[] { "WSW", "SCS", "WSW", 'W', ModItems.wire_schrabidium, 'S', ModItems.powder_schrabidate, 'C', ModBlocks.hadron_coil_schrabidium }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_starmetal, 1), new Object[] { "NSN", "SCS", "NSN", 'S', ModItems.ring_starmetal, 'N', ModBlocks.hadron_coil_neodymium, 'C', ModBlocks.hadron_coil_schrabidate }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hadron_coil_chlorophyte, 1), new Object[] { "TCT", "CSC", "TCT", 'T', "dustTungsten", 'C', ModItems.powder_chlorophyte, 'S', ModBlocks.hadron_coil_starmetal })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidium, 1), new Object[] { "WWW", "WCW", "WWW", 'W', ModItems.wire_schrabidium, 'C', ModBlocks.hadron_coil_magtung }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_schrabidate, 1), new Object[] { " S ", "SCS", " S ", 'S', ModItems.powder_schrabidate, 'C', ModBlocks.hadron_coil_schrabidium }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hadron_coil_starmetal, 1), new Object[] { "SNS", "SCS", "SNS", 'S', "ingotStarmetal", 'N', ModBlocks.hadron_coil_neodymium, 'C', ModBlocks.hadron_coil_schrabidate })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.hadron_coil_chlorophyte, 1), new Object[] { "TCT", "TST", "TCT", 'T', ModItems.coil_tungsten, 'C', ModItems.powder_chlorophyte, 'S', ModBlocks.hadron_coil_starmetal }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hadron_diode, 1), new Object[] { "CIC", "ISI", "CIC", 'C', ModBlocks.hadron_coil_alloy, 'I', "ingotSteel", 'S', ModItems.circuit_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hadron_plating, 1), new Object[] { "IPI", "P P", "IPI", 'I', "ingotSteel", 'P', "plateSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.hadron_plating_blue, 1), new Object[] { ModBlocks.hadron_plating, "dyeBlue" })); diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index e4abc1a55..933b0bca4 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -1094,6 +1094,18 @@ public class ItemRenderLibrary { bindTexture(ResourceManager.tower_large_tex); ResourceManager.tower_large.renderAll(); GL11.glShadeModel(GL11.GL_FLAT); }}); + + renderers.put(Item.getItemFromBlock(ModBlocks.machine_fracking_tower), new ItemRenderBase() { + public void renderInventory() { + GL11.glTranslated(0, -4.5, 0); + GL11.glScaled(2.5, 2.5, 2.5); + } + public void renderCommon() { + GL11.glScaled(0.25, 0.25, 0.25); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.fracking_tower_tex); ResourceManager.fracking_tower.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + }}); } private static void bindTexture(ResourceLocation res) { diff --git a/src/main/java/com/hbm/render/item/ItemRenderTransformer.java b/src/main/java/com/hbm/render/item/ItemRenderTransformer.java new file mode 100644 index 000000000..189fe6935 --- /dev/null +++ b/src/main/java/com/hbm/render/item/ItemRenderTransformer.java @@ -0,0 +1,103 @@ +package com.hbm.render.item; + +import org.lwjgl.opengl.GL11; + +import com.hbm.render.util.RenderItemStack; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.client.IItemRenderer; + +public class ItemRenderTransformer implements IItemRenderer { + + double[] rtp; + double[] ttp; + double[] stp; + double[] rfp; + double[] tfp; + double[] sfp; + double[] rir; + double[] tir; + double[] sir; + + public ItemRenderTransformer(double[] rtp, double[] ttp, double[] stp, double[] rfp, double[] tfp, double[] sfp, double[] rir, double[] tir, double[] sir) { + this.rtp = rtp; + this.ttp = ttp; + this.stp = stp; + this.rfp = rfp; + this.tfp = tfp; + this.sfp = sfp; + this.rir = rir; + this.tir = tir; + this.sir = sir; + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type != ItemRenderType.ENTITY; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + switch(type) { + + case EQUIPPED_FIRST_PERSON: + GL11.glRotated(180, 0, 1, 0); + GL11.glRotated(-90, 0, 0, 1); + //GL11.glRotated(rfp[1], 0, 1, 0); + //GL11.glRotated(rfp[0], 1, 0, 0); + //GL11.glRotated(rfp[2], 0, 0, 1); + //GL11.glTranslated(tfp[0] * 0.0625, tfp[1] * 0.0625, tfp[2] * 0.0625); + GL11.glTranslated(0.5, 0.5, 0); + GL11.glScaled(sfp[0] * 2, sfp[1] * 2, sfp[2] * 2); + GL11.glTranslated(-0.5, -0.5, 0); + GL11.glTranslated(-0.5, -0.25, 0); + break; + case EQUIPPED: + GL11.glRotated(180, 0, 1, 0); + GL11.glRotated(-90, 0, 0, 1); + GL11.glTranslated(-1.5, -1.125, 0); + GL11.glScaled(stp[0], stp[1], stp[2]); + break; + case INVENTORY: + GL11.glRotated(rir[0], 1, 0, 0); + GL11.glRotated(rir[1], 0, 1, 0); + GL11.glRotated(rir[2], 0, 0, 1); + GL11.glTranslated(tir[0] * 0.0625, tir[1] * 0.0625, tir[2] * 0.0625); + GL11.glTranslated(8, 8, 0); + GL11.glScaled(sir[0], sir[1], sir[2]); + GL11.glTranslated(-8, -8, 0); + break; + + default: break; + } + + if(data.length > 1 && data[1] instanceof EntityLivingBase) { + EntityLivingBase entity = (EntityLivingBase) data[1]; + IIcon iicon = entity.getItemIcon(item, 0); + + if(iicon == null) { + return; + } + + Minecraft.getMinecraft().getTextureManager().bindTexture(Minecraft.getMinecraft().getTextureManager().getResourceLocation(item.getItemSpriteNumber())); + TextureUtil.func_152777_a(false, false, 1.0F); + Tessellator tessellator = Tessellator.instance; + ItemRenderer.renderItemIn2D(tessellator, iicon.getMaxU(), iicon.getMinV(), iicon.getMinU(), iicon.getMaxV(), iicon.getIconWidth(), iicon.getIconHeight(), 0.0625F); + } else { + RenderItemStack.renderItemStackNoEffect(0, 0, 0, item); + } + } + +} diff --git a/src/main/java/com/hbm/render/tileentity/RenderFrackingTower.java b/src/main/java/com/hbm/render/tileentity/RenderFrackingTower.java index ec595c04a..1ecfd4a40 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFrackingTower.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFrackingTower.java @@ -15,14 +15,15 @@ public class RenderFrackingTower extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); GL11.glShadeModel(GL11.GL_SMOOTH); bindTexture(ResourceManager.fracking_tower_tex); ResourceManager.fracking_tower.renderAll(); GL11.glShadeModel(GL11.GL_FLAT); - + + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopMatrix(); } } diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 3e3f5491c..a9983ee86 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -226,6 +226,8 @@ public class TileMappings { } private static void putMachines() { + map.put(TileEntityUVLamp.class, "tileentity_uv_lamp"); + map.put(TileEntityCondenser.class, "tileentity_condenser"); map.put(TileEntityTowerSmall.class, "tileentity_cooling_tower_small"); map.put(TileEntityTowerLarge.class, "tileentity_cooling_tower_large"); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 69afb0c71..a72f4bab7 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3263,6 +3263,8 @@ tile.residue.name=Wolkenrückstände tile.safe.name=Panzerschrank tile.sand_boron.name=Borsand tile.sand_boron_layer.name=Borsanddecke +tile.sand_dirty.name=Öliger Sand +tile.sand_dirty_red.name=Roter Öliger Sand tile.sand_gold.name=Goldsand tile.sand_gold198.name=Gold-198-Sand tile.sand_lead.name=Bleisand @@ -3301,6 +3303,7 @@ tile.steel_wall.name=Stahlwand tile.stone_depth.name=Tiefenfels tile.stone_depth_nether.name=Nether-Tiefenfels tile.stone_gneiss.name=Graphitschiefer +tile.stone_porous.name=Poröser Stein tile.struct_iter_core.name=Fusionsreaktor-Kernkomponente tile.struct_launcher.name=Startrampe-Komponentenblock tile.struct_launcher_core.name=Kompaktrampe-Kernkomponente diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 161bec7b7..a5dff4f74 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3330,6 +3330,8 @@ tile.residue.name=Cloud Residue tile.safe.name=Safe tile.sand_boron.name=Boron Sand tile.sand_boron_layer.name=Boron Sand Layer +tile.sand_dirty.name=Oily Sand +tile.sand_dirty_red.name=Red Oily Sand tile.sand_gold.name=Gold Sand tile.sand_gold198.name=Gold-198 Sand tile.sand_lead.name=Lead Sand @@ -3368,6 +3370,7 @@ tile.steel_wall.name=Steel Wall tile.stone_depth.name=Depth Rock tile.stone_depth_nether.name=Nether Depth Rock tile.stone_gneiss.name=Graphitic Schist +tile.stone_porous.name=Porous Stone tile.struct_iter_core.name=Fusion Reactor Core Component tile.struct_launcher.name=Launch Pad Component Block tile.struct_launcher_core.name=Compact Launcher Core Component diff --git a/src/main/resources/assets/hbm/textures/blocks/deco_steel_orig.png b/src/main/resources/assets/hbm/textures/blocks/deco_steel_orig.png new file mode 100644 index 0000000000000000000000000000000000000000..53abec415990b683d0fd27a35d0e56458c9eebfa GIT binary patch literal 424 zcmV;Z0ayNsP)N2bZe?^J zG%hhNHvLWs=l}o#CP_p=R5(vvlG|>BKnz6rDO5;+N0e|00>mvv0u=uL8+w*OF6}(P zcs*l#4c_O#vMhbykK+h=zu%DW1KYOk`#wz*oK)Mk-ny=3S>}2Ecs!oZr+AiSkfJCo z6bH^gkftf8S5#GXvMjS&VHi4t%6DCN=KrbzQVhs$x0^T5GqDn;tLvJ!gut>Gf*|m? zjixlnh6g}oz|R!E@4GEo4Is6VYX=N*9G_bv)*g7m&8Cz>28p7`jdVQ~w>w;`fcyP^ zZb>mYL~`m5;s$qV3=F3lRvtk9seiY`j&)=m@XG_t#-Y2zFbpy@O{0WhI>0YPt+N9^ zmcG380arCZs)o+M|ESRc9$O1Q2b3lCdcB;1^1MKjBz#Do3IXBQ0j1ng5c~jG!{Vi6 STqz^~0000G0q~2SQn8JdHfAMm5Kj?D4ZXse=MgsvtL93U z@+hq_*vKG-BqS)PU=unV#3`FJv(COm!?%nwc^LgIRKdwnM2WmHQY+L|rL2*z(x;;; z=Kg=4wl*{Ebq^K)vR=zo)KSKLY|Uz_r=(muXIO-=x=CTJ#u*>;RWH zEloK9u6BWuXG`XCLkiIHYZ~xz0Sx4Up?e^-?#-&XkMk!Ww@puU2OJ&&6I37B_yfXy zXYQ!7>azd<010qNS#tmYE+YT{E+YYWr9XB600L@BL_t(o!|j$!YZFlzhToY?C)V7^ zwUef_L4uhOjZiQ)p(s`%3ewA>g1U5}zrwxXZ%|MaEZSWH$x1?!LQ7hcjRjGPn^J-? zn?f3!Ies&XK(VR0O*ZC*!{p2idA|D`V5E_Bmd$pPnM`rk?m4d)nB#bYFR<0sr*OIC zw(ki#;bFHY2>uvGqY=%fGCTuR&t0xXw!Hk1eskKrqoZFKN(u~y^BR0*%#QYpx? zjC}qzh5yT$48H%IkCEqhSUkQ!hVWY0!{IQp*_Z!>_ica*x7lv6xw%`gTCK=rGKfSX z1b>C&pAUsX0f9gO8yj!BhIgF;L9o(fyTlw08L?Olxm->& zVr%Q&nXNVu19;vDizUwN_5gyxAj;)3BuPT4^nr%X_nvF1;}j^0mrYJy);w0>UauEB zJ8RSh7pWTzy$`T%Uar+@+ETT>{ay>ZC|+f%0gN^EjDY{d_k4dpOVxixs|kZar06uD zV+vIG9(Ol-sDag`?m12%_&I|A?r)5D26wX=X&mx&rFF__HtTeqX9ou#2l72>8+H}` z{7I0>)23D$CMNE|Y@TO>Il6S<`KQl6vHRnYQ}3HhUK%(J)a%9Jd#=yn?Gyvlf;;KC we)_8joz5`Eq-R5cpDOhXFG=?qM*3g$2QpXKj!xuvO#lD@07*qoM6N<$f}ub3*Z=?k literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!RMYXjv*HQ$teol8h_f2PB3!)|NMD-gCTSC zgL<_U8WS0oRB|0|Q-%PZg_0}*OoA!G zhZGLY+Q`rm?`XpBuP~vk@zM@vo@|p_x0f^I{_*KLdxAkE!}WoHy5TAb37fMn|I>e* zY&1Qz$6<@2!r8emU;Q_IvSXo?gOuZp1&Rv-!WnM&T?5_gJu8# diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 2638eba40..b20db59d8 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,12 +3,12 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4011", + "version":"1.0.27_X4018", "mcversion": "1.7.10", "url": "", "updateUrl": "", "authorList": ["HbMinecraft"], - "credits": "rodolphito (explosion algorithms), grangerave (explosion algorithms), Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting), UFFR (fork with all sorts of features), Bismarck (chinese localization), FirzzleFrazzle (models), Minecreep (models), VT-6/24 (models, textures), PheodoreKaczynski (textures), Vær (fibrosis code), Pashtet (russian localization), Sten89 (models), impbk2002 (project settings), OvermindDL1 (project settings)", + "credits": "rodolphito (explosion algorithms), grangerave (explosion algorithms), Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting), UFFR (fork with all sorts of features), Bismarck (chinese localization), FirzzleFrazzle (models), Minecreep (models), VT-6/24 (models, textures), PheodoreKaczynski (textures), Vær (fibrosis code), Pashtet (russian localization), Sten89 (models), Pixelguru26 (textures), impbk2002 (project settings), OvermindDL1 (project settings)", "logoFile": "", "screenshots": [], "dependencies": []