RBMK console for the most part, recipes, tweaks, gamerules

i probably forgot something really vital but here goes nothing
This commit is contained in:
Bob 2021-05-09 18:42:10 +02:00
parent 4469d43e0b
commit 9c63e9c3d2
65 changed files with 4547 additions and 126 deletions

View File

@ -68,6 +68,7 @@ public class ModBlocks {
public static Block ore_daffergon;
public static Block ore_verticium;
public static Block ore_rare;
public static Block ore_cinnebar;
public static Block ore_nether_coal;
public static Block ore_nether_smoldering;
@ -103,6 +104,8 @@ public class ModBlocks {
public static Block ore_gneiss_gas;
public static Block stone_depth;
public static Block ore_depth_cinnebar;
public static Block ore_depth_zirconium;
public static Block cluster_depth_iron;
public static Block cluster_depth_titanium;
public static Block cluster_depth_tungsten;
@ -176,6 +179,7 @@ public class ModBlocks {
public static Block block_asbestos;
public static Block block_cobalt;
public static Block block_lithium;
public static Block block_zirconium;
public static Block block_white_phosphorus;
public static Block block_red_phosphorus;
public static Block block_fallout;
@ -215,6 +219,7 @@ public class ModBlocks {
public static Block gravel_obsidian;
public static Block gravel_diamond;
public static Block asphalt;
public static Block asphalt_light;
public static Block reinforced_brick;
public static Block reinforced_glass;
@ -231,6 +236,7 @@ public class ModBlocks {
public static Block reinforced_stone;
public static Block concrete_smooth;
public static Block concrete;
public static Block concrete_asbestos;
public static Block concrete_pillar;
public static Block brick_concrete;
public static Block brick_concrete_mossy;
@ -1070,6 +1076,8 @@ public class ModBlocks {
ore_gneiss_gas = new BlockOre(Material.rock).setBlockName("ore_gneiss_gas").setCreativeTab(MainRegistry.blockTab).setHardness(1.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_gneiss_gas");
stone_depth = new BlockGeneric(Material.rock).setBlockName("stone_depth").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":stone_depth");
ore_depth_cinnebar = new BlockOre(Material.rock).setBlockName("ore_depth_cinnebar").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_cinnebar");
ore_depth_zirconium = new BlockOre(Material.rock).setBlockName("ore_depth_zirconium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_depth_zirconium");
cluster_depth_iron = new BlockOre(Material.rock).setBlockName("cluster_depth_iron").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_iron");
cluster_depth_titanium = new BlockOre(Material.rock).setBlockName("cluster_depth_titanium").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_titanium");
cluster_depth_tungsten = new BlockOre(Material.rock).setBlockName("cluster_depth_tungsten").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cluster_depth_tungsten");
@ -1081,6 +1089,7 @@ public class ModBlocks {
ore_daffergon = new BlockGeneric(Material.rock).setBlockName("ore_daffergon").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_daffergon");
ore_verticium = new BlockGeneric(Material.rock).setBlockName("ore_verticium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_verticium");
ore_rare = new BlockOre(Material.rock).setBlockName("ore_rare").setCreativeTab(MainRegistry.blockTab).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_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");
@ -1143,6 +1152,7 @@ public class ModBlocks {
block_asbestos = new BlockOutgas(Material.cloth, true, 5, true).addAsbestos().toBlock().setBlockName("block_asbestos").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_asbestos");
block_cobalt = new BlockGeneric(Material.iron).setBlockName("block_cobalt").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_cobalt");
block_lithium = new BlockLithium(Material.iron).addHydroReactivity().toBlock().setBlockName("block_lithium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lithium");
block_zirconium = new BlockGeneric(Material.iron).setBlockName("block_zirconium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_zirconium");
block_white_phosphorus = new BlockHazard(Material.rock).addFire(15).toBlock().setBlockName("block_white_phosphorus").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_white_phosphorus");
block_red_phosphorus = new BlockHazardFalling().addFire(15).toBlock().setStepSound(Block.soundTypeSand).setBlockName("block_red_phosphorus").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_red_phosphorus");
block_fallout = new BlockHazardFalling().addRadiation(ItemHazard.fo * ItemHazard.block).toBlock().setStepSound(Block.soundTypeGravel).setBlockName("block_fallout").setCreativeTab(MainRegistry.blockTab).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":ash");
@ -1182,6 +1192,7 @@ public class ModBlocks {
gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian");
gravel_diamond = new BlockFalling(Material.sand).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond");
asphalt = new BlockSpeedy(Material.rock, 1.15).setBlockName("asphalt").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt");
asphalt_light = new BlockSpeedy(Material.rock, 1.15).setBlockName("asphalt_light").setCreativeTab(MainRegistry.blockTab).setLightLevel(1F).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":asphalt_light");
reinforced_brick = new BlockGeneric(Material.rock).setBlockName("reinforced_brick").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(8000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_brick");
reinforced_glass = new BlockNTMGlass(0, RefStrings.MODID + ":reinforced_glass", Material.rock).setBlockName("reinforced_glass").setCreativeTab(MainRegistry.blockTab).setLightOpacity(0).setHardness(15.0F).setResistance(200.0F);
@ -1198,6 +1209,7 @@ public class ModBlocks {
reinforced_stone = new BlockGeneric(Material.rock).setBlockName("reinforced_stone").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(3000.0F).setBlockTextureName(RefStrings.MODID + ":reinforced_stone");
concrete_smooth = new BlockGeneric(Material.rock).setBlockName("concrete_smooth").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete");
concrete = new BlockGeneric(Material.rock).setBlockName("concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_tile");
concrete_asbestos = new BlockGeneric(Material.rock).setBlockName("concrete_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_asbestos");
concrete_pillar = new BlockRotatablePillar(Material.rock, RefStrings.MODID + ":concrete_pillar_top").setBlockName("concrete_pillar").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_pillar_side");
brick_concrete = new BlockGeneric(Material.rock).setBlockName("brick_concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
brick_concrete_mossy = new BlockGeneric(Material.rock).setBlockName("brick_concrete_mossy").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_mossy");
@ -1835,6 +1847,7 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_daffergon, ItemOreBlock.class, ore_daffergon.getUnlocalizedName());
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());
//Stone clusters
GameRegistry.registerBlock(cluster_iron, ItemBlockCluster.class, cluster_iron.getUnlocalizedName());
@ -1881,6 +1894,8 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_gneiss_gas, ore_gneiss_gas.getUnlocalizedName());
//Depth ores
GameRegistry.registerBlock(ore_depth_cinnebar, ItemBlockDepth.class, ore_depth_cinnebar.getUnlocalizedName());
GameRegistry.registerBlock(ore_depth_zirconium, ItemBlockDepth.class, ore_depth_zirconium.getUnlocalizedName());
GameRegistry.registerBlock(cluster_depth_iron, ItemBlockDepth.class, cluster_depth_iron.getUnlocalizedName());
GameRegistry.registerBlock(cluster_depth_titanium, ItemBlockDepth.class, cluster_depth_titanium.getUnlocalizedName());
GameRegistry.registerBlock(cluster_depth_tungsten, ItemBlockDepth.class, cluster_depth_tungsten.getUnlocalizedName());
@ -1923,6 +1938,7 @@ public class ModBlocks {
GameRegistry.registerBlock(block_steel, block_steel.getUnlocalizedName());
GameRegistry.registerBlock(block_lead, block_lead.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());
GameRegistry.registerBlock(block_red_phosphorus, ItemBlockHazard.class, block_red_phosphorus.getUnlocalizedName());
GameRegistry.registerBlock(block_yellowcake, ItemBlockHazard.class, block_yellowcake.getUnlocalizedName());
@ -1996,6 +2012,7 @@ public class ModBlocks {
//Reinforced Blocks
GameRegistry.registerBlock(asphalt, asphalt.getUnlocalizedName());
GameRegistry.registerBlock(asphalt_light, asphalt_light.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_brick, reinforced_brick.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_glass, reinforced_glass.getUnlocalizedName());
GameRegistry.registerBlock(reinforced_light, reinforced_light.getUnlocalizedName());
@ -2007,6 +2024,7 @@ public class ModBlocks {
GameRegistry.registerBlock(reinforced_stone, reinforced_stone.getUnlocalizedName());
GameRegistry.registerBlock(concrete_smooth, concrete_smooth.getUnlocalizedName());
GameRegistry.registerBlock(concrete, concrete.getUnlocalizedName());
GameRegistry.registerBlock(concrete_asbestos, concrete_asbestos.getUnlocalizedName());
GameRegistry.registerBlock(concrete_pillar, concrete_pillar.getUnlocalizedName());
GameRegistry.registerBlock(brick_concrete, brick_concrete.getUnlocalizedName());
GameRegistry.registerBlock(brick_concrete_mossy, brick_concrete_mossy.getUnlocalizedName());

View File

@ -155,7 +155,7 @@ public class BlockOre extends Block {
if(this == ModBlocks.ore_rare || this == ModBlocks.ore_gneiss_rare) {
switch(rand.nextInt(6)) {
case 0:
return ModItems.fragment_actinium;
return ModItems.fragment_boron;
case 1:
return ModItems.fragment_cerium;
case 2:
@ -207,29 +207,41 @@ public class BlockOre extends Block {
if(this == ModBlocks.cluster_depth_tungsten) {
return ModItems.crystal_tungsten;
}
if(this == ModBlocks.ore_cinnebar || this == ModBlocks.ore_depth_cinnebar) {
return ModItems.cinnebar;
}
if(this == ModBlocks.ore_depth_zirconium) {
return ModItems.nugget_zirconium;
}
return Item.getItemFromBlock(this);
}
@Override
public int quantityDropped(Random p_149745_1_) {
public int quantityDropped(Random rand) {
if(this == ModBlocks.ore_fluorite) {
return 2 + p_149745_1_.nextInt(3);
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_niter) {
return 2 + p_149745_1_.nextInt(3);
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_sulfur || this == ModBlocks.ore_nether_sulfur || this == ModBlocks.ore_meteor_sulfur) {
return 2 + p_149745_1_.nextInt(3);
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_rare || this == ModBlocks.ore_gneiss_rare) {
return 4 + p_149745_1_.nextInt(8);
return 4 + rand.nextInt(8);
}
if(this == ModBlocks.block_meteor_broken) {
return 1 + p_149745_1_.nextInt(3);
return 1 + rand.nextInt(3);
}
if(this == ModBlocks.block_meteor_treasure) {
return 1 + p_149745_1_.nextInt(3);
return 1 + rand.nextInt(3);
}
if(this == ModBlocks.ore_depth_cinnebar) {
return 2 + rand.nextInt(3);
}
if(this == ModBlocks.ore_depth_zirconium) {
return 2 + rand.nextInt(2);
}
return 1;

View File

@ -20,6 +20,7 @@ public class WorldConfig {
public static int asbestosSpawn = 4;
public static int rareSpawn = 6;
public static int lithiumSpawn = 6;
public static int cinnebarSpawn = 2;
public static int oilcoalSpawn = 128;
public static int gassshaleSpawn = 5;
public static int gasbubbleSpawn = 64;
@ -89,6 +90,7 @@ public class WorldConfig {
oilcoalSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.15_oilCoalSpawnRate", "Spawns an oily coal vein every nTH chunk", 128);
gassshaleSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.16_gasShaleSpawnRate", "Amount of oil shale veins per chunk", 5);
gasbubbleSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.17_gasBubbleSpawnRate", "Spawns a gas bubble every nTH chunk", 64);
cinnebarSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.18_cinnebarSpawnRate", "Amount of cinnebar ore veins per chunk", 2);
ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4);
titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2);

View File

@ -26,6 +26,11 @@ public class MineralRecipes {
RecipesCommon.add9To1(ModItems.ingot_boron, ModBlocks.block_boron);
RecipesCommon.add1To9(ModBlocks.block_boron, ModItems.ingot_boron);
RecipesCommon.add9To1(ModItems.powder_boron_tiny, ModItems.powder_boron);
RecipesCommon.add1To9(ModItems.powder_boron, ModItems.powder_boron_tiny);
RecipesCommon.add9To1(ModItems.ingot_zirconium, ModBlocks.block_zirconium);
RecipesCommon.add1To9(ModBlocks.block_zirconium, ModItems.ingot_zirconium);
RecipesCommon.add9To1(ModItems.nugget_zirconium, ModItems.ingot_zirconium);
RecipesCommon.add1To9(ModItems.ingot_zirconium, ModItems.nugget_zirconium);
@ -107,6 +112,8 @@ public class MineralRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 3), new Object[] { ModItems.billet_schrabidium, ModItems.billet_neptunium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "nuggetNeptunium237", "nuggetNeptunium237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "tinyNp237", "tinyNp237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium", "nuggetPolonium", "nuggetPolonium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium238", "nuggetPlutonium238", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium, 2), new Object[] { ModItems.billet_uranium, ModItems.billet_uranium, ModItems.billet_uranium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_u233, 2), new Object[] { ModItems.billet_u233, ModItems.billet_u233, ModItems.billet_u233 });

View File

@ -33,8 +33,8 @@ public class PowderRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_semtex_mix, 1), new Object[] { ModItems.solid_fuel, ModItems.ballistite, "dustSaltpeter" }));
//Desh
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_actinium_tiny, ModItems.powder_actinium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_boron_tiny, ModItems.powder_boron_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_boron, ModItems.powder_boron, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_desh_ready, 1), new Object[] { ModItems.powder_desh_mix, ModItems.nugget_mercury, ModItems.nugget_mercury, "dustCoal" }));
//Metal powders

View File

@ -101,6 +101,11 @@ public class RecipesCommon {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 4), new Object[] { out });
}
//Fill rods with 6 nuggets
public static void addRBMKRod(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rbmk_fuel_empty, billet, billet, billet, billet, billet, billet, billet, billet });
}
//Sword
public static void addSword(Item ingot, Item sword) {

View File

@ -161,7 +161,21 @@ public class RodRecipes {
RecipesCommon.addQuadRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_quad_plutonium_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_mox_fuel, ModItems.rod_quad_mox_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_quad_schrabidium_fuel);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rbmk_fuel_empty, 1), new Object[] { "ZRZ", "Z Z", "ZRZ", 'Z', "ingotZirconium", 'R', ModItems.rod_quad_empty }));
RecipesCommon.addRBMKRod(ModItems.billet_uranium_fuel, ModItems.rbmk_fuel_meu);
RecipesCommon.addRBMKRod(ModItems.billet_thorium_fuel, ModItems.rbmk_fuel_thmeu);
RecipesCommon.addRBMKRod(ModItems.billet_plutonium_fuel, ModItems.rbmk_fuel_lep);
RecipesCommon.addRBMKRod(ModItems.billet_pu_mix, ModItems.rbmk_fuel_mep);
RecipesCommon.addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men);
RecipesCommon.addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be);
RecipesCommon.addRBMKRod(ModItems.billet_pu238be, ModItems.rbmk_fuel_pu238be);
RecipesCommon.addRBMKRod(ModItems.billet_australium_lesser, ModItems.rbmk_fuel_leaus);
RecipesCommon.addRBMKRod(ModItems.billet_australium_greater, ModItems.rbmk_fuel_heaus);
RecipesCommon.addRBMKRod(ModItems.egg_balefire_shard, ModItems.rbmk_fuel_balefire);
RecipesCommon.addRBMKRod(ModItems.billet_schrabidium_fuel, ModItems.rbmk_fuel_mes);
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rbmk_fuel_drx, 1), new Object[] { ModItems.rbmk_fuel_balefire, ModItems.particle_digamma });
//Water rods
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_water, 1), new Object[] { ModItems.rod_empty, Items.water_bucket });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_water, 1), new Object[] { ModItems.rod_dual_empty, Items.water_bucket, Items.water_bucket });

View File

@ -120,6 +120,7 @@ public class ToolRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.geiger), new Object[] { ModItems.geiger_counter });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.digamma_diagnostic), new Object[] { ModItems.geiger_counter, ModItems.billet_polonium, ModItems.ingot_asbestos });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mirror_tool), new Object[] { " A ", " IA", "I ", 'A', "ingotAluminum", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rbmk_tool), new Object[] { " A ", " IA", "I ", 'A', "ingotLead", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.defuser, 1), new Object[] { " PS", "P P", " P ", 'P', "ingotPolymer", 'S', "plateSteel" }));
//Bobmazon

View File

@ -73,7 +73,7 @@ public class WeaponRecipes {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', "plateSteel", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_saturnite, 1), new Object[] { "SSM", " RW", 'S', "plateSaturnite", 'W', "plankWood", 'R', ModItems.wire_tungsten, 'M', ModItems.mechanism_revolver_2 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_iron, 1), new Object[] { "SSM", " RW", 'S', "plateIron", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSM", " RW", 'S', "plateGold", 'W', "ingotGold", 'R', ModItems.wire_gold, 'M', ModItems.mechanism_revolver_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSM", " RW", 'S', "plateGold", 'W', "ingotTungsten", 'R', ModItems.wire_gold, 'M', ModItems.mechanism_revolver_1 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_lead, 1), new Object[] { "SSM", " RW", 'S', "plateLead", 'W', "ingotTungsten", 'R', ModItems.wire_tungsten, 'M', ModItems.mechanism_revolver_2 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_schrabidium, 1), new Object[] { "SSM", " RW", 'S', ModBlocks.block_schrabidium, 'W', "ingotTungsten", 'R', ModItems.wire_schrabidium, 'M', ModItems.mechanism_special }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip, 1), new Object[] { " G ", "SSP", " TI", 'G', "paneGlass", 'S', "plateSteel", 'P', ModItems.mechanism_revolver_2, 'T', ModItems.wire_tungsten, 'I', "ingotPolymer" }));
@ -173,7 +173,7 @@ public class WeaponRecipes {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 24), new Object[] { " I", "GC", " P", 'I', ModItems.trinitite, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_lead, 24), new Object[] { " I", "GC", " P", 'I', ModItems.nuclear_waste_tiny, 'G', ModItems.cordite, 'C', "paneGlassColorless", 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_gold, 24), new Object[] { " I", "GC", " P", 'I', "ingotGold", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 6), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', Items.nether_star }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_schrabidium, 6), new Object[] { " I ", "GCN", " P ", 'I', "ingotSchrabidium", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357, 'N', ModItems.billet_yharonite }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_nightmare, 24), new Object[] { " I", "GC", " P", 'I', "ingotTungsten", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_desh, 24), new Object[] { " I", "GC", " P", 'I', "ingotDesh", 'G', ModItems.cordite, 'C', ModItems.casing_357, 'P', ModItems.primer_357 }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.assembly_smg, 32), new Object[] { " I", "GC", " P", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_9, 'P', ModItems.primer_9 }));

View File

@ -685,9 +685,8 @@ public class AssemblerRecipes {
}, 400);
makeRecipe(new ComparableStack(ModBlocks.rbmk_blank, 1), new AStack[] {
new ComparableStack(ModBlocks.concrete, 6),
new ComparableStack(ModItems.ingot_asbestos, 6),
new OreDictStack("plateSteel", 12),
new ComparableStack(ModBlocks.concrete_asbestos, 4),
new OreDictStack("plateSteel", 8),
new OreDictStack("ingotCopper", 4),
new ComparableStack(ModItems.plate_polymer, 4)
}, 100);

View File

@ -58,6 +58,8 @@ public class CrystallizerRecipes {
recipes.put("blockRedstone", new ItemStack(ModItems.nugget_mercury));
recipes.put(new ComparableStack(Items.rotten_flesh), new ItemStack(Items.leather));
recipes.put(new ComparableStack(ModItems.coal_infernal), new ItemStack(ModItems.solid_fuel));
recipes.put(new ComparableStack(ModItems.cinnebar), new ItemStack(ModItems.nugget_mercury, 3));
recipes.put(new ComparableStack(ModItems.coke), new ItemStack(ModItems.ingot_graphite));
recipes.put(new ComparableStack(ModItems.powder_diamond), new ItemStack(Items.diamond));
recipes.put(new ComparableStack(ModItems.powder_emerald), new ItemStack(Items.emerald));

View File

@ -1650,6 +1650,11 @@ public class MachineRecipes {
list.add(new ItemStack(Blocks.gravel, 8));
list.add(new ItemStack(Blocks.sand, 8));
break;
case CONCRETE_ASBESTOS:
list.add(new ItemStack(Blocks.gravel, 2));
list.add(new ItemStack(Blocks.sand, 2));
list.add(new ItemStack(ModItems.ingot_asbestos, 4));
break;
case COOLANT:
list.add(new ItemStack(ModItems.niter, 1));
break;
@ -1826,11 +1831,14 @@ public class MachineRecipes {
input[1] = new FluidStack(2400, FluidType.STEAM);
break;
case ASPHALT:
input[0] = new FluidStack(8000, FluidType.BITUMEN);
input[0] = new FluidStack(1000, FluidType.BITUMEN);
break;
case CONCRETE:
input[0] = new FluidStack(2000, FluidType.WATER);
break;
case CONCRETE_ASBESTOS:
input[0] = new FluidStack(2000, FluidType.WATER);
break;
case COOLANT:
input[0] = new FluidStack(1800, FluidType.WATER);
break;
@ -1991,6 +1999,12 @@ public class MachineRecipes {
output[2] = new ItemStack(ModBlocks.concrete_smooth, 4);
output[3] = new ItemStack(ModBlocks.concrete_smooth, 4);
break;
case CONCRETE_ASBESTOS:
output[0] = new ItemStack(ModBlocks.concrete_asbestos, 4);
output[1] = new ItemStack(ModBlocks.concrete_asbestos, 4);
output[2] = new ItemStack(ModBlocks.concrete_asbestos, 4);
output[3] = new ItemStack(ModBlocks.concrete_asbestos, 4);
break;
case DESH:
output[0] = new ItemStack(ModItems.ingot_desh, 1);
break;

View File

@ -62,6 +62,7 @@ public class OreDictManager {
OreDictionary.registerOre("ingotStarmetal", ModItems.ingot_starmetal);
OreDictionary.registerOre("ingotAsbestos", ModItems.ingot_asbestos);
OreDictionary.registerOre("ingotZirconium", ModItems.ingot_zirconium);
OreDictionary.registerOre("ingotBoron", ModItems.ingot_boron);
OreDictionary.registerOre("nuggetLead", ModItems.nugget_lead);
OreDictionary.registerOre("nuggetBeryllium", ModItems.nugget_beryllium);
@ -101,6 +102,7 @@ public class OreDictManager {
OreDictionary.registerOre("nuggetCerium", ModItems.fragment_cerium);
OreDictionary.registerOre("nuggetLanthanium", ModItems.fragment_lanthanium);
OreDictionary.registerOre("nuggetActinium", ModItems.fragment_actinium);
OreDictionary.registerOre("nuggetBoron", ModItems.fragment_boron);
OreDictionary.registerOre("dustIron", ModItems.powder_iron);
OreDictionary.registerOre("dustGold", ModItems.powder_gold);
@ -148,6 +150,7 @@ public class OreDictManager {
OreDictionary.registerOre("dustAsbestos", ModItems.powder_asbestos);
OreDictionary.registerOre("dustPhosphorus", ModItems.powder_fire);
OreDictionary.registerOre("dustZirconium", ModItems.powder_zirconium);
OreDictionary.registerOre("dustBoron", ModItems.powder_boron);
OreDictionary.registerOre("dustNeptunium", ModItems.powder_neptunium);
OreDictionary.registerOre("dustIodine", ModItems.powder_iodine);
@ -201,6 +204,7 @@ public class OreDictManager {
OreDictionary.registerOre("oreDaffergon", ModBlocks.ore_daffergon);
OreDictionary.registerOre("oreVerticium", ModBlocks.ore_verticium);
OreDictionary.registerOre("oreRareEarth", ModBlocks.ore_rare);
OreDictionary.registerOre("oreZirconium", ModBlocks.ore_depth_zirconium);
OreDictionary.registerOre("oreIron", ModBlocks.ore_gneiss_iron);
OreDictionary.registerOre("oreGold", ModBlocks.ore_gneiss_gold);
@ -258,6 +262,8 @@ public class OreDictManager {
OreDictionary.registerOre("blockDesh", ModBlocks.block_desh);
OreDictionary.registerOre("blockAsbestos", ModBlocks.block_asbestos);
OreDictionary.registerOre("blockCobalt", ModBlocks.block_cobalt);
OreDictionary.registerOre("blockZirconium", ModBlocks.block_zirconium);
OreDictionary.registerOre("blockBoron", ModBlocks.block_boron);
OreDictionary.registerOre("blockThorium", ModBlocks.block_thorium);
OreDictionary.registerOre("blockThorium232", ModBlocks.block_thorium);

View File

@ -42,6 +42,11 @@ public class SILEXRecipes {
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium), 2))
);
recipes.put(new ComparableStack(ModItems.ingot_australium), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_lesser), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_australium_greater), 1))
);
recipes.put(new ComparableStack(ModItems.crystal_schraranium), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_schrabidium), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_uranium), 2))

View File

@ -133,6 +133,7 @@ public class ShredderRecipes {
ShredderRecipes.setRecipe(ModItems.fragment_cerium, new ItemStack(ModItems.powder_cerium_tiny, 1));
ShredderRecipes.setRecipe(ModItems.fragment_lanthanium, new ItemStack(ModItems.powder_lanthanium_tiny, 1));
ShredderRecipes.setRecipe(ModItems.fragment_actinium, new ItemStack(ModItems.powder_actinium_tiny, 1));
ShredderRecipes.setRecipe(ModItems.fragment_boron, new ItemStack(ModItems.powder_boron_tiny, 1));
ShredderRecipes.setRecipe(ModItems.fragment_meteorite, new ItemStack(ModItems.powder_meteorite_tiny, 1));
ShredderRecipes.setRecipe(ModBlocks.block_meteor, new ItemStack(ModItems.powder_meteorite, 10));
ShredderRecipes.setRecipe(Items.enchanted_book, new ItemStack(ModItems.powder_magic, 1));
@ -150,6 +151,7 @@ public class ShredderRecipes {
ShredderRecipes.setRecipe(ModItems.ingot_schrabidate, new ItemStack(ModItems.powder_schrabidate, 1));
ShredderRecipes.setRecipe(ModBlocks.block_schrabidate, new ItemStack(ModItems.powder_schrabidate, 9));
ShredderRecipes.setRecipe(ModItems.coal_infernal, new ItemStack(ModItems.powder_coal, 3));
ShredderRecipes.setRecipe(Items.reeds, new ItemStack(Items.paper, 3));
ShredderRecipes.setRecipe(ModItems.ingot_schraranium, new ItemStack(ModItems.nugget_schrabidium, 2));
ShredderRecipes.setRecipe(ModItems.crystal_coal, new ItemStack(ModItems.powder_coal, 3));

View File

@ -35,6 +35,7 @@ public class GUIMachineSelenium extends GuiInfoContainer {
String[] text = new String[] { "Accepted Fuels:",
" Industrial Oil (50 HE/t)",
" Heating Oil (75 HE/t)",
" Hydrogen (500 HE/t)",
" Diesel (225 HE/t)",
" Kerosene (300 HE/t)",
" Reclaimed Oil (100 HE/t)",

View File

@ -31,7 +31,6 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
@Override
public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f);
boiler.feed.renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 24, 16, 56);
boiler.steam.renderTankInfo(this, mouseX, mouseY, guiLeft + 89, guiTop + 39, 8, 28);
@ -68,7 +67,7 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
int i = boiler.feed.getFill() * 58 / boiler.feed.getMaxFill();
drawTexturedModalRect(guiLeft + 126, guiTop + 82 - i, 176, 58 - i, 14, i);
int j = boiler.feed.getFill() * 22 / boiler.steam.getMaxFill();
int j = boiler.steam.getFill() * 22 / boiler.steam.getMaxFill();
if(j > 0) j++;
if(j > 22) j++;

View File

@ -1,19 +1,40 @@
package com.hbm.inventory.gui;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.math.NumberUtils;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.inventory.container.ContainerRBMKConsole;
import com.hbm.lib.RefStrings;
import com.hbm.packet.NBTControlPacket;
import com.hbm.packet.PacketDispatcher;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.RBMKColumn;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
public class GUIRBMKConsole extends GuiInfoContainer {
private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/reactors/gui_rbmk_console.png");
private TileEntityRBMKConsole console;
private boolean[] selection = new boolean[15 * 15];
private boolean az5Lid = true;
private long lastPress = 0;
private GuiTextField field;
public GUIRBMKConsole(InventoryPlayer invPlayer, TileEntityRBMKConsole tedf) {
super(new ContainerRBMKConsole(invPlayer, tedf));
@ -23,11 +44,166 @@ public class GUIRBMKConsole extends GuiInfoContainer {
this.ySize = 172;
}
public void initGui() {
super.initGui();
Keyboard.enableRepeatEvents(true);
for(int i = 0; i < 4; i++) {
this.field = new GuiTextField(this.fontRendererObj, guiLeft + 9, guiTop + 84, 35, 9);
this.field.setTextColor(0x00ff00);
this.field.setDisabledTextColour(0x008000);
this.field.setEnableBackgroundDrawing(false);
this.field.setMaxStringLength(3);
}
}
@Override
public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f);
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 71, guiTop + 29, 16, 56, mouseX, mouseY, new String[]{ "%" } );
int bX = 86;
int bY = 11;
int size = 10;
if(guiLeft + 86 <= mouseX && guiLeft + 86 + 150 > mouseX && guiTop + 11 < mouseY && guiTop + 11 + 10150 >= mouseY) {
int index = ((mouseX - bX - guiLeft) / size + (mouseY - bY - guiTop) / size * 15);
if(index > 0 && index < console.columns.length) {
RBMKColumn col = console.columns[index];
if(col != null && col.data != null) {
List<String> list = new ArrayList();
Set<String> keys = col.data.func_150296_c();
list.add(col.type.toString());
for(String key : keys) {
list.add(key + ": " + col.data.getTag(key));
}
if(col != null) {
this.func_146283_a(list, mouseX, mouseY);
}
}
}
}
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 61, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select all control rods" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 72, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Deselect all" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 6, guiTop + 8, 76, 60, mouseX, mouseY, new String[]{ "ignore all this for now" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 6, guiTop + 96, 76, 38, mouseX, mouseY, new String[]{ "and this too" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 6, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select red group" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 17, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select yellow group" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 28, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select green group" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 39, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select blue group" } );
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 50, guiTop + 70, 10, 10, mouseX, mouseY, new String[]{ "Select purple group" } );
}
@Override
protected void mouseClicked(int mouseX, int mouseY, int i) {
super.mouseClicked(mouseX, mouseY, i);
this.field.mouseClicked(mouseX, mouseY, i);
int bX = 86;
int bY = 11;
int size = 10;
if(guiLeft + 86 <= mouseX && guiLeft + 86 + 150 > mouseX && guiTop + 11 < mouseY && guiTop + 11 + 150 >= mouseY) {
int index = ((mouseX - bX - guiLeft) / size + (mouseY - bY - guiTop) / size * 15);
if(index > 0 && index < selection.length && console.columns[index] != null) {
this.selection[index] = !this.selection[index];
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.75F + (this.selection[index] ? 0.25F : 0.0F)));
return;
}
}
if(guiLeft + 72 <= mouseX && guiLeft + 72 + 10 > mouseX && guiTop + 70 < mouseY && guiTop + 70 + 10 >= mouseY) {
this.selection = new boolean[15 * 15];
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.5F));
return;
}
if(guiLeft + 61 <= mouseX && guiLeft + 61 + 10 > mouseX && guiTop + 70 < mouseY && guiTop + 70 + 10 >= mouseY) {
this.selection = new boolean[15 * 15];
for(int j = 0; j < console.columns.length; j++) {
if(console.columns[j] != null && console.columns[j].type == ColumnType.CONTROL) {
this.selection[j] = true;
}
}
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.5F));
return;
}
for(int k = 0; k < 5; k++) {
if(guiLeft + 6 + k * 11 <= mouseX && guiLeft + 6 + k * 11 + 10 > mouseX && guiTop + 70 < mouseY && guiTop + 70 + 10 >= mouseY) {
this.selection = new boolean[15 * 15];
for(int j = 0; j < console.columns.length; j++) {
if(console.columns[j] != null && console.columns[j].type == ColumnType.CONTROL && console.columns[j].data.getShort("color") == k) {
this.selection[j] = true;
}
}
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 0.8F + k * 0.1F));
return;
}
}
if(guiLeft + 30 <= mouseX && guiLeft + 30 + 28 > mouseX && guiTop + 138 < mouseY && guiTop + 138 + 28 >= mouseY) {
if(az5Lid) {
az5Lid = false;
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F));
} else if(lastPress + 3000 < System.currentTimeMillis()) {
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.shutdown"), 1));
lastPress = System.currentTimeMillis();
NBTTagCompound control = new NBTTagCompound();
control.setDouble("level", 0);
for(int j = 0; j < console.columns.length; j++) {
if(console.columns[j] != null && console.columns[j].type == ColumnType.CONTROL)
control.setInteger("sel_" + j, j);
}
PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, console.xCoord, console.yCoord, console.zCoord));
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1F));
}
return;
}
if(guiLeft + 48 <= mouseX && guiLeft + 48 + 12 > mouseX && guiTop + 82 < mouseY && guiTop + 82 + 12 >= mouseY) {
double level;
if(NumberUtils.isNumber(field.getText())) {
int j = (int)MathHelper.clamp_double(Double.parseDouble(field.getText()), 0, 100);
field.setText(j + "");
level = j * 0.01D;
} else {
return;
}
NBTTagCompound control = new NBTTagCompound();
control.setDouble("level", level);
for(int j = 0; j < selection.length; j++) {
if(selection[j])
control.setInteger("sel_" + j, j);
}
PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, console.xCoord, console.yCoord, console.zCoord));
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1F));
}
}
@Override
@ -35,9 +211,94 @@ public class GUIRBMKConsole extends GuiInfoContainer {
}
@Override
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
protected void drawGuiContainerBackgroundLayer(float interp, int mX, int mY) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
if(az5Lid) {
drawTexturedModalRect(guiLeft + 30, guiTop + 138, 90, 172, 28, 28);
}
int bX = 86;
int bY = 11;
int size = 10;
for(int i = 0; i < console.columns.length; i++) {
RBMKColumn col = console.columns[i];
if(col == null)
continue;
int x = bX + size * (i % 15);
int y = bY + size * (i / 15);
int tX = col.type.offset;
int tY = 172;
drawTexturedModalRect(guiLeft + x, guiTop + y, tX, tY, size, size);
int h = (int)Math.ceil((col.data.getDouble("heat") - 20) * 10 / col.data.getDouble("maxHeat"));
drawTexturedModalRect(guiLeft + x, guiTop + y + size - h, 0, 192 - h, 10, h);
switch(col.type) {
case ABSORBER: break;
case BLANK: break;
case MODERATOR: break;
case REFLECTOR: break;
case CONTROL:
int color = col.data.getShort("color");
if(color > -1)
drawTexturedModalRect(guiLeft + x, guiTop + y, color * size, 202, 10, 10);
case CONTROL_AUTO:
int fr = 8 - (int)Math.ceil((col.data.getDouble("level") * 8));
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 1, 24, 183, 2, fr);
break;
case FUEL:
if(col.data.hasKey("c_heat")) {
int fh = (int)Math.ceil((col.data.getDouble("c_heat") - 20) * 8 / col.data.getDouble("c_maxHeat"));
drawTexturedModalRect(guiLeft + x + 1, guiTop + y + size - fh - 1, 11, 191 - fh, 2, fh);
int fe = (int)Math.ceil((col.data.getDouble("enrichment")) * 8);
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + size - fe - 1, 14, 191 - fe, 2, fe);
}
break;
case BOILER:
int fw = (int)Math.ceil((col.data.getInteger("water")) * 8 / col.data.getDouble("maxWater"));
drawTexturedModalRect(guiLeft + x + 1, guiTop + y + size - fw - 1, 41, 191 - fw, 3, fw);
int fs = (int)Math.ceil((col.data.getInteger("steam")) * 8 / col.data.getDouble("maxSteam"));
drawTexturedModalRect(guiLeft + x + 6, guiTop + y + size - fs - 1, 46, 191 - fs, 3, fs);
if(col.data.getShort("type") == FluidType.STEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 1, 44, 183, 2, 2);
if(col.data.getShort("type") == FluidType.HOTSTEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 3, 44, 185, 2, 2);
if(col.data.getShort("type") == FluidType.SUPERHOTSTEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 5, 44, 187, 2, 2);
if(col.data.getShort("type") == FluidType.ULTRAHOTSTEAM.ordinal())
drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 7, 44, 189, 2, 2);
break;
}
if(this.selection[i])
drawTexturedModalRect(guiLeft + x, guiTop + y, 0, 192, 10, 10);
}
this.field.drawTextBox();
}
@Override
protected void keyTyped(char c, int i) {
if(this.field.textboxKeyTyped(c, i))
return;
super.keyTyped(c, i);
}
}

View File

@ -77,6 +77,7 @@ public class ModItems {
public static Item powder_lignite;
public static Item briquette_lignite;
public static Item coal_infernal;
public static Item cinnebar;
public static Item niter;
public static Item ingot_copper;
@ -172,6 +173,8 @@ public class ModItems {
public static Item billet_neptunium_fuel;
public static Item billet_mox_fuel;
public static Item billet_schrabidium_fuel;
public static Item billet_po210be;
public static Item billet_pu238be;
public static Item billet_yharonite;
public static Item nugget_th232;
@ -353,10 +356,12 @@ public class ModItems {
public static Item powder_cerium_tiny;
public static Item powder_lanthanium_tiny;
public static Item powder_actinium_tiny;
public static Item powder_boron_tiny;
public static Item powder_meteorite_tiny;
public static Item powder_lanthanium;
public static Item powder_actinium;
public static Item powder_boron;
public static Item powder_desh;
public static Item powder_semtex_mix;
public static Item powder_desh_mix;
@ -374,6 +379,7 @@ public class ModItems {
public static Item fragment_cerium;
public static Item fragment_lanthanium;
public static Item fragment_actinium;
public static Item fragment_boron;
public static Item fragment_meteorite;
public static Item biomass;
@ -2390,6 +2396,8 @@ public class ModItems {
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_po210be = new ItemHazard().setUnlocalizedName("billet_po210be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_po210be");
billet_pu238be = new ItemHazard().setUnlocalizedName("billet_pu238be").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu238be");
billet_yharonite = new Item().setUnlocalizedName("billet_yharonite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_yharonite");
ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_dura_steel");
@ -2433,6 +2441,7 @@ public class ModItems {
briquette_lignite = new Item().setUnlocalizedName("briquette_lignite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":briquette_lignite");
powder_lignite = new Item().setUnlocalizedName("powder_lignite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lignite");
coal_infernal = new Item().setUnlocalizedName("coal_infernal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coal_infernal");
cinnebar = new Item().setUnlocalizedName("cinnebar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cinnebar");
ingot_australium = new ItemCustomLore().setUnlocalizedName("ingot_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_australium");
ingot_weidanium = new ItemCustomLore().setUnlocalizedName("ingot_weidanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_weidanium");
@ -2567,6 +2576,7 @@ public class ModItems {
powder_meteorite = new Item().setUnlocalizedName("powder_meteorite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_meteorite");
powder_lanthanium = new ItemCustomLore().setUnlocalizedName("powder_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lanthanium");
powder_actinium = new ItemCustomLore().setUnlocalizedName("powder_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_actinium");
powder_boron = new ItemCustomLore().setUnlocalizedName("powder_boron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_boron");
powder_semtex_mix = new Item().setUnlocalizedName("powder_semtex_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_semtex_mix");
powder_desh_mix = new Item().setUnlocalizedName("powder_desh_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_desh_mix");
powder_desh_ready = new Item().setUnlocalizedName("powder_desh_ready").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_desh_ready");
@ -2581,6 +2591,7 @@ public class ModItems {
powder_cerium_tiny = new Item().setUnlocalizedName("powder_cerium_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cerium_tiny");
powder_lanthanium_tiny = new Item().setUnlocalizedName("powder_lanthanium_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_lanthanium_tiny");
powder_actinium_tiny = new Item().setUnlocalizedName("powder_actinium_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_actinium_tiny");
powder_boron_tiny = new Item().setUnlocalizedName("powder_boron_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_boron_tiny");
powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny");
powder_yellowcake = new ItemHazard(ItemHazard.u * ItemHazard.powder).setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_yellowcake");
powder_magic = new Item().setUnlocalizedName("powder_magic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_magic");
@ -2593,6 +2604,7 @@ public class ModItems {
fragment_cerium = new Item().setUnlocalizedName("fragment_cerium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_cerium");
fragment_lanthanium = new Item().setUnlocalizedName("fragment_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":fragment_lanthanium");
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");
biomass = new Item().setUnlocalizedName("biomass").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":biomass");
@ -3146,53 +3158,92 @@ public class ModItems {
rod_dual_tritium = new ItemHazard(1F).setUnlocalizedName("rod_dual_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_tritium");
rod_quad_tritium = new ItemHazard(2F).setUnlocalizedName("rod_quad_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_tritium");
rbmk_lid = new Item().setUnlocalizedName("rbmk_lid").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid");
rbmk_lid = new Item().setUnlocalizedName("rbmk_lid").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_lid");
rbmk_fuel_empty = new Item().setUnlocalizedName("rbmk_fuel_empty").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rbmk_fuel_empty");
rbmk_fuel_meu = new ItemRBMKRod("Medium Enriched Uranium-235")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_meu").setTextureName(RefStrings.MODID + ":rbmk_fuel_meu");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.uf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_meu").setTextureName(RefStrings.MODID + ":rbmk_fuel_meu");
rbmk_fuel_thmeu = new ItemRBMKRod("Thorium with MEU Driver Fuel")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_thmeu").setTextureName(RefStrings.MODID + ":rbmk_fuel_thmeu");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.thf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_thmeu").setTextureName(RefStrings.MODID + ":rbmk_fuel_thmeu");
rbmk_fuel_lep = new ItemRBMKRod("Low Enriched Plutonium-239")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_lep").setTextureName(RefStrings.MODID + ":rbmk_fuel_lep");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.puf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_lep").setTextureName(RefStrings.MODID + ":rbmk_fuel_lep");
rbmk_fuel_mep = new ItemRBMKRod("Medium Enriched Plutonium-239")
.setYield(100000000D)
.setStats(100, 20).setUnlocalizedName("rbmk_fuel_mep").setTextureName(RefStrings.MODID + ":rbmk_fuel_mep");
.setStats(100, 20)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.purg * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_mep").setTextureName(RefStrings.MODID + ":rbmk_fuel_mep");
rbmk_fuel_men = new ItemRBMKRod("Medium Enriched Neptunium-237")
.setYield(100000000D)
.setStats(100, 20).setUnlocalizedName("rbmk_fuel_men").setTextureName(RefStrings.MODID + ":rbmk_fuel_men");
.setStats(100, 20)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.npf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_men").setTextureName(RefStrings.MODID + ":rbmk_fuel_men");
rbmk_fuel_mox = new ItemRBMKRod("Mixed LEU & LEP Oxide")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_mox").setTextureName(RefStrings.MODID + ":rbmk_fuel_mox");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.mox * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_mox").setTextureName(RefStrings.MODID + ":rbmk_fuel_mox");
rbmk_fuel_les = new ItemRBMKRod("Low Enriched Schrabidium-236")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_les").setTextureName(RefStrings.MODID + ":rbmk_fuel_les");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_les").setTextureName(RefStrings.MODID + ":rbmk_fuel_les");
rbmk_fuel_mes = new ItemRBMKRod("Medium Enriched Schrabidium-236")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_mes").setTextureName(RefStrings.MODID + ":rbmk_fuel_mes");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_mes").setTextureName(RefStrings.MODID + ":rbmk_fuel_mes");
rbmk_fuel_hes = new ItemRBMKRod("Highly Enriched Schrabidium-236")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_hes").setTextureName(RefStrings.MODID + ":rbmk_fuel_hes");
.setStats(100)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.saf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_hes").setTextureName(RefStrings.MODID + ":rbmk_fuel_hes");
rbmk_fuel_leaus = new ItemRBMKRod("Low Enriched Australium (Tasmanite)")
.setYield(100000000D)
.setMeltingPoint(2000)
.setStats(100).setUnlocalizedName("rbmk_fuel_leaus").setTextureName(RefStrings.MODID + ":rbmk_fuel_leaus");
rbmk_fuel_heaus = new ItemRBMKRod("Highly Enriched Australium (Ayerite)")
.setYield(100000000D)
.setMeltingPoint(2000)
.setStats(100).setUnlocalizedName("rbmk_fuel_heaus").setTextureName(RefStrings.MODID + ":rbmk_fuel_heaus");
rbmk_fuel_po210be = new ItemRBMKRod("Polonium-210 & Beryllium Neutron Source")
.setYield(100000000D)
.setStats(70, 50).setUnlocalizedName("rbmk_fuel_po210be").setTextureName(RefStrings.MODID + ":rbmk_fuel_po210be");
.setStats(70, 50)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.pobe * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_po210be").setTextureName(RefStrings.MODID + ":rbmk_fuel_po210be");
rbmk_fuel_pu238be = new ItemRBMKRod("Plutonium-238 & Beryllium Neutron Source")
.setYield(100000000D)
.setStats(60, 35).setUnlocalizedName("rbmk_fuel_pu238be").setTextureName(RefStrings.MODID + ":rbmk_fuel_pu238be");
.setStats(60, 35)
.setMeltingPoint(2000)
.addRadiation(ItemHazard.pube * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_pu238be").setTextureName(RefStrings.MODID + ":rbmk_fuel_pu238be");
rbmk_fuel_balefire = new ItemRBMKRod("Draconic Flames")
.setYield(100000000D)
.setStats(60, 35).setUnlocalizedName("rbmk_fuel_balefire").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire");
.setStats(60, 35)
.setMeltingPoint(2000)
.addRadiation(800000F).toItem()
.setUnlocalizedName("rbmk_fuel_balefire").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire");
rbmk_fuel_drx = new ItemRBMKRod(EnumChatFormatting.OBFUSCATED + "can't you hear, can't you hear the thunder?")
.setYield(100000000D)
.setStats(60, 35)
.setMeltingPoint(100000)
.addDigamma(0.1F).toItem().setUnlocalizedName("rbmk_fuel_drx").setTextureName(RefStrings.MODID + ":rbmk_fuel_drx");
trinitite = new ItemHazard().addRadiation(ItemHazard.trn * ItemHazard.ingot).toItem().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new");
@ -4947,9 +4998,12 @@ public class ModItems {
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_po210be, billet_po210be.getUnlocalizedName());
GameRegistry.registerItem(billet_pu238be, billet_pu238be.getUnlocalizedName());
GameRegistry.registerItem(billet_yharonite, billet_yharonite.getUnlocalizedName());
//Dusts % Other
//Dusts & Other
GameRegistry.registerItem(cinnebar, cinnebar.getUnlocalizedName());
GameRegistry.registerItem(nugget_mercury, nugget_mercury.getUnlocalizedName());
GameRegistry.registerItem(bottle_mercury, bottle_mercury.getUnlocalizedName());
GameRegistry.registerItem(coke, coke.getUnlocalizedName());
@ -5014,6 +5068,7 @@ public class ModItems {
GameRegistry.registerItem(powder_cerium, powder_cerium.getUnlocalizedName());
GameRegistry.registerItem(powder_lanthanium, powder_lanthanium.getUnlocalizedName());
GameRegistry.registerItem(powder_actinium, powder_actinium.getUnlocalizedName());
GameRegistry.registerItem(powder_boron, powder_boron.getUnlocalizedName());
GameRegistry.registerItem(powder_asbestos, powder_asbestos.getUnlocalizedName());
GameRegistry.registerItem(powder_magic, powder_magic.getUnlocalizedName());
GameRegistry.registerItem(powder_cloud, powder_cloud.getUnlocalizedName());
@ -5038,6 +5093,7 @@ public class ModItems {
GameRegistry.registerItem(powder_cerium_tiny, powder_cerium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_lanthanium_tiny, powder_lanthanium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_actinium_tiny, powder_actinium_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_boron_tiny, powder_boron_tiny.getUnlocalizedName());
GameRegistry.registerItem(powder_meteorite_tiny, powder_meteorite_tiny.getUnlocalizedName());
//Powders
@ -5083,6 +5139,7 @@ public class ModItems {
GameRegistry.registerItem(fragment_cerium, fragment_cerium.getUnlocalizedName());
GameRegistry.registerItem(fragment_lanthanium, fragment_lanthanium.getUnlocalizedName());
GameRegistry.registerItem(fragment_actinium, fragment_actinium.getUnlocalizedName());
GameRegistry.registerItem(fragment_boron, fragment_boron.getUnlocalizedName());
GameRegistry.registerItem(fragment_meteorite, fragment_meteorite.getUnlocalizedName());
//Things that look like rotten flesh but aren't

View File

@ -83,6 +83,7 @@ public class ItemChemistryTemplate extends Item {
CORDITE,
KEVLAR,
CONCRETE,
CONCRETE_ASBESTOS,
SOLID_FUEL,
ELECTROLYSIS,
XENON,
@ -252,6 +253,8 @@ public class ItemChemistryTemplate extends Item {
return 40;
case CONCRETE:
return 100;
case CONCRETE_ASBESTOS:
return 100;
case SOLID_FUEL:
return 200;
case ELECTROLYSIS:

View File

@ -34,13 +34,13 @@ public class ItemRBMKRod extends ItemHazard {
* |'-----'|
* | |
* '-----'
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* I I I I
* |'-----'|
* | |
* '-----'
@ -73,6 +73,11 @@ public class ItemRBMKRod extends ItemHazard {
return this;
}
public ItemRBMKRod setMeltingPoint(double meltingPoint) {
this.meltingPoint = meltingPoint;
return this;
}
public ItemRBMKRod setNeutronTypes(NType nType, NType rType) {
this.nType = nType;
this.rType = rType;
@ -88,7 +93,7 @@ public class ItemRBMKRod extends ItemHazard {
* @param inFlux
* @return outFlux
*/
public double burn(ItemStack stack, double inFlux) {
public double burn(World world, ItemStack stack, double inFlux) {
inFlux += selfRate;
@ -104,7 +109,7 @@ public class ItemRBMKRod extends ItemHazard {
setPoison(stack, xenon);
double outFlux = reactivityFunc(inFlux * getEnrichment(stack));
double outFlux = reactivityFunc(inFlux * getEnrichment(stack)) * RBMKDials.getReactivityMod(world);
double y = getYield(stack);
y -= inFlux;
@ -187,7 +192,7 @@ public class ItemRBMKRod extends ItemHazard {
* @return the amount of reactivity yielded, unmodified by xenon
*/
public double reactivityFunc(double flux) {
return funcEnd * flux / 100D; //goodness gracious i guessed the right formula on the first try!
return Math.log10(flux + 1) * funcEnd / 100D;
}
/**
@ -239,7 +244,7 @@ public class ItemRBMKRod extends ItemHazard {
list.add(EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("trait.rbmx.xenon", ((int)(getPoison(stack) * 1000D) / 1000D) + "%"));
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.fluxFunc", EnumChatFormatting.WHITE + "log10(x + 1" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : "") + EnumChatFormatting.WHITE + ") * " + funcEnd));
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"));
@ -258,7 +263,7 @@ public class ItemRBMKRod extends ItemHazard {
list.add(EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("trait.rbmk.xenon", ((int)(getPoison(stack) * 1000D) / 1000D) + "%"));
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.fluxFunc", EnumChatFormatting.WHITE + "log10(x + 1" + (selfRate > 0 ? (EnumChatFormatting.RED + " + " + selfRate) : "") + EnumChatFormatting.WHITE + ") * " + funcEnd));
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"));

View File

@ -54,6 +54,8 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
public static final float sa326 = 15.0F;
public static final float sa327 = 17.5F;
public static final float saf = 5.85F;
public static final float pobe = 37.5F;
public static final float pube = 5.0F;
public static final float sr = sa326 * 0.1F;
public static final float trx = 25.0F;
@ -72,6 +74,7 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
public static final float rod = 0.5F;
public static final float rod_dual = rod * 2;
public static final float rod_quad = rod * 4;
public static final float rod_rbmk = rod * 8;
ItemHazardModule module;

View File

@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.ChatStyle;
import net.minecraft.util.EnumChatFormatting;
@ -38,7 +39,7 @@ public class ItemRBMKTool extends Item {
stack.stackTagCompound = new NBTTagCompound();
stack.stackTagCompound.setInteger("posX", pos[0]);
stack.stackTagCompound.setInteger("posY", pos[1] + 1);
stack.stackTagCompound.setInteger("posY", pos[1]);
stack.stackTagCompound.setInteger("posZ", pos[2]);
player.addChatComponentMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".linked").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
@ -58,6 +59,7 @@ public class ItemRBMKTool extends Item {
int ty = stack.stackTagCompound.getInteger("posY");
int tz = stack.stackTagCompound.getInteger("posZ");
console.setTarget(tx, ty, tz);
player.addChatComponentMessage(new ChatComponentTranslation(this.getUnlocalizedName() + ".set").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)));
}
return true;

View File

@ -147,6 +147,7 @@ public class HbmWorldGen implements IWorldGenerator {
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.rareSpawn, 5, 5, 20, ModBlocks.ore_rare);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.ligniteSpawn, 24, 35, 25, ModBlocks.ore_lignite);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.asbestosSpawn, 4, 16, 16, ModBlocks.ore_asbestos);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.cinnebarSpawn, 2, 8, 8, ModBlocks.ore_asbestos);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.ironClusterSpawn, 6, 5, 50, ModBlocks.cluster_iron);
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.titaniumClusterSpawn, 6, 5, 30, ModBlocks.cluster_titanium);
@ -158,9 +159,11 @@ public class HbmWorldGen implements IWorldGenerator {
if(WorldConfig.gasbubbleSpawn > 0 && rand.nextInt(WorldConfig.gasbubbleSpawn) == 0)
DungeonToolbox.generateOre(world, rand, i, j, 1, 32, 30, 10, ModBlocks.gas_flammable);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_iron, rand, 16);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_titanium, rand, 16);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_tungsten, rand, 16);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_iron, rand, 24);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_titanium, rand, 32);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.6D, ModBlocks.cluster_depth_tungsten, rand, 32);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_cinnebar, rand, 16);
DepthDeposit.generateCondition(world, i, 0, 3, j, 5, 0.8D, ModBlocks.ore_depth_zirconium, rand, 16);
for (int k = 0; k < 6; k++) {
int randPosX = i + rand.nextInt(16);

View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.27 BETA (3826)";
public static final String VERSION = "1.0.27 BETA (3864)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

View File

@ -270,12 +270,12 @@ public class ClientProxy extends ServerProxy {
MinecraftForgeClient.registerItemRenderer(ModItems.gun_panzerschreck, new ItemRenderRpg());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver, new ItemRenderRevolver());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_saturnite, new ItemRenderRevolver());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_iron, new ItemRenderRevolverIron());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_gold, new ItemRenderRevolverGold());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_lead, new ItemRenderRevolverLead());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_schrabidium, new ItemRenderRevolverSchrabidium());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver, new ItemRenderWeaponFFColt(ResourceManager.ff_gun_bright, ResourceManager.ff_iron, ResourceManager.ff_wood));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_saturnite, new ItemRenderWeaponFFColt(ResourceManager.ff_saturnite, ResourceManager.ff_iron, ResourceManager.ff_wood));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_iron, new ItemRenderWeaponFFColt(ResourceManager.ff_iron, ResourceManager.ff_iron, ResourceManager.ff_wood));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_gold, new ItemRenderWeaponFFColt(ResourceManager.ff_gold, ResourceManager.ff_gold, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_lead, new ItemRenderWeaponFFColt(ResourceManager.ff_lead, ResourceManager.ff_iron, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_schrabidium, new ItemRenderWeaponFFColt(ResourceManager.ff_schrabidium, ResourceManager.ff_schrabidium, ResourceManager.ff_gun_dark));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_cursed, new ItemRenderRevolverCursed());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare2));

View File

@ -181,8 +181,8 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.levitation_unit, 1), new Object[] { "CSC", "TAT", "PSP", 'C', ModItems.coil_copper, 'S', ModItems.nugget_schrabidium, 'T', ModItems.coil_tungsten, 'P', "plateTitanium", 'A', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cap_aluminium, 1), new Object[] { "PIP", 'P', "plateAluminum", 'I', "ingotAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_small_steel, 1), new Object[] { "PPP", " ", "PPP", 'P', "plateSteel", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_small_aluminium, 1), new Object[] { "PPP", " ", "PPP", 'P', "plateAluminum", 'I', "ingotAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_small_steel, 3), new Object[] { "PPP", " ", "PPP", 'P', "plateSteel", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_small_aluminium, 3), new Object[] { "PPP", " ", "PPP", 'P', "plateAluminum", 'I', "ingotAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_big_steel, 1), new Object[] { "III", " ", "III", 'P', "plateSteel", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_big_aluminium, 1), new Object[] { "III", " ", "III", 'P', "plateAluminum", 'I', "ingotAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hull_big_titanium, 1), new Object[] { "III", " ", "III", 'P', "plateTitanium", 'I', "ingotTitanium" }));
@ -725,6 +725,26 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.ingot_dineutronium, 8), new Object[] { "UUU", "UPU", "UUU", 'U', ModItems.ingot_schrabidate, 'P', new ItemStack(ModItems.particle_sparkticle).setStackDisplayName("Sparkticle (Temporary Recipe)") });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fireworks, 1), new Object[] { "PPP", "PPP", "WIW", 'P', Items.paper, 'W', "plankWood", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_moderator, 1), new Object[] { " G ", "GRG", " G ", 'G', ModBlocks.block_graphite, 'R', ModBlocks.rbmk_blank });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_absorber, 1), new Object[] { " G ", "GRG", " G ", 'G', ModBlocks.block_boron, 'R', ModBlocks.rbmk_blank });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_reflector, 1), new Object[] { "GGG", "GRG", "GGG", 'G', ModItems.neutron_reflector, 'R', ModBlocks.rbmk_blank });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_control, 1), new Object[] { "GBG", "GRG", "GBG", 'G', ModItems.ingot_boron, 'B', ModItems.motor, 'R', ModBlocks.rbmk_absorber });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_control_auto, 1), new Object[] { "C", "R", "C", 'C', ModItems.circuit_targeting_tier1, 'R', ModBlocks.rbmk_control });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_boiler, 1), new Object[] { "CPC", "CRC", "CPC", 'C', ModItems.board_copper, 'P', ModItems.pipes_steel, 'R', ModBlocks.rbmk_blank });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_rod, 1), new Object[] { "C", "R", "C", 'C', ModItems.hull_small_steel, 'R', ModBlocks.rbmk_blank });
GameRegistry.addRecipe(new ItemStack(ModBlocks.rbmk_console, 1), new Object[] { "PPP", "PCP", "PPP", 'C', ModItems.circuit_targeting_tier3, 'P', Items.potato });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_sturdy, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "plankWood" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_iron, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_gold, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotGold" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_aluminium, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_copper, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotCopper" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_titanium, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotTitanium" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_lead, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_cobalt, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotCobalt" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_steel, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ladder_tungsten, 8), new Object[] { "LLL", "L#L", "LLL", 'L', Blocks.ladder, '#', "ingotTungsten" }));
if(GeneralConfig.enableBabyMode) {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.cordite, 3), new Object[] { ModItems.ballistite, Items.gunpowder, new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE) });
@ -865,6 +885,7 @@ public class CraftingManager {
GameRegistry.addSmelting(ModItems.powder_polymer, new ItemStack(ModItems.ingot_polymer), 1.0F);
GameRegistry.addSmelting(ModItems.powder_lanthanium, new ItemStack(ModItems.ingot_lanthanium), 1.0F);
GameRegistry.addSmelting(ModItems.powder_actinium, new ItemStack(ModItems.ingot_actinium), 1.0F);
GameRegistry.addSmelting(ModItems.powder_boron, new ItemStack(ModItems.ingot_boron), 1.0F);
GameRegistry.addSmelting(ModItems.powder_desh, new ItemStack(ModItems.ingot_desh), 1.0F);
GameRegistry.addSmelting(ModItems.powder_dineutronium, new ItemStack(ModItems.ingot_dineutronium), 5.0F);
GameRegistry.addSmelting(ModItems.powder_asbestos, new ItemStack(ModItems.ingot_asbestos), 1.0F);

View File

@ -523,6 +523,7 @@ public class ResourceManager {
public static final IModelCustom vortex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/vortex.obj"));
public static final IModelCustom thompson = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/thompson.obj"));
public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj"));
public static final IModelCustom ff_python = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/python.obj"));
public static final IModelCustom grenade_frag = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_frag.obj"));
public static final IModelCustom grenade_aschrab = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_aschrab.obj"));
@ -577,6 +578,17 @@ public class ResourceManager {
public static final ResourceLocation bolter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter.png");
public static final ResourceLocation bolter_digamma_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/bolter_digamma.png");
public static final ResourceLocation ff_gold = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gold.png");
public static final ResourceLocation ff_gun_bright = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_bright.png");
public static final ResourceLocation ff_gun_dark = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_dark.png");
public static final ResourceLocation ff_gun_normal = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_normal.png");
public static final ResourceLocation ff_iron = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/iron.png");
public static final ResourceLocation ff_lead = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/lead.png");
public static final ResourceLocation ff_saturnite = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/saturnite.png");
public static final ResourceLocation ff_schrabidium = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/schrabidium.png");
public static final ResourceLocation ff_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood.png");
public static final ResourceLocation ff_wood_red = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood_red.png");
public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");

View File

@ -0,0 +1,105 @@
package com.hbm.render.item.weapon;
import org.lwjgl.opengl.GL11;
import com.hbm.main.ResourceManager;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
public class ItemRenderWeaponFFColt implements IItemRenderer {
ResourceLocation main;
ResourceLocation hammer;
ResourceLocation grip;
public ItemRenderWeaponFFColt(ResourceLocation main, ResourceLocation hammer, ResourceLocation grip) {
this.main = main;
this.hammer = hammer;
this.grip = grip;
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
case ENTITY:
case INVENTORY:
return true;
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_CULL_FACE);
switch(type) {
case EQUIPPED_FIRST_PERSON:
double s0 = 1.5D;
GL11.glTranslated(0.75, 0.5, 0);
GL11.glScaled(s0, s0, s0);
GL11.glRotated(100, 0, -1, 0);
GL11.glRotated(25, 1, 0, 0);
break;
case EQUIPPED:
double scale = 1.5D;
GL11.glRotated(195, 0, 1, 0);
GL11.glRotated(-10, 0, 0, 1);
GL11.glRotated(-10, 1, 0, 0);
GL11.glTranslated(-0.5, 0.1, -0.25);
GL11.glScaled(scale, scale, scale);
break;
case ENTITY:
double s1 = 1D;
GL11.glScaled(s1, s1, s1);
GL11.glRotated(90, 0, 1, 0);
break;
case INVENTORY:
GL11.glEnable(GL11.GL_LIGHTING);
double s = 17D;
GL11.glTranslated(8, 8, 0);
GL11.glRotated(-135, 0, 0, 1);
GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(s, s, -s);
break;
default: break;
}
Minecraft.getMinecraft().renderEngine.bindTexture(main);
ResourceManager.ff_python.renderPart("Body");
ResourceManager.ff_python.renderPart("Cylinder");
Minecraft.getMinecraft().renderEngine.bindTexture(grip);
ResourceManager.ff_python.renderPart("Grip");
Minecraft.getMinecraft().renderEngine.bindTexture(hammer);
ResourceManager.ff_python.renderPart("Hammer");
GL11.glPopMatrix();
}
}

View File

@ -109,8 +109,8 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
if(slots[2] == null)
slots[2] = result;
else if(slots[2].stackSize < slots[2].getMaxStackSize())
slots[2].stackSize++;
else if(slots[2].stackSize + result.stackSize <= slots[2].getMaxStackSize())
slots[2].stackSize += result.stackSize;
float freeChance = this.getFreeChance();

View File

@ -269,6 +269,8 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide
return 50;
if(type.name().equals(FluidType.HEATINGOIL.name()))
return 75;
if(type.name().equals(FluidType.HYDROGEN.name()))
return 500;
if(type.name().equals(FluidType.DIESEL.name()))
return 225;
if(type.name().equals(FluidType.KEROSENE.name()))

View File

@ -13,17 +13,21 @@ public class RBMKDials {
public static final String KEY_COLUMN_HEIGHT = "dialColumnHeight";
public static final String KEY_PERMANENT_SCRAP = "dialEnablePermaScrap";
public static final String KEY_BOILER_HEAT_CONSUMPTION = "dialBoilerHeatConsumption";
public static final String KEY_CONTROL_SPEED_MOD = "dialControlSpeed";
public static final String KEY_REACTIVITY_MOD = "dialReactivityMod";
public static void createDials(World world) {
GameRules rules = world.getGameRules();
rules.setOrCreateGameRule(KEY_PASSIVE_COOLING, "5.0");
rules.setOrCreateGameRule(KEY_PASSIVE_COOLING, "1.0");
rules.setOrCreateGameRule(KEY_COLUMN_HEAT_FLOW, "0.2");
rules.setOrCreateGameRule(KEY_FUEL_DIFFUSION_MOD, "1.0");
rules.setOrCreateGameRule(KEY_FUEL_DIFFUSION_MOD, "0.02");
rules.setOrCreateGameRule(KEY_HEAT_PROVISION, "0.2");
rules.setOrCreateGameRule(KEY_COLUMN_HEIGHT, "4");
rules.setOrCreateGameRule(KEY_PERMANENT_SCRAP, "false");
rules.setOrCreateGameRule(KEY_BOILER_HEAT_CONSUMPTION, "0.1");
rules.setOrCreateGameRule(KEY_CONTROL_SPEED_MOD, "1.0");
rules.setOrCreateGameRule(KEY_REACTIVITY_MOD, "1.0");
}
/**
@ -32,7 +36,7 @@ public class RBMKDials {
* @return
*/
public static double getPassiveCooling(World world) {
return shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_PASSIVE_COOLING), 5.0D);
return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_PASSIVE_COOLING), 5.0D), 0.0D);
}
/**
@ -89,6 +93,24 @@ public class RBMKDials {
return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_BOILER_HEAT_CONSUMPTION), 0.1D), 0D);
}
/**
* A multiplier for how quickly the control rods move.
* @param world
* @return
*/
public static double getControlSpeed(World world) {
return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_CONTROL_SPEED_MOD), 1.0D), 0.0D);
}
/**
* A multiplier for how much flux the rods give out.
* @param world
* @return
*/
public static double getReactivityMod(World world) {
return Math.max(shittyWorkaroundParseDouble(world.getGameRules().getGameRuleStringValue(KEY_REACTIVITY_MOD), 1.0D), 0.0D);
}
//why make the double representation accessible in a game rule when you can just force me to add a second pointless parsing operation?
public static double shittyWorkaroundParseDouble(String s, double def) {

View File

@ -57,6 +57,8 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
if(steam.getFill() > steam.getMaxFill()) {
steam.setFill(steam.getMaxFill());
}
this.heat -= waterUsed * RBMKDials.getBoilerHeatConsumption(worldObj);
}
fillFluidInit(steam.getTankType());
@ -89,7 +91,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
@Override
public void fillFluidInit(FluidType type) {
fillFluid(this.xCoord, this.yCoord + RBMKDials.getColumnHeight(worldObj) + 1, this.zCoord, getTact(), type);
}
@ -100,7 +102,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
@Override
@Deprecated //why are we still doing this?
public boolean getTact() { return false; }
public boolean getTact() { return worldObj.getTotalWorldTime() % 2 == 0; }
@Override
public void setFluidFill(int i, FluidType type) {
@ -248,4 +250,15 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
public ColumnType getConsoleType() {
return ColumnType.BOILER;
}
@Override
public NBTTagCompound getNBTForConsole() {
NBTTagCompound data = new NBTTagCompound();
data.setInteger("water", this.feed.getFill());
data.setInteger("maxWater", this.feed.getMaxFill());
data.setInteger("steam", this.steam.getFill());
data.setInteger("maxSteam", this.steam.getMaxFill());
data.setShort("type", (short)this.steam.getTankType().ordinal());
return data;
}
}

View File

@ -1,20 +1,27 @@
package com.hbm.tileentity.machine.rbmk;
import java.util.Set;
import com.hbm.interfaces.IControlReceiver;
import com.hbm.tileentity.TileEntityMachineBase;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
public class TileEntityRBMKConsole extends TileEntityMachineBase {
public class TileEntityRBMKConsole extends TileEntityMachineBase implements IControlReceiver {
private int targetX;
private int targetY;
private int targetZ;
public RBMKColumn[][] columns = new RBMKColumn[15][15];
//made this one-dimensional because it's a lot easier to serialize
public RBMKColumn[] columns = new RBMKColumn[15 * 15];
public TileEntityRBMKConsole() {
super(0);
@ -32,6 +39,7 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase {
if(this.worldObj.getTotalWorldTime() % 10 == 0) {
rescan();
prepareNetworkPack();
}
}
}
@ -42,15 +50,76 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase {
for(int j = -7; j <= 7; j++) {
TileEntity te = worldObj.getTileEntity(targetX + i, targetY, targetZ + j);
int index = (i + 7) + (j + 7) * 15;
if(te instanceof TileEntityRBMKBase) {
TileEntityRBMKBase rbmk = (TileEntityRBMKBase)te;
columns[i + 7][j + 7] = new RBMKColumn(rbmk.getConsoleType(), rbmk.getNBTForConsole());
columns[index] = new RBMKColumn(rbmk.getConsoleType(), rbmk.getNBTForConsole());
columns[index].data.setDouble("heat", rbmk.heat);
columns[index].data.setDouble("maxHeat", rbmk.maxHeat());
} else {
columns[i + 7][j + 7] = null;
columns[index] = null;
}
}
}
}
private void prepareNetworkPack() {
NBTTagCompound data = new NBTTagCompound();
for(int i = 0; i < columns.length; i++) {
if(this.columns[i] != null) {
data.setTag("column_" + i, this.columns[i].data);
data.setShort("type_" + i, (short)this.columns[i].type.ordinal());
}
}
this.networkPack(data, 50);
}
@Override
public void networkUnpack(NBTTagCompound data) {
this.columns = new RBMKColumn[15 * 15];
for(int i = 0; i < columns.length; i++) {
if(data.hasKey("type_" + i)) {
this.columns[i] = new RBMKColumn(ColumnType.values()[data.getShort("type_" + i)], (NBTTagCompound)data.getTag("column_" + i));
}
}
}
@Override
public boolean hasPermission(EntityPlayer player) {
return Vec3.createVectorHelper(xCoord - player.posX, yCoord - player.posY, zCoord - player.posZ).lengthVector() < 20;
}
@Override
public void receiveControl(NBTTagCompound data) {
if(data.hasKey("level")) {
Set<String> keys = data.func_150296_c();
for(String key : keys) {
if(key.startsWith("sel_")) {
int x = data.getInteger(key) % 15 - 7;
int z = data.getInteger(key) / 15 - 7;
TileEntity te = worldObj.getTileEntity(targetX + x, targetY, targetZ + z);
if(te instanceof TileEntityRBMKControlManual) {
((TileEntityRBMKControlManual)te).targetLevel = MathHelper.clamp_double(data.getDouble("level"), 0, 1);
te.markDirty();
}
}
}
}
@ -74,6 +143,24 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase {
this.markDirty();
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
this.targetX = nbt.getInteger("tX");
this.targetY = nbt.getInteger("tY");
this.targetZ = nbt.getInteger("tZ");
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setInteger("tX", this.targetX);
nbt.setInteger("tY", this.targetY);
nbt.setInteger("tZ", this.targetZ);
}
public static class RBMKColumn {
public ColumnType type;
@ -85,18 +172,29 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase {
public RBMKColumn(ColumnType type, NBTTagCompound data) {
this.type = type;
this.data = data;
if(data != null) {
this.data = data;
} else {
this.data = new NBTTagCompound();
}
}
}
public static enum ColumnType {
BLANK,
FUEL,
CONTROL,
CONTROL_AUTO,
BOILER,
MODERATOR,
ABSORBER,
REFLECTOR
BLANK(0),
FUEL(10),
CONTROL(20),
CONTROL_AUTO(30),
BOILER(40),
MODERATOR(50),
ABSORBER(60),
REFLECTOR(70);
public int offset;
private ColumnType(int offset) {
this.offset = offset;
}
}
}

View File

@ -33,7 +33,7 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
if(level < targetLevel) {
level += speed;
level += speed * RBMKDials.getControlSpeed(worldObj);
if(level > targetLevel)
level = targetLevel;
@ -41,7 +41,7 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
if(level > targetLevel) {
level -= speed;
level -= speed * RBMKDials.getControlSpeed(worldObj);
if(level < targetLevel)
level = targetLevel;
@ -116,4 +116,11 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
//control rods will not spawn lid projectiles since the lid is already part of the rod projectiles
//super.onMelt(reduce);
}
@Override
public NBTTagCompound getNBTForConsole() {
NBTTagCompound data = new NBTTagCompound();
data.setDouble("level", this.level);
return data;
}
}

View File

@ -73,4 +73,16 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
public ColumnType getConsoleType() {
return ColumnType.CONTROL;
}
@Override
public NBTTagCompound getNBTForConsole() {
NBTTagCompound data = super.getNBTForConsole();
if(this.color != null)
data.setShort("color", (short)this.color.ordinal());
else
data.setShort("color", (short)-1);
return data;
}
}

View File

@ -49,7 +49,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
double fluxIn = fluxFromType(rod.nType);
//System.out.println(fluxIn + " - " + this.fluxFast + " - " + this.fluxSlow);
double fluxOut = rod.burn(slots[0], fluxIn);
double fluxOut = rod.burn(worldObj, slots[0], fluxIn);
NType rType = rod.rType;
rod.updateHeat(worldObj, slots[0]);
@ -229,4 +229,20 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
public ColumnType getConsoleType() {
return ColumnType.FUEL;
}
@Override
public NBTTagCompound getNBTForConsole() {
NBTTagCompound data = new NBTTagCompound();
if(slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod) {
ItemRBMKRod rod = ((ItemRBMKRod)slots[0].getItem());
data.setDouble("enrichment", rod.getEnrichment(slots[0]));
data.setDouble("xenon", rod.getPoison(slots[0]));
data.setDouble("c_heat", rod.getHullHeat(slots[0]));
data.setDouble("c_maxHeat", rod.meltingPoint);
}
return data;
}
}

View File

@ -171,52 +171,43 @@ public class ArmorUtil {
public static boolean checkForGasMask(EntityPlayer player) {
if(checkArmorPiece(player, ModItems.hazmat_helmet, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hazmat_helmet_red, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_helmet_red, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hazmat_helmet_grey, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_helmet_grey, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hazmat_paa_helmet, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_paa_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.liquidator_helmet, 3))
{
if(checkArmorPiece(player, ModItems.liquidator_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.gas_mask, 3))
{
if(checkArmorPiece(player, ModItems.gas_mask, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.gas_mask_m65, 3))
{
if(checkArmorPiece(player, ModItems.gas_mask_m65, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.t45_helmet, 3))
{
if(checkArmorPiece(player, ModItems.t45_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.ajr_helmet, 3))
{
if(checkArmorPiece(player, ModItems.ajr_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hev_helmet, 3))
{
if(checkArmorPiece(player, ModItems.ajro_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.schrabidium_helmet, 3))
{
if(checkArmorPiece(player, ModItems.hev_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.euphemium_helmet, 3))
{
if(checkArmorPiece(player, ModItems.schrabidium_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.euphemium_helmet, 3)) {
return true;
}
@ -260,40 +251,34 @@ public class ArmorUtil {
public static boolean checkForGoggles(EntityPlayer player) {
if(checkArmorPiece(player, ModItems.goggles, 3))
{
if(checkArmorPiece(player, ModItems.goggles, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hazmat_helmet_red, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_helmet_red, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hazmat_helmet_grey, 3))
{
if(checkArmorPiece(player, ModItems.hazmat_helmet_grey, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.liquidator_helmet, 3))
{
if(checkArmorPiece(player, ModItems.liquidator_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.gas_mask, 3))
{
if(checkArmorPiece(player, ModItems.gas_mask, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.t45_helmet, 3))
{
if(checkArmorPiece(player, ModItems.t45_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.ajr_helmet, 3))
{
if(checkArmorPiece(player, ModItems.ajr_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.bj_helmet, 3))
{
if(checkArmorPiece(player, ModItems.ajro_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hev_helmet, 3))
{
if(checkArmorPiece(player, ModItems.bj_helmet, 3)) {
return true;
}
if(checkArmorPiece(player, ModItems.hev_helmet, 3)) {
return true;
}

View File

@ -107,6 +107,7 @@ chem.CC_OIL=Kohleverflüssigung
chem.CIRCUIT_4=Überstaktete Schaltkreisherstellung
chem.CIRCUIT_5=Leistungsstarke Schaltkreisherstellung
chem.CONCRETE=Betonherstellung
chem.CONCRETE_ASBESTOS=Asbestbetonherstellung
chem.COOLANT=Kühlflüssigkeit mischen
chem.CORDITE=Korditherstellung
chem.CRYOGEL=Kryogel mischen
@ -680,9 +681,11 @@ 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_po210be.name=Po210Be-Billet
item.billet_polonium.name=Polonium-210-Billet
item.billet_pu_mix.name=Reaktorfähiges Plutoniumbillet
item.billet_pu238.name=Pu238-Billet
item.billet_pu238be.name=Pu238Be-Billet
item.billet_pu239.name=Pu239-Billet
item.billet_pu240.name=Pu240-Billet
item.billet_plutonium.name=Plutoniumbillet
@ -863,6 +866,7 @@ item.chopper_head.name=Jagdschrauber Cockpit
item.chopper_tail.name=Jagdschrauber Heck
item.chopper_torso.name=Jagdschrauber Rumpf
item.chopper_wing.name=Jagdschrauber Seitentragfläche
item.cinnebar.name=Zinnober
item.circuit_aluminium.name=Einfacher Schaltkreis
item.circuit_copper.name=Erweiterter Schaltkreis
item.circuit_gold.name=Übertakteter Schaltkreis
@ -1097,6 +1101,7 @@ item.folly_bullet_nuclear.name=12,8cm Atomares Geschoss
item.folly_shell.name=Silberne Kanonenhülse
item.fooditem.name=lebensmittel
item.fragment_actinium.name=Actiniumfragment
item.fragment_boron.name=Borfragment
item.fragment_cerium.name=Cerium Ffragment
item.fragment_cobalt.name=Cobaltfragment
item.fragment_lanthanium.name=Lanthanfragment
@ -1834,6 +1839,8 @@ item.powder_au198.name=Gold-198-Staub
item.powder_australium.name=Australiumstaub
item.powder_balefire.name=Thermonukleare Asche
item.powder_beryllium.name=Berylliumstaub
item.powder_boron.name=Borstaub
item.powder_boron_tiny.name=Kleiner Haufen Borstaub
item.powder_bromine.name=Bromstaub
item.powder_caesium.name=Caesiumstaub
item.powder_cerium.name=Cerstaub
@ -1934,6 +1941,10 @@ item.rbmk_fuel_po210be.name=Po210Be-RBMK-Neutronenquelle
item.rbmk_fuel_pu238be.name=Pu238Be-RBMK-Neutronenquelle
item.rbmk_fuel_thmeu.name=ThMEU-RBMK-Kernbrennstoff
item.rbmk_lid.name=RBMK-Abdeckplatte
item.rbmk_tool.name=RBMK-Konsolen-Verlinkungsgerät
item.rbmk_tool.desc=Schleichen und Rechtsclick auf RBMK um Position zu speichern,$Schleichen und Rechtsclick auf Konsole um zu verlinken!
item.rbmk_tool.linked=Position gespeichert!
item.rbmk_tool.set=RBMK verlinkt!
item.reactor_core.name=Brutreaktorkern
item.reactor_sensor.name=Reaktor-Fernsensor
item.record.glass.desc=? ? ?
@ -2368,6 +2379,7 @@ tile.ams_emitter.name=AMS-Emitter [WIP]
tile.ams_limiter.name=AMS-Stabilisator [WIP]
tile.ancient_scrap.name=Antikes Altmetall
tile.asphalt.name=Asphalt
tile.asphalt_light.name=Leuchtender Asphalt
tile.barbed_wire.name=Stacheldraht
tile.barbed_wire_acid.name=Ätzender Stacheldraht
tile.barbed_wire_fire.name=Flammender Stacheldraht
@ -2461,6 +2473,7 @@ tile.block_waste_painted.name=Bemalter Atommüllblock
tile.block_weidanium.name=Weidaniumblock
tile.block_white_phosphorus.name=Weißer Phosphorblock
tile.block_yellowcake.name=Yellowcakeblock
tile.block_zirconium.name=Zirkoniumblock
tile.boat.name=Boot
tile.bomb_multi.name=Mehrzweckbombe
tile.bomber.name=Abgestürtzer Bomber
@ -2503,6 +2516,7 @@ tile.cmb_brick.name=CMB-Stahlfliese
tile.cmb_brick_reinforced.name=Verstärkte CMB-Ziegel
tile.compact_launcher.name=Kompakt-Startrampe
tile.concrete.name=Betonfliese
tile.concrete_asbestos.name=Asbestbeton
tile.concrete_pillar.name=Stahlbetonsäule
tile.concrete_smooth.name=Beton
tile.crashed_bomb.name=Blindgänger
@ -2763,10 +2777,13 @@ tile.ore_aluminium.name=Aluminiumerz
tile.ore_asbestos.name=Asbesterz
tile.ore_australium.name=Australisches Erz
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_copper.name=Kupfererz
tile.ore_daffergon.name=Dellit
tile.ore_depth_cinnebar.name=Tiefen-Zinnobererz
tile.ore_depth_zirconium.name=Tiefen-Zirkonerz
tile.ore_fluorite.name=Fluoriterz
tile.ore_gneiss_asbestos.name=Schiefer-Asbesterz
tile.ore_gneiss_copper.name=Schiefer-Kupfererz

View File

@ -107,6 +107,7 @@ chem.CC_OIL=Coal Liquefaction
chem.CIRCUIT_4=Overclocked Circuit Production
chem.CIRCUIT_5=High Performance Circuit Production
chem.CONCRETE=Concrete Production
chem.CONCRETE_ASBESTOS=Asbestos Concrete Production
chem.COOLANT=Coolant Mixing
chem.CORDITE=Cordite Production
chem.CRYOGEL=Cryogel Mixing
@ -680,9 +681,11 @@ 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_po210be.name=Po210Be Billet
item.billet_polonium.name=Polonium-210 Billet
item.billet_pu_mix.name=Reactor Grade Plutonium Billet
item.billet_pu238.name=Pu238 Billet
item.billet_pu238be.name=Pu238Be Billet
item.billet_pu239.name=Pu239 Billet
item.billet_pu240.name=Pu240 Billet
item.billet_plutonium.name=Plutonium Billet
@ -863,6 +866,7 @@ item.chopper_head.name=Hunter Chopper Cockpit
item.chopper_tail.name=Hunter Chopper Tail
item.chopper_torso.name=Hunter Chopper Body
item.chopper_wing.name=Hunter Chopper Wing
item.cinnebar.name=Cinnebar
item.circuit_aluminium.name=Basic Circuit
item.circuit_copper.name=Enhanced Circuit
item.circuit_gold.name=Overclocked Circuit
@ -1097,6 +1101,7 @@ item.folly_bullet_nuclear.name=12.8cm Nuclear Shell
item.folly_shell.name=Silver Bullet Casing
item.fooditem.name=food item
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_lanthanium.name=Lanthanium Fragment
@ -1834,6 +1839,8 @@ 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
item.powder_boron.name=Boron Powder
item.powder_boron_tiny.name=Tiny Pile of Boron Powder
item.powder_bromine.name=Bromine Powder
item.powder_caesium.name=Caesium Powder
item.powder_cerium.name=Cerium Powder
@ -1934,6 +1941,10 @@ item.rbmk_fuel_po210be.name=Po210Be RBMK Neutron Source
item.rbmk_fuel_pu238be.name=Pu238Be RBMK Neutron Source
item.rbmk_fuel_thmeu.name=ThMEU RBMK Fuel Rod
item.rbmk_lid.name=RBMK Cover Panel
item.rbmk_tool.name=RBMK Console Linking Device
item.rbmk_tool.desc=Sneak and right-click RBMK to save the position,$sneak and right-click console to link!
item.rbmk_tool.linked=Position set!
item.rbmk_tool.set=RBMK linked!
item.reactor_core.name=Breeding Reactor Core
item.reactor_sensor.name=Reactor Remote Sensor
item.record.glass.desc=? ? ?
@ -2368,6 +2379,7 @@ tile.ams_emitter.name=AMS Emitter [WIP]
tile.ams_limiter.name=AMS Stabilizer [WIP]
tile.ancient_scrap.name=Ancient Scrap Metal
tile.asphalt.name=Asphalt
tile.asphalt_light.name=Glowing Asphalt
tile.barbed_wire.name=Barbed Wire
tile.barbed_wire_acid.name=Caustic Barbed Wire
tile.barbed_wire_fire.name=Flaming Barbed Wire
@ -2461,6 +2473,7 @@ tile.block_waste_painted.name=Painted Block of Nuclear Waste
tile.block_weidanium.name=Block of Weidanium
tile.block_white_phosphorus.name=Block of White Phosphorus
tile.block_yellowcake.name=Block of Yellowcake
tile.block_zirconium.name=Block of Zirconium
tile.boat.name=Boat
tile.bomb_multi.name=Multi Purpose Bomb
tile.bomber.name=Crashed Bomber
@ -2503,6 +2516,7 @@ tile.cmb_brick.name=CMB Steel Tile
tile.cmb_brick_reinforced.name=Reinforced CMB Bricks
tile.compact_launcher.name=Compact Launch Pad
tile.concrete.name=Concrete Tile
tile.concrete_asbestos.name=Asbestos Concrete
tile.concrete_pillar.name=Rebar Reinforced Concrete Pillar
tile.concrete_smooth.name=Concrete
tile.crashed_bomb.name=Dud
@ -2763,10 +2777,13 @@ tile.ore_aluminium.name=Aluminium Ore
tile.ore_asbestos.name=Asbestos Ore
tile.ore_australium.name=Australian Ore
tile.ore_beryllium.name=Beryllium Ore
tile.ore_cinnebar.name=Cinnebar Ore
tile.ore_coal_oil.name=Oily Coal Ore
tile.ore_coal_oil_burning.name=Burning Oily Coal Ore
tile.ore_copper.name=Copper Ore
tile.ore_daffergon.name=Dellite
tile.ore_depth_cinnebar.name=Depth Cinnebar Ore
tile.ore_depth_zirconium.name=Depth Zirconium Ore
tile.ore_fluorite.name=Fluorite Ore
tile.ore_gneiss_asbestos.name=Schist Asbestos Ore
tile.ore_gneiss_copper.name=Schist Copper Ore

File diff suppressed because it is too large Load Diff

View File

@ -35,6 +35,7 @@
"block.soyuzReady": {"category": "block", "sounds": [{"name": "block/soyuzReady", "stream": true}]},
"block.screm": {"category": "block", "sounds": ["screm/scream1", "screm/scream01", "screm/scream2", "screm/scream02", "screm/scream3", "screm/scream03", "screm/scream4", "screm/scream04", "screm/scream5", "screm/scream05", "screm/scream6", "screm/scream06", "screm/scream7", "screm/scream07", "screm/scream08", "screm/scream09", "screm/scream10", "screm/scream11", "screm/scream12", "screm/scream13", "screm/scream14", "screm/scream15", "screm/scream16", "screm/scream17", "screm/scream18", "screm/scream19", "screm/scream20", "screm/scream21", "screm/scream22", "screm/scream23", "screm/scream24", "screm/scream25"]},
"block.rbmk_explosion": {"category": "block", "sounds": [{"name": "block/rbmk_explosion", "stream": false}]},
"block.rbmk_az5_cover": {"category": "block", "sounds": [{"name": "block/rbmk_az5_cover", "stream": false}]},
"item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]},
"item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]},

Binary file not shown.

After

Width:  |  Height:  |  Size: 901 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 746 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 953 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 844 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -3,7 +3,7 @@
"modid": "hbm",
"name": "Hbm's Nuclear Tech",
"description": "A mod that adds weapons, nuclear themed stuff and machines",
"version":"1.0.27-3826",
"version":"1.0.27-3864",
"mcversion": "1.7.10",
"url": "",
"updateUrl": "",