From 8ee8d351265b7c35995e5de36374390e511b52e0 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 7 Jul 2021 00:10:50 +0200 Subject: [PATCH] coltan, it's coltan --- src/main/java/com/hbm/blocks/ModBlocks.java | 9 +++++++++ .../java/com/hbm/blocks/generic/BlockOre.java | 3 +++ .../java/com/hbm/crafting/MineralRecipes.java | 3 +++ src/main/java/com/hbm/items/ModItems.java | 15 +++++++++++++++ src/main/java/com/hbm/main/CraftingManager.java | 1 + src/main/resources/assets/hbm/lang/de_DE.lang | 8 ++++++++ src/main/resources/assets/hbm/lang/en_US.lang | 8 ++++++++ .../assets/hbm/textures/blocks/block_coltan.png | Bin 0 -> 563 bytes .../hbm/textures/blocks/block_tantalium.png | Bin 0 -> 624 bytes .../assets/hbm/textures/blocks/ore3_base.png | Bin 0 -> 418 bytes .../assets/hbm/textures/blocks/ore_coltan.png | Bin 0 -> 513 bytes .../hbm/textures/items/circuit_tantalium.png | Bin 0 -> 290 bytes .../hbm/textures/items/circuit_tantalium_raw.png | Bin 0 -> 301 bytes .../hbm/textures/items/fragment_coltan.png | Bin 0 -> 497 bytes .../hbm/textures/items/ingot_tantalium.png | Bin 0 -> 304 bytes .../hbm/textures/items/nugget_tantalium.png | Bin 0 -> 205 bytes 16 files changed, 47 insertions(+) create mode 100644 src/main/resources/assets/hbm/textures/blocks/block_coltan.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/block_tantalium.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/ore3_base.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/ore_coltan.png create mode 100644 src/main/resources/assets/hbm/textures/items/circuit_tantalium.png create mode 100644 src/main/resources/assets/hbm/textures/items/circuit_tantalium_raw.png create mode 100644 src/main/resources/assets/hbm/textures/items/fragment_coltan.png create mode 100644 src/main/resources/assets/hbm/textures/items/ingot_tantalium.png create mode 100644 src/main/resources/assets/hbm/textures/items/nugget_tantalium.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 962a47a0c..1b3f8c318 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -69,6 +69,7 @@ public class ModBlocks { public static Block ore_verticium; public static Block ore_rare; public static Block ore_cinnebar; + public static Block ore_coltan; public static Block ore_nether_coal; public static Block ore_nether_smoldering; @@ -156,6 +157,8 @@ public class ModBlocks { public static Block block_steel; public static Block block_lead; public static Block block_bismuth; + public static Block block_coltan; + public static Block block_tantalium; public static Block block_trinitite; public static Block block_waste; public static Block block_waste_painted; @@ -1161,6 +1164,7 @@ public class ModBlocks { ore_verticium = new BlockGeneric(Material.rock).setBlockName("ore_verticium").setCreativeTab(null).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_verticium"); ore_rare = new BlockOre(Material.rock).setBlockName("ore_rare").setCreativeTab(null).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_rare"); ore_cinnebar = new BlockOre(Material.rock).setBlockName("ore_cinnebar").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_cinnebar"); + ore_coltan = new BlockOre(Material.rock).setBlockName("ore_coltan").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_coltan"); ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil"); ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty"); @@ -1200,6 +1204,8 @@ public class ModBlocks { block_steel = new BlockGeneric(Material.iron).setBlockName("block_steel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); block_lead = new BlockGeneric(Material.iron).setBlockName("block_lead").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(30.0F).setBlockTextureName(RefStrings.MODID + ":block_lead"); block_bismuth = new BlockGeneric(Material.iron).setBlockName("block_bismuth").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(30.0F).setBlockTextureName(RefStrings.MODID + ":block_bismuth"); + block_coltan = new BlockGeneric(Material.iron).setBlockName("block_coltan").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(30.0F).setBlockTextureName(RefStrings.MODID + ":block_coltan"); + block_tantalium = new BlockGeneric(Material.iron).setBlockName("block_tantalium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(30.0F).setBlockTextureName(RefStrings.MODID + ":block_tantalium"); block_trinitite = new BlockHazard().addRadiation(ItemHazard.trn * ItemHazard.block).toBlock().setBlockName("block_trinitite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_trinitite"); block_waste = new BlockNuclearWaste().setDisplayEffect(ExtDisplayEffect.RADFOG).addRadiation(ItemHazard.wst * ItemHazard.block).toBlock().setBlockName("block_waste").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste"); block_waste_painted = new BlockNuclearWaste().setDisplayEffect(ExtDisplayEffect.RADFOG).addRadiation(ItemHazard.wst * ItemHazard.block).toBlock().setBlockName("block_waste_painted").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste_painted"); @@ -1985,6 +1991,7 @@ public class ModBlocks { GameRegistry.registerBlock(ore_verticium, ItemOreBlock.class, ore_verticium.getUnlocalizedName()); GameRegistry.registerBlock(ore_rare, ItemOreBlock.class, ore_rare.getUnlocalizedName()); GameRegistry.registerBlock(ore_cinnebar, ore_cinnebar.getUnlocalizedName()); + GameRegistry.registerBlock(ore_coltan, ore_coltan.getUnlocalizedName()); //Stone clusters GameRegistry.registerBlock(cluster_iron, ItemBlockCluster.class, cluster_iron.getUnlocalizedName()); @@ -2081,6 +2088,8 @@ public class ModBlocks { GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName()); GameRegistry.registerBlock(block_lead, block_lead.getUnlocalizedName()); GameRegistry.registerBlock(block_bismuth, block_bismuth.getUnlocalizedName()); + GameRegistry.registerBlock(block_coltan, block_coltan.getUnlocalizedName()); + GameRegistry.registerBlock(block_tantalium, block_tantalium.getUnlocalizedName()); GameRegistry.registerBlock(block_lithium, ItemBlockHazard.class, block_lithium.getUnlocalizedName()); GameRegistry.registerBlock(block_zirconium, block_zirconium.getUnlocalizedName()); GameRegistry.registerBlock(block_white_phosphorus, ItemBlockHazard.class, block_white_phosphorus.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index b0843b2f7..4fe38e9f4 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -213,6 +213,9 @@ public class BlockOre extends Block { if(this == ModBlocks.ore_depth_zirconium) { return ModItems.nugget_zirconium; } + if(this == ModBlocks.ore_coltan) { + return ModItems.fragment_coltan; + } return Item.getItemFromBlock(this); } diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 3690c17f9..4f58d1910 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -66,6 +66,9 @@ public class MineralRecipes { RecipesCommon.add1To9Pair(ModItems.ingot_bismuth, ModItems.nugget_bismuth); RecipesCommon.add1To9Pair(ModBlocks.block_bismuth, ModItems.ingot_bismuth); + RecipesCommon.add1To9Pair(ModBlocks.block_coltan, ModItems.fragment_coltan); + RecipesCommon.add1To9Pair(ModItems.ingot_tantalium, ModItems.nugget_tantalium); + RecipesCommon.add1To9Pair(ModBlocks.block_tantalium, ModItems.ingot_tantalium); RecipesCommon.add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241); RecipesCommon.add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index c3cf2c37d..9843340f2 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -229,6 +229,8 @@ public class ModItems { public static Item nugget_lead; public static Item ingot_bismuth; public static Item nugget_bismuth; + public static Item ingot_tantalium; + public static Item nugget_tantalium; public static Item plate_lead; public static Item nugget_schrabidium; public static Item plate_schrabidium; @@ -417,6 +419,7 @@ public class ModItems { public static Item fragment_actinium; public static Item fragment_boron; public static Item fragment_meteorite; + public static Item fragment_coltan; public static Item biomass; public static Item biomass_compressed; @@ -461,6 +464,8 @@ public class ModItems { public static Item circuit_schrabidium; public static Item circuit_bismuth_raw; public static Item circuit_bismuth; + public static Item circuit_tantalium_raw; + public static Item circuit_tantalium; public static Item mechanism_revolver_1; public static Item mechanism_revolver_2; @@ -2602,6 +2607,8 @@ public class ModItems { nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_lead"); ingot_bismuth = new ItemCustomLore().setUnlocalizedName("ingot_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth"); nugget_bismuth = new Item().setUnlocalizedName("nugget_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_bismuth"); + ingot_tantalium = new Item().setUnlocalizedName("ingot_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tantalium"); + nugget_tantalium = new Item().setUnlocalizedName("nugget_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_tantalium"); nugget_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium"); nugget_beryllium = new Item().setUnlocalizedName("nugget_beryllium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_beryllium"); hazmat_cloth = new Item().setUnlocalizedName("hazmat_cloth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hazmat_cloth"); @@ -2736,6 +2743,7 @@ public class ModItems { fragment_actinium = new Item().setUnlocalizedName("fragment_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_actinium"); fragment_boron = new Item().setUnlocalizedName("fragment_boron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_boron"); fragment_meteorite = new Item().setUnlocalizedName("fragment_meteorite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_meteorite"); + fragment_coltan = new Item().setUnlocalizedName("fragment_coltan").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_coltan"); biomass = new Item().setUnlocalizedName("biomass").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":biomass"); biomass_compressed = new Item().setUnlocalizedName("biomass_compressed").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":biomass_compressed"); @@ -2857,6 +2865,8 @@ public class ModItems { circuit_schrabidium = new ItemCustomLore().setUnlocalizedName("circuit_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_schrabidium"); circuit_bismuth_raw = new Item().setUnlocalizedName("circuit_bismuth_raw").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_bismuth_raw"); circuit_bismuth = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_bismuth"); + circuit_tantalium_raw = new Item().setUnlocalizedName("circuit_tantalium_raw").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_tantalium_raw"); + circuit_tantalium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("circuit_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_tantalium"); circuit_targeting_tier1 = new Item().setUnlocalizedName("circuit_targeting_tier1").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier1"); circuit_targeting_tier2 = new Item().setUnlocalizedName("circuit_targeting_tier2").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier2"); circuit_targeting_tier3 = new Item().setUnlocalizedName("circuit_targeting_tier3").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":circuit_targeting_tier3"); @@ -5217,6 +5227,7 @@ public class ModItems { GameRegistry.registerItem(ingot_tcalloy, ingot_tcalloy.getUnlocalizedName()); GameRegistry.registerItem(ingot_lead, ingot_lead.getUnlocalizedName()); GameRegistry.registerItem(ingot_bismuth, ingot_bismuth.getUnlocalizedName()); + GameRegistry.registerItem(ingot_tantalium, ingot_tantalium.getUnlocalizedName()); GameRegistry.registerItem(ingot_beryllium, ingot_beryllium.getUnlocalizedName()); GameRegistry.registerItem(ingot_cobalt, ingot_cobalt.getUnlocalizedName()); GameRegistry.registerItem(ingot_boron, ingot_boron.getUnlocalizedName()); @@ -5455,6 +5466,7 @@ public class ModItems { GameRegistry.registerItem(fragment_actinium, fragment_actinium.getUnlocalizedName()); GameRegistry.registerItem(fragment_boron, fragment_boron.getUnlocalizedName()); GameRegistry.registerItem(fragment_meteorite, fragment_meteorite.getUnlocalizedName()); + GameRegistry.registerItem(fragment_coltan, fragment_coltan.getUnlocalizedName()); //Things that look like rotten flesh but aren't GameRegistry.registerItem(biomass, biomass.getUnlocalizedName()); @@ -5483,6 +5495,7 @@ public class ModItems { GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName()); GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName()); GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName()); + GameRegistry.registerItem(nugget_tantalium, nugget_tantalium.getUnlocalizedName()); GameRegistry.registerItem(nugget_beryllium, nugget_beryllium.getUnlocalizedName()); GameRegistry.registerItem(nugget_schrabidium, nugget_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(nugget_solinium, nugget_solinium.getUnlocalizedName()); @@ -5684,6 +5697,8 @@ public class ModItems { GameRegistry.registerItem(circuit_schrabidium, circuit_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(circuit_bismuth_raw, circuit_bismuth_raw.getUnlocalizedName()); GameRegistry.registerItem(circuit_bismuth, circuit_bismuth.getUnlocalizedName()); + GameRegistry.registerItem(circuit_tantalium_raw, circuit_tantalium_raw.getUnlocalizedName()); + GameRegistry.registerItem(circuit_tantalium, circuit_tantalium.getUnlocalizedName()); //Military Circuits GameRegistry.registerItem(circuit_targeting_tier1, circuit_targeting_tier1.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index a71a542d9..669e9cdcb 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -69,6 +69,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_raw, 1), new Object[] { "A", "R", "S", 'S', "plateSteel", 'R', "dustRedstone", 'A', ModItems.wire_aluminium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_bismuth_raw, 1), new Object[] { "RPR", "ABA", "RPR", 'R', "dustRedstone", 'P', "ingotPolymer", 'A', "ingotAsbestos", 'B', ModItems.ingot_bismuth })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_tantalium_raw, 1), new Object[] { "RWR", "PTP", "RWR", 'R', "dustRedstone", 'W', ModItems.wire_gold, 'P', "plateCopper", 'T', ModItems.nugget_tantalium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier1, 1), new Object[] { "CPC", 'C', ModItems.circuit_aluminium, 'P', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier2, 1), new Object[] { "CPC", 'C', ModItems.circuit_copper, 'P', "dustNetherQuartz" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier3, 1), new Object[] { "CPC", 'C', ModItems.circuit_red_copper, 'P', "dustGold" })); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index fddc15e16..d14d183a5 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -912,6 +912,8 @@ item.circuit_gold.name=Übertakteter Schaltkreis item.circuit_raw.name=Schaltkreisrohling item.circuit_red_copper.name=Forgeschrittener Schaltkreis item.circuit_schrabidium.name=Leistungsstarker Schaltkreis +item.circuit_tantalium.name=Kondensatorplatine +item.circuit_tantalium_raw.name=Kondensatorplatinenrohling item.circuit_targeting_tier1.name=Militärische Schaltplatte (Stufe 1) item.circuit_targeting_tier2.name=Militärische Schaltplatte (Stufe 2) item.circuit_targeting_tier3.name=Militärische Schaltplatte (Stufe 3) @@ -1147,6 +1149,7 @@ item.fragment_actinium.name=Actiniumfragment item.fragment_boron.name=Borfragment item.fragment_cerium.name=Cerium Ffragment item.fragment_cobalt.name=Cobaltfragment +item.fragment_coltan.name=Coltan item.fragment_lanthanium.name=Lanthanfragment item.fragment_meteorite.name=Meteoritenfragment item.fragment_neodymium.name=Neodymfragment @@ -1440,6 +1443,7 @@ item.ingot_solinium.name=Soliniumbarren item.ingot_starmetal.name=§9Sternenmetallbarren§r item.ingot_steel.name=Stahlbarren item.ingot_steel_dusted.name=Bestäubter Stahlbarren +item.ingot_tantalium.name=Tantalbarren item.ingot_tcalloy.name=Technetiumstahlbarren item.ingot_technetium.name=Technetium-99-Barren item.ingot_th232.name=Thorium-232-Barren @@ -1775,6 +1779,7 @@ item.nugget_reiium.name=Reiiumnugget item.nugget_schrabidium.name=Schrabidiumnugget item.nugget_schrabidium_fuel.name=Schrabidiumkernbrennstoffnugget item.nugget_solinium.name=Soliniumnugget +item.nugget_tantalium.name=Tantalnugget item.nugget_technetium.name=Technetium-99-Nugget item.nugget_th232.name=Thorium-232-Nugget item.nugget_thorium_fuel.name=Thoriumkernbrennstoffnugget @@ -2549,6 +2554,7 @@ tile.block_cap_sparkle.name=S~Cola Kronkorkenblock tile.block_cap_star.name=Sunset Sarsaparilla Kronkorkenblock tile.block_cap_sunset.name=Sunset Sarsaparilla Sternkronkorkenblock tile.block_cobalt.name=Kobaltblock +tile.block_coltan.name=Coltanblock tile.block_combine_steel.name=CMB-Stahlblock tile.block_copper.name=Kupferblock tile.block_corium.name=Corium @@ -2597,6 +2603,7 @@ tile.block_solinium.name=Soliniumblock tile.block_starmetal.name=§9Sternenmetallblock§r tile.block_steel.name=Stahlblock tile.block_sulfur.name=Schwefelblock +tile.block_tantalium.name=Tantalblock tile.block_thorium.name=Thorium-232-Block tile.block_thorium_fuel.name=Thoriumkernbrennstoffblock tile.block_titanium.name=Titanblock @@ -2955,6 +2962,7 @@ tile.ore_beryllium.name=Berylliumerz tile.ore_cinnebar.name=Zinnobererz tile.ore_coal_oil.name=Öliges Kohleerz tile.ore_coal_oil_burning.name=Brennendes Öliges Kohleerz +tile.ore_coltan.name=Coltanerz tile.ore_copper.name=Kupfererz tile.ore_daffergon.name=Dellit tile.ore_depth_cinnebar.name=Tiefen-Zinnobererz diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 1673ed0b9..e67d3068c 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -980,6 +980,8 @@ item.circuit_gold.name=Overclocked Circuit item.circuit_raw.name=Basic Circuit Assembly item.circuit_red_copper.name=Advanced Circuit item.circuit_schrabidium.name=High Performance Circuit +item.circuit_tantalium.name=Capacitor Board +item.circuit_tantalium_raw.name=Capacitor Board Assembly item.circuit_targeting_tier1.name=Military Grade Circuit Board (Tier 1) item.circuit_targeting_tier2.name=Military Grade Circuit Board (Tier 2) item.circuit_targeting_tier3.name=Military Grade Circuit Board (Tier 3) @@ -1215,6 +1217,7 @@ item.fragment_actinium.name=Actinium Fragment item.fragment_boron.name=Boron Fragment item.fragment_cerium.name=Cerium Fragment item.fragment_cobalt.name=Cobalt Fragment +item.fragment_coltan.name=Coltan item.fragment_lanthanium.name=Lanthanium Fragment item.fragment_meteorite.name=Meteorite Fragment item.fragment_neodymium.name=Neodymium Fragment @@ -1508,6 +1511,7 @@ item.ingot_solinium.name=Solinium Ingot item.ingot_starmetal.name=§9Starmetal Ingot§r item.ingot_steel.name=Steel Ingot item.ingot_steel_dusted.name=Dusted Steel Ingot +item.ingot_tantalium.name=Tantalium Ingot item.ingot_tcalloy.name=Technetium Steel Ingot item.ingot_technetium.name=Technetium-99 Ingot item.ingot_th232.name=Thorium-232 Ingot @@ -1843,6 +1847,7 @@ item.nugget_reiium.name=Reiium Nugget item.nugget_schrabidium.name=Schrabidium Nugget item.nugget_schrabidium_fuel.name=Nugget of Schrabidium Fuel item.nugget_solinium.name=Solinium Nugget +item.nugget_tantalium.name=Tantalium Nugget item.nugget_technetium.name=Technetium-99 Nugget item.nugget_th232.name=Thorium-232 Nugget item.nugget_thorium_fuel.name=Nugget of Thorium Fuel @@ -2617,6 +2622,7 @@ tile.block_cap_sparkle.name=Block of S~Cola Bottle Caps tile.block_cap_star.name=Block of Sunset Sarsaparilla Star Caps tile.block_cap_sunset.name=Block of Sunset Sarsaparilla Bottle Caps tile.block_cobalt.name=Block of Cobalt +tile.block_coltan.name=Block of Coltan tile.block_combine_steel.name=Block of CMB Steel tile.block_copper.name=Block of Copper tile.block_corium.name=Corium @@ -2665,6 +2671,7 @@ tile.block_solinium.name=Block of Solinium tile.block_starmetal.name=§9Block of Starmetal§r tile.block_steel.name=Block of Steel tile.block_sulfur.name=Block of Sulfur +tile.block_tantalium.name=Block of Tantalium tile.block_thorium.name=Block of Thorium-232 tile.block_thorium_fuel.name=Block of Thorium Fuel tile.block_titanium.name=Block of Titanium @@ -3039,6 +3046,7 @@ tile.ore_beryllium.name=Beryllium Ore tile.ore_cinnebar.name=Cinnibar Ore tile.ore_coal_oil.name=Oily Coal Ore tile.ore_coal_oil_burning.name=Burning Oily Coal Ore +tile.ore_coltan.name=Coltan Ore tile.ore_copper.name=Copper Ore tile.ore_daffergon.name=Dellite tile.ore_depth_cinnebar.name=Depth Cinnibar Ore diff --git a/src/main/resources/assets/hbm/textures/blocks/block_coltan.png b/src/main/resources/assets/hbm/textures/blocks/block_coltan.png new file mode 100644 index 0000000000000000000000000000000000000000..2c67e1cef93b97ccc996d6fb30706230fd0566f6 GIT binary patch literal 563 zcmV-30?hr1P) zlM*lv6MtThG)CCa_dOvY88QiKp=?CfGtdYoCx_FyqBJ61Kf88Cw`vh$-L-V>3OiYM zEt{@I)FnU&Ni>S64-z<;rgz90Vcw^SQUYPdajLX{CIkzmCNnEU%rFcD5Fz@$M=}EX zVWbF-=L^_;z26~>1Wj4G1<5xsr}G8p%){M|m*a&HJl<}qpf(W#yH4M9 zE!%a6`0yQ^$!^_Mi-B#oLW&wViAF$?cwhV($8m9`PPo6>P(nD9$Ga`g1ShtucGVhx zikEY;Kb?5lp9sw9a^-NY&=2Q-952_;c&k!hL|I}A#x|R7wIDG!>y8l2^UStu7r|?S z8*ECcd{hE5`Es+ZVG%ss?yzg)Z+AOl30$QBjbyIZH%_NBr38V=Ot6>ySAYWQW3pz?if4coLP$ucMJlCT zApSJPCazi$(!?d-qKd!Udq=Wl>v)dO%p8lSr>AB*o$~zr%-!7`qtS@7voipaBtdHp zK)2gvHk;9g)|#RykVR3jx3`Csl3uSD5&+7wWVKoWkmor`k|3qTdrzL{yu7?10rvOz z>G%6M=Kx64l%gmAkW%iDZZ;c)5KO02USD6g1Z7#0rYTib0dRSF$=?x05u42>?5(vp z=e7iOU6ZD1xO{bW1%MEOrfK;7{S8>B(+OBvmRkaVgM))`>H7K_fbZ{bK0iOP)-s>Z z>G%6oRYjI%oS&a_b8|ySYt4GSCd;zG+(w(+?RGK7pp@DvNlLj@(ChUA&@>IsIevbA z!po!42xAQE_4=RQ$UM)f>zc#E!=PZXSYWLs&vRz88O}M3F*}LvG&)I=5XUiPSq89` z{qgaEbB;KUvDOCMdmkny%d*^=Len(7y}dCU4l%}Hj3LXi;1PhTs)(Y9rfCqjx3|s7 z$;pm9r4)<*Y`$1Z8xm^BpJ~}!IJ!s37gTa8~<6|BlAMxI!lnR#pGraelo}Mxo z3>c5c|0|eGCQK%iAXzDe_Z}exaU2H)-g}HOe0_akt!24f0`MPXK}8Chfz|o|0000< KMNUMnLSTZwsUsTz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/ore3_base.png b/src/main/resources/assets/hbm/textures/blocks/ore3_base.png new file mode 100644 index 0000000000000000000000000000000000000000..117120814672197041c20a6c71685ff05ae75146 GIT binary patch literal 418 zcmV;T0bTxyP)0+3RA z0j%pvKMdSMAjU}Bwmio10N9HFV6CMe26_>+)+iC#jWKN7_G%mk&ee+)`j2ts9zu~& z004gf{tkn=5x_b31w79)O-hNBQlVUL%UjlU{bG3Y9&0U4M(#yWO2NJtu;(SHATTkHk5U}SU z)m8sISFz4BN<{Yjp=Ofp)LH`^q~t!WH7bNq0N|B{uImoEuNGwBf5^SoPE~GL?*IS* M07*qoM6N<$f@KQ3cmMzZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/ore_coltan.png b/src/main/resources/assets/hbm/textures/blocks/ore_coltan.png new file mode 100644 index 0000000000000000000000000000000000000000..9b1eed3cfc3e40e1dd7e330ebd17a914738095ed GIT binary patch literal 513 zcmV+c0{;DpP)l*25QRS)Y69ehR$f9Rbcdj+g#d-UBsGvBQ>OkY|GNSn z(IpmD!>_3(vs_2xbVIEc=xE5%jM2{PrpQjEXx2Wih?}PvDR|zUUDc1 zRaF%LX_^9%Wf@tPQ4|GQYXH3Wok3mKls|tkHlJ|Lk)|nSSt4o+z@}O=na%*vTC@H2 zozv_4Jwb=qxt3+g-`_Q&_B4~}EaEpW&zxM&X}#YY1jN;9g{Uo}8qQQhdohow#+dG6 zIRDKj@!sRTkI120+Z$9}*H~+#NYs{hA2eEPlHe>ND5co#c5JFOq8hI59wcj&g~)Ucwnm0-H=#*ZA3A2LzERlCVD50HfLSG}{J`0X6S$tRB#F8T z9OKAoQTTS|y85qAxBj;;Q)O7Bu_<%bqOEG4LLbjgXO8-BmSM-xVA1zhUuX4Siyzsk zn{^JyYe&C!4sCg}jr}6ijPGV1=UE-9^7c;G3)}9l*+?_EbQ@RZ zaXmX`FngWW&r1vsw#>ir@RNqz7w6QsTjOs!l;{J^2&{QjP$`nil(ANuneFlKtG8@9 lni>wS_&aeA?-tFw47;WK(UPj5T(c- zf#|lDjn*h^W{OqF+7-(#3SaZfmw9=4Z)V^}1b~z>^gIvW_ik&nOUc;tRh_}h|Bm!VG?mvx|hxu$Riji1WjnlD8y>+=4ymO__ z@d^OJC7@Cd2;%xohr}gzJ43WK_teH92ZxvW&|tFI0bsB808ExQpKjV%RxLFn9{zQb z(YPO$OQl!GXk(bq*5d6?l!F6Wo7Cj1cT3?4;9!~zng6XM00000NkvXXu0mjf0Iq&@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/fragment_coltan.png b/src/main/resources/assets/hbm/textures/items/fragment_coltan.png new file mode 100644 index 0000000000000000000000000000000000000000..909192d49c059a3ffe52f2f0f680d75277a27a30 GIT binary patch literal 497 zcmVcqbL7uJ!xW6L$o0* z_F-Ej(pDbJvg>x)&w~dgLcHo+Co{=B;J-kWh0$rGMO@-jCu9$P+4nGtyUzJ&QQqPu(%u|_UsfbQY zLIX99Ff|23jVWX;Qo6#)mCNhS0CW>kwOwWc|LY7iyOkla7+-z^c-jP z3a!dxX_kvzj>ZhHCzweCQ4Izok025{-QFLoEgk7?yQ@eP%8UJnOlNbxeDjDEjdthL n+P|zsYxll9-6^iT?!Sj0Q2V)`!%z_D00000NkvXXu0mjf&DP&F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/ingot_tantalium.png b/src/main/resources/assets/hbm/textures/items/ingot_tantalium.png new file mode 100644 index 0000000000000000000000000000000000000000..3e6af1b613aaa91150e83b2d56cf1519aa391a50 GIT binary patch literal 304 zcmV-00nh%4P)qHgx?cLDIukV_a4r~9juwH;rvF-ve#Z-$^5m{Hb(~B0 z)0}DbdB#lt?6(G=f13S%nyLHko`B#P%feW3hB@_~KFv|u*P;SKzuY^!C68T^WrbE! zPa1z36NAQ52N#>p{0YU!Bo3PvC@OttHqVc9wsNl9oq0tF=pF`7S3j3^P6