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

solinium rods and recipe, chemplant crash fix

Browse Source
This commit is contained in:
HbmMods 2018-03-31 23:27:32 +02:00
parent 36d8bcfb17
commit 880f7fd13f
14 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/hbm/lang/en_US.lang
View File

@ -820,7 +820,8 @@ item.rod_pu239.name=Pu239 Rod
item.rod_pu240.name=Pu240 Rod
item.rod_neptunium.name=Neptunium Rod
item.rod_lead.name=Lead Rod
item.rod_schrabidium.name=Schrabidium Rod
item.rod_schrabidium.name=Sa326 Rod
item.rod_solinium.name=Sa327 Rod
item.rod_euphemium.name=Euphemium Rod
item.rod_australium.name=Australium Rod
item.rod_weidanium.name=Weidanium Rod
@ -839,7 +840,8 @@ item.rod_dual_pu239.name=Pu239 Dual Rod
item.rod_dual_pu240.name=Pu240 Dual Rod
item.rod_dual_neptunium.name=Neptunium Dual Rod
item.rod_dual_lead.name=Lead Dual Rod
item.rod_dual_schrabidium.name=Schrabidium Dual Rod
item.rod_dual_schrabidium.name=Sa326 Dual Rod
item.rod_dual_solinium.name=Sa327 Dual Rod
item.rod_quad_empty.name=Empty Quad Rod
item.rod_quad_uranium.name=Uranium Quad Rod
@ -851,7 +853,8 @@ item.rod_quad_pu239.name=Pu239 Quad Rod
item.rod_quad_pu240.name=Pu240 Quad Rod
item.rod_quad_neptunium.name=Neptunium Quad Rod
item.rod_quad_lead.name=Lead Quad Rod
item.rod_quad_schrabidium.name=Schrabidium Quad Rod
item.rod_quad_schrabidium.name=Sa326 Quad Rod
item.rod_quad_solinium.name=Sa327 Quad Rod
item.rod_uranium_fuel_depleted.name=Depleted Uranium Fuel Rod
item.rod_dual_uranium_fuel_depleted.name=Depleted Uranium Dual Fuel Rod

BIN
assets/hbm/textures/items/rod_dual_schrabidium.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 253 B

BIN
assets/hbm/textures/items/rod_dual_solinium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

BIN
assets/hbm/textures/items/rod_quad_schrabidium.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 294 B

BIN
assets/hbm/textures/items/rod_quad_solinium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 316 B

BIN
assets/hbm/textures/items/rod_schrabidium.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 203 B

BIN
assets/hbm/textures/items/rod_solinium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

20
com/hbm/inventory/MachineRecipes.java
View File

@ -443,6 +443,10 @@ public class MachineRecipes {
return new ItemStack(ModItems.rod_lead, 1);
}
if (item == ModItems.rod_schrabidium) {
return new ItemStack(ModItems.rod_solinium, 1);
}
if (item == ModItems.rod_dual_uranium) {
return new ItemStack(ModItems.rod_dual_plutonium, 1);
}
@ -475,6 +479,10 @@ public class MachineRecipes {
return new ItemStack(ModItems.rod_dual_lead, 1);
}
if (item == ModItems.rod_dual_schrabidium) {
return new ItemStack(ModItems.rod_dual_solinium, 1);
}
if (item == ModItems.rod_quad_uranium) {
return new ItemStack(ModItems.rod_quad_plutonium, 1);
}
@ -508,7 +516,7 @@ public class MachineRecipes {
}
if (item == ModItems.rod_quad_schrabidium) {
return new ItemStack(ModItems.rod_quad_euphemium, 1);
return new ItemStack(ModItems.rod_quad_solinium, 1);
}
if (item == ModItems.rod_lithium) {
@ -523,6 +531,10 @@ public class MachineRecipes {
return new ItemStack(ModItems.rod_quad_tritium, 1);
}
if (item == ModItems.rod_quad_solinium) {
return new ItemStack(ModItems.rod_quad_euphemium, 1);
}
return null;
}
@ -871,7 +883,10 @@ public class MachineRecipes {
recipes.put(new ItemStack(ModItems.rod_neptunium), getReactorOutput(ModItems.rod_neptunium));
recipes.put(new ItemStack(ModItems.rod_dual_neptunium), getReactorOutput(ModItems.rod_dual_neptunium));
recipes.put(new ItemStack(ModItems.rod_quad_neptunium), getReactorOutput(ModItems.rod_quad_neptunium));
recipes.put(new ItemStack(ModItems.rod_schrabidium), getReactorOutput(ModItems.rod_schrabidium));
recipes.put(new ItemStack(ModItems.rod_dual_schrabidium), getReactorOutput(ModItems.rod_dual_schrabidium));
recipes.put(new ItemStack(ModItems.rod_quad_schrabidium), getReactorOutput(ModItems.rod_quad_schrabidium));
recipes.put(new ItemStack(ModItems.rod_quad_solinium), getReactorOutput(ModItems.rod_quad_solinium));
recipes.put(new ItemStack(ModItems.rod_lithium), getReactorOutput(ModItems.rod_lithium));
recipes.put(new ItemStack(ModItems.rod_dual_lithium), getReactorOutput(ModItems.rod_dual_lithium));
recipes.put(new ItemStack(ModItems.rod_quad_lithium), getReactorOutput(ModItems.rod_quad_lithium));
@ -1218,6 +1233,9 @@ public class MachineRecipes {
fuels.add(new ItemStack(ModItems.rod_schrabidium));
fuels.add(new ItemStack(ModItems.rod_dual_schrabidium));
fuels.add(new ItemStack(ModItems.rod_quad_schrabidium));
fuels.add(new ItemStack(ModItems.rod_solinium));
fuels.add(new ItemStack(ModItems.rod_dual_solinium));
fuels.add(new ItemStack(ModItems.rod_quad_solinium));
fuels.add(new ItemStack(ModItems.pellet_rtg));
return fuels;
}

12
com/hbm/items/ModItems.java
View File

@ -535,6 +535,7 @@ public class ModItems {
public static Item rod_neptunium;
public static Item rod_lead;
public static Item rod_schrabidium;
public static Item rod_solinium;
public static Item rod_euphemium;
public static Item rod_australium;
public static Item rod_weidanium;
@ -554,6 +555,7 @@ public class ModItems {
public static Item rod_dual_neptunium;
public static Item rod_dual_lead;
public static Item rod_dual_schrabidium;
public static Item rod_dual_solinium;
public static Item rod_quad_empty;
public static Item rod_quad_uranium;
@ -566,6 +568,7 @@ public class ModItems {
public static Item rod_quad_neptunium;
public static Item rod_quad_lead;
public static Item rod_quad_schrabidium;
public static Item rod_quad_solinium;
public static Item rod_uranium_fuel;
public static Item rod_dual_uranium_fuel;
@ -1219,7 +1222,7 @@ public class ModItems {
ingot_uranium = new ItemRadioactive().setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium");
ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u235");
ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u238");
ingot_u238m2 = new ItemUnstable(350, 200).setUnlocalizedName("ingot_u238m2").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u238m2");
ingot_u238m2 = new ItemUnstable(350, 200).setUnlocalizedName("ingot_u238m2").setCreativeTab(null).setTextureName(RefStrings.MODID + ":ingot_u238m2");
ingot_plutonium = new ItemRadioactive().setUnlocalizedName("ingot_plutonium").setCreativeTab(MainRegistry.tabParts).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu238");
ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu239");
@ -1674,6 +1677,7 @@ public class ModItems {
rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium");
rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead");
rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium");
rod_solinium = new ItemCustomLore().setUnlocalizedName("rod_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_solinium");
rod_euphemium = new ItemCustomLore().setUnlocalizedName("rod_euphemium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_euphemium");
rod_australium = new ItemCustomLore().setUnlocalizedName("rod_australium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_australium");
rod_weidanium = new ItemCustomLore().setUnlocalizedName("rod_weidanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_weidanium");
@ -1693,6 +1697,7 @@ public class ModItems {
rod_dual_neptunium = new ItemCustomLore().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium");
rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead");
rod_dual_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium");
rod_dual_solinium = new ItemCustomLore().setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium");
rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_quad_empty");
rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
@ -1705,6 +1710,7 @@ public class ModItems {
rod_quad_neptunium = new ItemCustomLore().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium");
rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead");
rod_quad_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium");
rod_quad_solinium = new ItemCustomLore().setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium");
rod_uranium_fuel = new ItemFuelRod(10000).setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel");
rod_dual_uranium_fuel = new ItemFuelRod(20000).setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel");
@ -2987,6 +2993,10 @@ public class ModItems {
GameRegistry.registerItem(rod_dual_schrabidium, rod_dual_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_schrabidium, rod_quad_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(rod_solinium, rod_solinium.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_solinium, rod_dual_solinium.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_solinium, rod_quad_solinium.getUnlocalizedName());
GameRegistry.registerItem(rod_uranium_fuel, rod_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_uranium_fuel, rod_dual_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_uranium_fuel, rod_quad_uranium_fuel.getUnlocalizedName());

21
com/hbm/items/special/ItemCustomLore.java
View File

@ -142,6 +142,13 @@ public class ItemCustomLore extends ItemRadioactive {
{
list.add("Worth 15 operations in breeding reactor");
list.add("Worth 75 operations in nuclear powered furnace");
list.add("Turns into Solinium Rod");
}
if(this == ModItems.rod_solinium)
{
list.add("Worth 20 operations in breeding reactor");
list.add("Worth 100 operations in nuclear powered furnace");
}
if(this == ModItems.rod_dual_uranium)
@ -204,6 +211,13 @@ public class ItemCustomLore extends ItemRadioactive {
{
list.add("Worth 30 operations in breeding reactor");
list.add("Worth 150 operations in nuclear powered furnace");
list.add("Turns into Dual Solinium Rod");
}
if(this == ModItems.rod_dual_solinium)
{
list.add("Worth 40 operations in breeding reactor");
list.add("Worth 200 operations in nuclear powered furnace");
}
if(this == ModItems.rod_quad_uranium)
@ -266,6 +280,13 @@ public class ItemCustomLore extends ItemRadioactive {
{
list.add("Worth 60 operations in breeding reactor");
list.add("Worth 300 operations in nuclear powered furnace");
list.add("Turns into Quad Solinium Rod");
}
if(this == ModItems.rod_quad_solinium)
{
list.add("Worth 80 operations in breeding reactor");
list.add("Worth 400 operations in nuclear powered furnace");
}
if(this == ModItems.igniter)

3
com/hbm/items/special/ItemRadioactive.java
View File

@ -189,6 +189,9 @@ public class ItemRadioactive extends Item {
this == ModItems.rod_schrabidium ||
this == ModItems.rod_dual_schrabidium ||
this == ModItems.rod_quad_schrabidium ||
this == ModItems.rod_solinium ||
this == ModItems.rod_dual_solinium ||
this == ModItems.rod_quad_solinium ||
this == ModItems.rod_schrabidium_fuel ||
this == ModItems.rod_dual_schrabidium_fuel ||
this == ModItems.rod_quad_schrabidium_fuel) {

2
com/hbm/tileentity/machine/TileEntityMachineChemplant.java
View File

@ -633,6 +633,8 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
return false;
else {
List<ItemStack> list = MachineRecipes.getChemInputFromTempate(slots[4]);
if(list == null || list.isEmpty())
return false;
for(int i = 0; i < list.size(); i++)
list.get(i).stackSize = 1;

3
com/hbm/tileentity/machine/TileEntityMachineReactor.java
View File

@ -134,6 +134,9 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent
if(item == ModItems.rod_schrabidium) return 15;
if(item == ModItems.rod_dual_schrabidium) return 30;
if(item == ModItems.rod_quad_schrabidium) return 60;
if(item == ModItems.rod_solinium) return 20;
if(item == ModItems.rod_dual_solinium) return 40;
if(item == ModItems.rod_quad_solinium) return 80;
return 0;
}

3
com/hbm/tileentity/machine/TileEntityNukeFurnace.java
View File

@ -134,6 +134,9 @@ public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory
if(item == ModItems.rod_schrabidium) return 15 * 5;
if(item == ModItems.rod_dual_schrabidium) return 30 * 5;
if(item == ModItems.rod_quad_schrabidium) return 60 * 5;
if(item == ModItems.rod_solinium) return 20 * 5;
if(item == ModItems.rod_dual_solinium) return 40 * 5;
if(item == ModItems.rod_quad_solinium) return 80 * 5;
return 0;
}