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

more americium stuff, recipes, patching up anvil recipes

Browse Source
This commit is contained in:
Bob 2021-06-27 20:28:14 +02:00
parent 4b0ea024f6
commit e0c8e5fc52
46 changed files with 7266 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/hbm/blocks/machine/MachineTeleporter.java
View File

@ -55,17 +55,15 @@ public class MachineTeleporter extends BlockContainer {
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
if (world.isRemote) {
return true;
} else if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.linker) {
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.linker) {
return false;
}else if (!player.isSneaking()) {
} else if(!player.isSneaking()) {
TileEntityMachineTeleporter entity = (TileEntityMachineTeleporter) world.getTileEntity(x, y, z);
if (entity != null) {
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_teleporter, world, x,
y, z);
if(entity != null && world.isRemote) {
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_teleporter, world, x, y, z);
}
return true;
} else {

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

@ -22,8 +22,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
public abstract class RBMKBase extends BlockDummyable implements IScrewable {
public static boolean dropLids = true;
public static boolean digamma = false;
protected RBMKBase() {
super(Material.iron);

10
src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java
View File

@ -53,10 +53,7 @@ public class RBMKConsole extends BlockDummyable {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(world.isRemote) {
return true;
} else if(!player.isSneaking()) {
if(!player.isSneaking()) {
BossSpawnHandler.markFBI(player);
@ -91,12 +88,13 @@ public class RBMKConsole extends BlockDummyable {
}
}
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rbmk_console, world, pos[0], pos[1], pos[2]);
if(world.isRemote)
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rbmk_console, world, pos[0], pos[1], pos[2]);
}
return true;
} else {
return false;
return true;
}
}

1
src/main/java/com/hbm/crafting/ConsumableRecipes.java
View File

@ -172,6 +172,7 @@ public class ConsumableRecipes {
GameRegistry.addRecipe(new ItemStack(ModItems.medal_liquidator, 1), new Object[] { "GBG", "BFB", "GBG", 'G', ModItems.nugget_au198, 'B', ModItems.ingot_boron, 'F', ModItems.debris_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_5htp, 1), new Object[] { ModItems.five_htp, ModItems.circuit_targeting_tier1, ModItems.plate_saturnite });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.injector_knife, 1), new Object[] { ModItems.injector_5htp, Items.iron_sword });
GameRegistry.addRecipe(new ItemStack(ModItems.shackles, 1), new Object[] { "CIC", "C C", "I I", 'I', ModItems.ingot_chainsteel, 'C', ModBlocks.chain });
//Stealth boy
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stealth_boy, 1), new Object[] { " B", "LI", "LC", 'B', Item.getItemFromBlock(Blocks.stone_button), 'L', Items.leather, 'I', "ingotSteel", 'C', ModItems.circuit_red_copper }));

20
src/main/java/com/hbm/crafting/MineralRecipes.java
View File

@ -61,14 +61,17 @@ public class MineralRecipes {
RecipesCommon.add1To9(ModItems.powder_i131, ModItems.powder_i131_tiny);
RecipesCommon.add1To9Pair(ModItems.ingot_technetium, ModItems.nugget_technetium);
RecipesCommon.add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60);
RecipesCommon.add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198);
RecipesCommon.add1To9Pair(ModItems.ingot_bismuth, ModItems.nugget_bismuth);
RecipesCommon.add1To9Pair(ModBlocks.block_bismuth, ModItems.ingot_bismuth);
RecipesCommon.add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241);
RecipesCommon.add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241);
RecipesCommon.add1To9Pair(ModItems.ingot_am242, ModItems.nugget_am242);
RecipesCommon.add1To9Pair(ModItems.ingot_am_mix, ModItems.nugget_am_mix);
RecipesCommon.add1To9Pair(ModItems.ingot_americium_fuel, ModItems.nugget_americium_fuel);
for(int i = 0; i < ItemWasteLong.WasteClass.values().length; i++) {
RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_long_tiny, ModItems.nuclear_waste_long, i);
@ -137,6 +140,15 @@ public class MineralRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_pu_mix, ModItems.billet_pu_mix });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "nuggetUranium238", "nuggetUranium238" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_plutonium_fuel, 1), new Object[] { ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, ModItems.nugget_pu_mix, "tinyU238", "tinyU238" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_pu_mix, 3), new Object[] { ModItems.billet_pu239, ModItems.billet_pu239, ModItems.billet_pu240 });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_americium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_am_mix });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_americium_fuel, 1), new Object[] { ModItems.nugget_am_mix, ModItems.nugget_am_mix, "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_americium_fuel, 1), new Object[] { ModItems.nugget_am_mix, ModItems.nugget_am_mix, "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_am_mix, 3), new Object[] { ModItems.billet_am241, ModItems.billet_am242, ModItems.billet_am242 });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_am_mix, 1), new Object[] { "nuggetAmericium241", "nuggetAmericium241", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_am_mix, 1), new Object[] { "tinyAm241", "tinyAm241", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 3), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_neptunium });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 1), new Object[] { "nuggetNeptunium237", "nuggetNeptunium237", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_neptunium_fuel, 1), new Object[] { "tinyNp237", "tinyNp237", "tinyU238", "tinyU238", "tinyU238", "tinyU238" }));
@ -163,9 +175,14 @@ public class MineralRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_pu238, 2), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_pu239, 2), new Object[] { ModItems.billet_pu239, ModItems.billet_pu239, ModItems.billet_pu239 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_pu240, 2), new Object[] { ModItems.billet_pu240, ModItems.billet_pu240, ModItems.billet_pu240 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_pu241, 2), new Object[] { ModItems.billet_pu241, ModItems.billet_pu241, ModItems.billet_pu241 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_pu_mix, 2), new Object[] { ModItems.billet_pu_mix, ModItems.billet_pu_mix, ModItems.billet_pu_mix });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_am241, 2), new Object[] { ModItems.billet_am241, ModItems.billet_am241, ModItems.billet_am241 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_am242, 2), new Object[] { ModItems.billet_am242, ModItems.billet_am242, ModItems.billet_am242 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_am_mix, 2), new Object[] { ModItems.billet_am_mix, ModItems.billet_am_mix, ModItems.billet_am_mix });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 2), new Object[] { ModItems.billet_uranium_fuel, ModItems.billet_uranium_fuel, ModItems.billet_uranium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 2), new Object[] { ModItems.billet_plutonium_fuel, ModItems.billet_plutonium_fuel, ModItems.billet_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_americium_fuel, 2), new Object[] { ModItems.billet_americium_fuel, ModItems.billet_americium_fuel, ModItems.billet_americium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_mox_fuel, 2), new Object[] { ModItems.billet_mox_fuel, ModItems.billet_mox_fuel, ModItems.billet_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_neptunium, 2), new Object[] { ModItems.billet_neptunium, ModItems.billet_neptunium, ModItems.billet_neptunium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_neptunium_fuel, 2), new Object[] { ModItems.billet_neptunium_fuel, ModItems.billet_neptunium_fuel, ModItems.billet_neptunium_fuel });
@ -183,6 +200,7 @@ public class MineralRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_americium), new Object[] { ModItems.billet_am241, ModItems.billet_am241, ModItems.billet_am241, "plateIron" }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite });
@ -377,5 +395,7 @@ public class MineralRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_les, 1), new Object[] { "nuggetSchrabidium", "nuggetNeptunium237", "nuggetNeptunium237", "nuggetNeptunium237", "nuggetNeptunium237", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPluonium240", "nuggetPluonium240", "nuggetPluonium240" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_pu_mix, 1), new Object[] { "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu239", "tinyPu240", "tinyPu240", "tinyPu240" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "nuggetAmericium241", "nuggetAmericium241", "nuggetAmericium241", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "tinyAm241", "tinyAm241", "tinyAm241", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242" }));
}
}

3
src/main/java/com/hbm/crafting/RodRecipes.java
View File

@ -165,6 +165,9 @@ public class RodRecipes {
RecipesCommon.addRBMKRod(ModItems.billet_pu_mix, ModItems.rbmk_fuel_mep);
RecipesCommon.addRBMKRod(ModItems.billet_pu239, ModItems.rbmk_fuel_hep239);
RecipesCommon.addRBMKRod(ModItems.billet_pu241, ModItems.rbmk_fuel_hep241);
RecipesCommon.addRBMKRod(ModItems.billet_americium_fuel, ModItems.rbmk_fuel_lea);
RecipesCommon.addRBMKRod(ModItems.billet_am_mix, ModItems.rbmk_fuel_mea);
RecipesCommon.addRBMKRod(ModItems.billet_am242, ModItems.rbmk_fuel_hea242);
RecipesCommon.addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men);
RecipesCommon.addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be);
RecipesCommon.addRBMKRod(ModItems.billet_ra226be, ModItems.rbmk_fuel_ra226be);

4
src/main/java/com/hbm/handler/GUIHandler.java
View File

@ -264,7 +264,7 @@ public class GUIHandler implements IGuiHandler {
case ModBlocks.guiID_machine_teleporter: {
if(entity instanceof TileEntityMachineTeleporter) {
return new ContainerMachineTeleporter(player.inventory, (TileEntityMachineTeleporter) entity);
// return new ContainerMachineTeleporter(player.inventory, (TileEntityMachineTeleporter) entity);
}
return null;
}
@ -817,7 +817,7 @@ public class GUIHandler implements IGuiHandler {
case ModBlocks.guiID_rbmk_console: {
if(entity instanceof TileEntityRBMKConsole) {
return new ContainerRBMKConsole(player.inventory, (TileEntityRBMKConsole) entity);
// return new ContainerRBMKConsole(player.inventory, (TileEntityRBMKConsole) entity);
}
return null;
}

1
src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java
View File

@ -18,7 +18,6 @@ import com.hbm.render.anim.HbmAnimations.AnimType;
import com.hbm.render.util.RenderScreenOverlay.Crosshair;
import net.minecraft.block.material.Material;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class GunRocketFactory {

22
src/main/java/com/hbm/inventory/AnvilRecipes.java
View File

@ -3,10 +3,13 @@ package com.hbm.inventory;
import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.inventory.RecipesCommon.AStack;
import com.hbm.inventory.RecipesCommon.ComparableStack;
import com.hbm.inventory.RecipesCommon.OreDictStack;
import com.hbm.items.ModItems;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
public class AnvilRecipes {
@ -17,6 +20,25 @@ public class AnvilRecipes {
smithingRecipes.add(new AnvilSmithingRecipe(2, new ItemStack(ModItems.plate_steel, 2),
new OreDictStack("ingotSteel"), new OreDictStack("ingotSteel")));
Block[] anvils = new Block[]{ModBlocks.anvil_iron, ModBlocks.anvil_lead};
for(Block anvil : anvils) {
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_bismuth, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_bismuth, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_dnt, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_dineutronium, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_ferrouranium, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_u238, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_meteorite, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_meteorite, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_schrabidate, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_schrabidate, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_starmetal, 1),
new ComparableStack(anvil), new ComparableStack(ModItems.ingot_starmetal, 10)));
smithingRecipes.add(new AnvilSmithingRecipe(1, new ItemStack(ModBlocks.anvil_steel, 1),
new ComparableStack(anvil), new OreDictStack("ingotSteel", 10)));
}
}
public static List<AnvilSmithingRecipe> getSmithing() {

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

@ -472,7 +472,7 @@ public class AssemblerRecipes {
new ComparableStack(ModItems.bolt_compound, 3),
new ComparableStack(ModItems.pipes_steel, 1),
new ComparableStack(ModItems.circuit_aluminium, 1),
}, 20);
}, 200);
makeRecipe(new ComparableStack(ModBlocks.machine_chungus, 1), new AStack[] {
new ComparableStack(ModItems.hull_big_steel, 6),
new OreDictStack("plateSteel", 32),

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

@ -21,6 +21,8 @@ public class OreDictManager {
OreDictionary.registerOre("ingotPlutonium239", ModItems.ingot_pu239);
OreDictionary.registerOre("ingotPlutonium240", ModItems.ingot_pu240);
OreDictionary.registerOre("ingotPlutonium241", ModItems.ingot_pu241);
OreDictionary.registerOre("ingotAmericium241", ModItems.ingot_am241);
OreDictionary.registerOre("ingotAmericium242", ModItems.ingot_am242);
OreDictionary.registerOre("ingotNeptunium237", ModItems.ingot_neptunium);
OreDictionary.registerOre("ingotTechnetium99", ModItems.ingot_technetium);
OreDictionary.registerOre("U233", ModItems.ingot_u233);
@ -31,6 +33,8 @@ public class OreDictManager {
OreDictionary.registerOre("Pu239", ModItems.ingot_pu239);
OreDictionary.registerOre("Pu240", ModItems.ingot_pu240);
OreDictionary.registerOre("Pu241", ModItems.ingot_pu241);
OreDictionary.registerOre("Am241", ModItems.ingot_am241);
OreDictionary.registerOre("Am242", ModItems.ingot_am242);
OreDictionary.registerOre("Np237", ModItems.ingot_neptunium);
OreDictionary.registerOre("ingotPolonium", ModItems.ingot_polonium);
OreDictionary.registerOre("ingotSchrabidium", ModItems.ingot_schrabidium);
@ -77,6 +81,8 @@ public class OreDictManager {
OreDictionary.registerOre("nuggetPlutonium239", ModItems.nugget_pu239);
OreDictionary.registerOre("nuggetPlutonium240", ModItems.nugget_pu240);
OreDictionary.registerOre("nuggetPlutonium241", ModItems.nugget_pu241);
OreDictionary.registerOre("nuggetAmericium241", ModItems.nugget_am241);
OreDictionary.registerOre("nuggetAmericium242", ModItems.nugget_am242);
OreDictionary.registerOre("nuggetAustralium", ModItems.nugget_australium);
OreDictionary.registerOre("nuggetEuphemium", ModItems.nugget_euphemium);
OreDictionary.registerOre("nuggetNeptunium237", ModItems.nugget_neptunium);
@ -94,6 +100,8 @@ public class OreDictManager {
OreDictionary.registerOre("tinyPu239", ModItems.nugget_pu239);
OreDictionary.registerOre("tinyPu240", ModItems.nugget_pu240);
OreDictionary.registerOre("tinyPu241", ModItems.nugget_pu241);
OreDictionary.registerOre("tinyAm241", ModItems.nugget_am241);
OreDictionary.registerOre("tinyAm242", ModItems.nugget_am242);
OreDictionary.registerOre("tinyNp237", ModItems.nugget_neptunium);
OreDictionary.registerOre("tinyTc99", ModItems.nugget_technetium);
OreDictionary.registerOre("tinyRa226", ModItems.nugget_ra226);

2
src/main/java/com/hbm/inventory/RecipesCommon.java
View File

@ -230,7 +230,7 @@ public class RecipesCommon {
if(stack.stackSize < this.stacksize)
return false;
return false;
return true;
}
}

127
src/main/java/com/hbm/inventory/SILEXRecipes.java
View File

@ -37,6 +37,11 @@ public class SILEXRecipes {
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 6))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 3))
);
recipes.put(new ComparableStack(ModItems.ingot_am_mix), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am241), 3))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am242), 6))
);
itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium));
dictTranslation.put("dustPlutonium", "ingotPlutonium");
@ -77,27 +82,27 @@ public class SILEXRecipes {
recipes.put(new ComparableStack(ModItems.rbmk_pellet_ueu, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 87 - i * 6))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 9 - i * 2))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 3 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 2 + 5 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 3 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 2 + 5 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_ueu, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 87 - i * 6))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 8 - i * 2))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 3 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 2 + 5 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 3 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 2 + 5 * i)) );
// MEU //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_meu, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_uranium_fuel), 90 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 4 + 8 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 6 + 12 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 8 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 12 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_meu, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_uranium_fuel), 89 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 4 + 8 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 6 + 12 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 4 + 8 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 6 + 12 * i)) );
// TH232 //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_thmeu, 1, i), new SILEXRecipe(600, 100)
@ -112,32 +117,46 @@ public class SILEXRecipes {
// LEP //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 90 - i * 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 10 + 15 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 10 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 5 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_lep, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 89 - i * 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 10 + 15 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 7 + 10 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 3 + 5 * i)) );
// MEP //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_plutonium_fuel), 85 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 10 + 10 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 5 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_mep, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu_mix), 84 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 10 + 10 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 5 * i)) );
// MEP //
// HEP239 //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 85 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 15 + 20 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep239, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 84 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 15 + 20 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 15 + 20 * i)) );
// HEP241 //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep241, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 85 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), 15 + 20 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_hep241, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 84 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), 15 + 20 * i)) );
// MEN //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_men, 1, i), new SILEXRecipe(600, 100)
@ -154,16 +173,18 @@ public class SILEXRecipes {
// MOX //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_mox, 1, i), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mox_fuel), 90 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 4 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 3 + 6 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 10 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 4 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 3 + 6 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 3 + 7 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 2 + 3 * i)) );
recipes.put(new ComparableStack(ModItems.rbmk_pellet_mox, 1, i + 5), new SILEXRecipe(600, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_xe135_tiny), 1))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_mox_fuel), 89 - i * 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), 2 + 4 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), 3 + 6 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 5 + 10 * i)) );
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_long_tiny, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), 2 + 4 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), 3 + 6 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), 3 + 7 * i))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_short_tiny, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), 2 + 3 * i)) );
// LEAUS //
recipes.put(new ComparableStack(ModItems.rbmk_pellet_leaus, 1, i), new SILEXRecipe(600, 100)
@ -271,34 +292,73 @@ public class SILEXRecipes {
.addOut(new WeightedRandomObject(new ItemStack(ModItems.undefined), 1)) );
}
recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100)
recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 45))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100)
recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 65))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 20))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100)
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 30))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM.ordinal()), new SILEXRecipe(900, 100)
recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM235.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu239), 45))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 15))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_long_depleted, 1, ItemWasteLong.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 65))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 20))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 30))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 10))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 40))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM239.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM240.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu240), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu241), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u238), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_ra226), 15))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5))
@ -309,6 +369,19 @@ public class SILEXRecipes {
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 35))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 45))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am241), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am242), 35))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_i131_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cs137_tiny), 5))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 30))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short_depleted, 1, ItemWasteShort.WasteClass.PLUTONIUM241.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_neptunium), 20))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 55))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nuclear_waste_tiny), 25))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_long, 1, ItemWasteLong.WasteClass.THORIUM.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u233), 40))

48
src/main/java/com/hbm/inventory/container/ContainerAnvil.java
View File

@ -1,6 +1,5 @@
package com.hbm.inventory.container;
import com.hbm.handler.ArmorModHandler;
import com.hbm.inventory.AnvilRecipes;
import com.hbm.inventory.AnvilRecipes.AnvilSmithingRecipe;
import com.hbm.inventory.SlotMachineOutput;
@ -18,9 +17,9 @@ public class ContainerAnvil extends Container {
public InventoryBasic input = new InventoryBasic("Input", false, 8);
public IInventory output = new InventoryCraftResult();
public ContainerAnvil(InventoryPlayer inventory) {
this.addSlotToContainer(new SmithingSlot(input, 0, 17, 27));
this.addSlotToContainer(new SmithingSlot(input, 1, 53, 27));
this.addSlotToContainer(new SlotMachineOutput(output, 0, 89, 27) {
@ -28,7 +27,7 @@ public class ContainerAnvil extends Container {
@Override
public void onPickupFromSlot(EntityPlayer player, ItemStack stack) {
super.onPickupFromSlot(player, stack);
ItemStack left = ContainerAnvil.this.input.getStackInSlot(0);
ItemStack right = ContainerAnvil.this.input.getStackInSlot(1);
@ -63,21 +62,21 @@ public class ContainerAnvil extends Container {
this.onCraftMatrixChanged(this.input);
}
@Override
public boolean canInteractWith(EntityPlayer player) {
return true;
}
@Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
ItemStack var3 = null;
Slot var4 = (Slot) this.inventorySlots.get(par2);
if(var4 != null && var4.getHasStack()) {
ItemStack var5 = var4.getStack();
var3 = var5.copy();
if(par2 == 2) {
if(!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) {
@ -96,31 +95,50 @@ public class ContainerAnvil extends Container {
if(!this.mergeItemStack(var5, 0, 2, false))
return null;
}
if(var5.stackSize == 0) {
var4.putStack((ItemStack) null);
} else {
var4.onSlotChanged();
}
var4.onPickupFromSlot(p_82846_1_, var5);
}
return var3;
}
@Override
public void onContainerClosed(EntityPlayer player) {
super.onContainerClosed(player);
if(!player.worldObj.isRemote) {
for(int i = 0; i < this.input.getSizeInventory(); ++i) {
ItemStack itemstack = this.input.getStackInSlotOnClosing(i);
if(itemstack != null) {
player.dropPlayerItemWithRandomChoice(itemstack, false);
}
}
}
}
public class SmithingSlot extends Slot {
public SmithingSlot(IInventory inventory, int index, int x, int y) {
super(inventory, index, x, y);
}
public void onSlotChanged() {
super.onSlotChanged();
ContainerAnvil.this.updateSmithing();
}
@Override
public void putStack(ItemStack stack) {
super.putStack(stack);
ContainerAnvil.this.updateSmithing();
}
public void onPickupFromSlot(EntityPlayer player, ItemStack stack) {
super.onPickupFromSlot(player, stack);
ContainerAnvil.this.updateSmithing();
@ -128,7 +146,7 @@ public class ContainerAnvil extends Container {
}
private void updateSmithing() {
ItemStack left = this.input.getStackInSlot(0);
ItemStack right = this.input.getStackInSlot(1);

6
src/main/java/com/hbm/inventory/container/ContainerStorageDrum.java
View File

@ -41,11 +41,11 @@ public class ContainerStorageDrum extends Container {
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
ItemStack var3 = null;
Slot var4 = (Slot) this.inventorySlots.get(par2);
if(var4 != null && var4.getHasStack()) {
ItemStack var5 = var4.getStack();
var3 = var5.copy();
if(par2 <= drum.getSizeInventory() - 1) {
if(!this.mergeItemStack(var5, drum.getSizeInventory(), this.inventorySlots.size(), true)) {
return null;
@ -59,6 +59,8 @@ public class ContainerStorageDrum extends Container {
} else {
var4.onSlotChanged();
}
var4.onPickupFromSlot(p_82846_1_, var5);
}
return var3;

34
src/main/java/com/hbm/inventory/container/ContainerWasteDrum.java
View File

@ -43,39 +43,31 @@ public class ContainerWasteDrum extends Container {
}
@Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
{
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
ItemStack var3 = null;
Slot var4 = (Slot) this.inventorySlots.get(par2);
if (var4 != null && var4.getHasStack())
{
if(var4 != null && var4.getHasStack()) {
ItemStack var5 = var4.getStack();
var3 = var5.copy();
if (par2 <= diFurnace.getSizeInventory() - 1) {
if (!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true))
{
if(par2 <= diFurnace.getSizeInventory() - 1) {
if(!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true)) {
return null;
}
} else if(!this.mergeItemStack(var5, 0, 0, false)) {
return null;
}
else if (!this.mergeItemStack(var5, 0, 0, false))
{
return null;
}
if (var5.stackSize == 0)
{
if(var5.stackSize == 0) {
var4.putStack((ItemStack) null);
}
else
{
} else {
var4.onSlotChanged();
}
}
return var3;
}
}
@Override
public boolean canInteractWith(EntityPlayer player) {

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

@ -644,6 +644,7 @@ public class ModItems {
public static Item pellet_rtg_weak;
public static Item pellet_rtg_polonium;
public static Item pellet_rtg_gold;
public static Item pellet_rtg_americium;
public static Item tritium_deuterium_cake;
public static Item pellet_schrabidium;
@ -2388,11 +2389,11 @@ public class ModItems {
ingot_pu238 = new ItemHazard(ItemHazard.pu238 * ItemHazard.ingot, true).setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu238");
ingot_pu239 = new ItemHazard(ItemHazard.pu239 * ItemHazard.ingot).setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu239");
ingot_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.ingot).setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu240");
ingot_pu241 = new ItemHazard().addRadiation(ItemHazard.pu240 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu241");
ingot_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu241");
ingot_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.ingot).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix");
ingot_am241 = new ItemHazard().setUnlocalizedName("ingot_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am241");
ingot_am242 = new ItemHazard().setUnlocalizedName("ingot_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am242");
ingot_am_mix = new ItemHazard().setUnlocalizedName("ingot_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am_mix");
ingot_am241 = new ItemHazard().addRadiation(ItemHazard.am241 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am241");
ingot_am242 = new ItemHazard().addRadiation(ItemHazard.am242 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am242");
ingot_am_mix = new ItemHazard().addRadiation(ItemHazard.amrg * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_am_mix");
ingot_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.ingot).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium");
ingot_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.ingot, true).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium");
ingot_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_technetium");
@ -2408,7 +2409,7 @@ public class ModItems {
ingot_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.ingot).setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel");
ingot_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium_fuel");
ingot_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.ingot).setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_mox_fuel");
ingot_americium_fuel = new ItemHazard().setUnlocalizedName("ingot_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_americium_fuel");
ingot_americium_fuel = new ItemHazard().addRadiation(ItemHazard.amf * ItemHazard.ingot).toItem().setUnlocalizedName("ingot_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_americium_fuel");
ingot_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.ingot, false, true).setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel");
ingot_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.ingot).setUnlocalizedName("ingot_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_thorium_fuel");
nugget_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.nugget).setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel");
@ -2416,7 +2417,7 @@ public class ModItems {
nugget_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.nugget).setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel");
nugget_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium_fuel");
nugget_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.nugget).setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_mox_fuel");
nugget_americium_fuel = new ItemHazard().setUnlocalizedName("nugget_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_americium_fuel");
nugget_americium_fuel = new ItemHazard().addRadiation(ItemHazard.amf * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_americium_fuel");
nugget_schrabidium_fuel = new ItemHazard(ItemHazard.saf * ItemHazard.nugget, false, true).setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel");
ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy");
ingot_tcalloy = new Item().setUnlocalizedName("ingot_tcalloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tcalloy");
@ -2482,9 +2483,9 @@ public class ModItems {
billet_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.billet).setUnlocalizedName("billet_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu240");
billet_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("billet_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu241");
billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix");
billet_am241 = new ItemHazard().setUnlocalizedName("billet_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am241");
billet_am242 = new ItemHazard().setUnlocalizedName("billet_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am242");
billet_am_mix = new ItemHazard().setUnlocalizedName("billet_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am_mix");
billet_am241 = new ItemHazard().addRadiation(ItemHazard.am241 * ItemHazard.billet).toItem().setUnlocalizedName("billet_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am241");
billet_am242 = new ItemHazard().addRadiation(ItemHazard.am242 * ItemHazard.billet).toItem().setUnlocalizedName("billet_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am242");
billet_am_mix = new ItemHazard().addRadiation(ItemHazard.amrg * ItemHazard.billet).toItem().setUnlocalizedName("billet_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_am_mix");
billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium");
billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium");
billet_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.billet).toItem().setUnlocalizedName("billet_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_technetium");
@ -2500,7 +2501,7 @@ public class ModItems {
billet_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.billet).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel");
billet_neptunium_fuel = new ItemHazard().addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("billet_neptunium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium_fuel");
billet_mox_fuel = new ItemHazard(ItemHazard.mox * ItemHazard.billet).setUnlocalizedName("billet_mox_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_mox_fuel");
billet_americium_fuel = new ItemHazard().setUnlocalizedName("billet_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_americium_fuel");
billet_americium_fuel = new ItemHazard().addRadiation(ItemHazard.amf * ItemHazard.billet).toItem().setUnlocalizedName("billet_americium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_americium_fuel");
billet_les = new ItemHazard().addRadiation(ItemHazard.saf * ItemHazard.billet).addBlinding().toItem().setUnlocalizedName("billet_les").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_les");
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_hes = new ItemHazard().addRadiation(ItemHazard.saf * ItemHazard.billet).addBlinding().toItem().setUnlocalizedName("billet_hes").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_hes");
@ -2579,9 +2580,9 @@ public class ModItems {
nugget_pu240 = new ItemHazard(ItemHazard.pu240 * ItemHazard.nugget).setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu240");
nugget_pu241 = new ItemHazard().addRadiation(ItemHazard.pu241 * ItemHazard.nugget).addFire(1).toItem().setUnlocalizedName("nugget_pu241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu241");
nugget_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.nugget).setUnlocalizedName("nugget_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu_mix");
nugget_am241 = new ItemHazard().setUnlocalizedName("nugget_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am241");
nugget_am242 = new ItemHazard().setUnlocalizedName("nugget_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am242");
nugget_am_mix = new ItemHazard().setUnlocalizedName("nugget_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am_mix");
nugget_am241 = new ItemHazard().addRadiation(ItemHazard.am241 * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_am241").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am241");
nugget_am242 = new ItemHazard().addRadiation(ItemHazard.am242 * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_am242").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am242");
nugget_am_mix = new ItemHazard().addRadiation(ItemHazard.amrg * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_am_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_am_mix");
nugget_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.nugget).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium");
nugget_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.nugget, true).setUnlocalizedName("nugget_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_polonium");
nugget_technetium = new ItemHazard().addRadiation(ItemHazard.tc99 * ItemHazard.nugget).toItem().setUnlocalizedName("nugget_technetium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_technetium");
@ -2901,6 +2902,7 @@ public class ModItems {
pellet_rtg_weak = new ItemHazard(ItemHazard.u238 * ItemHazard.billet * 2 + ItemHazard.pu238 * ItemHazard.billet).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak");
pellet_rtg_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.rtg, true).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium");
pellet_rtg_gold = new ItemHazard().addRadiation(ItemHazard.au198 * ItemHazard.rtg).addFire(15).toItem().setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold");
pellet_rtg_americium = new ItemHazard().addRadiation(ItemHazard.am241 * ItemHazard.rtg).addFire(15).toItem().setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium");
tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake");
piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium");
@ -3301,9 +3303,9 @@ public class ModItems {
rbmk_pellet_mep = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Plutonium-239").addRadiation(ItemHazard.purg * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mep").setTextureName(RefStrings.MODID + ":rbmk_pellet_mep");
rbmk_pellet_hep239 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-239").addRadiation(ItemHazard.pu239 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep239").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep239");
rbmk_pellet_hep241 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Plutonium-241").addRadiation(ItemHazard.pu241 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hep241").setTextureName(RefStrings.MODID + ":rbmk_pellet_hep241");
rbmk_pellet_lea = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Americium-242").setUnlocalizedName("rbmk_pellet_lea").setTextureName(RefStrings.MODID + ":rbmk_pellet_lea");
rbmk_pellet_mea = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Americium-242").setUnlocalizedName("rbmk_pellet_mea").setTextureName(RefStrings.MODID + ":rbmk_pellet_mea");
rbmk_pellet_hea242 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-242").setUnlocalizedName("rbmk_pellet_hea242").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea242");
rbmk_pellet_lea = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Americium-242").addRadiation(ItemHazard.amf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_lea").setTextureName(RefStrings.MODID + ":rbmk_pellet_lea");
rbmk_pellet_mea = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Americium-242").addRadiation(ItemHazard.amrg * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mea").setTextureName(RefStrings.MODID + ":rbmk_pellet_mea");
rbmk_pellet_hea242 = (ItemRBMKPellet) new ItemRBMKPellet("Highly Enriched Americium-242").addRadiation(ItemHazard.am242 * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_hea242").setTextureName(RefStrings.MODID + ":rbmk_pellet_hea242");
rbmk_pellet_men = (ItemRBMKPellet) new ItemRBMKPellet("Medium Enriched Neptunium-237").addRadiation(ItemHazard.npf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_men").setTextureName(RefStrings.MODID + ":rbmk_pellet_men");
rbmk_pellet_mox = (ItemRBMKPellet) new ItemRBMKPellet("Mixed LEU & LEP Oxide").addRadiation(ItemHazard.mox * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_mox").setTextureName(RefStrings.MODID + ":rbmk_pellet_mox");
rbmk_pellet_les = (ItemRBMKPellet) new ItemRBMKPellet("Low Enriched Schrabidium-326").addRadiation(ItemHazard.saf * ItemHazard.billet).toItem().setUnlocalizedName("rbmk_pellet_les").setTextureName(RefStrings.MODID + ":rbmk_pellet_les");
@ -3334,8 +3336,19 @@ public class ModItems {
.addRadiation(ItemHazard.uf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_meu").setTextureName(RefStrings.MODID + ":rbmk_fuel_meu");
rbmk_fuel_heu233 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_heu233)
.setYield(100000000D)
.setStats(215)
.setFunction(EnumBurnFunc.SQUARE_ROOT)
.setHeat(1.25D)
.setMeltingPoint(2865)
.addRadiation(ItemHazard.u233 * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_heu233").setTextureName(RefStrings.MODID + ":rbmk_fuel_heu233");
rbmk_fuel_heu235 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_heu235)
.setYield(100000000D)
.setStats(200)
.setFunction(EnumBurnFunc.SQUARE_ROOT)
.setMeltingPoint(2865)
.addRadiation(ItemHazard.u233 * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_heu235").setTextureName(RefStrings.MODID + ":rbmk_fuel_heu235");
rbmk_fuel_thmeu = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_thmeu)
.setYield(100000000D)
@ -3375,10 +3388,28 @@ public class ModItems {
.addRadiation(ItemHazard.pu241 * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_hep241").setTextureName(RefStrings.MODID + ":rbmk_fuel_hep241");
rbmk_fuel_lea = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_lea)
.setYield(100000000D)
.setStats(250, 10)
.setFunction(EnumBurnFunc.SQUARE_ROOT)
.setHeat(1.5D)
.setMeltingPoint(2386)
.addRadiation(ItemHazard.amf * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_lea").setTextureName(RefStrings.MODID + ":rbmk_fuel_lea");
rbmk_fuel_mea = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_mea)
.setYield(100000000D)
.setStats(275, 20)
.setFunction(EnumBurnFunc.ARCH)
.setHeat(1.75D)
.setMeltingPoint(2386)
.addRadiation(ItemHazard.amrg * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_mea").setTextureName(RefStrings.MODID + ":rbmk_fuel_mea");
rbmk_fuel_hea242 = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_hea242)
.setYield(100000000D)
.setStats(300)
.setFunction(EnumBurnFunc.LINEAR)
.setHeat(2D)
.setMeltingPoint(2386)
.addRadiation(ItemHazard.am242 * ItemHazard.rod_rbmk).toItem()
.setUnlocalizedName("rbmk_fuel_hea242").setTextureName(RefStrings.MODID + ":rbmk_fuel_hea242");
rbmk_fuel_men = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_men)
.setYield(100000000D)
@ -3476,7 +3507,7 @@ public class ModItems {
.setUnlocalizedName("rbmk_fuel_balefire").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire");
rbmk_fuel_drx = (ItemRBMKRod) new ItemRBMKRod(rbmk_pellet_drx)
.setYield(1000000D)
.setStats(10000)
.setStats(1000, 10)
.setFunction(EnumBurnFunc.QUADRATIC)
.setHeat(0.1D)
.setMeltingPoint(100000)
@ -5712,6 +5743,7 @@ public class ModItems {
GameRegistry.registerItem(pellet_rtg_weak, pellet_rtg_weak.getUnlocalizedName());
GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName());
GameRegistry.registerItem(pellet_rtg_gold, pellet_rtg_gold.getUnlocalizedName());
GameRegistry.registerItem(pellet_rtg_americium, pellet_rtg_americium.getUnlocalizedName());
GameRegistry.registerItem(tritium_deuterium_cake, tritium_deuterium_cake.getUnlocalizedName());
GameRegistry.registerItem(pellet_cluster, pellet_cluster.getUnlocalizedName());
GameRegistry.registerItem(pellet_buckshot, pellet_buckshot.getUnlocalizedName());

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

@ -32,6 +32,8 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
//PU239 24,000a α 005.00Rad/s
//PU240 6,600a α 007.50Rad/s
//PU241 14a β− 025.00Rad/s Spicy
//AM241 432a α 008.50Rad/s
//AM242 141a β− 009.50Rad/s
public static final float co60 = 30.0F;
public static final float tc99 = 2.75F;
@ -58,6 +60,10 @@ public class ItemHazard extends ItemCustomLore implements IItemHazard {
public static final float pu240 = 7.5F;
public static final float pu241 = 25.0F;
public static final float puf = 4.25F;
public static final float am241 = 8.5F;
public static final float am242 = 9.5F;
public static final float amrg = 9.0F;
public static final float amf = 4.75F;
public static final float mox = 2.5F;
public static final float sa326 = 15.0F;
public static final float sa327 = 17.5F;

3
src/main/java/com/hbm/items/special/ItemWasteLong.java
View File

@ -44,7 +44,8 @@ public class ItemWasteLong extends ItemHazard {
public enum WasteClass {
//all decayed versions include lead-types and classic nuclear waste
URANIUM("Uranium"), //plutonium 239 and 240, neptunium 237 / -
URANIUM235("Uranium-235"), //plutonium 239 and 240, neptunium 237 / -
URANIUM233("Uranium-233"), //uranium 235, plutonium 239, neptunium 237 / -
NEPTUNIUM("Neptunium"), //plutonium 239 and uranium 238 / -
THORIUM("Thorium"); //uranium 233 and uranium 235 / -

6
src/main/java/com/hbm/items/special/ItemWasteShort.java
View File

@ -44,11 +44,13 @@ public class ItemWasteShort extends ItemHazard {
public enum WasteClass {
//all decayed versions include lead-types and classic nuclear waste
URANIUM("Uranium"), //fresh recycling makes iodine, caesium and technetium, depleted turns into neptunium
URANIUM235("Uranium-235"), //fresh recycling makes iodine, caesium and technetium, depleted turns into neptunium
URANIUM233("Uranium-233"), //fresh recycling makes iodine, caesium and technetium, depleted turns into u235
NEPTUNIUM("Neptunium"), //funny fission fragments + polonium and pu238 and 239 / u235
PLUTONIUM239("Plutonium-239"), //funny fission fragments + pu240 and 241 / u238 (actually u236 but fuck you)
PLUTONIUM240("Plutonium-240"), //funny fission fragments + pu241 / u238 + lead
PLUTONIUM241("Plutonium-241"); //funny fission fragments + am241 / 242 / np237 + bismuth
PLUTONIUM241("Plutonium-241"), //funny fission fragments + am241 / 242 / np237 + bismuth
AMERICIUM242("Americium-242"); //funny fission fragments + californium / np237 + pu241
String name;

4
src/main/java/com/hbm/lib/HbmWorldGen.java
View File

@ -667,7 +667,7 @@ public class HbmWorldGen implements IWorldGenerator {
private void generateEnd(World world, Random rand, int i, int j) {
DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.endTikiteSpawn, 6, 0, 127, ModBlocks.ore_tikite, Blocks.end_stone);
for(int k = 0; k < 50; k++){
/*for(int k = 0; k < 50; k++){
int x = i + rand.nextInt(16);
int z = j + rand.nextInt(16);
int d = 5 + rand.nextInt(60);
@ -675,7 +675,7 @@ public class HbmWorldGen implements IWorldGenerator {
for(int y = d - 5; y <= d; y++)
if(world.getBlock(x, y, z) == Blocks.air && world.getBlock(x, y + 1, z).isSideSolid(world, x, y, z, ForgeDirection.DOWN))
world.setBlock(x, y, z, ModBlocks.crystal_trixite);
}
}*/
}
}

2
src/main/java/com/hbm/lib/RefStrings.java
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 (3902)";
public static final String VERSION = "1.0.27 BETA (3913)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

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

@ -288,7 +288,7 @@ public class ClientProxy extends ServerProxy {
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_nightmare, new ItemRenderWeaponFFNightmare());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare2));
MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman, new ItemRenderFatMan());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_proto, new ItemRenderFatMan());

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

@ -254,6 +254,8 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_microwave, 1), new Object[] { "III", "SGM", "IDI", 'I', ModItems.plate_polymer, 'S', "plateSteel", 'G', "paneGlass", 'M', ModItems.magnetron, 'D', ModItems.motor }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_solar_boiler), new Object[] { "SHS", "DHD", "SHS", 'S', "ingotSteel", 'H', ModItems.hull_big_steel, 'D', "dyeBlack" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.solar_mirror, 3), new Object[] { "AAA", " B ", "SSS", 'A', "plateAluminum", 'B', ModBlocks.steel_beam, 'S', "ingotSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.anvil_iron, 1), new Object[] { "III", " B ", "III", 'I', "ingotIron", 'B', "blockIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.anvil_lead, 1), new Object[] { "III", " B ", "III", 'I', "ingotLead", 'B', "blockLead" }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.muffler, 1), new Object[] { "III", "IWI", "III", 'I', ModItems.plate_polymer, 'W', Blocks.wool });

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

@ -537,6 +537,7 @@ public class ResourceManager {
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 ff_maresleg = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/maresleg.obj"));
public static final IModelCustom ff_nightmare = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/nightmare.obj"));
public static final IModelCustom fireext = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/fireext.obj"));
public static final IModelCustom lance = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lance.obj"));

100
src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFNightmare.java Normal file
View File

@ -0,0 +1,100 @@
package com.hbm.render.item.weapon;
import org.lwjgl.opengl.GL11;
import com.hbm.items.weapon.ItemGunBase;
import com.hbm.main.ResourceManager;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
public class ItemRenderWeaponFFNightmare implements IItemRenderer {
@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.0D;
GL11.glTranslated(0.75, 0.55, 0);
GL11.glScaled(s0, s0, s0);
GL11.glRotated(100, 0, -1, 0);
GL11.glRotated(25, 1, 0, 0);
break;
case EQUIPPED:
double scale = 1.0D;
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 = 0.75D;
GL11.glScaled(s1, s1, s1);
GL11.glRotated(90, 0, 1, 0);
break;
case INVENTORY:
GL11.glEnable(GL11.GL_LIGHTING);
double s = 9D;
GL11.glTranslated(10, 9, 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(ResourceManager.ff_gun_dark);
ResourceManager.ff_nightmare.renderPart("Grip");
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_normal);
ResourceManager.ff_nightmare.renderPart("Dark");
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_bright);
ResourceManager.ff_nightmare.renderPart("Light");
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_gun_dark);
int ammo = ItemGunBase.getMag(item);
for(int i = 0; i < ammo; i++) {
ResourceManager.ff_nightmare.renderPart("Bullet" + (i + 1));
}
GL11.glPopMatrix();
}
}

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java
View File

@ -230,6 +230,8 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory,
heat += 3;
if(slots[i].getItem() == ModItems.pellet_rtg_polonium)
heat += 25;
if(slots[i].getItem() == ModItems.pellet_rtg_americium)
heat += 50;
if(slots[i].getItem() == ModItems.pellet_rtg_gold) {

27
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKAbsorber.java
View File

@ -1,39 +1,12 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
public class TileEntityRBMKAbsorber extends TileEntityRBMKBase {
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 1 + worldObj.rand.nextInt(2);

27
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBase.java
View File

@ -10,6 +10,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.entity.effect.EntitySpear;
import com.hbm.entity.projectile.EntityRBMKDebris;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.main.MainRegistry;
@ -267,17 +268,18 @@ public abstract class TileEntityRBMKBase extends TileEntity implements INBTPacke
}
protected void standardMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, RBMKDials.getColumnHeight(worldObj));
int h = RBMKDials.getColumnHeight(worldObj);
reduce = MathHelper.clamp_int(reduce, 1, h);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
for(int i = h; i >= 0; i--) {
if(i <= 4 - reduce) {
if(i <= h + 1 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
if(reduce > 1 && i == h + 1 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
@ -357,7 +359,11 @@ public abstract class TileEntityRBMKBase extends TileEntity implements INBTPacke
Block b = worldObj.getBlock(x, y, z);
if(worldObj.rand.nextInt(3) == 0 && (b == ModBlocks.pribris || b == ModBlocks.pribris_burning)) {
worldObj.setBlock(x, y, z, ModBlocks.pribris_radiating);
if(RBMKBase.digamma)
worldObj.setBlock(x, y, z, ModBlocks.pribris_digamma);
else
worldObj.setBlock(x, y, z, ModBlocks.pribris_radiating);
}
}
}
@ -377,7 +383,16 @@ public abstract class TileEntityRBMKBase extends TileEntity implements INBTPacke
worldObj.playSoundEffect(avgX + 0.5, yCoord + 1, avgZ + 0.5, "hbm:block.rbmk_explosion", 50.0F, 1.0F);
if(RBMKBase.digamma) {
EntitySpear spear = new EntitySpear(worldObj);
spear.posX = avgX + 0.5;
spear.posZ = avgZ + 0.5;
spear.posY = yCoord + 100;
worldObj.spawnEntityInWorld(spear);
}
RBMKBase.dropLids = true;
RBMKBase.digamma = false;
}
private void getFF(int x, int y, int z) {

27
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBlank.java
View File

@ -1,39 +1,12 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
public class TileEntityRBMKBlank extends TileEntityRBMKBase {
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 1 + worldObj.rand.nextInt(2);

26
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java
View File

@ -14,9 +14,7 @@ import com.hbm.lib.Library;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements IFluidAcceptor, IFluidSource, IControlReceiver {
@ -231,30 +229,6 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
//TODO: steam explosions
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 1 + worldObj.rand.nextInt(2);

27
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java
View File

@ -1,13 +1,10 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.init.Blocks;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
@ -92,27 +89,6 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 2 + worldObj.rand.nextInt(2);
@ -120,8 +96,7 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase {
spawnDebris(DebrisType.ROD);
}
//control rods will not spawn lid projectiles since the lid is already part of the rod projectiles
//super.onMelt(reduce);
this.standardMelt(reduce);
}
@Override

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

@ -23,12 +23,14 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
this.startingLevel = this.level;
}
@Override
public double getMult() {
double surge = 0;
if(this.targetLevel < this.startingLevel && Math.abs(this.level - this.targetLevel) > 0.01D) {
surge = Math.sin(Math.pow(this.level, 15) * Math.PI) * (this.startingLevel - this.targetLevel) * RBMKDials.getSurgeMod(worldObj);
surge = Math.sin(Math.pow((1D - this.level), 15) * Math.PI) * (this.startingLevel - this.targetLevel) * RBMKDials.getSurgeMod(worldObj);
}
return this.level + surge;
@ -64,6 +66,9 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
if(nbt.hasKey("startingLevel"))
this.startingLevel = nbt.getDouble("startingLevel");
if(nbt.hasKey("color"))
this.color = RBMKColor.values()[nbt.getInteger("color")];
@ -74,6 +79,9 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setDouble("startingLevel", this.startingLevel);
nbt.setDouble("mult", this.getMult());
if(color != null)
nbt.setInteger("color", color.ordinal());

26
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKModerator.java
View File

@ -1,38 +1,12 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
public class TileEntityRBMKModerator extends TileEntityRBMKBase {
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 2 + worldObj.rand.nextInt(2);

13
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.interfaces.IFluidAcceptor;
import com.hbm.interfaces.IFluidSource;
@ -217,6 +218,18 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement
public void clearFluidList(FluidType type) {
list.clear();
}
@Override
public void onMelt(int reduce) {
int count = 4 + worldObj.rand.nextInt(2);
for(int i = 0; i < count; i++) {
spawnDebris(DebrisType.BLANK);
}
super.onMelt(reduce);
}
@Override
public ColumnType getConsoleType() {

25
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKReflector.java
View File

@ -1,37 +1,12 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
public class TileEntityRBMKReflector extends TileEntityRBMKBase {
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 1 + worldObj.rand.nextInt(2);

50
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
View File

@ -1,8 +1,10 @@
package com.hbm.tileentity.machine.rbmk;
import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType;
import com.hbm.handler.radiation.ChunkRadiationManager;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemRBMKRod;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType;
@ -146,6 +148,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
break;
flux *= control.getMult();
continue;
}
@ -218,47 +221,44 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM
@Override
public void onMelt(int reduce) {
reduce = MathHelper.clamp_int(reduce, 1, 3);
int h = RBMKDials.getColumnHeight(worldObj);
reduce = MathHelper.clamp_int(reduce, 1, h);
if(worldObj.rand.nextInt(3) == 0)
reduce++;
boolean corium = slots[0] != null && slots[0].getItem() instanceof ItemRBMKRod;
slots[0] = null;
for(int i = 3; i >= 0; i--) {
if(i <= 4 - reduce) {
if(corium) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.corium_block);
} else {
if(reduce > 1 && i == 4 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris_burning);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.pribris);
}
}
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
if(corium && slots[0].getItem() == ModItems.rbmk_fuel_drx)
RBMKBase.digamma = true;
slots[0] = null;
if(corium) {
int count = 1 + worldObj.rand.nextInt(3);
for(int i = h; i >= 0; i--) {
if(i <= h + 1 - reduce) {
worldObj.setBlock(xCoord, yCoord + i, zCoord, ModBlocks.corium_block);
} else {
worldObj.setBlock(xCoord, yCoord + i, zCoord, Blocks.air);
}
worldObj.markBlockForUpdate(xCoord, yCoord + i, zCoord);
}
int count = 1 + worldObj.rand.nextInt(RBMKDials.getColumnHeight(worldObj));
for(int i = 0; i < count; i++) {
spawnDebris(DebrisType.FUEL);
}
} else {
this.standardMelt(reduce);
}
spawnDebris(DebrisType.ELEMENT);
super.onMelt(reduce);
if(this.getBlockMetadata() == RBMKBase.DIR_NORMAL_LID.ordinal() + RBMKBase.offset)
spawnDebris(DebrisType.LID);
}
@Override

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

@ -703,6 +703,8 @@ item.billet_australium_greater.name=Ayerit-Australiumbillet
item.billet_australium_lesser.name=Tasmanit-Australiumbillet
item.billet_balefire_gold.name=Flammgoldbillet
item.billet_co60.name=Kobalt-60-Billet
item.billet_hes.name=Stark angereichertes Schrabidiumkernbrennstoffbillet
item.billet_les.name=Schwach angereichertes Schrabidiumkernbrennstoffbillet
item.billet_mox_fuel.name=MOX-Kernbrennstoffbillet
item.billet_neptunium.name=Neptuniumbillet
item.billet_neptunium_fuel.name=Neptuniumkernbrennstoffbillet
@ -1845,6 +1847,7 @@ item.pellet_mes.name=MES-Watzpellet
item.pellet_meteorite.name=Meteoritenkugeln
item.pellet_neptunium.name=Neptunium-Watzpellet
item.pellet_rtg.name=Plutonium-238 Pellet
item.pellet_rtg_americium.name=Americium-241 Pellet
item.pellet_rtg_gold.name=Gold-198 Pellet
item.pellet_rtg_polonium.name=Polonium-210 Pellet
item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet

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

@ -771,6 +771,8 @@ item.billet_australium_greater.name=Greater Australium Billet
item.billet_australium_lesser.name=Lesser Australium Billet
item.billet_balefire_gold.name=Flashgold Billet
item.billet_co60.name=Cobalt-60 Billet
item.billet_hes.name=Highly Enriched Schrabidium Fuel Billet
item.billet_les.name=Low Enriched Schrabidium Fuel Billet
item.billet_mox_fuel.name=MOX Fuel Billet
item.billet_neptunium.name=Neptunium Billet
item.billet_neptunium_fuel.name=Neptunium Fuel Billet
@ -1913,6 +1915,7 @@ item.pellet_mes.name=MES Watz Pellet
item.pellet_meteorite.name=Meteorite Rounds
item.pellet_neptunium.name=Neptunium Watz Pellet
item.pellet_rtg.name=Plutonium-238 Fuel Pellet
item.pellet_rtg_americium.name=Americium-241 Fuel Pellet
item.pellet_rtg_gold.name=Gold-198 Fuel Pellet
item.pellet_rtg_polonium.name=Polonium-210 Fuel Pellet
item.pellet_rtg_weak.name=Weak Uranium RTG Pellet

6799
src/main/resources/assets/hbm/models/weapons/nightmare.obj Normal file
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 314 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 376 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

2
src/main/resources/mcmod.info
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-3902",
"version":"1.0.27-3913",
"mcversion": "1.7.10",
"url": "",
"updateUrl": "",