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

more RBMK byproducts, base block for the console

Browse Source
This commit is contained in:
Bob 2021-04-12 23:30:00 +02:00
parent 7ea4c857de
commit 573b1a6af7
25 changed files with 304 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1563,6 +1563,7 @@ public class ModBlocks {
rbmk_reflector = new RBMKReflector().setBlockName("rbmk_reflector").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_reflector");
rbmk_absorber = new RBMKAbsorber().setBlockName("rbmk_absorber").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_absorber");
rbmk_moderator = new RBMKModerator().setBlockName("rbmk_moderator").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_moderator");
rbmk_console = new RBMKConsole().setBlockName("rbmk_console").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_console");
book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.nukeTab);
@ -2214,6 +2215,7 @@ public class ModBlocks {
GameRegistry.registerBlock(rbmk_reflector, rbmk_reflector.getUnlocalizedName());
GameRegistry.registerBlock(rbmk_absorber, rbmk_absorber.getUnlocalizedName());
GameRegistry.registerBlock(rbmk_moderator, rbmk_moderator.getUnlocalizedName());
GameRegistry.registerBlock(rbmk_console, rbmk_console.getUnlocalizedName());
//GameRegistry.registerBlock(rbmk_console, rbmk_console.getUnlocalizedName());
GameRegistry.registerBlock(red_cable, red_cable.getUnlocalizedName());

1
src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java
View File

@ -1,7 +1,6 @@
package com.hbm.blocks.machine.rbmk;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.MainRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;

36
src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java Normal file
View File

@ -0,0 +1,36 @@
package com.hbm.blocks.machine.rbmk;
import com.hbm.blocks.machine.BlockMachineBase;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class RBMKConsole extends BlockMachineBase {
public RBMKConsole() {
super(Material.iron, 0);
this.rotatable = true;
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityRBMKConsole();
}
@Override
public int getRenderType() {
return -1;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
}

26
src/main/java/com/hbm/inventory/AssemblerRecipes.java
View File

@ -224,28 +224,28 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModItems.upgrade_speed_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new OreDictStack("dustRedCopperAlloy", 4), new ComparableStack(Items.redstone, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_speed_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_speed_1, 1), new OreDictStack("dustRedCopperAlloy", 2), new ComparableStack(Items.redstone, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_speed_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_speed_2, 1), new OreDictStack("dustRedCopperAlloy", 2), new ComparableStack(Items.redstone, 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(ModItems.powder_dura_steel, 4), new ComparableStack(ModItems.powder_steel, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_effect_1, 1), new ComparableStack(ModItems.powder_dura_steel, 2), new ComparableStack(ModItems.powder_steel, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_effect_2, 1), new ComparableStack(ModItems.powder_dura_steel, 2), new ComparableStack(ModItems.powder_steel, 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(ModItems.powder_dura_steel, 4), new OreDictStack("dustSteel", 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_effect_1, 1), new ComparableStack(ModItems.powder_dura_steel, 2), new OreDictStack("dustSteel", 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_effect_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_effect_2, 1), new ComparableStack(ModItems.powder_dura_steel, 2), new OreDictStack("dustSteel", 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_power_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new OreDictStack("dustLapis", 4), new ComparableStack(Items.glowstone_dust, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_power_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_power_1, 1), new OreDictStack("dustLapis", 2), new ComparableStack(Items.glowstone_dust, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_power_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_power_2, 1), new OreDictStack("dustLapis", 2), new ComparableStack(Items.glowstone_dust, 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new OreDictStack("dustDiamond", 4), new ComparableStack(ModItems.powder_iron, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_fortune_1, 1), new OreDictStack("dustDiamond", 2), new ComparableStack(ModItems.powder_iron, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_fortune_2, 1), new OreDictStack("dustDiamond", 2), new ComparableStack(ModItems.powder_iron, 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(ModItems.powder_polymer, 4), new ComparableStack(ModItems.powder_tungsten, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_afterburn_1, 1), new ComparableStack(ModItems.powder_polymer, 2), new ComparableStack(ModItems.powder_tungsten, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_afterburn_2, 1), new ComparableStack(ModItems.powder_polymer, 2), new ComparableStack(ModItems.powder_tungsten, 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new OreDictStack("dustDiamond", 4), new OreDictStack("dustIron", 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_fortune_1, 1), new OreDictStack("dustDiamond", 2), new OreDictStack("dustIron", 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_fortune_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_fortune_2, 1), new OreDictStack("dustDiamond", 2), new OreDictStack("dustIron", 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(ModItems.powder_polymer, 4), new OreDictStack("dustTungsten", 6), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_afterburn_1, 1), new ComparableStack(ModItems.powder_polymer, 2), new OreDictStack("dustTungsten", 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_afterburn_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_afterburn_2, 1), new ComparableStack(ModItems.powder_polymer, 2), new OreDictStack("dustTungsten", 6), new OreDictStack("ingotDesh", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_radius, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(Items.glowstone_dust, 6), new OreDictStack("dustDiamond", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_health, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(Items.glowstone_dust, 6), new ComparableStack(ModItems.powder_titanium, 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_health, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new ComparableStack(Items.glowstone_dust, 6), new OreDictStack("dustTitanium", 4), },500);
makeRecipe(new ComparableStack(ModItems.upgrade_overdrive_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_speed_3, 4), new ComparableStack(ModItems.upgrade_effect_3, 2), new OreDictStack("ingotDesh", 8), new ComparableStack(ModItems.powder_power, 16), new ComparableStack(ModItems.crystal_lithium, 4), new ComparableStack(ModItems.circuit_schrabidium, 4), },200);
makeRecipe(new ComparableStack(ModItems.upgrade_overdrive_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_overdrive_1, 1), new ComparableStack(ModItems.upgrade_afterburn_1, 1), new ComparableStack(ModItems.upgrade_speed_3, 2), new ComparableStack(ModItems.upgrade_effect_3, 2), new ComparableStack(ModItems.ingot_saturnite, 12), new ComparableStack(ModItems.powder_nitan_mix, 16), new ComparableStack(ModItems.crystal_starmetal, 6), new ComparableStack(ModItems.circuit_schrabidium, 6), },300);
makeRecipe(new ComparableStack(ModItems.upgrade_overdrive_3, 1), new AStack[] {new ComparableStack(ModItems.upgrade_overdrive_2, 1), new ComparableStack(ModItems.upgrade_afterburn_1, 1), new ComparableStack(ModItems.upgrade_speed_3, 2), new ComparableStack(ModItems.upgrade_effect_3, 2), new OreDictStack("ingotDesh", 8), new ComparableStack(ModItems.powder_power, 16), new ComparableStack(ModItems.crystal_lithium, 4), new ComparableStack(ModItems.circuit_schrabidium, 4), },500);
makeRecipe(new ComparableStack(ModItems.fuse, 1), new AStack[] {new OreDictStack("plateSteel", 2), new ComparableStack(Blocks.glass_pane, 1), new ComparableStack(ModItems.wire_aluminium, 1), },100);
makeRecipe(new ComparableStack(ModItems.redcoil_capacitor, 1), new AStack[] {new OreDictStack("plateGold", 3), new ComparableStack(ModItems.fuse, 1), new ComparableStack(ModItems.wire_advanced_alloy, 4), new ComparableStack(ModItems.coil_advanced_alloy, 6), new ComparableStack(Blocks.redstone_block, 2), },200);
makeRecipe(new ComparableStack(ModItems.titanium_filter, 1), new AStack[] {new OreDictStack("plateLead", 3), new ComparableStack(ModItems.fuse, 1), new ComparableStack(ModItems.wire_tungsten, 4), new OreDictStack("plateTitanium", 6), new ComparableStack(ModItems.ingot_u238, 2), },200);
makeRecipe(new ComparableStack(ModItems.part_lithium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new ComparableStack(ModItems.powder_lithium, 1), },50);
makeRecipe(new ComparableStack(ModItems.part_beryllium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new ComparableStack(ModItems.powder_beryllium, 1), },50);
makeRecipe(new ComparableStack(ModItems.part_lithium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack("dustLithium", 1), },50);
makeRecipe(new ComparableStack(ModItems.part_beryllium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack("dustBeryllium", 1), },50);
makeRecipe(new ComparableStack(ModItems.part_carbon, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack("dustCoal", 1), },50);
makeRecipe(new ComparableStack(ModItems.part_copper, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack("dustCopper", 1), },50);
makeRecipe(new ComparableStack(ModItems.part_plutonium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new ComparableStack(ModItems.powder_plutonium, 1), },50);
@ -268,7 +268,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModBlocks.machine_reactor_small, 1), new AStack[] {new OreDictStack("ingotSteel", 6), new ComparableStack(ModItems.ingot_polymer, 4), new OreDictStack("plateLead", 8), new OreDictStack("plateCopper", 4), new OreDictStack("ingotLead", 12), new OreDictStack("ingotRedCopperAlloy", 6), new ComparableStack(ModItems.circuit_copper, 8), new ComparableStack(ModItems.circuit_red_copper, 4), },300);
makeRecipe(new ComparableStack(ModBlocks.machine_rtg_grey, 1), new AStack[] {new ComparableStack(ModItems.rtg_unit, 5), new OreDictStack("plateSteel", 8), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 6), },200);
makeRecipe(new ComparableStack(ModBlocks.machine_battery, 1), new AStack[] {new OreDictStack("ingotSteel", 4), new OreDictStack("dustSulfur", 12), new OreDictStack("dustLead", 12), new OreDictStack("ingotRedCopperAlloy", 2), new ComparableStack(ModItems.wire_red_copper, 4), },200);
makeRecipe(new ComparableStack(ModBlocks.machine_lithium_battery, 1), new AStack[] {new ComparableStack(ModItems.ingot_polymer, 4), new OreDictStack("dustCobalt", 12), new ComparableStack(ModItems.powder_lithium, 12), new ComparableStack(ModItems.ingot_advanced_alloy, 2), new ComparableStack(ModItems.wire_red_copper, 4), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_lithium_battery, 1), new AStack[] {new ComparableStack(ModItems.ingot_polymer, 4), new OreDictStack("dustCobalt", 12), new OreDictStack("dustLithium", 12), new ComparableStack(ModItems.ingot_advanced_alloy, 2), new ComparableStack(ModItems.wire_red_copper, 4), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_battery, 1), new AStack[] {new OreDictStack("ingotDesh", 4), new ComparableStack(ModItems.powder_neptunium, 12), new ComparableStack(ModItems.powder_schrabidium, 12), new ComparableStack(ModItems.ingot_schrabidium, 2), new ComparableStack(ModItems.wire_schrabidium, 4), },800);
makeRecipe(new ComparableStack(ModBlocks.machine_dineutronium_battery, 1), new AStack[] {new ComparableStack(ModItems.ingot_dineutronium, 24), new ComparableStack(ModItems.powder_spark_mix, 12), new ComparableStack(ModItems.battery_spark_cell_1000, 1), new ComparableStack(ModItems.ingot_combine_steel, 32), new ComparableStack(ModItems.coil_magnetized_tungsten, 8), },1600);
makeRecipe(new ComparableStack(ModBlocks.machine_shredder, 1), new AStack[] {new OreDictStack("ingotSteel", 2), new OreDictStack("plateSteel", 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.wire_red_copper, 2), new ComparableStack(ModBlocks.steel_beam, 2), new ComparableStack(Blocks.iron_bars, 2), new ComparableStack(ModBlocks.red_wire_coated, 1), },200);

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

@ -89,6 +89,7 @@ public class ModItems {
public static Item ingot_schrabidium;
public static Item ingot_schrabidate;
public static Item ingot_plutonium_fuel;
public static Item ingot_neptunium_fuel;
public static Item ingot_uranium_fuel;
public static Item ingot_mox_fuel;
public static Item ingot_schrabidium_fuel;
@ -96,6 +97,7 @@ public class ModItems {
public static Item nugget_uranium_fuel;
public static Item nugget_thorium_fuel;
public static Item nugget_plutonium_fuel;
public static Item nugget_neptunium_fuel;
public static Item nugget_mox_fuel;
public static Item nugget_schrabidium_fuel;
public static Item ingot_advanced_alloy;
@ -165,6 +167,7 @@ public class ModItems {
public static Item billet_uranium_fuel;
public static Item billet_thorium_fuel;
public static Item billet_plutonium_fuel;
public static Item billet_neptunium_fuel;
public static Item billet_mox_fuel;
public static Item billet_schrabidium_fuel;
public static Item billet_yharonite;
@ -279,6 +282,9 @@ public class ModItems {
public static Item powder_polonium;
public static Item powder_co60;
public static Item powder_au198;
public static Item powder_i131;
public static Item powder_cs137;
public static Item powder_at209;
public static Item powder_schrabidium;
public static Item powder_schrabidate;
@ -2282,12 +2288,14 @@ public class ModItems {
ingot_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.ingot).setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel");
ingot_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.ingot).setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel");
ingot_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium_fuel");
ingot_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.ingot).setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mox_fuel");
ingot_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel");
ingot_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.ingot).setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel");
nugget_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.nugget).setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel");
nugget_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.nugget).setUnlocalizedName("nugget_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_thorium_fuel");
nugget_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.nugget).setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel");
nugget_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium_fuel");
nugget_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.nugget).setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel");
nugget_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel");
ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy");
@ -2362,6 +2370,7 @@ public class ModItems {
billet_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.billet).setUnlocalizedName("billet_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_uranium_fuel");
billet_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.billet).setUnlocalizedName("billet_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_thorium_fuel");
billet_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.billet).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel");
billet_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("billet_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium_fuel");
billet_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.billet).setUnlocalizedName("billet_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_mox_fuel");
billet_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium_fuel");
billet_yharonite = new Item().setUnlocalizedName("billet_yharonite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_yharonite");
@ -2484,7 +2493,10 @@ public class ModItems {
powder_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.powder, true).setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_neptunium");
powder_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.powder, true).setUnlocalizedName("powder_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_polonium");
powder_co60 = new ItemHazard().addRadiation(ItemHazard.co60 * ItemHazard.powder).addFire(5).toItem().setUnlocalizedName("powder_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_co60");
powder_i131 = new ItemHazard().addRadiation(ItemHazard.i131 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_i131").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_i131");
powder_cs137 = new ItemHazard().addRadiation(ItemHazard.cs137 * ItemHazard.powder).addFire(5).toItem().setUnlocalizedName("powder_cs137").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cs137");
powder_au198 = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.powder).addFire(15).toItem().setUnlocalizedName("powder_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_au198");
powder_at209 = new ItemHazard().addRadiation(ItemHazard.at209 * ItemHazard.powder).addFire(15).addBlinding().toItem().setUnlocalizedName("powder_at209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_at209");
powder_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidium");
powder_schrabidate = new ItemHazard(ItemHazard.sa326 * ItemHazard.powder, true, true).setUnlocalizedName("powder_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_schrabidate");
powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_aluminium");
@ -4530,6 +4542,11 @@ public class ModItems {
meteorite_sword_baleful = new ItemSwordMeteorite(500F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword");
mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy");
initializeItem2();
}
public static void initializeItem2() {
hazmat_helmet = new ArmorHazmat(MainRegistry.aMatHaz, 9, 0).setUnlocalizedName("hazmat_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_helmet");
hazmat_plate = new ArmorHazmat(MainRegistry.aMatHaz, 9, 1).setUnlocalizedName("hazmat_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate");
@ -4642,11 +4659,6 @@ public class ModItems {
book_secret = new ItemCustomLore().setUnlocalizedName("book_secret").setCreativeTab(MainRegistry.polaroidID == 11 ? MainRegistry.consumableTab : null).setTextureName(RefStrings.MODID + ":book_secret");
book_of_ = new ItemBook().setUnlocalizedName("book_of_").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":book_of_");
burnt_bark = new ItemCustomLore().setUnlocalizedName("burnt_bark").setCreativeTab(null).setTextureName(RefStrings.MODID + ":burnt_bark");
initializeItem2();
}
public static void initializeItem2() {
smoke1 = new Item().setUnlocalizedName("smoke1").setTextureName(RefStrings.MODID + ":smoke1");
smoke2 = new Item().setUnlocalizedName("smoke2").setTextureName(RefStrings.MODID + ":smoke2");
@ -4838,6 +4850,7 @@ public class ModItems {
GameRegistry.registerItem(ingot_uranium_fuel, ingot_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_thorium_fuel, ingot_thorium_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_plutonium_fuel, ingot_plutonium_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_neptunium_fuel, ingot_neptunium_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_mox_fuel, ingot_mox_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_schrabidium_fuel, ingot_schrabidium_fuel.getUnlocalizedName());
GameRegistry.registerItem(ingot_hes, ingot_hes.getUnlocalizedName());
@ -4897,6 +4910,7 @@ public class ModItems {
GameRegistry.registerItem(billet_uranium_fuel, billet_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_thorium_fuel, billet_thorium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_plutonium_fuel, billet_plutonium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_neptunium_fuel, billet_neptunium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_mox_fuel, billet_mox_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_schrabidium_fuel, billet_schrabidium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_yharonite, billet_yharonite.getUnlocalizedName());
@ -4923,7 +4937,10 @@ public class ModItems {
GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName());
GameRegistry.registerItem(powder_polonium, powder_polonium.getUnlocalizedName());
GameRegistry.registerItem(powder_co60, powder_co60.getUnlocalizedName());
GameRegistry.registerItem(powder_i131, powder_i131.getUnlocalizedName());
GameRegistry.registerItem(powder_cs137, powder_cs137.getUnlocalizedName());
GameRegistry.registerItem(powder_au198, powder_au198.getUnlocalizedName());
GameRegistry.registerItem(powder_at209, powder_at209.getUnlocalizedName());
GameRegistry.registerItem(powder_titanium, powder_titanium.getUnlocalizedName());
GameRegistry.registerItem(powder_copper, powder_copper.getUnlocalizedName());
GameRegistry.registerItem(powder_red_copper, powder_red_copper.getUnlocalizedName());
@ -5058,6 +5075,7 @@ public class ModItems {
GameRegistry.registerItem(nugget_uranium_fuel, nugget_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_thorium_fuel, nugget_thorium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_plutonium_fuel, nugget_plutonium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_neptunium_fuel, nugget_neptunium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_mox_fuel, nugget_mox_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_schrabidium_fuel, nugget_schrabidium_fuel.getUnlocalizedName());
GameRegistry.registerItem(nugget_hes, nugget_hes.getUnlocalizedName());

48
src/main/java/com/hbm/items/machine/ItemRBMKRod.java
View File

@ -6,6 +6,7 @@ import com.hbm.items.ModItems;
import com.hbm.items.special.ItemHazard;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.machine.rbmk.IRBMKFluxReceiver.NType;
import com.hbm.util.I18nUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -186,14 +187,49 @@ public class ItemRBMKRod extends ItemHazard {
list.add(EnumChatFormatting.ITALIC + this.fullName);
if(selfRate > 0) {
list.add(EnumChatFormatting.RED + "Self-igniting");
if(this == ModItems.rbmk_fuel_drx) {
if(selfRate > 0) {
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmx.source"));
}
list.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey("trait.rbmx.depletion", ((int)(((yield - getYield(stack)) / yield) * 10000)) / 10000D + "%"));
list.add(EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("trait.rbmx.xenon", ((getPoison(stack) * 100D) / 100D) + "%"));
list.add(EnumChatFormatting.BLUE + I18nUtil.resolveKey("trait.rbmx.splitsWith", I18nUtil.resolveKey(nType.unlocalized + ".x")));
list.add(EnumChatFormatting.BLUE + I18nUtil.resolveKey("trait.rbmx.splitsInto", I18nUtil.resolveKey(rType.unlocalized + ".x")));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmx.fluxFunc", EnumChatFormatting.WHITE + "" + funcEnd + " * x" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : "")));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmx.xenonGen", EnumChatFormatting.WHITE + "x * " + xGen));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmx.xenonBurn", EnumChatFormatting.WHITE + "x² * " + xBurn));
list.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("trait.rbmx.heat", heat + "°C"));
list.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("trait.rbmx.diffusion", diffusion + "°C/t"));
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmx.skinTemp", ((int)(getHullHeat(stack) * 10D) / 10D) + "m"));
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmx.coreTemp", ((int)(getCoreHeat(stack) * 10D) / 10D) + "m"));
list.add(EnumChatFormatting.DARK_RED + I18nUtil.resolveKey("trait.rbmx.melt", meltingPoint + "m"));
} else {
if(selfRate > 0) {
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmk.source"));
}
list.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey("trait.rbmk.depletion", ((int)(((yield - getYield(stack)) / yield) * 10000)) / 10000D + "%"));
list.add(EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("trait.rbmk.xenon", ((getPoison(stack) * 100D) / 100D) + "%"));
list.add(EnumChatFormatting.BLUE + I18nUtil.resolveKey("trait.rbmk.splitsWith", I18nUtil.resolveKey(nType.unlocalized)));
list.add(EnumChatFormatting.BLUE + I18nUtil.resolveKey("trait.rbmk.splitsInto", I18nUtil.resolveKey(rType.unlocalized)));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmk.fluxFunc", EnumChatFormatting.WHITE + "" + funcEnd + " * x" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : "")));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmk.xenonGen", EnumChatFormatting.WHITE + "x * " + xGen));
list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.rbmk.xenonBurn", EnumChatFormatting.WHITE + "x² * " + xBurn));
list.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("trait.rbmk.heat", heat + "°C"));
list.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("trait.rbmk.diffusion", diffusion + "°C/t"));
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmk.skinTemp", ((int)(getHullHeat(stack) * 10D) / 10D) + "°C"));
list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("trait.rbmk.coreTemp", ((int)(getCoreHeat(stack) * 10D) / 10D) + "°C"));
list.add(EnumChatFormatting.DARK_RED + I18nUtil.resolveKey("trait.rbmk.melt", meltingPoint + "°C"));
}
list.add(EnumChatFormatting.GREEN + "Depletion: " + ((int)(((yield - getYield(stack)) / yield) * 10000)) / 10000D + "%");
/*list.add(EnumChatFormatting.GREEN + "Depletion: " + ((int)(((yield - getYield(stack)) / yield) * 10000)) / 10000D + "%");
list.add(EnumChatFormatting.DARK_PURPLE + "Xenon poison: " + ((getPoison(stack) * 100D) / 100D) + "%");
list.add(EnumChatFormatting.BLUE + "Splits with: " + nType.localized);
list.add(EnumChatFormatting.BLUE + "Splits into: " + rType.localized);
list.add(EnumChatFormatting.BLUE + "Splits with: " + nType.unlocalized);
list.add(EnumChatFormatting.BLUE + "Splits into: " + rType.unlocalized);
list.add(EnumChatFormatting.YELLOW + "Flux function: " + EnumChatFormatting.WHITE + "" + funcEnd + " * x" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : ""));
list.add(EnumChatFormatting.YELLOW + "Xenon gen function: " + EnumChatFormatting.WHITE + "x * " + xGen);
list.add(EnumChatFormatting.YELLOW + "Xenon burn function: " + EnumChatFormatting.WHITE + "x² * " + xBurn);
@ -201,7 +237,7 @@ public class ItemRBMKRod extends ItemHazard {
list.add(EnumChatFormatting.GOLD + "Diffusion: " + diffusion + "°C/t");
list.add(EnumChatFormatting.RED + "Skin temp: " + ((int)(getHullHeat(stack) * 10D) / 10D) + "°C");
list.add(EnumChatFormatting.RED + "Core temp: " + ((int)(getCoreHeat(stack) * 10D) / 10D) + "°C");
list.add(EnumChatFormatting.DARK_RED + "Melting point: " + meltingPoint + "°C");
list.add(EnumChatFormatting.DARK_RED + "Melting point: " + meltingPoint + "°C");*/
super.addInformation(stack, player, list, bool);
}

15
src/main/java/com/hbm/items/special/ItemHazard.java
View File

@ -14,9 +14,12 @@ import net.minecraft.world.World;
public class ItemHazard extends ItemCustomLore implements IItemHazard {
//CO60 5a α 015.00Rad/s Spicy
//CO60 5a α 030.00Rad/s Spicy
//I181 192h α 150.00Rad/s 2 much spice :(
//CS137 30a α 020.00Rad/s Spicy
//AU192 64h α 500.00Rad/s 2 much spice :(
//PO210 138d α 025.00Rad/s Spicy
//AT209 5h α like 2k or sth idk bruv
//PO210 138d α 075.00Rad/s Spicy
//TH232 14,000,000,000a α 000.10Rad/s
//U233 160,000a α 005.00Rad/s
//U235 700,000,000a α 001.00Rad/s
@ -26,9 +29,12 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
//PU239 24,000a α 005.00Rad/s
//PU240 6,600a α 007.50Rad/s
public static final float co60 = 15.0F;
public static final float co60 = 30.0F;
public static final float i131 = 150.0F;
public static final float cs137 = 20.0F;
public static final float au198 = 500.0F;
public static final float po210 = 25.0F;
public static final float at209 = 2000.0F;
public static final float po210 = 75.0F;
public static final float th232 = 0.1F;
public static final float thf = 1.75F;
public static final float u = 0.35F;
@ -37,6 +43,7 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
public static final float u238 = 0.25F;
public static final float uf = 0.5F;
public static final float np237 = 2.5F;
public static final float npf = 1.5F;
public static final float pu = 7.5F;
public static final float purg = 6.25F;
public static final float pu238 = 10.0F;

3
src/main/java/com/hbm/main/ClientProxy.java
View File

@ -71,6 +71,7 @@ import com.hbm.tileentity.bomb.*;
import com.hbm.tileentity.conductor.*;
import com.hbm.tileentity.deco.*;
import com.hbm.tileentity.machine.*;
import com.hbm.tileentity.machine.rbmk.*;
import com.hbm.tileentity.turret.*;
import cpw.mods.fml.client.registry.ClientRegistry;
@ -205,6 +206,8 @@ public class ClientProxy extends ServerProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzStruct.class, new RenderSoyuzMultiblock());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITERStruct.class, new RenderITERMultiblock());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPlasmaStruct.class, new RenderPlasmaMultiblock());
//RBMK
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKConsole.class, new RenderRBMKConsole());
//ITER
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITER.class, new RenderITER());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachinePlasmaHeater.class, new RenderPlasmaHeater());

4
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -420,8 +420,8 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "dustSulfur", 'L', "dustLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PSP", "PLP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PLP", "PSP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', ModItems.powder_cobalt }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PSP", "PLP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', "dustCobalt" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_lithium), new Object[] { "A A", "PLP", "PSP", 'A', ModItems.wire_gold, 'P', "plateTitanium", 'S', "dustLithium", 'L', "dustCobalt" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium }));
GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_spark), new Object[] { " A ", "PSP", "PSP", 'A', ModItems.wire_magnetized_tungsten, 'P', ModItems.plate_dineutronium, 'S', ModItems.powder_spark_mix });

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

@ -469,6 +469,7 @@ public class MainRegistry {
GameRegistry.registerTileEntity(TileEntityRBMKReflector.class, "tileentity_rbmk_reflector");
GameRegistry.registerTileEntity(TileEntityRBMKAbsorber.class, "tileentity_rbmk_absorber");
GameRegistry.registerTileEntity(TileEntityRBMKModerator.class, "tileentity_rbmk_moderator");
GameRegistry.registerTileEntity(TileEntityRBMKConsole.class, "tileentity_rbmk_console");
EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);

2
src/main/java/com/hbm/main/ResourceManager.java
View File

@ -994,5 +994,7 @@ public class ResourceManager {
public static final IModelCustom rbmk_element = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element.obj"));
public static final IModelCustom rbmk_reflector = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_reflector.obj"));
public static final IModelCustom rbmk_rods = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_rods.obj"));
public static final IModelCustom rbmk_console = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_console.obj"));
public static final ResourceLocation rbmk_console_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_control.png");
}

40
src/main/java/com/hbm/render/tileentity/RenderRBMKConsole.java Normal file
View File

@ -0,0 +1,40 @@
package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.machine.TileEntityMachineFENSU;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
public class RenderRBMKConsole extends TileEntitySpecialRenderer {
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float interp) {
GL11.glPushMatrix();
GL11.glTranslatef((float)x + 0.5F, (float)y, (float)z + 0.5F);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glShadeModel(GL11.GL_SMOOTH);
switch(te.getBlockMetadata()) {
case 2: GL11.glRotatef(90, 0F, 1F, 0F); break;
case 4: GL11.glRotatef(180, 0F, 1F, 0F); break;
case 3: GL11.glRotatef(270, 0F, 1F, 0F); break;
case 5: GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(ResourceManager.rbmk_console_tex);
ResourceManager.rbmk_console.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glPopMatrix();
}
}

12
src/main/java/com/hbm/tileentity/deco/TileEntityTrappedBrick.java
View File

@ -113,26 +113,28 @@ public class TileEntityTrappedBrick extends TileEntity {
switch(trap) {
case FALLING_ROCKS:
detector = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord - 3, zCoord - 1, xCoord + 2, yCoord, zCoord + 2);
break;
return;
case PILLAR:
detector = AxisAlignedBB.getBoundingBox(xCoord + 0.2, yCoord - 3, zCoord + 0.2, xCoord + 0.8, yCoord, zCoord + 0.8);
break;
return;
case ARROW:
case FLAMING_ARROW:
case POISON_DART:
setDetectorDirectional();
break;
return;
case ZOMBIE:
detector = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord + 1, zCoord - 1, xCoord + 2, yCoord + 2, zCoord + 2);
break;
return;
case SPIDERS:
detector = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord - 3, zCoord - 1, xCoord + 2, yCoord, zCoord + 2);
break;
return;
}
detector = AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1);
}
private void setDetectorDirectional() {

10
src/main/java/com/hbm/tileentity/machine/rbmk/IRBMKFluxReceiver.java
View File

@ -3,14 +3,14 @@ package com.hbm.tileentity.machine.rbmk;
public interface IRBMKFluxReceiver {
public enum NType {
FAST("Fast Neutrons"),
SLOW("Slow Neutrons"),
ANY("All Neutrons"); //not to be used for reactor flux calculation, only for the fuel designation
FAST("trait.rbmk.neutron.fast"),
SLOW("trait.rbmk.neutron.slow"),
ANY("trait.rbmk.neutron.any"); //not to be used for reactor flux calculation, only for the fuel designation
public String localized;
public String unlocalized;
private NType(String loc) {
this.localized = loc;
this.unlocalized = loc;
}
}

20
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java Normal file
View File

@ -0,0 +1,20 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.tileentity.TileEntityMachineBase;
public class TileEntityRBMKConsole extends TileEntityMachineBase {
public TileEntityRBMKConsole() {
super(0);
}
@Override
public String getName() {
return null;
}
@Override
public void updateEntity() {
}
}

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

@ -674,9 +674,12 @@ item.beta.name=Beta-Features
item.big_sword.name=Großes Schwert
item.billet_au198.name=Gold-198-Billet
item.billet_australium.name=Australiumbillet
item.billet_australium_greater.name=Ayerit-Australiumbillet
item.billet_australium_lesser.name=Tasmanit-Australiumbillet
item.billet_co60.name=Kobalt-60-Billet
item.billet_mox_fuel.name=MOX-Kernbrennstoffbillet
item.billet_neptunium.name=Neptuniumbillet
item.billet_neptunium_fuel.name=Neptuniumkernbrennstoffbillet
item.billet_polonium.name=Polonium-210-Billet
item.billet_pu_mix.name=Reaktorfähiges Plutoniumbillet
item.billet_pu238.name=Pu238-Billet
@ -1328,9 +1331,11 @@ item.ingot_actinium.name=Semistabiler Actiniumbarren
item.ingot_advanced_alloy.name=Fortgeschrittene Legierung
item.ingot_aluminium.name=Aluminiumbarren
item.ingot_asbestos.name=Asbestplatte
item.ingot_au198.name=Gold-198-Barren
item.ingot_australium.name=Australiumbarren
item.ingot_beryllium.name=Berylliumbarren
item.ingot_chainsteel.name=Schwerer Kettenstahl
item.ingot_co60.name=Kobalt-60-Barren
item.ingot_cobalt.name=Kobaltbarren
item.ingot_combine_steel.name=CMB-Stahlbarren
item.ingot_copper.name=Industrielles Kupfer
@ -1350,6 +1355,7 @@ item.ingot_meteorite.name=Meteoritenbarren
item.ingot_meteorite_forged.name=Geschmiedeter Meteoritenbarren
item.ingot_mox_fuel.name=MOX-Kernbrennstoffbarren
item.ingot_neptunium.name=Neptuniumbarren
item.ingot_neptunium_fuel.name=Neptuniumkernbrennstoffbarren
item.ingot_phosphorus.name=Weiße Phosphortafel
item.ingot_plutonium.name=Plutoniumbarren
item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren
@ -1667,6 +1673,8 @@ item.nuclear_waste_short_depleted_tiny.name=Kleiner Haufen zerfallender kurzlebi
item.nugget.name=Chicken Nugget
item.nugget_au198.name=Gold-198-Nugget
item.nugget_australium.name=Australiumnugget
item.nugget_australium_greater.name=Ayerit-Australiumnugget
item.nugget_australium_lesser.name=Tasmanit-Australiumnugget
item.nugget_beryllium.name=Berylliumnugget
item.nugget_co60.name=Kobalt-60-Nugget
item.nugget_daffergon.name=Daffergonnugget
@ -1679,6 +1687,7 @@ item.nugget_les.name=Schwach angereichertes Schrabidiumkernbrennstoffnugget
item.nugget_mercury.name=Quecksilbertropfen
item.nugget_mox_fuel.name=MOX-Kernbrennstoffnugget
item.nugget_neptunium.name=Neptuniumnugget
item.nugget_neptunium_fuel.name=Neptuniumkernbrennstoffnugget
item.nugget_plutonium.name=Plutoniumnugget
item.nugget_plutonium_fuel.name=Plutoniumkernbrennstoffnugget
item.nugget_polonium.name=Polonium-210-Nugget
@ -1809,6 +1818,8 @@ item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub
item.powder_aluminium.name=Aluminiumstaub
item.powder_asbestos.name=Asbeststaub
item.powder_astatine.name=Astatstaub
item.powder_at209.name=Astat-209-Staub
item.powder_au198.name=Gold-198-Staub
item.powder_australium.name=Australiumstaub
item.powder_balefire.name=Thermonukleare Asche
item.powder_beryllium.name=Berylliumstaub
@ -1818,11 +1829,13 @@ item.powder_cerium.name=Cerstaub
item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub
item.powder_chlorophyte.name=Grünalgenstaub
item.powder_cloud.name=Wolkenrückstände
item.powder_co60.name=Kobalt-60-Staub
item.powder_coal.name=Kohlestaub
item.powder_cobalt.name=Cobaltstaub
item.powder_cobalt.name=Kobaltstaub
item.powder_cobalt_tiny.name=Kleiner Haufen Cobaltstaub
item.powder_combine_steel.name=CMB-Stahlstaub
item.powder_copper.name=Kupferstaub
item.powder_cs137.name=Caesium-137-Staub
item.powder_daffergon.name=Daffergonstaub
item.powder_desh.name=Deshstaub
item.powder_desh_mix.name=Deshmischung
@ -1834,6 +1847,7 @@ item.powder_emerald.name=Smaragdstaub
item.powder_euphemium.name=Euphemiumstaub
item.powder_fire.name=Roter Phosphor
item.powder_gold.name=Goldstaub
item.powder_i131.name=Iod-131-Staub
item.powder_ice.name=Kryopulver
item.powder_iodine.name=Iodstaub
item.powder_iron.name=Eisenstaub
@ -2910,6 +2924,40 @@ trait.hydro=Hydro-Reaktiv
trait.radioactive=Radioaktiv
trait.radResistance=Strahlungs-Resistenz: %s
trait.rbmk.coreTemp=Kerntemperatur: %s
trait.rbmk.depletion=Erschöpfung: %s
trait.rbmk.diffusion=Diffusion: %s
trait.rbmk.fluxFunc=Flux-Funktion: %s
trait.rbmk.heat=Hitze pro Tick bei voller Kraft: %s
trait.rbmk.melt=Schmelzpunkt: %s
trait.rbmk.neutron.any=Alle Neutronen
trait.rbmk.neutron.fast=Schnelle Neutronen
trait.rbmk.neutron.slow=Langsame Neutronen
trait.rbmk.skinTemp=Außentemperatur: %s
trait.rbmk.source=Selbstzündend
trait.rbmk.splitsInto=Teilt sich in: %s
trait.rbmk.splitsWith=Teilt sich mit: %s
trait.rbmk.xenon=Xenonvergiftung: %s
trait.rbmk.xenonBurn=Xenon-Verbr.-Funkion: %s
trait.rbmk.xenonGen=Xenon-Erzg.-Funktion: %s
trait.rbmx.coreTemp=Kernentropie: %s
trait.rbmx.depletion=Verkrustungsgraad: %s
trait.rbmx.diffusion=Fluss: %s
trait.rbmx.fluxFunc=Zerstörungsfunktion: %s
trait.rbmx.heat=Verkrustung pro Tick bei voller Kraft: %s
trait.rbmx.melt=Kollapstiefe: %s
trait.rbmk.neutron.any.x=Alle nicht-euklidischen Formen
trait.rbmk.neutron.fast.x=Elliptische nicht-euklidische Formen
trait.rbmk.neutron.slow.x=Hyperbolische nicht-euklidische Formen
trait.rbmx.skinTemp=Außenentropie: %s
trait.rbmx.source=Selbstverbrennend
trait.rbmx.splitsInto=Verlässt nach: %s
trait.rbmx.splitsWith=Kommt von: %s
trait.rbmx.xenon=Belivergiftung: %s
trait.rbmx.xenonBurn=Blei-Verbr.-Funkion: %s
trait.rbmx.xenonGen=Blei-Erzg.-Funktion: %s
tool.ability.cnetrifuge=Auto-Zentrifuge
tool.ability.crystallizer=Auto-Kristallisierer
tool.ability.explosion=Explosion

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

@ -674,9 +674,12 @@ item.beta.name=Beta Features
item.big_sword.name=Great Sword
item.billet_au198.name=Gold-198 Billet
item.billet_australium.name=Australium Billet
item.billet_australium_greater.name=Greater Australium Billet
item.billet_australium_lesser.name=Lesser Australium Billet
item.billet_co60.name=Cobalt-60 Billet
item.billet_mox_fuel.name=MOX Fuel Billet
item.billet_neptunium.name=Neptunium Billet
item.billet_neptunium_fuel.name=Neptunium Fuel Billet
item.billet_polonium.name=Polonium-210 Billet
item.billet_pu_mix.name=Reactor Grade Plutonium Billet
item.billet_pu238.name=Pu238 Billet
@ -1328,9 +1331,11 @@ item.ingot_actinium.name=Semi-Stable Actinium Ingot
item.ingot_advanced_alloy.name=Advanced Alloy Ingot
item.ingot_aluminium.name=Aluminium Ingot
item.ingot_asbestos.name=Asbestos Sheet
item.ingot_au198.name=Gold-198 Ingot
item.ingot_australium.name=Australium Ingot
item.ingot_beryllium.name=Beryllium Ingot
item.ingot_chainsteel.name=Heavy Chainsteel
item.ingot_co60.name=Cobalt-60 Ingot
item.ingot_cobalt.name=Cobalt Ingot
item.ingot_combine_steel.name=CMB Steel Ingot
item.ingot_copper.name=Industrial Grade Copper
@ -1350,6 +1355,7 @@ item.ingot_meteorite.name=Meteorite Ingot
item.ingot_meteorite_forged.name=Forged Meteorite Ingot
item.ingot_mox_fuel.name=Ingot of MOX Fuel
item.ingot_neptunium.name=Neptunium Ingot
item.ingot_neptunium_fuel.name=Neptunium Fuel Ingot
item.ingot_phosphorus.name=Bar of White Phosphorus
item.ingot_plutonium.name=Plutonium Ingot
item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel
@ -1667,6 +1673,8 @@ item.nuclear_waste_short_depleted_tiny.name=Tiny Pile of Decayed Short-Lived Nuc
item.nugget.name=Chicken Nugget
item.nugget_au198.name=Gold-198 Nugget
item.nugget_australium.name=Australium Nugget
item.nugget_australium_greater.name=Greater Australium Nugget
item.nugget_australium_lesser.name=Lesser Australium Nugget
item.nugget_beryllium.name=Beryllium Nugget
item.nugget_co60.name=Cobalt-60 Nugget
item.nugget_daffergon.name=Daffergon Nugget
@ -1679,6 +1687,7 @@ item.nugget_les.name=Low Enriched Schrabidium Fuel Nugget
item.nugget_mercury.name=Small Drop of Mercury
item.nugget_mox_fuel.name=Nugget of MOX Fuel
item.nugget_neptunium.name=Neptunium Nugget
item.nugget_neptunium_fuel.name=Neptunium Fuel Nugget
item.nugget_plutonium.name=Plutonium Nugget
item.nugget_plutonium_fuel.name=Nugget of Plutonium Fuel
item.nugget_polonium.name=Polonium-210 Nugget
@ -1809,6 +1818,8 @@ item.powder_advanced_alloy.name=Advanced Alloy Powder
item.powder_aluminium.name=Aluminium Powder
item.powder_asbestos.name=Asbestos Powder
item.powder_astatine.name=Astatine Powder
item.powder_at209.name=Astatine-209 Powder
item.powder_au198.name=Gold-198 Powder
item.powder_australium.name=Australium Powder
item.powder_balefire.name=Thermonuclear Ashes
item.powder_beryllium.name=Beryllium Powder
@ -1818,11 +1829,13 @@ item.powder_cerium.name=Cerium Powder
item.powder_cerium_tiny.name=Tiny Pile of Cerium Powder
item.powder_chlorophyte.name=Chlorophyte Powder
item.powder_cloud.name=Cloud Residue
item.powder_co60.name=Cobalt-60 Powder
item.powder_coal.name=Coal Powder
item.powder_cobalt.name=Cobalt Powder
item.powder_cobalt_tiny.name=Tiny Pile of Cobalt Powder
item.powder_combine_steel.name=CMB Steel Powder
item.powder_copper.name=Copper Powder
item.powder_cs137.name=Caesium-137 Powder
item.powder_daffergon.name=Daffergon Powder
item.powder_desh.name=Desh Powder
item.powder_desh_mix.name=Desh Blend
@ -1834,6 +1847,7 @@ item.powder_emerald.name=Emerald Powder
item.powder_euphemium.name=Euphemium Powder
item.powder_fire.name=Red Phosphorus
item.powder_gold.name=Gold Powder
item.powder_i131.name=Iodine-131 Powder
item.powder_ice.name=Cryo Powder
item.powder_iodine.name=Iodine Powder
item.powder_iron.name=Iron Powder
@ -2910,6 +2924,40 @@ trait.hydro=Hydroreactive
trait.radioactive=Radioactive
trait.radResistance=Radiation resistance: %s
trait.rbmk.coreTemp=Core temp: %s
trait.rbmk.depletion=Depletion: %s
trait.rbmk.diffusion=Diffusion: %s
trait.rbmk.fluxFunc=Flux function: %s
trait.rbmk.heat=Heat per tick at full power: %s
trait.rbmk.melt=Melting point: %s
trait.rbmk.neutron.any=All Neutrons
trait.rbmk.neutron.fast=Fast Neutrons
trait.rbmk.neutron.slow=Slow Neutrons
trait.rbmk.skinTemp=Skin temp: %s
trait.rbmk.source=Self-igniting
trait.rbmk.splitsInto=Splits into: %s
trait.rbmk.splitsWith=Splits with: %s
trait.rbmk.xenon=Xenon poison: %s
trait.rbmk.xenonBurn=Xenon burn function: %s
trait.rbmk.xenonGen=Xenon gen function: %s
trait.rbmx.coreTemp=Core entropy: %s
trait.rbmx.depletion=Crustyness: %s
trait.rbmx.diffusion=Flow: %s
trait.rbmx.fluxFunc=Doom function: %s
trait.rbmx.heat=Crust per tick at full power: %s
trait.rbmx.melt=Crush depth: %s
trait.rbmk.neutron.any.x=All non-euclidean shapes
trait.rbmk.neutron.fast.x=Elliptic non-euclidean shapes
trait.rbmk.neutron.slow.x=Hyperbolic non-euclidean shapes
trait.rbmx.skinTemp=Skin entropy: %s
trait.rbmx.source=Self-combusting
trait.rbmx.splitsInto=Departs to: %s
trait.rbmx.splitsWith=Arrives from: %s
trait.rbmx.xenon=Lead poison: %s
trait.rbmx.xenonBurn=Lead destruction function: %s
trait.rbmx.xenonGen=Lead creation function: %s
tool.ability.centrifuge=Auto-Centrifuge
tool.ability.crystallizer=Auto-Crystallizer
tool.ability.explosion=Explosion

BIN
src/main/resources/assets/hbm/textures/blocks/conveyor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 263 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 435 B

BIN
src/main/resources/assets/hbm/textures/items/powder_polonium.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 395 B