xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

bronze

Browse Source
This commit is contained in:
Bob 2024-04-20 23:41:49 +02:00
parent 9eaeddca32
commit 13aaa627b2
19 changed files with 111 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changelog
View File

@ -1,3 +1,13 @@
## Added
* Bismuth bronze and arsenic bronze
* Kind of self-explanatory
* Can be made into anvils, allows for an alternative that doesn't involve 10 entire ingots of bismuth for a single anvil
## Changed
* Arsenic is now made from only 16 oils scrap (instead of 256) in an ore acidizer using high-performance solvent (instead of chemical plant using sulfuric acid)
* Meteorite and starmetal anvils have been replaced with desh and saturnite ones
## Fixed
* Limited assembler input to up to 10 attempts per ingredient, fixing a rare issue where the assembler freezes the server when pulling items
* Fixed fallout effects not loading chunks
* Fixed fallout effects not loading chunks
* Fixed RBMK steam channel recycling recipe

53
src/main/java/com/hbm/blocks/ModBlocks.java
View File

@ -1079,10 +1079,11 @@ public class ModBlocks {
public static Block anvil_iron;
public static Block anvil_lead;
public static Block anvil_steel;
public static Block anvil_meteorite;
public static Block anvil_starmetal;
public static Block anvil_desh;
public static Block anvil_saturnite;
public static Block anvil_ferrouranium;
public static Block anvil_bismuth;
public static Block anvil_bismuth_bronze;
public static Block anvil_arsenic_bronze;
public static Block anvil_schrabidate;
public static Block anvil_dnt;
public static Block anvil_osmiridium;
@ -2127,7 +2128,7 @@ public class ModBlocks {
tesla = new MachineTesla(Material.iron).setBlockName("tesla").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":tesla");
launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad");
launch_pad_rusted = new LaunchPadRusted(Material.iron).setBlockName("launch_pad_rusted").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad_rusted");
launch_pad_rusted = new LaunchPadRusted(Material.iron).setBlockName("launch_pad_rusted").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_rust");
launch_pad_large = new LaunchPadLarge(Material.iron).setBlockName("launch_pad_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
machine_radar = new MachineRadar(Material.iron).setBlockName("machine_radar").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_radar");
machine_radar_large = new MachineRadarLarge(Material.iron).setBlockName("machine_radar_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
@ -2293,16 +2294,17 @@ public class ModBlocks {
machine_autocrafter = new MachineAutocrafter().setBlockName("machine_autocrafter").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab);
machine_funnel = new MachineFunnel().setBlockName("machine_funnel").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab);
anvil_iron = new NTMAnvil(Material.iron, 1).setBlockName("anvil_iron").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_iron");
anvil_lead = new NTMAnvil(Material.iron, 1).setBlockName("anvil_lead").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_lead");
anvil_steel = new NTMAnvil(Material.iron, 2).setBlockName("anvil_steel").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel");
anvil_meteorite = new NTMAnvil(Material.iron, 3).setBlockName("anvil_meteorite").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_meteorite");
anvil_starmetal = new NTMAnvil(Material.iron, 3).setBlockName("anvil_starmetal").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_starmetal");
anvil_ferrouranium = new NTMAnvil(Material.iron, 4).setBlockName("anvil_ferrouranium").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_ferrouranium");
anvil_bismuth = new NTMAnvil(Material.iron, 5).setBlockName("anvil_bismuth").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_bismuth");
anvil_schrabidate = new NTMAnvil(Material.iron, 6).setBlockName("anvil_schrabidate").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_schrabidate");
anvil_dnt = new NTMAnvil(Material.iron, 7).setBlockName("anvil_dnt").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_dnt");
anvil_osmiridium = new NTMAnvil(Material.iron, 8).setBlockName("anvil_osmiridium").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_osmiridium");
anvil_iron = new NTMAnvil(Material.iron, NTMAnvil.TIER_IRON).setBlockName("anvil_iron").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_iron");
anvil_lead = new NTMAnvil(Material.iron, NTMAnvil.TIER_IRON).setBlockName("anvil_lead").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_lead");
anvil_steel = new NTMAnvil(Material.iron, NTMAnvil.TIER_STEEL).setBlockName("anvil_steel").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel");
anvil_desh = new NTMAnvil(Material.iron, NTMAnvil.TIER_OIL).setBlockName("anvil_desh").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_desh");
anvil_saturnite = new NTMAnvil(Material.iron, NTMAnvil.TIER_OIL).setBlockName("anvil_saturnite").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_saturnite");
anvil_ferrouranium = new NTMAnvil(Material.iron, NTMAnvil.TIER_NUCLEAR).setBlockName("anvil_ferrouranium").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_ferrouranium");
anvil_bismuth_bronze = new NTMAnvil(Material.iron, NTMAnvil.TIER_RBMK).setBlockName("anvil_bismuth_bronze").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_bismuth_bronze");
anvil_arsenic_bronze = new NTMAnvil(Material.iron, NTMAnvil.TIER_RBMK).setBlockName("anvil_arsenic_bronze").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_arsenic_bronze");
anvil_schrabidate = new NTMAnvil(Material.iron, NTMAnvil.TIER_FUSION).setBlockName("anvil_schrabidate").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_schrabidate");
anvil_dnt = new NTMAnvil(Material.iron, NTMAnvil.TIER_PARTICLE).setBlockName("anvil_dnt").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_dnt");
anvil_osmiridium = new NTMAnvil(Material.iron, NTMAnvil.TIER_GERALD).setBlockName("anvil_osmiridium").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_osmiridium");
anvil_murky = new NTMAnvil(Material.iron, 1916169).setBlockName("anvil_murky").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel");
machine_waste_drum = new WasteDrum(Material.iron).setBlockName("machine_waste_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":waste_drum");
@ -3058,17 +3060,18 @@ public class ModBlocks {
register(machine_autocrafter);
register(machine_funnel);
GameRegistry.registerBlock(anvil_iron, ItemBlockBase.class, anvil_iron.getUnlocalizedName());
GameRegistry.registerBlock(anvil_lead, ItemBlockBase.class, anvil_lead.getUnlocalizedName());
GameRegistry.registerBlock(anvil_steel, ItemBlockBase.class, anvil_steel.getUnlocalizedName());
GameRegistry.registerBlock(anvil_meteorite, ItemBlockBase.class, anvil_meteorite.getUnlocalizedName());
GameRegistry.registerBlock(anvil_starmetal, ItemBlockBase.class, anvil_starmetal.getUnlocalizedName());
GameRegistry.registerBlock(anvil_ferrouranium, ItemBlockBase.class, anvil_ferrouranium.getUnlocalizedName());
GameRegistry.registerBlock(anvil_bismuth, ItemBlockBase.class, anvil_bismuth.getUnlocalizedName());
GameRegistry.registerBlock(anvil_schrabidate, ItemBlockBase.class, anvil_schrabidate.getUnlocalizedName());
GameRegistry.registerBlock(anvil_dnt, ItemBlockBase.class, anvil_dnt.getUnlocalizedName());
GameRegistry.registerBlock(anvil_osmiridium, ItemBlockBase.class, anvil_osmiridium.getUnlocalizedName());
GameRegistry.registerBlock(anvil_murky, ItemBlockBase.class, anvil_murky.getUnlocalizedName());
register(anvil_iron);
register(anvil_lead);
register(anvil_steel);
register(anvil_desh);
register(anvil_saturnite);
register(anvil_ferrouranium);
register(anvil_bismuth_bronze);
register(anvil_arsenic_bronze);
register(anvil_schrabidate);
register(anvil_dnt);
register(anvil_osmiridium);
register(anvil_murky);
GameRegistry.registerBlock(press_preheater, press_preheater.getUnlocalizedName());
GameRegistry.registerBlock(machine_press, machine_press.getUnlocalizedName());

9
src/main/java/com/hbm/blocks/machine/NTMAnvil.java
View File

@ -39,6 +39,15 @@ import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class NTMAnvil extends BlockFallingNT implements ITooltipProvider, IGUIProvider {
public static final int TIER_IRON = 1;
public static final int TIER_STEEL = 2;
public static final int TIER_OIL = 3;
public static final int TIER_NUCLEAR = 4;
public static final int TIER_RBMK = 5;
public static final int TIER_FUSION = 6;
public static final int TIER_PARTICLE = 7;
public static final int TIER_GERALD = 8;
public final int tier;

9
src/main/java/com/hbm/inventory/OreDictManager.java
View File

@ -164,6 +164,10 @@ public class OreDictManager {
public static final DictFrame TCALLOY = new DictFrame("TcAlloy");
/** CADMIUM STEEL */
public static final DictFrame CDALLOY = new DictFrame("CdAlloy");
/** BISMUTH BRONZE */
public static final DictFrame BBRONZE = new DictFrame("BismuthBronze");
/** ARSENIC BRONZE */
public static final DictFrame ABRONZE = new DictFrame("ArsenicBronze");
/** LEAD */
public static final DictFrame PB = new DictFrame("Lead");
public static final DictFrame BI = new DictFrame("Bismuth");
@ -290,6 +294,8 @@ public class OreDictManager {
public static final DictGroup ANY_HARDPLASTIC = new DictGroup("AnyHardPlastic", PC, PVC);
/** Any post nuclear steel like TCA or CDA */
public static final DictGroup ANY_RESISTANTALLOY = new DictGroup("AnyResistantAlloy", TCALLOY, CDALLOY);
/** Any post nuclear steel like TCA or CDA */
public static final DictGroup ANY_BISMOIDBRONZE = new DictGroup("AnyBismoidBronze", BBRONZE, ABRONZE);
/** Any "powder" propellant like gunpowder, ballistite and cordite */
public static final DictFrame ANY_GUNPOWDER = new DictFrame("AnyPropellant");
/** Any smokeless powder like ballistite and cordite */
@ -363,6 +369,8 @@ public class OreDictManager {
STEEL .ingot(ingot_steel) .dustSmall(powder_steel_tiny) .dust(powder_steel) .plate(plate_steel) .block(block_steel);
TCALLOY .ingot(ingot_tcalloy) .dust(powder_tcalloy) .block(block_tcalloy);
CDALLOY .ingot(ingot_cdalloy) .block(block_cdalloy);
BBRONZE .ingot(ingot_bismuth_bronze);
ABRONZE .ingot(ingot_arsenic_bronze);
PB .nugget(nugget_lead) .ingot(ingot_lead) .dust(powder_lead) .plate(plate_lead) .block(block_lead) .ore(ore_lead, ore_meteor_lead);
BI .nugget(nugget_bismuth) .billet(billet_bismuth) .ingot(ingot_bismuth) .dust(powder_bismuth) .block(block_bismuth);
AS .nugget(nugget_arsenic) .ingot(ingot_arsenic);
@ -627,6 +635,7 @@ public class OreDictManager {
ANY_PLASTIC.addPrefix(INGOT, true).addPrefix(DUST, true).addPrefix(BLOCK, true);
ANY_HARDPLASTIC.addPrefix(INGOT, true);
ANY_RESISTANTALLOY.addPrefix(INGOT, true).addPrefix(DUST, true).addPrefix(PLATECAST, true).addPrefix(PLATEWELDED, true).addPrefix(HEAVY_COMPONENT, true).addPrefix(BLOCK, true);
ANY_BISMOIDBRONZE.addPrefix(INGOT, true).addPrefix(PLATECAST, true);
ANY_TAR.addPrefix(ANY, false);
}

2
src/main/java/com/hbm/inventory/material/Mats.java
View File

@ -125,6 +125,8 @@ public class Mats {
public static final NTMMaterial MAT_FERRO = makeSmeltable(_AS + 7, FERRO, 0xB7B7C9, 0x101022, 0x6B6B8B).setShapes(INGOT);
public static final NTMMaterial MAT_TCALLOY = makeSmeltable(_AS + 6, TCALLOY, 0xD4D6D6, 0x323D3D, 0x9CA6A6).setShapes(INGOT, DUST, CASTPLATE, WELDEDPLATE, HEAVY_COMPONENT);
public static final NTMMaterial MAT_CDALLOY = makeSmeltable(_AS + 13, CDALLOY, 0xF7DF8F, 0x604308, 0xFBD368).setShapes(INGOT, CASTPLATE, WELDEDPLATE, HEAVY_COMPONENT);
public static final NTMMaterial MAT_BBRONZE = makeSmeltable(_AS + 16, BBRONZE, 0xE19A69, 0x485353, 0x987D65).setShapes(INGOT, CASTPLATE);
public static final NTMMaterial MAT_ABRONZE = makeSmeltable(_AS + 17, ABRONZE, 0xDB9462, 0x203331, 0x77644D).setShapes(INGOT, CASTPLATE);
public static final NTMMaterial MAT_MAGTUNG = makeSmeltable(_AS + 8, MAGTUNG, 0x22A2A2, 0x0F0F0F, 0x22A2A2).setShapes(INGOT, DUST, DENSEWIRE, BLOCK);
public static final NTMMaterial MAT_CMB = makeSmeltable(_AS + 9, CMB, 0x6F6FB4, 0x000011, 0x6F6FB4).setShapes(INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, BLOCK);
public static final NTMMaterial MAT_DNT = makeSmeltable(_AS + 15, DNT, 0x7582B9, 0x16000E, 0x455289).setShapes(INGOT, DUST, DENSEWIRE, BLOCK);

7
src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java
View File

@ -286,13 +286,6 @@ public class ChemplantRecipes extends SerializableRecipe {
new ItemStack(ModItems.gem_tantalium),
new ItemStack(ModItems.dust, 3))
.outputFluids(new FluidStack(Fluids.WATER, 250)));
recipes.add(new ChemRecipe(91, "ARSENIC", 1200)
.inputItems(new ComparableStack(ModItems.scrap_oil, 256))
.inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 1000))
.outputItems(
new ItemStack(ModItems.nugget_arsenic),
new ItemStack(ModItems.sulfur, 2))
.outputFluids(new FluidStack(Fluids.HEAVYOIL, 1500)));
recipes.add(new ChemRecipe(68, "VIT_LIQUID", 100)
.inputItems(new ComparableStack(ModBlocks.sand_lead))
.inputFluids(new FluidStack(Fluids.WASTEFLUID, 1000))

8
src/main/java/com/hbm/inventory/recipes/CrucibleRecipes.java
View File

@ -96,6 +96,14 @@ public class CrucibleRecipes extends SerializableRecipe {
.inputs(new MaterialStack(Mats.MAT_STEEL, n * 8), new MaterialStack(Mats.MAT_CADMIUM, n))
.outputs(new MaterialStack(Mats.MAT_CDALLOY, i)));
recipes.add(new CrucibleRecipe(14, "crucible.bbronze", 9, new ItemStack(ModItems.ingot_bismuth_bronze))
.inputs(new MaterialStack(Mats.MAT_COPPER, n * 8), new MaterialStack(Mats.MAT_BISMUTH, n), new MaterialStack(Mats.MAT_FLUX, n * 3))
.outputs(new MaterialStack(Mats.MAT_BBRONZE, i), new MaterialStack(Mats.MAT_SLAG, n * 3)));
recipes.add(new CrucibleRecipe(15, "crucible.abronze", 9, new ItemStack(ModItems.ingot_arsenic_bronze))
.inputs(new MaterialStack(Mats.MAT_COPPER, n * 8), new MaterialStack(Mats.MAT_ARSENIC, n), new MaterialStack(Mats.MAT_FLUX, n * 3))
.outputs(new MaterialStack(Mats.MAT_ABRONZE, i), new MaterialStack(Mats.MAT_SLAG, n * 3)));
recipes.add(new CrucibleRecipe(13, "crucible.cmb", 3, new ItemStack(ModItems.ingot_combine_steel))
.inputs(new MaterialStack(Mats.MAT_MAGTUNG, n * 6), new MaterialStack(Mats.MAT_MUD, n * 3))
.outputs(new MaterialStack(Mats.MAT_CMB, i)));

1
src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java
View File

@ -97,6 +97,7 @@ public class CrystallizerRecipes extends SerializableRecipe {
registerRecipe(new ComparableStack(Items.dye, 1, 15), new CrystallizerRecipe(new ItemStack(Items.slime_ball, 4), mixingTime), new FluidStack(Fluids.SULFURIC_ACID, 250));
registerRecipe(new ComparableStack(Items.bone), new CrystallizerRecipe(new ItemStack(Items.slime_ball, 16), mixingTime), new FluidStack(Fluids.SULFURIC_ACID, 1_000));
registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.plant_item, EnumPlantType.MUSTARDWILLOW)), new CrystallizerRecipe(new ItemStack(ModItems.powder_cadmium), 100).setReq(10), new FluidStack(Fluids.RADIOSOLVENT, 250));
registerRecipe(new ComparableStack(ModItems.scrap_oil), new CrystallizerRecipe(new ItemStack(ModItems.nugget_arsenic), 100).setReq(16), new FluidStack(Fluids.RADIOSOLVENT, 100));
registerRecipe(new ComparableStack(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.FULLERENE)), new CrystallizerRecipe(new ItemStack(ModItems.ingot_cft), baseTime).setReq(4), new FluidStack(Fluids.XYLENE, 1_000));
registerRecipe(DIAMOND.dust(), new CrystallizerRecipe(Items.diamond, utilityTime));

17
src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java
View File

@ -53,13 +53,14 @@ public class AnvilRecipes {
Block[] anvils = new Block[]{ModBlocks.anvil_iron, ModBlocks.anvil_lead};
for(Block anvil : anvils) {
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_bismuth, 1), new ComparableStack(anvil), new ComparableStack(ModItems.ingot_bismuth, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_dnt, 1), new ComparableStack(anvil), new OreDictStack(DNT.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_ferrouranium, 1), new ComparableStack(anvil), new ComparableStack(ModItems.ingot_ferrouranium, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_meteorite, 1), new ComparableStack(anvil), new ComparableStack(ModItems.ingot_meteorite, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_schrabidate, 1), new ComparableStack(anvil), new OreDictStack(SBD.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_starmetal, 1), new ComparableStack(anvil), new OreDictStack(STAR.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_steel, 1), new ComparableStack(anvil), new OreDictStack(STEEL.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_desh, 1), new ComparableStack(anvil), new OreDictStack(DESH.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_saturnite, 1), new ComparableStack(anvil), new OreDictStack(BIGMT.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_ferrouranium, 1), new ComparableStack(anvil), new ComparableStack(ModItems.ingot_ferrouranium, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_bismuth_bronze, 1), new ComparableStack(anvil), new OreDictStack(BBRONZE.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_arsenic_bronze, 1), new ComparableStack(anvil), new OreDictStack(ABRONZE.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_schrabidate, 1), new ComparableStack(anvil), new OreDictStack(SBD.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_dnt, 1), new ComparableStack(anvil), new OreDictStack(DNT.ingot(), 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_osmiridium, 1), new ComparableStack(anvil), new OreDictStack(OSMIRIDIUM.ingot(), 10)));
}
@ -1034,8 +1035,8 @@ public class AnvilRecipes {
constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModBlocks.rbmk_boiler), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModBlocks.rbmk_blank, 1)),
new AnvilOutput(new ItemStack(ModItems.plate_cast, 6, Mats.MAT_COPPER.id)),
new AnvilOutput(new ItemStack(ModItems.pipes_steel, 2))
new AnvilOutput(new ItemStack(ModItems.pipe, 6, Mats.MAT_COPPER.id)),
new AnvilOutput(new ItemStack(ModItems.shell, 2, Mats.MAT_COPPER.id))
}).setTier(4));
constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModBlocks.rbmk_cooler), new AnvilOutput[] {

7
src/main/java/com/hbm/items/ModItems.java
View File

@ -144,6 +144,8 @@ public class ModItems {
public static Item ingot_advanced_alloy;
public static Item ingot_tcalloy;
public static Item ingot_cdalloy;
public static Item ingot_bismuth_bronze;
public static Item ingot_arsenic_bronze;
public static Item lithium;
public static Item ingot_zirconium;
public static Item ingot_hes;
@ -2553,6 +2555,8 @@ public class ModItems {
ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy");
ingot_tcalloy = new Item().setUnlocalizedName("ingot_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tcalloy");
ingot_cdalloy = new Item().setUnlocalizedName("ingot_cdalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cdalloy");
ingot_bismuth_bronze = new Item().setUnlocalizedName("ingot_bismuth_bronze").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth_bronze");
ingot_arsenic_bronze = new Item().setUnlocalizedName("ingot_arsenic_bronze").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_arsenic_bronze");
niter = new Item().setUnlocalizedName("niter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":salpeter");
ingot_copper = new Item().setUnlocalizedName("ingot_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_copper");
@ -5636,6 +5640,8 @@ public class ModItems {
GameRegistry.registerItem(ingot_steel, ingot_steel.getUnlocalizedName());
GameRegistry.registerItem(ingot_tcalloy, ingot_tcalloy.getUnlocalizedName());
GameRegistry.registerItem(ingot_cdalloy, ingot_cdalloy.getUnlocalizedName());
GameRegistry.registerItem(ingot_bismuth_bronze, ingot_bismuth_bronze.getUnlocalizedName());
GameRegistry.registerItem(ingot_arsenic_bronze, ingot_arsenic_bronze.getUnlocalizedName());
GameRegistry.registerItem(ingot_lead, ingot_lead.getUnlocalizedName());
GameRegistry.registerItem(ingot_bismuth, ingot_bismuth.getUnlocalizedName());
GameRegistry.registerItem(ingot_arsenic, ingot_arsenic.getUnlocalizedName());
@ -5653,7 +5659,6 @@ public class ModItems {
GameRegistry.registerItem(ingot_bakelite, ingot_bakelite.getUnlocalizedName());
GameRegistry.registerItem(ingot_biorubber, ingot_biorubber.getUnlocalizedName());
GameRegistry.registerItem(ingot_rubber, ingot_rubber.getUnlocalizedName());
//GameRegistry.registerItem(ingot_pet, ingot_pet.getUnlocalizedName());
GameRegistry.registerItem(ingot_pc, ingot_pc.getUnlocalizedName());
GameRegistry.registerItem(ingot_pvc, ingot_pvc.getUnlocalizedName());
GameRegistry.registerItem(ingot_mud, ingot_mud.getUnlocalizedName());

6
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -1291,12 +1291,18 @@ public class MainRegistry {
ignoreMappings.add("hbm:item.rotor_steel");
ignoreMappings.add("hbm:item.generator_steel");
ignoreMappings.add("hbm:item.bolt_compound");
ignoreMappings.add("hbm:tile.anvil_meteorite");
ignoreMappings.add("hbm:tile.anvil_starmetal");
ignoreMappings.add("hbm:tile.anvil_bismuth");
/// REMAP ///
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);
remapItems.put("hbm:item.man_explosive8", ModItems.explosive_lenses);
remapItems.put("hbm:item.briquette_lignite", ModItems.briquette);
remapItems.put("hbm:item.antiknock", ModItems.fuel_additive);
remapItems.put("hbm:tile.anvil_meteorite", Item.getItemFromBlock(ModBlocks.anvil_desh));
remapItems.put("hbm:tile.anvil_starmetal", Item.getItemFromBlock(ModBlocks.anvil_saturnite));
remapItems.put("hbm:tile.anvil_bismuth", Item.getItemFromBlock(ModBlocks.anvil_bismuth_bronze));
for(MissingMapping mapping : event.get()) {

14
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -450,8 +450,10 @@ container.watzPowerplant=Watzkraftwerk
container.zirnox=ZIRNOX Atomreaktor
crucible.aa=Herstellung - Fortgeschrittene Legierung
crucible.cdalloy=Herstellung Cadmiumstahl
crucible.cmb=Herstellung CMB-Stahl
crucible.abronze=Herstellung - Arsennronze
crucible.bbronze=Herstellung - Bismutbronze
crucible.cdalloy=Herstellung - Cadmiumstahl
crucible.cmb=Herstellung - CMB-Stahl
crucible.ferro=Herstellung - Ferrouran
crucible.hematite=Herstellung - Eisen aus Hämatit
crucible.hss=Herstellung - Schnellarbeitsstahl
@ -791,10 +793,12 @@ hbmmat.americiumrg=Reaktorfähiges Armericium
hbmmat.americium241=Americium-241
hbmmat.americium242=Americium-242
hbmmat.arsenic=Arsen
hbmmat.arsenicbronze=Arsenbronze
hbmmat.asbestos=Asbest
hbmmat.bakelite=Bakelit
hbmmat.beryllium=Beryllium
hbmmat.bismuth=Bismut
hbmmat.bismuthbronze=Bismutbronze
hbmmat.borax=Borax
hbmmat.boron=Bor
hbmmat.cadmium=Cadmium
@ -2114,6 +2118,7 @@ item.ingot_am241.name=Americium-241-Barren
item.ingot_am242.name=Americium-242-Barren
item.ingot_americium_fuel.name=Americiumkernbrennstoffbarren
item.ingot_arsenic.name=Arsenbarren
item.ingot_arsenic_bronze.name=Arsenbronzebarren
item.ingot_asbestos.name=Asbestplatte
item.ingot_au198.name=Gold-198-Barren
item.ingot_australium.name=Australiumbarren
@ -2121,6 +2126,7 @@ item.ingot_bakelite.name=Bakelittafel
item.ingot_beryllium.name=Berylliumbarren
item.ingot_biorubber.name=Latextafel
item.ingot_bismuth.name=Bismutbarren
item.ingot_bismuth_bronze.name=Bismutbronzebarren
item.ingot_boron.name=Borbarren
item.ingot_c4.name=C4-Tafel
item.ingot_cadmium.name=Cadmiumbarren
@ -3551,7 +3557,10 @@ tile.ams_base.name=AMS-Basis (Deko)
tile.ams_emitter.name=AMS-Emitter (Deko)
tile.ams_limiter.name=AMS-Stabilisator (Deko)
tile.ancient_scrap.name=Antikes Altmetall
tile.anvil_arsenic_bronze.name=Arsenbronzeamboss
tile.anvil_bismuth.name=Bismutamboss
tile.anvil_bismuth_bronze.name=Bismuthbronzeamboss
tile.anvil_desh.name=Deshamboss
tile.anvil_dnt.name=Dineutroniumamboss
tile.anvil_ferrouranium.name=Ferrouranamboss
tile.anvil_iron.name=Eisenamboss
@ -3559,6 +3568,7 @@ tile.anvil_lead.name=Bleiamboss
tile.anvil_meteorite.name=Meteoritenamboss
tile.anvil_murky.name=Düsteramboss
tile.anvil_osmiridium.name=Osmiridiumamboss
tile.anvil_saturnite.name=Saturnitamboss
tile.anvil_schrabidate.name=Eisenschrabidatamboss
tile.anvil_starmetal.name=Sternenmetallamboss
tile.anvil_steel.name=Stahlamboss

10
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -845,6 +845,8 @@ container.watzPowerplant=Watz Power Plant
container.zirnox=ZIRNOX Nuclear Reactor
crucible.aa=Advanced Alloy Production
crucible.abronze=Arsenic Bronze Production
crucible.bbronze=Bismuth Bronze Production
crucible.cdalloy=Cadmium Steel Production
crucible.cmb=CMB Steel Production
crucible.ferro=Ferrouranium Production
@ -1482,10 +1484,12 @@ hbmmat.americiumrg=Reactor-Grade Americium
hbmmat.americium241=Americium-241
hbmmat.americium242=Americium-242
hbmmat.arsenic=Arsenic
hbmmat.arsenicbronze=Arsenic Bronze
hbmmat.asbestos=Asbestos
hbmmat.bakelite=Bakelite
hbmmat.beryllium=Beryllium
hbmmat.bismuth=Bismuth
hbmmat.bismuthbronze=Bismuth Bronze
hbmmat.borax=Borax
hbmmat.boron=Boron
hbmmat.cadmium=Cadmium
@ -2889,6 +2893,7 @@ item.ingot_am241.name=Americium-241 Ingot
item.ingot_am242.name=Americium-242 Ingot
item.ingot_americium_fuel.name=Ingot of Americium Fuel
item.ingot_arsenic.name=Arsenic Ingot
item.ingot_arsenic_bronze.name=Arsenic Bronze Ingot
item.ingot_asbestos.name=Asbestos Sheet
item.ingot_asbestos.desc=§o"Filled with life, self-doubt and asbestos. That comes with the air."§r
item.ingot_au198.name=Gold-198 Ingot
@ -2897,6 +2902,7 @@ item.ingot_bakelite.name=Bakelite Bar
item.ingot_beryllium.name=Beryllium Ingot
item.ingot_biorubber.name=Latex Bar
item.ingot_bismuth.name=Bismuth Ingot
item.ingot_bismuth_bronze.name=Bismuth Bronze Ingot
item.ingot_boron.name=Boron Ingot
item.ingot_c4.name=Bar of Composition C-4
item.ingot_cadmium.name=Cadmium Ingot
@ -4560,7 +4566,10 @@ tile.ams_base.name=AMS Base (Deco)
tile.ams_emitter.name=AMS Emitter (Deco)
tile.ams_limiter.name=AMS Stabilizer (Deco)
tile.ancient_scrap.name=Ancient Scrap Metal
tile.anvil_arsenic_bronze.name=Arsenic Bronze Anvil
tile.anvil_bismuth.name=Bismuth Anvil
tile.anvil_bismuth_bronze.name=Bismuth Bronze Anvil
tile.anvil_desh.name=Desh Anvil
tile.anvil_dnt.name=Dineutronium Anvil
tile.anvil_ferrouranium.name=Ferrouranium Anvil
tile.anvil_iron.name=Iron Anvil
@ -4568,6 +4577,7 @@ tile.anvil_lead.name=Lead Anvil
tile.anvil_meteorite.name=Meteorite Anvil
tile.anvil_murky.name=Murky Anvil
tile.anvil_osmiridium.name=Osmiridium Anvil
tile.anvil_saturnite.name=Saturnite Anvil
tile.anvil_schrabidate.name=Ferric Schrabidate Anvil
tile.anvil_starmetal.name=Starmetal Anvil
tile.anvil_steel.name=Steel Anvil

BIN
src/main/resources/assets/hbm/textures/blocks/anvil_arsenic_bronze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 516 B

BIN
src/main/resources/assets/hbm/textures/blocks/anvil_bismuth_bronze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 516 B

BIN
src/main/resources/assets/hbm/textures/blocks/anvil_desh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 534 B

BIN
src/main/resources/assets/hbm/textures/blocks/anvil_saturnite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

BIN
src/main/resources/assets/hbm/textures/items/ingot_arsenic_bronze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 512 B

BIN
src/main/resources/assets/hbm/textures/items/ingot_bismuth_bronze.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 529 B