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

Merge pull request #393 from Vaern/master

Browse Source 
balancing
This commit is contained in:
HbmMods 2022-01-16 21:24:19 +01:00 committed by GitHub
commit f731e0dc2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1425,7 +1425,7 @@ public class ModBlocks {
block_boron = new BlockBeaconable(Material.iron).setBlockName("block_boron").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_boron");
block_lanthanium = new BlockBeaconable(Material.iron).setBlockName("block_lanthanium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lanthanium");
block_ra226 = new BlockHazard().makeBeaconable().setBlockName("block_ra226").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_ra226");
block_actinium = new BlockBeaconable(Material.iron).setBlockName("block_actinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_actinium");
block_actinium = new BlockHazard().makeBeaconable().setBlockName("block_actinium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_actinium");
block_tritium = new BlockRotatablePillar(Material.glass, RefStrings.MODID + ":block_tritium_top").setBlockName("block_tritium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGlass).setHardness(3.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_tritium_side");
block_semtex = new BlockSemtex(Material.tnt).setBlockName("block_semtex").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(2.0F).setBlockTextureName(RefStrings.MODID + ":block_semtex");
block_smore = new BlockPillar(Material.rock, RefStrings.MODID + ":block_smore_top").setBlockName("block_smore").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(900.0F).setBlockTextureName(RefStrings.MODID + ":block_smore_side");

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

@ -60,6 +60,7 @@ public class MineralRecipes {
add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198);
add1To9Pair(ModItems.ingot_pb209, ModItems.nugget_pb209);
add1To9Pair(ModItems.ingot_ra226, ModItems.nugget_ra226);
add1To9Pair(ModItems.ingot_actinium, ModItems.nugget_actinium);
add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241);
add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241);
@ -106,6 +107,7 @@ public class MineralRecipes {
addBillet(ModItems.billet_au198, ModItems.ingot_au198, ModItems.nugget_au198, AU198.allNuggets());
addBillet(ModItems.billet_pb209, ModItems.ingot_pb209, ModItems.nugget_pb209, PB209.allNuggets()); //and so forth
addBillet(ModItems.billet_ra226, ModItems.ingot_ra226, ModItems.nugget_ra226, "nuggetRa226");
addBillet(ModItems.billet_actinium, ModItems.ingot_actinium, ModItems.nugget_actinium, "nuggetActinium227", "tinyAc227");
addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, "nuggetSchrabidium");
addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, "nuggetSolinium");
addBillet(ModItems.billet_uranium_fuel, ModItems.ingot_uranium_fuel, ModItems.nugget_uranium_fuel);
@ -204,6 +206,7 @@ public class MineralRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, "plateIron" }));
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_strontium), new Object[] { ModItems.billet_sr90, ModItems.billet_sr90, ModItems.billet_sr90, "plateIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_actinium), new Object[] { ModItems.billet_actinium, ModItems.billet_actinium, ModItems.billet_actinium, "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_lead), new Object[] { ModItems.billet_pb209, ModItems.billet_pb209, ModItems.billet_pb209, "plateIron" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" }));

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

@ -62,6 +62,8 @@ public class RodRecipes {
addBreedingRod(CO, ModItems.billet_cobalt, BreedingRodType.CO);
addBreedingRod(CO60, ModItems.billet_co60, BreedingRodType.CO60);
addBreedingRod(RA226, ModItems.billet_ra226, BreedingRodType.RA226);
addBreedingRod(AC227, ModItems.billet_actinium, BreedingRodType.AC227);
addBreedingRod(TH232, ModItems.billet_th232, BreedingRodType.TH232);
addBreedingRod(ModItems.billet_thorium_fuel, BreedingRodType.THF);
addBreedingRod(U235, ModItems.billet_u235, BreedingRodType.U235);

4
src/main/java/com/hbm/hazard/HazardRegistry.java
View File

@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack;
public class HazardRegistry {
//CO60 5a β− 030.00Rad/s Spicy
//SR90 29a β− 015.00Rad/s Spicy
//TC99 211,000a β− 002.75Rad/s Spicy
//I181 192h β− 150.00Rad/s 2 much spice :(
//XE135 9h β− aaaaaaaaaaaaaaaa
@ -30,6 +31,7 @@ public class HazardRegistry {
//AT209 5h β+ like 2k or sth idk bruv
//PO210 138d α 075.00Rad/s Spicy
//RA226 1,600a α 007.50Rad/s
//AC227 22a β− 030.00Rad/s Spicy
//TH232 14,000,000,000a α 000.10Rad/s
//U233 160,000a α 005.00Rad/s
//U235 700,000,000a α 001.00Rad/s
@ -70,6 +72,7 @@ public class HazardRegistry {
public static final float at209 = 2000.0F;
public static final float po210 = 75.0F;
public static final float ra226 = 7.5F;
public static final float ac227 = 30.0F;
public static final float th232 = 0.1F;
public static final float thf = 1.75F;
public static final float u = 0.35F;
@ -315,6 +318,7 @@ public class HazardRegistry {
registerRTGPellet(pellet_rtg_radium, ra226 * rtg, 0);
registerRTGPellet(pellet_rtg_weak, (pu238 + (u238 * 2)) * billet, 0);
registerRTGPellet(pellet_rtg_strontium, sr90 * rtg, 0);
registerRTGPellet(pellet_rtg_actinium, ac227 * rtg, 0);
registerRTGPellet(pellet_rtg_polonium, po210 * rtg, 0, 3F);
registerRTGPellet(pellet_rtg_lead, pb209 * rtg, 0, 7F, 5F);
registerRTGPellet(pellet_rtg_gold, au198 * rtg, 0, 5F);

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

@ -109,6 +109,7 @@ public class OreDictManager {
public static final DictFrame PO210 = new DictFrame("Polonium210", "Po210", "Polonium");
public static final DictFrame TC99 = new DictFrame("Technetium99", "Tc99");
public static final DictFrame RA226 = new DictFrame("Radium226", "Ra226");
public static final DictFrame AC227 = new DictFrame("Actinium227", "Ac227");
public static final DictFrame CO60 = new DictFrame("Cobalt60", "Co60");
public static final DictFrame AU198 = new DictFrame("Gold198", "Au198");
public static final DictFrame PB209 = new DictFrame("Lead209", "Pb209");
@ -181,7 +182,6 @@ public class OreDictManager {
* RARE EARTHS
*/
public static final DictFrame LA = new DictFrame("Lanthanum");
public static final DictFrame AC = new DictFrame("Actinium");
public static final DictFrame ZR = new DictFrame("Zirconium");
public static final DictFrame ND = new DictFrame("Neodymium");
public static final DictFrame CE = new DictFrame("Cerium");
@ -245,6 +245,7 @@ public class OreDictManager {
PO210 .rad(HazardRegistry.po210) .hot(3) .nugget(nugget_polonium) .billet(billet_polonium) .ingot(ingot_polonium) .dust(powder_polonium) .block(block_polonium);
TC99 .rad(HazardRegistry.tc99) .nugget(nugget_technetium) .billet(billet_technetium) .ingot(ingot_technetium);
RA226 .rad(HazardRegistry.ra226) .nugget(nugget_ra226) .billet(billet_ra226) .ingot(ingot_ra226) .dust(powder_ra226) .block(block_ra226);
AC227 .rad(HazardRegistry.ac227) .nugget(nugget_actinium) .billet(billet_actinium) .ingot(ingot_actinium) .dust(powder_actinium) .block(block_actinium) .dustSmall(powder_actinium_tiny);
CO60 .rad(HazardRegistry.co60) .hot(1) .nugget(nugget_co60) .billet(billet_co60) .ingot(ingot_co60) .dust(powder_co60);
AU198 .rad(HazardRegistry.au198) .hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198);
PB209 .rad(HazardRegistry.pb209) .blinding(3F) .hot(7) .nugget(nugget_pb209) .billet(billet_pb209) .ingot(ingot_pb209);
@ -323,7 +324,6 @@ public class OreDictManager {
* RARE EARTHS
*/
LA .nugget(fragment_lanthanium) .ingot(ingot_lanthanium) .dustSmall(powder_lanthanium_tiny) .dust(powder_lanthanium) .block(block_lanthanium);
AC .nugget(fragment_actinium) .ingot(ingot_actinium) .dustSmall(powder_actinium_tiny) .dust(powder_actinium) .block(block_actinium);
ZR .nugget(nugget_zirconium) .ingot(ingot_zirconium) .billet(billet_zirconium) .dust(powder_zirconium) .block(block_zirconium) .ore(ore_depth_zirconium);
ND .nugget(fragment_neodymium) .dustSmall(powder_neodymium_tiny) .dust(powder_neodymium) .ore(ore_depth_nether_neodymium);
CE .nugget(fragment_cerium) .dustSmall(powder_cerium_tiny) .dust(powder_cerium);

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

@ -157,7 +157,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModItems.centrifuge_tower, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack(POLYMER.ingot(), 2), },150);
makeRecipe(new ComparableStack(ModItems.magnet_circular, 1), new AStack[] {new ComparableStack(ModBlocks.fusion_conductor, 5), new OreDictStack(STEEL.ingot(), 4), new OreDictStack(ALLOY.plate(), 6), },150);
makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack(PB.ingot(), 8), new OreDictStack(BE.ingot(), 6), new OreDictStack(STEEL.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(FIBER.ingot(), 2) },100);
makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 3), new ComparableStack(ModItems.board_copper, 1), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.circuit_copper, 1), },100);
makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 2), new ComparableStack(ModItems.board_copper, 1), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.circuit_copper, 1), },100);
makeRecipe(new ComparableStack(ModItems.thermo_unit_empty, 1), new AStack[] {new ComparableStack(ModItems.coil_copper_torus, 3), new OreDictStack(STEEL.ingot(), 3), new OreDictStack(TI.plate(), 6), new ComparableStack(ModItems.plate_polymer, 12), },100);
makeRecipe(new ComparableStack(ModItems.levitation_unit, 1), new AStack[] {new ComparableStack(ModItems.coil_copper, 4), new ComparableStack(ModItems.coil_tungsten, 2), new OreDictStack(TI.plate(), 6), new ComparableStack(ModItems.nugget_schrabidium, 2), },100);
makeRecipe(new ComparableStack(ModItems.drill_titanium, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(DURA.ingot(), 2), new ComparableStack(ModItems.bolt_dura_steel, 2), new OreDictStack(TI.plate(), 6), },100);

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

@ -24,6 +24,7 @@ public class BreederRecipes {
setRecipe(BreedingRodType.LITHIUM, BreedingRodType.TRITIUM, 200);
setRecipe(BreedingRodType.CO, BreedingRodType.CO60, 100);
setRecipe(BreedingRodType.RA226, BreedingRodType.AC227, 400);
setRecipe(BreedingRodType.TH232, BreedingRodType.THF, 500);
setRecipe(BreedingRodType.U235, BreedingRodType.NP237, 300);
setRecipe(BreedingRodType.NP237, BreedingRodType.PU238, 200);

6
src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java
View File

@ -399,9 +399,9 @@ public class SILEXRecipes {
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_technetium), 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))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_lead), 60))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_bismuth), 25))
.addOut(new WeightedRandomObject(new ItemStack(ModItems.dust_tiny), 15))
);
recipes.put(new ComparableStack(ModItems.nuclear_waste_short, 1, ItemWasteShort.WasteClass.URANIUM233.ordinal()), new SILEXRecipe(900, 100)
.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 4))

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

@ -1,6 +1,7 @@
package com.hbm.items;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.MachineConfig;
import com.hbm.handler.BucketHandler;
import com.hbm.handler.ToolAbility;
import com.hbm.handler.ToolAbility.LuckAbility;
@ -196,6 +197,7 @@ public class ModItems {
public static Item billet_au198;
public static Item billet_pb209;
public static Item billet_ra226;
public static Item billet_actinium;
public static Item billet_schrabidium;
public static Item billet_solinium;
public static Item billet_australium;
@ -246,6 +248,7 @@ public class ModItems {
public static Item nugget_au198;
public static Item nugget_pb209;
public static Item nugget_ra226;
public static Item nugget_actinium;
public static Item plate_titanium;
public static Item plate_aluminium;
public static Item wire_red_copper;
@ -2608,6 +2611,7 @@ public class ModItems {
billet_au198 = new Item().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198");
billet_pb209 = new Item().setUnlocalizedName("billet_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb209");
billet_ra226 = new Item().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226");
billet_actinium = new Item().setUnlocalizedName("billet_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_actinium");
billet_schrabidium = new Item().setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium");
billet_solinium = new Item().setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium");
billet_australium = new Item().setUnlocalizedName("billet_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium");
@ -2720,6 +2724,7 @@ public class ModItems {
nugget_au198 = new Item().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198");
nugget_pb209 = new Item().setUnlocalizedName("nugget_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pb209");
nugget_ra226 = new Item().setUnlocalizedName("nugget_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_ra226");
nugget_actinium = new Item().setUnlocalizedName("nugget_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_actinium");
plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium");
plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium");
wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper");
@ -3068,12 +3073,12 @@ public class ModItems {
pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg");
pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium");
pellet_rtg_weak = new ItemRTGPellet(5).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(1.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak");
pellet_rtg_polonium = new ItemRTGPellet(25).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium");
pellet_rtg_actinium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium");
pellet_rtg_polonium = new ItemRTGPellet(35).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium");
pellet_rtg_actinium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(21.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium");
pellet_rtg_strontium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.ZIRCONIUM, (long) (RTGUtil.getLifespan(29.0F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium");
pellet_rtg_lead = new ItemRTGPellet(300).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead");
pellet_rtg_gold = new ItemRTGPellet(150).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold");
pellet_rtg_americium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium");
pellet_rtg_lead = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead");
pellet_rtg_gold = new ItemRTGPellet(MachineConfig.doRTGsDecay ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold");
pellet_rtg_americium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium");
pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium");
tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake");
@ -5583,6 +5588,7 @@ public class ModItems {
GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName());
GameRegistry.registerItem(billet_pb209, billet_pb209.getUnlocalizedName());
GameRegistry.registerItem(billet_ra226, billet_ra226.getUnlocalizedName());
GameRegistry.registerItem(billet_actinium, billet_actinium.getUnlocalizedName());
GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName());
GameRegistry.registerItem(billet_australium, billet_australium.getUnlocalizedName());
@ -5804,6 +5810,7 @@ public class ModItems {
GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName());
GameRegistry.registerItem(nugget_pb209, nugget_pb209.getUnlocalizedName());
GameRegistry.registerItem(nugget_ra226, nugget_ra226.getUnlocalizedName());
GameRegistry.registerItem(nugget_actinium, nugget_actinium.getUnlocalizedName());
GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName());
GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName());
GameRegistry.registerItem(nugget_tantalium, nugget_tantalium.getUnlocalizedName());

5
src/main/java/com/hbm/items/machine/ItemBreedingRod.java
View File

@ -25,6 +25,9 @@ public class ItemBreedingRod extends ItemEnumMulti {
//Required for prototype
LEAD,
URANIUM
URANIUM,
RA226,
AC227
}
}

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

@ -2,6 +2,8 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.config.MachineConfig;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemRTGPellet;
import com.hbm.lib.Library;
@ -24,7 +26,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory,
private ItemStack slots[];
public int heat;
public final int heatMax = 150;
public final int heatMax = MachineConfig.doRTGsDecay ? 600 : 200;
public long power;
public final long powerMax = 100000;

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

@ -898,6 +898,7 @@ item.battery_su_l.name=Large SU-Battery
item.battery_trixite.name=Off-Brand Spark Battery
item.beta.name=Beta Features
item.big_sword.name=Great Sword
item.billet_actinium.name=Actinium-227 Billet
item.billet_am_mix.name=Reactor Grade Americium Billet
item.billet_am241.name=Americium-241 Billet
item.billet_am242.name=Americium-242 Billet
@ -1411,7 +1412,7 @@ item.folly_bullet_du.name=12.8cm DU-Shell
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_actinium.name=Actinium-227 Fragment
item.fragment_boron.name=Boron Fragment
item.fragment_cerium.name=Cerium Fragment
item.fragment_cobalt.name=Cobalt Fragment
@ -1660,7 +1661,7 @@ item.inf_sulfur.name=Infinite Sulfur Tank
item.inf_tritium.name=Infinite Tritium Tank
item.inf_water.name=Infinite Water Tank
item.inf_water_mk2.name=Heavy Infinite Water Tank
item.ingot_actinium.name=Semi-Stable Actinium Ingot
item.ingot_actinium.name=Actinium-227 Ingot
item.ingot_advanced_alloy.name=Advanced Alloy Ingot
item.ingot_aluminium.name=Aluminium Ingot
item.ingot_am_mix.name=Reactor Grade Americium Ingot
@ -2039,6 +2040,7 @@ item.nuclear_waste_short_depleted_tiny.name=Tiny Pile of Decayed Short-Lived Nuc
item.nuclear_waste_vitrified.name=Vitrified Nuclear Waste
item.nuclear_waste_vitrified_tiny.name=Tiny Pile of Vitrified Nuclear Waste
item.nugget.name=Chicken Nugget
item.nugget_actinium.name=Actinium-227 Nugget
item.nugget_am_mix.name=Reactor Grade Americium Nugget
item.nugget_am241.name=Americium-241 Nugget
item.nugget_am242.name=Americium-242 Nugget
@ -2161,8 +2163,8 @@ item.pellet_meteorite.name=Meteorite Rounds
item.pellet_neptunium.name=Neptunium Watz Pellet
item.pellet_rtg.name=Plutonium-238 RTG Pellet
item.pellet_rtg.desc=RTG fuel pellet for infinite energy! (almost)
item.pellet_rtg_actinium.name=Actinium RTG Pellet
item.pellet_rtg_actinium.desc=
item.pellet_rtg_actinium.name=Actinium-227 RTG Pellet
item.pellet_rtg_actinium.desc=A glow of blue light and beta rays.
item.pellet_rtg_americium.name=Americium-241 RTG Pellet
item.pellet_rtg_americium.desc=Rare and reliable, good old Americium!
item.pellet_rtg_berkelium.name=Berkelium RTG Pellet
@ -2438,6 +2440,8 @@ item.rod.lithium.name=Lithium Rod
item.rod.tritium.name=Tritium Rod
item.rod.co.name=Cobalt Rod
item.rod.co60.name=Cobalt-60 Rod
item.rod.ra226.name=Radium-226 Rod
item.rod.ac227.name=Actinium-227 Rod
item.rod.th232.name=Thorium-232 Rod
item.rod.thf.name=Thorium Fuel Rod
item.rod.u235.name=Uranium-235 Rod
@ -2454,6 +2458,8 @@ item.rod_dual.lithium.name=Lithium Dual Rod
item.rod_dual.tritium.name=Tritium Dual Rod
item.rod_dual.co.name=Cobalt Dual Rod
item.rod_dual.co60.name=Cobalt-60 Dual Rod
item.rod_dual.ra226.name=Radium-226 Dual Rod
item.rod_dual.ac227.name=Actinium-227 Dual Rod
item.rod_dual.th232.name=Thorium-232 Dual Rod
item.rod_dual.thf.name=Thorium Fuel Dual Rod
item.rod_dual.u235.name=Uranium-235 Dual Rod
@ -2470,6 +2476,8 @@ item.rod_quad.lithium.name=Lithium Quad Rod
item.rod_quad.tritium.name=Tritium Quad Rod
item.rod_quad.co.name=Cobalt Quad Rod
item.rod_quad.co60.name=Cobalt-60 Quad Rod
item.rod_quad.ra226.name=Radium-226 Quad Rod
item.rod_quad.ac227.name=Actinium-227 Quad Rod
item.rod_quad.th232.name=Thorium-232 Quad Rod
item.rod_quad.thf.name=Thorium Fuel Quad Rod
item.rod_quad.u235.name=Uranium-235 Quad Rod

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 258 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 266 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 232 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 236 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 278 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B