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

finished new breeder crap, balefire rods, small tweaks

Browse Source
This commit is contained in:
Bob 2020-07-25 21:00:57 +02:00
parent 26036fe3bb
commit 14e10e2f2d
24 changed files with 205 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/assets/hbm/lang/de_DE.lang
View File

@ -493,6 +493,7 @@ item.battery_steam.name=Dampfbetriebener Energiespeichertank
item.battery_steam_large.name=Großer dampfbetriebener Energiespeichertank
item.battery_su.name=Einwegbatterie
item.battery_su_l.name=Große Einwegbatterie
item.battery_trixite.name=Billige Spark-Batterie-Nachmache
item.big_sword.name=Großes Schwert
item.biomass.name=Biomasse
item.biomass_compressed.name=Verdichtete Biomasse
@ -1522,8 +1523,12 @@ item.remote.name=Kaputte Fernbedienung
item.ring_pull.name=Dosenring
item.rocket_fuel.name=Festbrennstoff (Raketentreibstoff)
item.rod_australium.name=Australiumbrennstab
item.rod_balefire.name=Balefire-Brennstab
item.rod_balefire_blazing.name=Lodernder Balefire-Brennstab
item.rod_coolant.name=Kühlzelle
item.rod_daffergon.name=Daffergonbrennstab
item.rod_balefire.name=Balefire-Doppelbrennstab
item.rod_balefire_blazing.name=Lodernder Balefire-Doppelbrennstab
item.rod_dual_coolant.name=Doppelte Kühlzelle
item.rod_dual_empty.name=Leerer Doppelbrennstab
item.rod_dual_lead.name=Bleidoppelstab
@ -1568,6 +1573,8 @@ item.rod_polonium.name=Poloniumbrennstab
item.rod_pu238.name=Pu238-Brennstab
item.rod_pu239.name=Pu239-Brennstab
item.rod_pu240.name=Pu240-Brennstab
item.rod_balefire.name=Balefire-Vierfachbrennstab
item.rod_balefire_blazing.name=Lodernder Balefire-Vierfachbrennstab
item.rod_quad_coolant.name=Vierfache Kühlzelle
item.rod_quad_empty.name=Leerer Vierfachbrennstab
item.rod_quad_euphemium.name=Ausgebrannter Schrabidiumvierfachbrennstab

7
src/main/java/assets/hbm/lang/en_US.lang
View File

@ -493,6 +493,7 @@ item.battery_steam.name=Steam Powered Energy Storage Tank
item.battery_steam_large.name=Large Steam Powered Energy Storage Tank
item.battery_su.name=SU-Battery
item.battery_su_l.name=Large SU-Battery
item.battery_trixite.name=Off-Brand Spark Battery
item.big_sword.name=Great Sword
item.biomass.name=Biomass
item.biomass_compressed.name=Compressed Biomass
@ -1522,8 +1523,12 @@ item.remote.name=Broken Remote
item.ring_pull.name=Ring Pull
item.rocket_fuel.name=Solid Fuel (Rocket Propellant)
item.rod_australium.name=Australium Rod
item.rod_balefire.name=Balefire Rod
item.rod_balefire_blazing.name=Blazing Balefire Rod
item.rod_coolant.name=Coolant Cell
item.rod_daffergon.name=Daffergon Rod
item.rod_dual_balefire.name=Balefire Dual Rod
item.rod_dual_balefire_blazing.name=Blazing Balefire Dual Rod
item.rod_dual_coolant.name=Dual Coolant Cell
item.rod_dual_empty.name=Empty Dual Rod
item.rod_dual_lead.name=Lead Dual Rod
@ -1568,6 +1573,8 @@ item.rod_polonium.name=Polonium Rod
item.rod_pu238.name=Pu238 Rod
item.rod_pu239.name=Pu239 Rod
item.rod_pu240.name=Pu240 Rod
item.rod_quad_balefire.name=Balefire Quad Rod
item.rod_quad_balefire_blazing.name=Blazing Balefire Quad Rod
item.rod_quad_coolant.name=Quad Coolant Cell
item.rod_quad_empty.name=Empty Quad Rod
item.rod_quad_euphemium.name=Burned Out Quad Schrabidium Rod

BIN
src/main/java/assets/hbm/textures/gui/weapon/fstbmbSchematic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
src/main/java/assets/hbm/textures/items/balefire_and_steel.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 320 B

BIN
src/main/java/assets/hbm/textures/items/battery_trixite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 B

BIN
src/main/java/assets/hbm/textures/items/rod_balefire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B

BIN
src/main/java/assets/hbm/textures/items/rod_balefire_blazing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
src/main/java/assets/hbm/textures/items/rod_dual_balefire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
src/main/java/assets/hbm/textures/items/rod_dual_balefire_blazing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 395 B

BIN
src/main/java/assets/hbm/textures/items/rod_quad_balefire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 380 B

BIN
src/main/java/assets/hbm/textures/items/rod_quad_balefire_blazing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 571 B

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

@ -492,9 +492,11 @@ public class ModBlocks {
public static Block fusion_core;
public static Block plasma;
public static final int guiID_fusion_multiblock = 27;
public static Block iter;
public static final int guiID_iter = 27;
public static Block plasma_heater;
public static final int guiID_plasma_heater = 27;
public static Block watz_element;
public static Block watz_control;
@ -1171,6 +1173,7 @@ public class ModBlocks {
fusion_core = new FusionCore(Material.iron).setBlockName("fusion_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fusion_core_side");
plasma = new BlockPlasma(Material.iron).setBlockName("plasma").setHardness(5.0F).setResistance(6000.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":plasma");
iter = new MachineITER().setBlockName("iter").setHardness(5.0F).setResistance(6000.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":iter");
plasma_heater = new MachinePlasmaHeater().setBlockName("plasma_heater").setHardness(5.0F).setResistance(6000.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":plasma_heater");
watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side");
watz_control = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_control_top").setBlockName("watz_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_control_side");
@ -1882,6 +1885,7 @@ public class ModBlocks {
GameRegistry.registerBlock(fusion_core, fusion_core.getUnlocalizedName());
GameRegistry.registerBlock(plasma, ItemBlockLore.class, plasma.getUnlocalizedName());
GameRegistry.registerBlock(iter, iter.getUnlocalizedName());
GameRegistry.registerBlock(plasma_heater, plasma_heater.getUnlocalizedName());
GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName());
GameRegistry.registerBlock(watz_control, watz_control.getUnlocalizedName());

30
src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java Normal file
View File

@ -0,0 +1,30 @@
package com.hbm.blocks.machine;
import com.hbm.blocks.BlockDummyable;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class MachinePlasmaHeater extends BlockDummyable {
public MachinePlasmaHeater() {
super(Material.iron);
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
return null;
}
@Override
public int[] getDimensions() {
return new int[] {2, 0, 1, 1, 1, 8};
}
@Override
public int getOffset() {
return 1;
}
}

9
src/main/java/com/hbm/creativetabs/ControlTab.java
View File

@ -22,9 +22,9 @@ public class ControlTab extends CreativeTabs {
@Override
public Item getTabIconItem() {
if(ModItems.rod_uranium_fuel != null)
if(ModItems.rod_balefire_blazing != null)
{
return ModItems.rod_uranium_fuel;
return ModItems.rod_balefire_blazing;
}
return Items.iron_pickaxe;
@ -66,7 +66,10 @@ public class ControlTab extends CreativeTabs {
list.remove(index);
list.add(index, full);
list.add(index, empty);
//do not list empty versions of SU batteries
if(battery.getChargeRate() > 0)
list.add(index, empty);
}
}
}

6
src/main/java/com/hbm/creativetabs/MachineTab.java
View File

@ -15,10 +15,8 @@ public class MachineTab extends CreativeTabs {
@Override
public Item getTabIconItem() {
if(ModBlocks.machine_generator != null)
{
return Item.getItemFromBlock(ModBlocks.machine_rtg_grey);
}
if(ModBlocks.reactor_element != null)
return Item.getItemFromBlock(ModBlocks.reactor_element);
return Items.iron_pickaxe;
}

44
src/main/java/com/hbm/handler/nei/ReactorRecipeHandler.java
View File

@ -8,7 +8,6 @@ import java.util.Map;
import com.hbm.inventory.BreederRecipes;
import com.hbm.inventory.BreederRecipes.BreederRecipe;
import com.hbm.inventory.MachineRecipes;
import com.hbm.inventory.gui.GUIMachineReactor;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
@ -18,19 +17,24 @@ import net.minecraft.item.ItemStack;
public class ReactorRecipeHandler extends TemplateRecipeHandler {
public static ArrayList<Fuel> fuels;
public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe
{
public class BreedingSet extends TemplateRecipeHandler.CachedRecipe {
PositionedStack input;
PositionedStack result;
int heat;
public int heat;
public ArrayList<Fuel> fuels;
public SmeltingSet(ItemStack input, ItemStack result, int heat) {
public BreedingSet(ItemStack input, ItemStack result, int heat) {
input.stackSize = 1;
this.input = new PositionedStack(input, 51, 6);
this.result = new PositionedStack(result, 111, 24);
this.heat = heat;
fuels = new ArrayList();
for(ItemStack sta : BreederRecipes.getAllFuelsFromHEAT(heat)) {
fuels.add(new Fuel(sta));
}
}
@Override
@ -49,8 +53,8 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler {
}
}
public static class Fuel
{
public static class Fuel {
public Fuel(ItemStack ingred) {
this.stack = new PositionedStack(ingred, 51, 42, false);
@ -77,7 +81,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler {
Map<ItemStack, BreederRecipe> recipes = BreederRecipes.getAllRecipes();
for (Map.Entry<ItemStack, BreederRecipe> recipe : recipes.entrySet()) {
this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
}
} else {
super.loadCraftingRecipes(outputId, results);
@ -91,7 +95,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler {
for (Map.Entry<ItemStack, BreederRecipe> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType(recipe.getValue().output, result))
this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
}
}
@ -111,7 +115,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler {
for (Map.Entry<ItemStack, BreederRecipe> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()))
this.arecipes.add(new SmeltingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
this.arecipes.add(new BreedingSet(recipe.getKey(), recipe.getValue().output, recipe.getValue().heat));
}
}
@ -128,17 +132,9 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler {
@Override
public void drawExtras(int recipe) {
drawProgressBar(50, 24, 176, 0, 14, 14, 48 * 3, 7);
drawProgressBar(74, 23, 176, 16, 24, 16, 48, 0);
}
@Override
public TemplateRecipeHandler newInstance() {
if (fuels == null || fuels.isEmpty())
fuels = new ArrayList<Fuel>();
for(ItemStack i : MachineRecipes.instance().getReactorFuels())
{
fuels.add(new Fuel(i));
}
return super.newInstance();
drawProgressBar(75, 23, 176, 16, 24, 16, 48, 0);
int heat = ((BreedingSet)this.arecipes.get(recipe)).heat;
drawProgressBar(43, 24, 194, 0, 4, 16, (float) 1 - heat / 4F, 7);
}
}

29
src/main/java/com/hbm/inventory/BreederRecipes.java
View File

@ -1,6 +1,8 @@
package com.hbm.inventory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.hbm.blocks.ModBlocks;
@ -61,7 +63,10 @@ public class BreederRecipes {
recipes.put(new ComparableStack(ModItems.rod_schrabidium), new BreederRecipe(ModItems.rod_solinium, 3));
recipes.put(new ComparableStack(ModItems.rod_dual_schrabidium), new BreederRecipe(ModItems.rod_dual_solinium, 3));
recipes.put(new ComparableStack(ModItems.rod_quad_schrabidium), new BreederRecipe(ModItems.rod_quad_solinium, 3));
recipes.put(new ComparableStack(ModItems.rod_quad_euphemium), new BreederRecipe(ModItems.rod_quad_euphemium, 4));
recipes.put(new ComparableStack(ModItems.rod_quad_solinium), new BreederRecipe(ModItems.rod_quad_euphemium, 4));
recipes.put(new ComparableStack(ModItems.rod_balefire), new BreederRecipe(ModItems.rod_balefire_blazing, 4));
recipes.put(new ComparableStack(ModItems.rod_dual_balefire), new BreederRecipe(ModItems.rod_dual_balefire_blazing, 4));
recipes.put(new ComparableStack(ModItems.rod_quad_balefire), new BreederRecipe(ModItems.rod_quad_balefire_blazing, 4));
//rocks
recipes.put(new ComparableStack(Blocks.stone), new BreederRecipe(new ItemStack(ModBlocks.sellafield_0), 2));
@ -116,6 +121,14 @@ public class BreederRecipes {
fuels.put(new ComparableStack(ModItems.rod_tritium), new int[] {1, 1});
fuels.put(new ComparableStack(ModItems.rod_dual_tritium), new int[] {1, 2});
fuels.put(new ComparableStack(ModItems.rod_quad_tritium), new int[] {1, 4});
fuels.put(new ComparableStack(ModItems.rod_balefire), new int[] {2, 150});
fuels.put(new ComparableStack(ModItems.rod_dual_balefire), new int[] {2, 300});
fuels.put(new ComparableStack(ModItems.rod_quad_balefire), new int[] {2, 600});
fuels.put(new ComparableStack(ModItems.rod_balefire_blazing), new int[] {4, 75});
fuels.put(new ComparableStack(ModItems.rod_dual_balefire_blazing), new int[] {4, 150});
fuels.put(new ComparableStack(ModItems.rod_quad_balefire_blazing), new int[] {4, 300});
}
public static HashMap<ItemStack, BreederRecipe> getAllRecipes() {
@ -129,6 +142,20 @@ public class BreederRecipes {
return map;
}
public static List<ItemStack> getAllFuelsFromHEAT(int heat) {
List<ItemStack> list = new ArrayList();
for(Map.Entry<ComparableStack, int[]> fuel : fuels.entrySet()) {
if(fuel.getValue()[0] >= heat) {
list.add(fuel.getKey().toStack());
}
}
return list;
}
public static BreederRecipe getOutput(ItemStack stack) {
if(stack == null)

8
src/main/java/com/hbm/inventory/gui/GUINukeFstbmb.java
View File

@ -74,7 +74,7 @@ public class GUINukeFstbmb extends GuiInfoContainer {
String timer = bomb.getMinutes() + ":" + bomb.getSeconds();
double scale = 0.75;
GL11.glScaled(scale, scale, scale);
this.fontRendererObj.drawString(timer, (int) ((69 - this.fontRendererObj.getStringWidth(timer) / 2) * (1/scale)), (int) (95 * (1/scale)), 0xff0000);
this.fontRendererObj.drawString(timer, (int) ((69 - this.fontRendererObj.getStringWidth(timer) / 2) * (1/scale)), (int) (95.5 * (1/scale)), 0xff0000);
GL11.glScaled(1/scale, 1/scale, 1/scale);
}
@ -89,8 +89,12 @@ public class GUINukeFstbmb extends GuiInfoContainer {
if(bomb.hasEgg())
drawTexturedModalRect(guiLeft + 19, guiTop + 90, 176, 0, 30, 16);
if(bomb.hasBattery())
int battery = bomb.getBattery();
if(battery == 1)
drawTexturedModalRect(guiLeft + 88, guiTop + 93, 176, 16, 18, 10);
else if(battery == 2)
drawTexturedModalRect(guiLeft + 88, guiTop + 93, 194, 16, 18, 10);
if(bomb.started)
drawTexturedModalRect(guiLeft + 142, guiTop + 35, 176, 26, 18, 18);

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

@ -759,6 +759,8 @@ public class ModItems {
public static Item rod_unobtainium;
public static Item rod_daffergon;
public static Item rod_verticium;
public static Item rod_balefire;
public static Item rod_balefire_blazing;
public static Item rod_dual_empty;
public static Item rod_dual_uranium;
@ -775,6 +777,8 @@ public class ModItems {
public static Item rod_dual_lead;
public static Item rod_dual_schrabidium;
public static Item rod_dual_solinium;
public static Item rod_dual_balefire;
public static Item rod_dual_balefire_blazing;
public static Item rod_quad_empty;
public static Item rod_quad_uranium;
@ -791,6 +795,8 @@ public class ModItems {
public static Item rod_quad_lead;
public static Item rod_quad_schrabidium;
public static Item rod_quad_solinium;
public static Item rod_quad_balefire;
public static Item rod_quad_balefire_blazing;
public static Item rod_uranium_fuel;
public static Item rod_dual_uranium_fuel;
@ -1423,6 +1429,7 @@ public class ModItems {
public static Item battery_lithium;
public static Item battery_schrabidium;
public static Item battery_spark;
public static Item battery_trixite;
public static Item battery_creative;
public static Item battery_red_cell;
@ -2600,6 +2607,8 @@ public class ModItems {
rod_unobtainium = new ItemCustomLore().setUnlocalizedName("rod_unobtainium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_unobtainium");
rod_daffergon = new ItemCustomLore().setUnlocalizedName("rod_daffergon").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_daffergon");
rod_verticium = new ItemCustomLore().setUnlocalizedName("rod_verticium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_verticium");
rod_balefire = new ItemRadioactive(1500F).setUnlocalizedName("rod_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire");
rod_balefire_blazing = new ItemRadioactive(2500F, true).setUnlocalizedName("rod_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_balefire_blazing");
rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_dual_empty");
rod_dual_th232 = new ItemCustomLore().setUnlocalizedName("rod_dual_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_th232");
@ -2616,6 +2625,8 @@ public class ModItems {
rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead");
rod_dual_schrabidium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium");
rod_dual_solinium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium");
rod_dual_balefire = new ItemRadioactive(3000F).setUnlocalizedName("rod_dual_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire");
rod_dual_balefire_blazing = new ItemRadioactive(5000F, true).setUnlocalizedName("rod_dual_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire_blazing");
rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty");
rod_quad_th232 = new ItemCustomLore().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232");
@ -2632,6 +2643,8 @@ public class ModItems {
rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead");
rod_quad_schrabidium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium");
rod_quad_solinium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium");
rod_quad_balefire = new ItemRadioactive(6000F).setUnlocalizedName("rod_quad_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire");
rod_quad_balefire_blazing = new ItemRadioactive(10000F, true).setUnlocalizedName("rod_quad_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire_blazing");
rod_thorium_fuel = new ItemFuelRod(0.5F, false, 100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel");
rod_dual_thorium_fuel = new ItemFuelRod(1.5F, false, 100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel");
@ -3219,7 +3232,7 @@ public class ModItems {
n2_charge = new ItemN2().setUnlocalizedName("n2_charge").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":n2_charge");
egg_balefire_shard = new ItemRadioactive(1500F, true).setUnlocalizedName("egg_balefire_shard").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard");
egg_balefire_shard = new ItemRadioactive(1500F, true).setUnlocalizedName("egg_balefire_shard").setMaxStackSize(16).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire_shard");
egg_balefire = new ItemRadioactive(10000F, true).setUnlocalizedName("egg_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":egg_balefire");
custom_tnt = new ItemCustomLore().setUnlocalizedName("custom_tnt").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_tnt");
@ -3235,6 +3248,7 @@ public class ModItems {
battery_lithium = new ItemBattery(250000, 1000, 1000).setUnlocalizedName("battery_lithium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_lithium");
battery_schrabidium = new ItemBattery(1000000, 5000, 5000).setUnlocalizedName("battery_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_schrabidium_new");
battery_spark = new ItemBattery(100000000, 2000000, 2000000).setUnlocalizedName("battery_spark").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark");
battery_trixite = new ItemBattery(5000000, 40000, 200000).setUnlocalizedName("battery_trixite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_trixite");
battery_creative = new Item().setUnlocalizedName("battery_creative").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_creative_new");
battery_red_cell = new ItemBattery(15000, 100, 100).setUnlocalizedName("battery_red_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_red_cell");
@ -4456,6 +4470,7 @@ public class ModItems {
GameRegistry.registerItem(battery_schrabidium_cell_2, battery_schrabidium_cell_2.getUnlocalizedName());
GameRegistry.registerItem(battery_schrabidium_cell_4, battery_schrabidium_cell_4.getUnlocalizedName());
GameRegistry.registerItem(battery_spark, battery_spark.getUnlocalizedName());
GameRegistry.registerItem(battery_trixite, battery_trixite.getUnlocalizedName());
GameRegistry.registerItem(battery_spark_cell_6, battery_spark_cell_6.getUnlocalizedName());
GameRegistry.registerItem(battery_spark_cell_25, battery_spark_cell_25.getUnlocalizedName());
GameRegistry.registerItem(battery_spark_cell_100, battery_spark_cell_100.getUnlocalizedName());
@ -4743,6 +4758,14 @@ public class ModItems {
GameRegistry.registerItem(rod_tritium, rod_tritium.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_tritium, rod_dual_tritium.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_tritium, rod_quad_tritium.getUnlocalizedName());
GameRegistry.registerItem(rod_balefire, rod_balefire.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_balefire, rod_dual_balefire.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_balefire, rod_quad_balefire.getUnlocalizedName());
GameRegistry.registerItem(rod_balefire_blazing, rod_balefire_blazing.getUnlocalizedName());
GameRegistry.registerItem(rod_dual_balefire_blazing, rod_dual_balefire_blazing.getUnlocalizedName());
GameRegistry.registerItem(rod_quad_balefire_blazing, rod_quad_balefire_blazing.getUnlocalizedName());
GameRegistry.registerItem(rod_euphemium, rod_euphemium.getUnlocalizedName());
GameRegistry.registerItem(rod_australium, rod_australium.getUnlocalizedName());

37
src/main/java/com/hbm/items/block/ItemBlockLore.java
View File

@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
public class ItemBlockLore extends ItemBlock {
@ -25,27 +26,39 @@ public class ItemBlockLore extends ItemBlock {
}
if(this.field_150939_a == ModBlocks.barrel_plastic) {
list.add("Cannot store hot fluids");
list.add("Cannot store corrosive fluids");
list.add("Cannot store antimatter");
list.add(EnumChatFormatting.AQUA + "Capacity: 12,000mB");
list.add(EnumChatFormatting.YELLOW + "Cannot store hot fluids");
list.add(EnumChatFormatting.YELLOW + "Cannot store corrosive fluids");
list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter");
}
if(this.field_150939_a == ModBlocks.barrel_corroded) {
list.add(EnumChatFormatting.AQUA + "Capacity: 6,000mB");
list.add(EnumChatFormatting.GREEN + "Can store hot fluids");
list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids");
list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter");
list.add(EnumChatFormatting.RED + "Leaky");
}
if(this.field_150939_a == ModBlocks.barrel_iron) {
list.add("Can store hot fluids");
list.add("Cannot store corrosive fluids properly");
list.add("Cannot store antimatter");
list.add(EnumChatFormatting.AQUA + "Capacity: 8,000mB");
list.add(EnumChatFormatting.GREEN + "Can store hot fluids");
list.add(EnumChatFormatting.YELLOW + "Cannot store corrosive fluids properly");
list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter");
}
if(this.field_150939_a == ModBlocks.barrel_steel) {
list.add("Can store hot fluids");
list.add("Can store corrosive fluids");
list.add("Cannot store antimatter");
list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB");
list.add(EnumChatFormatting.GREEN + "Can store hot fluids");
list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids");
list.add(EnumChatFormatting.YELLOW + "Cannot store antimatter");
}
if(this.field_150939_a == ModBlocks.barrel_antimatter) {
list.add("Can store hot fluids");
list.add("Can store corrosive fluids");
list.add("Can store antimatter");
list.add(EnumChatFormatting.AQUA + "Capacity: 16,000mB");
list.add(EnumChatFormatting.GREEN + "Can store hot fluids");
list.add(EnumChatFormatting.GREEN + "Can store corrosive fluids");
list.add(EnumChatFormatting.GREEN + "Can store antimatter");
}
if(this.field_150939_a == ModBlocks.meteor_battery) {

2
src/main/java/com/hbm/items/tool/ItemBalefireMatch.java
View File

@ -12,7 +12,7 @@ public class ItemBalefireMatch extends Item {
public ItemBalefireMatch() {
this.maxStackSize = 1;
this.setMaxDamage(64);
this.setMaxDamage(256);
this.setCreativeTab(CreativeTabs.tabTools);
}

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

@ -295,6 +295,7 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_unobtainium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium, ModItems.nugget_unobtainium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_daffergon, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon, ModItems.nugget_daffergon });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_verticium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium, ModItems.nugget_verticium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_balefire, 1), new Object[] { ModItems.rod_empty, ModItems.egg_balefire_shard });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_empty, 1), new Object[] { ModItems.rod_empty, ModItems.rod_empty });
@ -317,6 +318,7 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_plutonium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_mox_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_schrabidium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_balefire, 1), new Object[] { ModItems.rod_dual_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_lithium, 1), new Object[] { ModItems.rod_empty, ModItems.lithium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_lithium, 1), new Object[] { ModItems.rod_dual_empty, ModItems.lithium, ModItems.lithium });
@ -347,6 +349,7 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_plutonium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_plutonium_fuel, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_mox_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_mox_fuel, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_schrabidium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_schrabidium_fuel, ModItems.ingot_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel, ModItems.nugget_schrabidium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_balefire, 1), new Object[] { ModItems.rod_quad_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_water, 1), new Object[] { ModItems.rod_empty, Items.water_bucket });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_water, 1), new Object[] { ModItems.rod_dual_empty, Items.water_bucket, Items.water_bucket });
@ -366,11 +369,11 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 6), new Object[] { ModItems.rod_lead });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 6), new Object[] { ModItems.rod_schrabidium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 6), new Object[] { ModItems.rod_solinium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 6), new Object[] { ModItems.rod_uranium_fuel });
/*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 6), new Object[] { ModItems.rod_uranium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 6), new Object[] { ModItems.rod_thorium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 6), new Object[] { ModItems.rod_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 6), new Object[] { ModItems.rod_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 6), new Object[] { ModItems.rod_schrabidium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 6), new Object[] { ModItems.rod_schrabidium_fuel });*/
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_australium, 6), new Object[] { ModItems.rod_australium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_weidanium, 6), new Object[] { ModItems.rod_weidanium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_reiium, 6), new Object[] { ModItems.rod_reiium });
@ -378,6 +381,7 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_daffergon, 6), new Object[] { ModItems.rod_daffergon });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_verticium, 6), new Object[] { ModItems.rod_verticium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 6), new Object[] { ModItems.rod_euphemium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { ModItems.rod_balefire });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 12), new Object[] { ModItems.rod_dual_th232 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 12), new Object[] { ModItems.rod_dual_uranium });
@ -393,11 +397,12 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 12), new Object[] { ModItems.rod_dual_lead });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 12), new Object[] { ModItems.rod_dual_schrabidium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 12), new Object[] { ModItems.rod_dual_solinium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 12), new Object[] { ModItems.rod_dual_thorium_fuel });
/*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 12), new Object[] { ModItems.rod_dual_thorium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 12), new Object[] { ModItems.rod_dual_uranium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 12), new Object[] { ModItems.rod_dual_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 12), new Object[] { ModItems.rod_dual_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 12), new Object[] { ModItems.rod_dual_schrabidium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 12), new Object[] { ModItems.rod_dual_schrabidium_fuel });*/
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 2), new Object[] { ModItems.rod_dual_balefire });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_th232, 24), new Object[] { ModItems.rod_quad_th232 });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium, 24), new Object[] { ModItems.rod_quad_uranium });
@ -413,11 +418,12 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 24), new Object[] { ModItems.rod_quad_lead });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 24), new Object[] { ModItems.rod_quad_schrabidium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 24), new Object[] { ModItems.rod_quad_solinium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 24), new Object[] { ModItems.rod_quad_thorium_fuel });
/*GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_thorium_fuel, 24), new Object[] { ModItems.rod_quad_thorium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 24), new Object[] { ModItems.rod_quad_uranium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 24), new Object[] { ModItems.rod_quad_plutonium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 24), new Object[] { ModItems.rod_quad_mox_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 24), new Object[] { ModItems.rod_quad_schrabidium_fuel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 24), new Object[] { ModItems.rod_quad_schrabidium_fuel });*/
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.egg_balefire_shard, 4), new Object[] { ModItems.rod_quad_balefire });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 1), new Object[] { ModItems.rod_waste });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 2), new Object[] { ModItems.rod_dual_waste });
@ -1077,6 +1083,8 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PNP", "PSP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_schrabidium), new Object[] { " A ", "PSP", "PNP", 'A', ModItems.wire_schrabidium, 'P', "plateSchrabidium", 'S', "dustSchrabidium", 'N', ModItems.powder_neptunium }));
GameRegistry.addRecipe(ItemBattery.getEmptyBattery(ModItems.battery_spark), new Object[] { " A ", "PSP", "PSP", 'A', ModItems.wire_magnetized_tungsten, 'P', ModItems.plate_dineutronium, 'S', ModItems.powder_spark_mix });
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PSP", "PTP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.battery_trixite), new Object[] { " A ", "PTP", "PSP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'S', ModItems.powder_spark_mix, 'T', ModItems.crystal_trixite }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TRD", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getFullBattery(ModItems.energy_core), new Object[] { "PCW", "TDR", "PCW", 'P', ModItems.plate_advanced_alloy, 'C', ModItems.coil_advanced_alloy, 'W', ModItems.wire_advanced_alloy, 'R', ModItems.cell_tritium, 'D', ModItems.cell_deuterium, 'T', "ingotTungsten" }));
@ -1267,7 +1275,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "sulfur", 'S', Items.stick }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.matchstick, 16), new Object[] { "I", "S", 'I', "dustSulfur", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.matchstick, 24), new Object[] { "I", "S", 'I', ModItems.powder_fire, 'S', Items.stick });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.balefire_and_steel, 1), new Object[] { "I ", " B", 'I', "ingotIron", 'B', ModItems.egg_balefire_shard }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.balefire_and_steel, 1), new Object[] { "ingotIron", ModItems.egg_balefire_shard }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.crowbar, 1), new Object[] { "II", " I", " I", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_power, 5), new Object[] { "dustRedstone", "dustGlowstone", "dustDiamond", "dustNeptunium", "dustMagnetizedTungsten" }));

28
src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
View File

@ -7,6 +7,7 @@ import com.hbm.render.util.DiamondPronter;
import com.hbm.render.util.EnumSymbol;
import com.hbm.tileentity.machine.TileEntityBarrel;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
@ -23,19 +24,24 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer {
TileEntityBarrel barrel = (TileEntityBarrel)te;
FluidType type = barrel.tank.getTankType();
int poison = type.poison;
int flammability = type.flammability;
int reactivity = type.reactivity;
EnumSymbol symbol = type.symbol;
for(int j = 0; j < 4; j++) {
if(type != FluidType.NONE) {
int poison = type.poison;
int flammability = type.flammability;
int reactivity = type.reactivity;
EnumSymbol symbol = type.symbol;
GL11.glPushMatrix();
GL11.glTranslated(0.4, 0.25, -0.15);
GL11.glScalef(1.0F, 0.35F, 0.35F);
DiamondPronter.pront(poison, flammability, reactivity, symbol);
GL11.glPopMatrix();
GL11.glRotatef(90, 0, 1, 0);
for(int j = 0; j < 4; j++) {
RenderHelper.disableStandardItemLighting();
GL11.glPushMatrix();
GL11.glTranslated(0.4, 0.25, -0.15);
GL11.glScalef(1.0F, 0.35F, 0.35F);
DiamondPronter.pront(poison, flammability, reactivity, symbol);
GL11.glPopMatrix();
GL11.glRotatef(90, 0, 1, 0);
RenderHelper.enableStandardItemLighting();
}
}
}

14
src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
View File

@ -90,12 +90,22 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase {
public boolean hasBattery() {
return getBattery() > 0;
}
public int getBattery() {
if(slots[1] != null && slots[1].getItem() == ModItems.battery_spark &&
((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge()) {
return true;
return 1;
}
return false;
if(slots[1] != null && slots[1].getItem() == ModItems.battery_trixite &&
((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge()) {
return 2;
}
return 0;
}
public void explode() {