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

Added temporary recipes, fixed NEI handlers, general improvements

Browse Source
This commit is contained in:
HbmMods 2017-09-01 12:40:00 +02:00
parent 21909b1ef2
commit 171f7de3c0
13 changed files with 638 additions and 610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1068
assets/hbm/models/pumpjack_base.obj
View File

File diff suppressed because it is too large Load Diff

3
com/hbm/blocks/ModBlocks.java
View File

@ -69,6 +69,7 @@ public class ModBlocks {
public static Block ore_unobtainium; public static Block ore_unobtainium;
public static Block ore_daffergon; public static Block ore_daffergon;
public static Block ore_verticium; public static Block ore_verticium;
public static Block ore_rare;
public static Block ore_oil; public static Block ore_oil;
public static Block ore_oil_empty; public static Block ore_oil_empty;
@ -468,6 +469,7 @@ public class ModBlocks {
ore_unobtainium = new BlockGeneric(Material.rock).setBlockName("ore_unobtainium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_unobtainium"); ore_unobtainium = new BlockGeneric(Material.rock).setBlockName("ore_unobtainium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_unobtainium");
ore_daffergon = new BlockGeneric(Material.rock).setBlockName("ore_daffergon").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_daffergon"); ore_daffergon = new BlockGeneric(Material.rock).setBlockName("ore_daffergon").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_daffergon");
ore_verticium = new BlockGeneric(Material.rock).setBlockName("ore_verticium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_verticium"); ore_verticium = new BlockGeneric(Material.rock).setBlockName("ore_verticium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_verticium");
ore_rare = new BlockOre(Material.rock).setBlockName("ore_rare").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_rare");
ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil"); ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil");
ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty"); ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty");
@ -789,6 +791,7 @@ public class ModBlocks {
GameRegistry.registerBlock(ore_unobtainium, ItemOreBlock.class, ore_unobtainium.getUnlocalizedName()); GameRegistry.registerBlock(ore_unobtainium, ItemOreBlock.class, ore_unobtainium.getUnlocalizedName());
GameRegistry.registerBlock(ore_daffergon, ItemOreBlock.class, ore_daffergon.getUnlocalizedName()); GameRegistry.registerBlock(ore_daffergon, ItemOreBlock.class, ore_daffergon.getUnlocalizedName());
GameRegistry.registerBlock(ore_verticium, ItemOreBlock.class, ore_verticium.getUnlocalizedName()); GameRegistry.registerBlock(ore_verticium, ItemOreBlock.class, ore_verticium.getUnlocalizedName());
GameRegistry.registerBlock(ore_rare, ItemOreBlock.class, ore_rare.getUnlocalizedName());
//Nether Ores //Nether Ores
GameRegistry.registerBlock(ore_nether_uranium, ore_nether_uranium.getUnlocalizedName()); GameRegistry.registerBlock(ore_nether_uranium, ore_nether_uranium.getUnlocalizedName());

15
com/hbm/blocks/generic/BlockOre.java
View File

@ -71,6 +71,17 @@ public class BlockOre extends Block {
{ {
return rand.nextInt(10) == 0 ? ModItems.plate_dalekanium : Item.getItemFromBlock(ModBlocks.block_meteor); return rand.nextInt(10) == 0 ? ModItems.plate_dalekanium : Item.getItemFromBlock(ModBlocks.block_meteor);
} }
if(this == ModBlocks.ore_rare)
{
switch(rand.nextInt(6)) {
case 0: return ModItems.fragment_actinium;
case 1: return ModItems.fragment_cerium;
case 2: return ModItems.fragment_cobalt;
case 3: return ModItems.fragment_lanthanium;
case 4: return ModItems.fragment_neodymium;
case 5: return ModItems.fragment_niobium;
}
}
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@ -94,6 +105,10 @@ public class BlockOre extends Block {
{ {
return 2 + p_149745_1_.nextInt(3); return 2 + p_149745_1_.nextInt(3);
} }
if(this == ModBlocks.ore_rare)
{
return 2 + p_149745_1_.nextInt(4);
}
return 1; return 1;
} }

14
com/hbm/entity/missile/EntityMissileBaseAdvanced.java
View File

@ -78,7 +78,12 @@ public abstract class EntityMissileBaseAdvanced extends Entity {
@Override @Override
protected void readEntityFromNBT(NBTTagCompound nbt) { protected void readEntityFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt); motionX = nbt.getDouble("moX");
motionY = nbt.getDouble("moY");
motionZ = nbt.getDouble("moZ");
posX = nbt.getDouble("poX");
posY = nbt.getDouble("poY");
posZ = nbt.getDouble("poZ");
decelY = nbt.getDouble("decel"); decelY = nbt.getDouble("decel");
accelXZ = nbt.getDouble("accel"); accelXZ = nbt.getDouble("accel");
targetX = nbt.getInteger("tX"); targetX = nbt.getInteger("tX");
@ -89,7 +94,12 @@ public abstract class EntityMissileBaseAdvanced extends Entity {
@Override @Override
protected void writeEntityToNBT(NBTTagCompound nbt) { protected void writeEntityToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt); nbt.setDouble("moX", motionX);
nbt.setDouble("moY", motionY);
nbt.setDouble("moZ", motionZ);
nbt.setDouble("poX", posX);
nbt.setDouble("poY", posY);
nbt.setDouble("poZ", posZ);
nbt.setDouble("decel", decelY); nbt.setDouble("decel", decelY);
nbt.setDouble("accel", accelXZ); nbt.setDouble("accel", accelXZ);
nbt.setInteger("tX", targetX); nbt.setInteger("tX", targetX);

8
com/hbm/handler/MultiblockHandler.java
View File

@ -59,10 +59,10 @@ public class MultiblockHandler {
public static final int[] fluidTankDimensionNS = new int[] { 1, 1, 2, 0, 2, 2 }; public static final int[] fluidTankDimensionNS = new int[] { 1, 1, 2, 0, 2, 2 };
public static final int[] fluidTankDimensionEW = new int[] { 2, 2, 2, 0, 1, 1 }; public static final int[] fluidTankDimensionEW = new int[] { 2, 2, 2, 0, 1, 1 };
public static final int[] refineryDimensions = new int[] { 1, 1, 9, 0, 1, 1 }; public static final int[] refineryDimensions = new int[] { 1, 1, 9, 0, 1, 1 };
public static final int[] pumpjackDimensionNorth = new int[] { 1, 1, 4, 0, 5, 0 }; public static final int[] pumpjackDimensionNorth = new int[] { 1, 1, 4, 0, 6, 0 };
public static final int[] pumpjackDimensionEast = new int[] { 0, 5, 4, 0, 1, 1 }; public static final int[] pumpjackDimensionEast = new int[] { 0, 6, 4, 0, 1, 1 };
public static final int[] pumpjackDimensionSouth = new int[] { 1, 1, 4, 0, 0, 5 }; public static final int[] pumpjackDimensionSouth = new int[] { 1, 1, 4, 0, 0, 6 };
public static final int[] pumpjackDimensionWest = new int[] { 5, 0, 4, 0, 1, 1 }; public static final int[] pumpjackDimensionWest = new int[] { 6, 0, 4, 0, 1, 1 };
//Approved! //Approved!
public static boolean checkSpace(World world, int x, int y, int z, int[] i) { public static boolean checkSpace(World world, int x, int y, int z, int[] i) {

12
com/hbm/handler/nei/ChemplantRecipeHandler.java
View File

@ -130,8 +130,8 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(ItemStack result) { public void loadCraftingRecipes(ItemStack result) {
Map<Object[], Object[]> recipes = MachineRecipes.instance().getChemistryRecipes(); Map<Object[], Object[]> recipes = MachineRecipes.instance().getChemistryRecipes();
for (Map.Entry<Object[], Object[]> recipe : recipes.entrySet()) { for (Map.Entry<Object[], Object[]> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[0]) || if (compareFluidStacks(result, (ItemStack)recipe.getValue()[0]) ||
NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[1]) || compareFluidStacks(result, (ItemStack)recipe.getValue()[1]) ||
NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[2]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[2]) ||
NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[3]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[3]) ||
NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[4]) || NEIServerUtils.areStacksSameType(result, (ItemStack)recipe.getValue()[4]) ||
@ -166,8 +166,8 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler {
public void loadUsageRecipes(ItemStack ingredient) { public void loadUsageRecipes(ItemStack ingredient) {
Map<Object[], Object[]> recipes = MachineRecipes.instance().getChemistryRecipes(); Map<Object[], Object[]> recipes = MachineRecipes.instance().getChemistryRecipes();
for (Map.Entry<Object[], Object[]> recipe : recipes.entrySet()) { for (Map.Entry<Object[], Object[]> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[0]) || if (compareFluidStacks(ingredient, (ItemStack)recipe.getKey()[0]) ||
NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[1]) || compareFluidStacks(ingredient, (ItemStack)recipe.getKey()[1]) ||
NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[2]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[2]) ||
NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[3]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[3]) ||
NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[4]) || NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey()[4]) ||
@ -189,6 +189,10 @@ public class ChemplantRecipeHandler extends TemplateRecipeHandler {
(ItemStack)recipe.getKey()[6])); (ItemStack)recipe.getKey()[6]));
} }
} }
private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) {
return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage();
}
@Override @Override
public Class<? extends GuiContainer> getGuiClass() { public Class<? extends GuiContainer> getGuiClass() {

27
com/hbm/handler/nei/RefineryRecipeHandler.java
View File

@ -90,7 +90,10 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler {
if ((outputId.equals("refinery")) && getClass() == RefineryRecipeHandler.class) { if ((outputId.equals("refinery")) && getClass() == RefineryRecipeHandler.class) {
Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe(); Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe();
for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) { for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(),
(ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1],
(ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3],
(ItemStack)recipe.getValue()[4]));
} }
} else { } else {
super.loadCraftingRecipes(outputId, results); super.loadCraftingRecipes(outputId, results);
@ -101,8 +104,15 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(ItemStack result) { public void loadCraftingRecipes(ItemStack result) {
Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe(); Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe();
for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) { for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[0], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[1], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[2], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[3], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[4], result)) if (compareFluidStacks((ItemStack)recipe.getValue()[0], result) ||
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); compareFluidStacks((ItemStack)recipe.getValue()[1], result) ||
compareFluidStacks((ItemStack)recipe.getValue()[2], result) ||
compareFluidStacks((ItemStack)recipe.getValue()[3], result) ||
compareFluidStacks((ItemStack)recipe.getValue()[4], result))
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(),
(ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1],
(ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3],
(ItemStack)recipe.getValue()[4]));
} }
} }
@ -119,10 +129,17 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler {
public void loadUsageRecipes(ItemStack ingredient) { public void loadUsageRecipes(ItemStack ingredient) {
Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe(); Map<Object, Object[]> recipes = MachineRecipes.instance().getRefineryRecipe();
for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) { for (Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
if (NEIServerUtils.areStacksSameType(ingredient, (ItemStack)recipe.getKey())) if (compareFluidStacks(ingredient, (ItemStack)recipe.getKey()))
this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1], (ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3], (ItemStack)recipe.getValue()[4])); this.arecipes.add(new SmeltingSet((ItemStack)recipe.getKey(),
(ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1],
(ItemStack)recipe.getValue()[2], (ItemStack)recipe.getValue()[3],
(ItemStack)recipe.getValue()[4]));
} }
} }
private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) {
return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage();
}
@Override @Override
public void drawExtras(int recipe) { public void drawExtras(int recipe) {

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

@ -18,6 +18,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
public class MachineRecipes { public class MachineRecipes {
@ -2463,7 +2464,7 @@ public class MachineRecipes {
case REFINERY: case REFINERY:
output = new ItemStack(ModBlocks.machine_refinery, 1); output = new ItemStack(ModBlocks.machine_refinery, 1);
break; break;
case CHEMPLANT: /*case CHEMPLANT:
output = new ItemStack(ModBlocks.machine_refinery, 1); output = new ItemStack(ModBlocks.machine_refinery, 1);
break; break;
case TANK: case TANK:
@ -2612,7 +2613,7 @@ public class MachineRecipes {
break; break;
case MISSILE_BUSTER_2: case MISSILE_BUSTER_2:
output = new ItemStack(ModItems.missile_buster_strong, 1); output = new ItemStack(ModItems.missile_buster_strong, 1);
break; break;*/
default: default:
output = new ItemStack(Items.stick, 1); output = new ItemStack(Items.stick, 1);
break; break;
@ -2692,12 +2693,32 @@ public class MachineRecipes {
public Map<Object, Object[]> getRefineryRecipe() { public Map<Object, Object[]> getRefineryRecipe() {
Map<Object, Object[]> recipes = new HashMap<Object, Object[]>(); Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
ItemStack oil = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.OIL));
oil.stackTagCompound = new NBTTagCompound();
oil.stackTagCompound.setInteger("fill", 1000);
recipes.put(new ItemStack(ModItems.canister_oil, 1) , new ItemStack[] { ItemStack heavy = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.HEAVYOIL));
new ItemStack(ModItems.canister_heavyoil, 1), heavy.stackTagCompound = new NBTTagCompound();
new ItemStack(ModItems.canister_naphtha, 1), heavy.stackTagCompound.setInteger("fill", 500);
new ItemStack(ModItems.canister_lightoil, 1),
new ItemStack(ModItems.gas_petroleum, 1), ItemStack naphtha = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.NAPHTHA));
naphtha.stackTagCompound = new NBTTagCompound();
naphtha.stackTagCompound.setInteger("fill", 250);
ItemStack light = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.LIGHTOIL));
light.stackTagCompound = new NBTTagCompound();
light.stackTagCompound.setInteger("fill", 150);
ItemStack petroleum = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(FluidType.PETROLEUM));
petroleum.stackTagCompound = new NBTTagCompound();
petroleum.stackTagCompound.setInteger("fill", 100);
recipes.put(oil , new ItemStack[] {
heavy,
naphtha,
light,
petroleum,
new ItemStack(ModItems.sulfur, 1) }); new ItemStack(ModItems.sulfur, 1) });
return recipes; return recipes;

8
com/hbm/items/tool/ItemAssemblyTemplate.java
View File

@ -31,12 +31,12 @@ public class ItemAssemblyTemplate extends Item {
LIMITER, ANGRY_METAL, CMB_TILE, CMB_BRICKS, HATCH_FRAME, HATCH_CONTROLLER, CENTRIFUGE, LIMITER, ANGRY_METAL, CMB_TILE, CMB_BRICKS, HATCH_FRAME, HATCH_CONTROLLER, CENTRIFUGE,
BREEDING_REACTOR, RTG_FURNACE, DIESEL_GENERATOR, NUCLEAR_GENERATOR, INDUSTRIAL_GENERATOR, CYCLOTRON, BREEDING_REACTOR, RTG_FURNACE, DIESEL_GENERATOR, NUCLEAR_GENERATOR, INDUSTRIAL_GENERATOR, CYCLOTRON,
RT_GENERATOR, BATTERY, HE_TO_RF, RF_TO_HE, SHREDDER, DERRICK, FLARE_STACK, RT_GENERATOR, BATTERY, HE_TO_RF, RF_TO_HE, SHREDDER, DERRICK, FLARE_STACK,
REFINERY, CHEMPLANT, TANK, MINER, SCHRABTRANS, CMB_FURNACE, FA_HULL, FA_HATCH, FA_CORE, FA_PORT, REFINERY; /*, CHEMPLANT, TANK, MINER, SCHRABTRANS, CMB_FURNACE, FA_HULL, FA_HATCH, FA_CORE, FA_PORT,
LR_ELEMENT, LR_HATCH, LR_PORT, LR_CORE, LF_MAGNET, LF_CENTER, LF_MOTOR, LF_HEATER, LF_HATCH, LF_CORE, LR_ELEMENT, LR_HATCH, LR_PORT, LR_CORE, LF_MAGNET, LF_CENTER, LF_MOTOR, LF_HEATER, LF_HATCH, LF_CORE,
LW_ELEMENT, LW_CONTROL, LW_COOLER, LW_STRUTURE, LW_HATCH, LW_PORT, LW_CORE, FW_MAGNET, FW_COMPUTER, LW_ELEMENT, LW_CONTROL, LW_COOLER, LW_STRUTURE, LW_HATCH, LW_PORT, LW_CORE, FW_MAGNET, FW_COMPUTER,
FW_CORE, GADGET, LITTLE_BOY, FAT_MAN, IVY_MIKE, TSAR_BOMB, PROTOTYPE, FLEIJA, CUSTOM_NUKE, BOMB_LEV, FW_CORE, GADGET, LITTLE_BOY, FAT_MAN, IVY_MIKE, TSAR_BOMB, PROTOTYPE, FLEIJA, CUSTOM_NUKE, BOMB_LEV,
BOMB_ENDO, BOMB_EXO, LAUNCH_PAD, HUNTER_CHOPPER, MISSILE_HE_1, MISSILE_FIRE_1, MISSILE_CLUSTER_1, BOMB_ENDO, BOMB_EXO, LAUNCH_PAD, HUNTER_CHOPPER, MISSILE_HE_1, MISSILE_FIRE_1, MISSILE_CLUSTER_1,
MISSILE_BUSTER_1, MISSILE_HE_2, MISSILE_FIRE_2, MISSILE_CLUSTER_2, MISSILE_BUSTER_2; MISSILE_BUSTER_1, MISSILE_HE_2, MISSILE_FIRE_2, MISSILE_CLUSTER_2, MISSILE_BUSTER_2;*/
//private final int value; //private final int value;
//private EnumAssemblyTemplate(int value) { //private EnumAssemblyTemplate(int value) {
@ -311,7 +311,7 @@ public class ItemAssemblyTemplate extends Item {
return 200; return 200;
case REFINERY: case REFINERY:
return 350; return 350;
case CHEMPLANT: /*case CHEMPLANT:
return 200; return 200;
case TANK: case TANK:
return 150; return 150;
@ -410,7 +410,7 @@ public class ItemAssemblyTemplate extends Item {
case MISSILE_CLUSTER_2: case MISSILE_CLUSTER_2:
return 250; return 250;
case MISSILE_BUSTER_2: case MISSILE_BUSTER_2:
return 250; return 250;*/
default: default:
return 100; return 100;
} }

9
com/hbm/items/tool/ItemTemplateFolder.java
View File

@ -1,5 +1,7 @@
package com.hbm.items.tool; package com.hbm.items.tool;
import java.util.List;
import com.hbm.items.ModItems; import com.hbm.items.ModItems;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
@ -20,5 +22,12 @@ public class ItemTemplateFolder extends Item {
return stack; return stack;
} }
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool)
{
list.add("Machine Templates: Paper + Dye");
list.add("Fluid IDs: Iron Plate + Dye");
}
} }

8
com/hbm/lib/HbmWorldGen.java
View File

@ -180,6 +180,14 @@ public class HbmWorldGen implements IWorldGenerator {
(new WorldGenMinable(ModBlocks.ore_verticium, 16)).generate(world, rand, randPosX, randPosY, randPosZ); (new WorldGenMinable(ModBlocks.ore_verticium, 16)).generate(world, rand, randPosX, randPosY, randPosZ);
} }
for (int k = 0; k < MainRegistry.niterSpawn; k++) {
int randPosX = i + rand.nextInt(16);
int randPosY = rand.nextInt(25);
int randPosZ = j + rand.nextInt(16);
(new WorldGenMinable(ModBlocks.ore_rare, 5)).generate(world, rand, randPosX, randPosY, randPosZ);
}
if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) { if (MainRegistry.enableBarrels && rand.nextInt(5) == 0) {
for (int k = 0; k < 1; k++) { for (int k = 0; k < 1; k++) {
int randPosX = i + rand.nextInt(16); int randPosX = i + rand.nextInt(16);

2
com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings { public class RefStrings {
public static final String MODID = "hbm"; public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod"; public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.26 BETA (Selena-Luna-X01)"; public static final String VERSION = "1.0.26 BETA (Astatine-Actinium-X02)";
//HBM's Beta Naming Convention: //HBM's Beta Naming Convention:
//V T (X-Y-Z) //V T (X-Y-Z)
//V -> next release version //V -> next release version

39
com/hbm/main/CraftingManager.java
View File

@ -823,15 +823,15 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_steel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_boots, 1), new Object[] { "E E", "E E", 'E', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_sword, 1), new Object[] { "I", "I", "S", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_axe, 1), new Object[] { "II", "IS", " S", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_shovel, 1), new Object[] { "I", "S", "S", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.steel_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_hoe, 1), new Object[] { "II", " S", " S", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_titanium });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_titanium });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.titanium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_titanium });
@ -976,6 +976,27 @@ public class CraftingManager {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.crystal_charred, 1), new Object[] { ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_niobium, ModItems.powder_tennessine, ModItems.powder_cerium, ModBlocks.block_meteor, ModBlocks.block_aluminium, Items.water_bucket }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.crystal_charred, 1), new Object[] { ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_niobium, ModItems.powder_tennessine, ModItems.powder_cerium, ModBlocks.block_meteor, ModBlocks.block_aluminium, Items.water_bucket });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_virus, 1), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_sas3, 'T', "dustTungsten", 'H', ModItems.crystal_horn })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_virus, 1), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_sas3, 'T', "dustTungsten", 'H', ModItems.crystal_horn }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_pulsar, 32), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_uf6, 'T', "dustAluminum", 'H', ModItems.crystal_charred })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.crystal_pulsar, 32), new Object[] { "STS", "THT", "STS", 'S', ModItems.cell_uf6, 'T', "dustAluminum", 'H', ModItems.crystal_charred }));
//TEMPORARY
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fluid_duct, 8), new Object[] { "SAS", " ", "SAS", 'S', "plateSteel", 'A', "plateAluminum" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_assembler, 1), new Object[] { "WWW", "MCM", "ISI", 'W', ModItems.coil_copper, 'M', ModItems.motor, 'C', ModItems.circuit_aluminium, 'I', "blockIron", 'S', "blockSteel" }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_chemplant, 1), new Object[] { "HTT", "HPP", "DCD", 'H', ModItems.hull_big_steel, 'T', ModItems.tank_steel, 'P', Blocks.piston, 'D', ModBlocks.fluid_duct, 'C', ModItems.circuit_red_copper });
GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_fluidtank, 1), new Object[] { "HHH", "HHH", "D D", 'H', ModItems.hull_big_steel, 'D', ModBlocks.fluid_duct });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_pumpjack, 1), new Object[] { "BBB", "PSM", "PST", 'B', "blockSteel", 'P', ModItems.pipes_steel, 'S', ModBlocks.steel_scaffold, 'M', ModItems.motor, 'T', ModItems.tank_steel }));
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_drill), 1), new Object[] { "MPM", "GPG", "GDG", 'P', ModItems.ingot_dura_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium });
GameRegistry.addRecipe(new ItemStack(ModItems.template_folder, 1), new Object[] { "LPL", "BPB", "LPL", 'P', Items.paper, 'L', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 15) });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_light, 1), new Object[] { "PPR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_heavy, 1), new Object[] { "IIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_rocket, 1), new Object[] { "BBR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_flamer, 1), new Object[] { "NIR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'N', ModItems.pipes_steel }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.turret_tau, 1), new Object[] { "ADR", " I ", "BCB", 'P', "plateSteel", 'R', Items.redstone, 'I', "ingotSteel", 'B', "blockSteel", 'C', ModItems.circuit_aluminium, 'A', ModItems.coil_advanced_alloy, 'D', ModItems.coil_advanced_torus }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turret_control, 1), new Object[] { "R12", "PPI", " I", 'R', Items.redstone, '1', ModItems.circuit_aluminium, '2', ModItems.circuit_red_copper, 'P', "plateSteel", 'I', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_barrel_empty, 2), new Object[] { "121", "1 1", "121", '1', "plateSteel", '2', "plateAluminum" }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_actinium_tiny, ModItems.powder_actinium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium });
} }
public static void AddSmeltingRec() public static void AddSmeltingRec()