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

o r b u s

Browse Source
This commit is contained in:
Bob 2021-08-22 18:15:26 +02:00
parent e72a963d38
commit 9204fbea9b
23 changed files with 6690 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,6 +859,7 @@ public class ModBlocks {
public static final int guiID_machine_fluidtank = 50;
public static Block machine_bat9000;
public static Block machine_orbus;
public static Block launch_pad;
public static final int guiID_launch_pad = 19;
@ -1900,6 +1901,7 @@ public class ModBlocks {
machine_chemplant = new MachineChemplant(Material.iron).setBlockName("machine_chemplant").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_chemplant");
machine_fluidtank = new MachineFluidTank(Material.iron).setBlockName("machine_fluidtank").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_fluidtank");
machine_bat9000 = new MachineBigAssTank9000(Material.iron).setBlockName("machine_bat9000").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
machine_orbus = new MachineOrbus(Material.iron).setBlockName("machine_orbus").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
machine_turbofan = new MachineTurbofan(Material.iron).setBlockName("machine_turbofan").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_turbofan");
machine_press = new MachinePress(Material.iron).setBlockName("machine_press").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_press");
machine_epress = new MachineEPress(Material.iron).setBlockName("machine_epress").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_epress");
@ -2724,6 +2726,7 @@ public class ModBlocks {
GameRegistry.registerBlock(machine_chemplant, machine_chemplant.getUnlocalizedName());
GameRegistry.registerBlock(machine_fluidtank, machine_fluidtank.getUnlocalizedName());
GameRegistry.registerBlock(machine_bat9000, machine_bat9000.getUnlocalizedName());
GameRegistry.registerBlock(machine_orbus, machine_orbus.getUnlocalizedName());
GameRegistry.registerBlock(machine_boiler_off, machine_boiler_off.getUnlocalizedName());
GameRegistry.registerBlock(machine_boiler_on, machine_boiler_on.getUnlocalizedName());
GameRegistry.registerBlock(machine_boiler_electric_on, machine_boiler_electric_on.getUnlocalizedName());

57
src/main/java/com/hbm/blocks/machine/MachineOrbus.java Normal file
View File

@ -0,0 +1,57 @@
package com.hbm.blocks.machine;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.TileEntityMachineOrbus;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class MachineOrbus extends BlockDummyable {
public MachineOrbus(Material mat) {
super(mat);
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
if(meta >= 12) return new TileEntityMachineOrbus();
if(meta >= 6) return new TileEntityProxyCombo(false, false, true);
return null;
}
@Override
public int[] getDimensions() {
return new int[] {4, 0, 2, 1, 2, 1};
}
@Override
public int getOffset() {
return 1;
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(world.isRemote) {
return true;
} else if(!player.isSneaking()) {
int[] pos = this.findCore(world, x, y, z);
if(pos == null)
return false;
FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_barrel, world, pos[0], pos[1], pos[2]);
return true;
} else {
return true;
}
}
}

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

@ -5,7 +5,6 @@ import com.hbm.config.GeneralConfig;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.inventory.OreDictManager;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemBattery;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;

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

@ -6,9 +6,11 @@ import com.hbm.items.special.ItemWasteLong;
import com.hbm.items.special.ItemWasteShort;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
/**
@ -19,123 +21,87 @@ public class MineralRecipes {
public static void register() {
RecipesCommon.add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny);
add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny);
RecipesCommon.add9To1(ModItems.ingot_aluminium, ModBlocks.block_aluminium);
RecipesCommon.add1To9(ModBlocks.block_aluminium, ModItems.ingot_aluminium);
add1To9Pair(ModBlocks.block_aluminium, ModItems.ingot_aluminium);
add1To9Pair(ModBlocks.block_graphite, ModItems.ingot_graphite);
add1To9Pair(ModBlocks.block_boron, ModItems.ingot_boron);
add1To9Pair(ModItems.powder_boron, ModItems.powder_boron_tiny);
add1To9Pair(ModBlocks.block_schraranium, ModItems.ingot_schraranium);
add1To9Pair(ModBlocks.block_lanthanium, ModItems.ingot_lanthanium);
add1To9Pair(ModBlocks.block_actinium, ModItems.ingot_actinium);
add1To9Pair(ModBlocks.block_schrabidate, ModItems.ingot_schrabidate);
add1To9Pair(ModBlocks.block_coltan, ModItems.fragment_coltan);
add1To9Pair(ModBlocks.block_smore, ModItems.ingot_smore);
add1To9Pair(ModItems.nuclear_waste_vitrified, ModItems.nuclear_waste_vitrified_tiny);
add1To9Pair(ModBlocks.block_waste_vitrified, ModItems.nuclear_waste_vitrified);
RecipesCommon.add9To1(ModItems.ingot_graphite, ModBlocks.block_graphite);
RecipesCommon.add1To9(ModBlocks.block_graphite, ModItems.ingot_graphite);
addMineralSet(ModItems.nugget_bismuth, ModItems.ingot_bismuth, ModBlocks.block_bismuth);
addMineralSet(ModItems.nugget_tantalium, ModItems.ingot_tantalium, ModBlocks.block_tantalium);
addMineralSet(ModItems.nugget_zirconium, ModItems.ingot_zirconium, ModBlocks.block_zirconium);
addMineralSet(ModItems.nugget_dineutronium, ModItems.ingot_dineutronium, ModBlocks.block_dineutronium);
RecipesCommon.add9To1(ModItems.ingot_boron, ModBlocks.block_boron);
RecipesCommon.add1To9(ModBlocks.block_boron, ModItems.ingot_boron);
add1To9Pair(ModItems.powder_xe135, ModItems.powder_xe135_tiny);
add1To9Pair(ModItems.powder_cs137, ModItems.powder_cs137_tiny);
add1To9Pair(ModItems.powder_i131, ModItems.powder_i131_tiny);
RecipesCommon.add9To1(ModItems.powder_boron_tiny, ModItems.powder_boron);
RecipesCommon.add1To9(ModItems.powder_boron, ModItems.powder_boron_tiny);
add1To9Pair(ModItems.ingot_technetium, ModItems.nugget_technetium);
add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60);
add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198);
RecipesCommon.add9To1(ModItems.ingot_zirconium, ModBlocks.block_zirconium);
RecipesCommon.add1To9(ModBlocks.block_zirconium, ModItems.ingot_zirconium);
RecipesCommon.add9To1(ModItems.nugget_zirconium, ModItems.ingot_zirconium);
RecipesCommon.add1To9(ModItems.ingot_zirconium, ModItems.nugget_zirconium);
RecipesCommon.add9To1(ModItems.ingot_schraranium, ModBlocks.block_schraranium);
RecipesCommon.add1To9(ModBlocks.block_schraranium, ModItems.ingot_schraranium);
RecipesCommon.add9To1(ModItems.ingot_lanthanium, ModBlocks.block_lanthanium);
RecipesCommon.add1To9(ModBlocks.block_lanthanium, ModItems.ingot_lanthanium);
RecipesCommon.add9To1(ModItems.ingot_actinium, ModBlocks.block_actinium);
RecipesCommon.add1To9(ModBlocks.block_actinium, ModItems.ingot_actinium);
RecipesCommon.add9To1(ModItems.ingot_schrabidate, ModBlocks.block_schrabidate);
RecipesCommon.add1To9(ModBlocks.block_schrabidate, ModItems.ingot_schrabidate);
RecipesCommon.add9To1(ModItems.ingot_dineutronium, ModBlocks.block_dineutronium);
RecipesCommon.add1To9(ModBlocks.block_dineutronium, ModItems.ingot_dineutronium);
RecipesCommon.add9To1(ModItems.powder_xe135_tiny, ModItems.powder_xe135);
RecipesCommon.add1To9(ModItems.powder_xe135, ModItems.powder_xe135_tiny);
RecipesCommon.add9To1(ModItems.powder_cs137_tiny, ModItems.powder_cs137);
RecipesCommon.add1To9(ModItems.powder_cs137, ModItems.powder_cs137_tiny);
RecipesCommon.add9To1(ModItems.powder_i131_tiny, ModItems.powder_i131);
RecipesCommon.add1To9(ModItems.powder_i131, ModItems.powder_i131_tiny);
RecipesCommon.add1To9Pair(ModItems.ingot_technetium, ModItems.nugget_technetium);
RecipesCommon.add1To9Pair(ModItems.ingot_co60, ModItems.nugget_co60);
RecipesCommon.add1To9Pair(ModItems.ingot_au198, ModItems.nugget_au198);
RecipesCommon.add1To9Pair(ModItems.ingot_bismuth, ModItems.nugget_bismuth);
RecipesCommon.add1To9Pair(ModBlocks.block_bismuth, ModItems.ingot_bismuth);
RecipesCommon.add1To9Pair(ModBlocks.block_coltan, ModItems.fragment_coltan);
RecipesCommon.add1To9Pair(ModItems.ingot_tantalium, ModItems.nugget_tantalium);
RecipesCommon.add1To9Pair(ModBlocks.block_tantalium, ModItems.ingot_tantalium);
RecipesCommon.add1To9Pair(ModItems.nuclear_waste_vitrified, ModItems.nuclear_waste_vitrified_tiny);
RecipesCommon.add1To9Pair(ModBlocks.block_waste_vitrified, ModItems.nuclear_waste_vitrified);
RecipesCommon.add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241);
RecipesCommon.add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241);
RecipesCommon.add1To9Pair(ModItems.ingot_am242, ModItems.nugget_am242);
RecipesCommon.add1To9Pair(ModItems.ingot_am_mix, ModItems.nugget_am_mix);
RecipesCommon.add1To9Pair(ModItems.ingot_americium_fuel, ModItems.nugget_americium_fuel);
add1To9Pair(ModItems.ingot_pu241, ModItems.nugget_pu241);
add1To9Pair(ModItems.ingot_am241, ModItems.nugget_am241);
add1To9Pair(ModItems.ingot_am242, ModItems.nugget_am242);
add1To9Pair(ModItems.ingot_am_mix, ModItems.nugget_am_mix);
add1To9Pair(ModItems.ingot_americium_fuel, ModItems.nugget_americium_fuel);
for(int i = 0; i < ItemWasteLong.WasteClass.values().length; i++) {
RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_long_tiny, ModItems.nuclear_waste_long, i);
RecipesCommon.add1To9SameMeta(ModItems.nuclear_waste_long, ModItems.nuclear_waste_long_tiny, i);
RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_long_depleted_tiny, ModItems.nuclear_waste_long_depleted, i);
RecipesCommon.add1To9SameMeta(ModItems.nuclear_waste_long_depleted, ModItems.nuclear_waste_long_depleted_tiny, i);
add1To9PairSameMeta(ModItems.nuclear_waste_long, ModItems.nuclear_waste_long_tiny, i);
add1To9PairSameMeta(ModItems.nuclear_waste_long_depleted, ModItems.nuclear_waste_long_depleted_tiny, i);
}
for(int i = 0; i < ItemWasteShort.WasteClass.values().length; i++) {
RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_short_tiny, ModItems.nuclear_waste_short, i);
RecipesCommon.add1To9SameMeta(ModItems.nuclear_waste_short, ModItems.nuclear_waste_short_tiny, i);
RecipesCommon.add9To1SameMeta(ModItems.nuclear_waste_short_depleted_tiny, ModItems.nuclear_waste_short_depleted, i);
RecipesCommon.add1To9SameMeta(ModItems.nuclear_waste_short_depleted, ModItems.nuclear_waste_short_depleted_tiny, i);
add1To9PairSameMeta(ModItems.nuclear_waste_short, ModItems.nuclear_waste_short_tiny, i);
add1To9PairSameMeta(ModItems.nuclear_waste_short_depleted, ModItems.nuclear_waste_short_depleted_tiny, i);
}
RecipesCommon.add9To1(ModItems.fallout, ModBlocks.block_fallout);
RecipesCommon.add1To9(ModBlocks.block_fallout, ModItems.fallout);
add1To9Pair(ModBlocks.block_fallout, ModItems.fallout);
GameRegistry.addRecipe(new ItemStack(ModBlocks.fallout, 2), new Object[] { "##", '#', ModItems.fallout });
RecipesCommon.add9To1(ModItems.ingot_pu_mix, ModBlocks.block_pu_mix);
RecipesCommon.add1To9(ModBlocks.block_pu_mix, ModItems.ingot_pu_mix);
RecipesCommon.add9To1(ModItems.nugget_pu_mix, ModItems.ingot_pu_mix);
RecipesCommon.add1To9(ModItems.ingot_pu_mix, ModItems.nugget_pu_mix);
RecipesCommon.add9To1(ModItems.nugget_neptunium_fuel, ModItems.ingot_neptunium_fuel);
RecipesCommon.add1To9(ModItems.ingot_neptunium_fuel, ModItems.nugget_neptunium_fuel);
RecipesCommon.addBillet(ModItems.billet_uranium, ModItems.nugget_uranium, "nuggetUranium");
RecipesCommon.addBillet(ModItems.billet_u233, ModItems.nugget_u233, "nuggetUranium233", "tinyU233");
RecipesCommon.addBillet(ModItems.billet_u235, ModItems.nugget_u235, "nuggetUranium235", "tinyU235");
RecipesCommon.addBillet(ModItems.billet_u238, ModItems.nugget_u238, "nuggetUranium238", "tinyU238");
RecipesCommon.addBillet(ModItems.billet_th232, ModItems.nugget_th232, "nuggetThorium232", "tinyTh232");
RecipesCommon.addBillet(ModItems.billet_plutonium, ModItems.nugget_plutonium, "nuggetPlutonium");
RecipesCommon.addBillet(ModItems.billet_pu238, ModItems.nugget_pu238, "nuggetPlutonium238", "tinyPu238");
RecipesCommon.addBillet(ModItems.billet_pu239, ModItems.nugget_pu239, "nuggetPlutonium239", "tinyPu239");
RecipesCommon.addBillet(ModItems.billet_pu240, ModItems.nugget_pu240, "nuggetPlutonium240", "tinyPu240");
RecipesCommon.addBillet(ModItems.billet_pu241, ModItems.nugget_pu241, "nuggetPlutonium241", "tinyPu241");
RecipesCommon.addBillet(ModItems.billet_pu_mix, ModItems.nugget_pu_mix);
RecipesCommon.addBillet(ModItems.billet_am241, ModItems.nugget_am241, "nuggetAmericium241", "tinyAm241");
RecipesCommon.addBillet(ModItems.billet_am242, ModItems.nugget_am242, "nuggetAmericium242", "tinyAm242");
RecipesCommon.addBillet(ModItems.billet_am_mix, ModItems.nugget_am_mix);
RecipesCommon.addBillet(ModItems.billet_neptunium, ModItems.nugget_neptunium, "nuggetNeptunium237", "tinyNp237");
RecipesCommon.addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium");
RecipesCommon.addBillet(ModItems.billet_technetium, ModItems.nugget_technetium, "nuggetTechnetium");
RecipesCommon.addBillet(ModItems.billet_au198, ModItems.nugget_au198);
RecipesCommon.addBillet(ModItems.billet_schrabidium, ModItems.nugget_schrabidium);
RecipesCommon.addBillet(ModItems.billet_solinium, ModItems.nugget_solinium);
RecipesCommon.addBillet(ModItems.billet_uranium_fuel, ModItems.nugget_uranium_fuel);
RecipesCommon.addBillet(ModItems.billet_thorium_fuel, ModItems.nugget_thorium_fuel);
RecipesCommon.addBillet(ModItems.billet_plutonium_fuel, ModItems.nugget_plutonium_fuel);
RecipesCommon.addBillet(ModItems.billet_neptunium_fuel, ModItems.nugget_neptunium_fuel);
RecipesCommon.addBillet(ModItems.billet_mox_fuel, ModItems.nugget_mox_fuel);
RecipesCommon.addBillet(ModItems.billet_les, ModItems.nugget_les);
RecipesCommon.addBillet(ModItems.billet_schrabidium_fuel, ModItems.nugget_schrabidium_fuel);
RecipesCommon.addBillet(ModItems.billet_hes, ModItems.nugget_hes);
RecipesCommon.addBillet(ModItems.billet_australium, ModItems.nugget_australium);
RecipesCommon.addBillet(ModItems.billet_australium_greater, ModItems.nugget_australium_greater);
RecipesCommon.addBillet(ModItems.billet_australium_lesser, ModItems.nugget_australium_lesser);
addMineralSet(ModItems.nugget_pu_mix, ModItems.ingot_pu_mix, ModBlocks.block_pu_mix);
add1To9Pair(ModItems.ingot_neptunium_fuel, ModItems.nugget_neptunium_fuel);
addBillet(ModItems.billet_uranium, ModItems.nugget_uranium, "nuggetUranium");
addBillet(ModItems.billet_u233, ModItems.nugget_u233, "nuggetUranium233", "tinyU233");
addBillet(ModItems.billet_u235, ModItems.nugget_u235, "nuggetUranium235", "tinyU235");
addBillet(ModItems.billet_u238, ModItems.nugget_u238, "nuggetUranium238", "tinyU238");
addBillet(ModItems.billet_th232, ModItems.nugget_th232, "nuggetThorium232", "tinyTh232");
addBillet(ModItems.billet_plutonium, ModItems.nugget_plutonium, "nuggetPlutonium");
addBillet(ModItems.billet_pu238, ModItems.nugget_pu238, "nuggetPlutonium238", "tinyPu238");
addBillet(ModItems.billet_pu239, ModItems.nugget_pu239, "nuggetPlutonium239", "tinyPu239");
addBillet(ModItems.billet_pu240, ModItems.nugget_pu240, "nuggetPlutonium240", "tinyPu240");
addBillet(ModItems.billet_pu241, ModItems.nugget_pu241, "nuggetPlutonium241", "tinyPu241");
addBillet(ModItems.billet_pu_mix, ModItems.nugget_pu_mix);
addBillet(ModItems.billet_am241, ModItems.nugget_am241, "nuggetAmericium241", "tinyAm241");
addBillet(ModItems.billet_am242, ModItems.nugget_am242, "nuggetAmericium242", "tinyAm242");
addBillet(ModItems.billet_am_mix, ModItems.nugget_am_mix);
addBillet(ModItems.billet_neptunium, ModItems.nugget_neptunium, "nuggetNeptunium237", "tinyNp237");
addBillet(ModItems.billet_polonium, ModItems.nugget_polonium, "nuggetPolonium");
addBillet(ModItems.billet_technetium, ModItems.nugget_technetium, "nuggetTechnetium");
addBillet(ModItems.billet_au198, ModItems.nugget_au198);
addBillet(ModItems.billet_schrabidium, ModItems.nugget_schrabidium);
addBillet(ModItems.billet_solinium, ModItems.nugget_solinium);
addBillet(ModItems.billet_uranium_fuel, ModItems.nugget_uranium_fuel);
addBillet(ModItems.billet_thorium_fuel, ModItems.nugget_thorium_fuel);
addBillet(ModItems.billet_plutonium_fuel, ModItems.nugget_plutonium_fuel);
addBillet(ModItems.billet_neptunium_fuel, ModItems.nugget_neptunium_fuel);
addBillet(ModItems.billet_mox_fuel, ModItems.nugget_mox_fuel);
addBillet(ModItems.billet_les, ModItems.nugget_les);
addBillet(ModItems.billet_schrabidium_fuel, ModItems.nugget_schrabidium_fuel);
addBillet(ModItems.billet_hes, ModItems.nugget_hes);
addBillet(ModItems.billet_australium, ModItems.nugget_australium);
addBillet(ModItems.billet_australium_greater, ModItems.nugget_australium_greater);
addBillet(ModItems.billet_australium_lesser, ModItems.nugget_australium_lesser);
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_thorium_fuel, 3), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetUranium233", "nuggetUranium233" }));
@ -382,7 +348,7 @@ public class MineralRecipes {
GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth });
GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat });
GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { "##", "##", '#', ModItems.powder_balefire });
RecipesCommon.add9To1(ModItems.cell_balefire, ModItems.egg_balefire_shard);
add9To1(ModItems.cell_balefire, ModItems.egg_balefire_shard);
GameRegistry.addRecipe(new ItemStack(ModItems.nugget_euphemium, 1), new Object[] { "#", '#', ModItems.rod_quad_euphemium });
GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1), new Object[] { "###", "###", "###", '#', ModItems.rod_quad_euphemium });
@ -405,4 +371,75 @@ public class MineralRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "nuggetAmericium241", "nuggetAmericium241", "nuggetAmericium241", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242", "nuggetAmericium242" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "tinyAm241", "tinyAm241", "tinyAm241", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242" }));
}
//Bundled 1/9 recipes
public static void add1To9Pair(Item one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add1To9Pair(Block one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add1To9PairSameMeta(Item one, Item nine, int meta) {
add1To9SameMeta(one, nine, meta);
add9To1SameMeta(nine, one, meta);
}
//Full set of nugget, ingot and block
public static void addMineralSet(Item nugget, Item ingot, Block block) {
add1To9(new ItemStack(ingot), new ItemStack(nugget, 9));
add9To1(new ItemStack(nugget), new ItemStack(ingot));
add1To9(new ItemStack(block), new ItemStack(ingot, 9));
add9To1(new ItemStack(ingot), new ItemStack(block));
}
//Decompress one item into nine
public static void add1To9(Block one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
}
public static void add1To9(Item one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
}
public static void add1To9SameMeta(Item one, Item nine, int meta) {
add1To9(new ItemStack(one, 1, meta), new ItemStack(nine, 9, meta));
}
public static void add1To9(ItemStack one, ItemStack nine) {
GameRegistry.addRecipe(nine, new Object[] { "#", '#', one });
}
//Compress nine items into one
public static void add9To1(Item nine, Block one) {
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add9To1(Item nine, Item one) {
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add9To1SameMeta(Item nine, Item one, int meta) {
add9To1(new ItemStack(nine, 1, meta), new ItemStack(one, 1, meta));
}
public static void add9To1(ItemStack nine, ItemStack one) {
GameRegistry.addRecipe(one, new Object[] { "###", "###", "###", '#', nine });
}
public static void addBillet(Item billet, Item nugget, String... ore) {
for(String o : ore)
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', o }));
addBillet(billet, nugget);
}
public static void addBillet(Item billet, Item nugget) {
GameRegistry.addRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', nugget });
GameRegistry.addShapelessRecipe(new ItemStack(nugget, 6), new Object[] { billet });
}
}

153
src/main/java/com/hbm/crafting/RecipesCommon.java
View File

@ -1,153 +0,0 @@
package com.hbm.crafting;
import com.hbm.items.ModItems;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
/**
* Wrappers for common recipe schemes
* @author hbm
*/
public class RecipesCommon {
//Bundled 1/9 recipes
public static void add1To9Pair(Item one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add1To9Pair(Block one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
add9To1(new ItemStack(nine), new ItemStack(one));
}
//Decompress one item into nine
public static void add1To9(Block one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
}
public static void add1To9(Item one, Item nine) {
add1To9(new ItemStack(one), new ItemStack(nine, 9));
}
public static void add1To9SameMeta(Item one, Item nine, int meta) {
add1To9(new ItemStack(one, 1, meta), new ItemStack(nine, 9, meta));
}
public static void add1To9(ItemStack one, ItemStack nine) {
GameRegistry.addRecipe(nine, new Object[] { "#", '#', one });
}
//Compress nine items into one
public static void add9To1(Item nine, Block one) {
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add9To1(Item nine, Item one) {
add9To1(new ItemStack(nine), new ItemStack(one));
}
public static void add9To1SameMeta(Item nine, Item one, int meta) {
add9To1(new ItemStack(nine, 1, meta), new ItemStack(one, 1, meta));
}
public static void add9To1(ItemStack nine, ItemStack one) {
GameRegistry.addRecipe(one, new Object[] { "###", "###", "###", '#', nine });
}
public static void addBillet(Item billet, Item nugget, String... ore) {
for(String o : ore)
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', o }));
addBillet(billet, nugget);
}
public static void addBillet(Item billet, Item nugget) {
GameRegistry.addRecipe(new ItemStack(billet), new Object[] { "###", "###", '#', nugget });
GameRegistry.addShapelessRecipe(new ItemStack(nugget, 6), new Object[] { billet });
}
//Fill rods with 6 nuggets
public static void addRod(Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, nugget, nugget, nugget, nugget, nugget, nugget });
}
//Fill rods with 12 nuggets
public static void addDualRod(Item ingot, Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, ingot, nugget, nugget, nugget });
}
//Fill rods with 24 nuggets
public static void addQuadRod(Item ingot, Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, ingot, ingot, nugget, nugget, nugget, nugget, nugget, nugget });
}
//Fill rods with one billet
public static void addRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet });
}
//Fill rods with two billets
public static void addDualRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet });
}
//Fill rods with three billets
public static void addQuadRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet });
}
//Fill rods with one billet + unload
public static void addRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 1), new Object[] { out });
}
//Fill rods with two billets + unload
public static void addDualRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 2), new Object[] { out });
}
//Fill rods with three billets + unload
public static void addQuadRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 4), new Object[] { out });
}
//Fill rods with 6 nuggets
public static void addRBMKRod(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rbmk_fuel_empty, billet, billet, billet, billet, billet, billet, billet, billet });
}
//Sword
public static void addSword(Item ingot, Item sword) {
GameRegistry.addRecipe(new ItemStack(sword), new Object[] { "I", "I", "S", 'I', ingot, 'S', Items.stick });
}
//Pickaxe
public static void addPickaxe(Item ingot, Item pick) {
GameRegistry.addRecipe(new ItemStack(pick), new Object[] { "III", " S ", " S ", 'I', ingot, 'S', Items.stick });
}
//Axe
public static void addAxe(Item ingot, Item axe) {
GameRegistry.addRecipe(new ItemStack(axe), new Object[] { "II", "IS", " S", 'I', ingot, 'S', Items.stick });
}
//Shovel
public static void addShovel(Item ingot, Item shovel) {
GameRegistry.addRecipe(new ItemStack(shovel), new Object[] { "I", "S", "S", 'I', ingot, 'S', Items.stick });
}
//Hoe
public static void addHoe(Item ingot, Item hoe) {
GameRegistry.addRecipe(new ItemStack(hoe), new Object[] { "II", " S", " S", 'I', ingot, 'S', Items.stick });
}
}

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

@ -4,6 +4,7 @@ import com.hbm.items.ModItems;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
@ -41,24 +42,24 @@ public class RodRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_balefire, 1), new Object[] { ModItems.rod_empty, ModItems.egg_balefire_shard });
//...with billets
RecipesCommon.addRodBilletUnload(ModItems.billet_uranium, ModItems.rod_uranium);
RecipesCommon.addRodBilletUnload(ModItems.billet_u233, ModItems.rod_u233);
RecipesCommon.addRodBilletUnload(ModItems.billet_u235, ModItems.rod_u235);
RecipesCommon.addRodBilletUnload(ModItems.billet_u238, ModItems.rod_u238);
RecipesCommon.addRodBilletUnload(ModItems.billet_th232, ModItems.rod_th232);
RecipesCommon.addRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_plutonium);
RecipesCommon.addRodBilletUnload(ModItems.billet_pu238, ModItems.rod_pu238);
RecipesCommon.addRodBilletUnload(ModItems.billet_pu239, ModItems.rod_pu239);
RecipesCommon.addRodBilletUnload(ModItems.billet_pu240, ModItems.rod_pu240);
RecipesCommon.addRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_neptunium);
RecipesCommon.addRodBilletUnload(ModItems.billet_polonium, ModItems.rod_polonium);
RecipesCommon.addRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_schrabidium);
RecipesCommon.addRodBilletUnload(ModItems.billet_solinium, ModItems.rod_solinium);
RecipesCommon.addRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_uranium_fuel);
RecipesCommon.addRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_thorium_fuel);
RecipesCommon.addRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_plutonium_fuel);
RecipesCommon.addRodBillet(ModItems.billet_mox_fuel, ModItems.rod_mox_fuel);
RecipesCommon.addRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_schrabidium_fuel);
addRodBilletUnload(ModItems.billet_uranium, ModItems.rod_uranium);
addRodBilletUnload(ModItems.billet_u233, ModItems.rod_u233);
addRodBilletUnload(ModItems.billet_u235, ModItems.rod_u235);
addRodBilletUnload(ModItems.billet_u238, ModItems.rod_u238);
addRodBilletUnload(ModItems.billet_th232, ModItems.rod_th232);
addRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_plutonium);
addRodBilletUnload(ModItems.billet_pu238, ModItems.rod_pu238);
addRodBilletUnload(ModItems.billet_pu239, ModItems.rod_pu239);
addRodBilletUnload(ModItems.billet_pu240, ModItems.rod_pu240);
addRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_neptunium);
addRodBilletUnload(ModItems.billet_polonium, ModItems.rod_polonium);
addRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_schrabidium);
addRodBilletUnload(ModItems.billet_solinium, ModItems.rod_solinium);
addRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_uranium_fuel);
addRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_thorium_fuel);
addRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_plutonium_fuel);
addRodBillet(ModItems.billet_mox_fuel, ModItems.rod_mox_fuel);
addRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_schrabidium_fuel);
//Dual rods
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty });
@ -85,24 +86,24 @@ public class RodRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_balefire, 1), new Object[] { ModItems.rod_dual_empty, ModItems.egg_balefire_shard, ModItems.egg_balefire_shard });
//...with billets
RecipesCommon.addDualRodBilletUnload(ModItems.billet_uranium, ModItems.rod_dual_uranium);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_u233, ModItems.rod_dual_u233);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_u235, ModItems.rod_dual_u235);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_u238, ModItems.rod_dual_u238);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_th232, ModItems.rod_dual_th232);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_dual_plutonium);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu238, ModItems.rod_dual_pu238);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu239, ModItems.rod_dual_pu239);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_pu240, ModItems.rod_dual_pu240);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_dual_neptunium);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_polonium, ModItems.rod_dual_polonium);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_dual_schrabidium);
RecipesCommon.addDualRodBilletUnload(ModItems.billet_solinium, ModItems.rod_dual_solinium);
RecipesCommon.addDualRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_dual_uranium_fuel);
RecipesCommon.addDualRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_dual_thorium_fuel);
RecipesCommon.addDualRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_dual_plutonium_fuel);
RecipesCommon.addDualRodBillet(ModItems.billet_mox_fuel, ModItems.rod_dual_mox_fuel);
RecipesCommon.addDualRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_dual_schrabidium_fuel);
addDualRodBilletUnload(ModItems.billet_uranium, ModItems.rod_dual_uranium);
addDualRodBilletUnload(ModItems.billet_u233, ModItems.rod_dual_u233);
addDualRodBilletUnload(ModItems.billet_u235, ModItems.rod_dual_u235);
addDualRodBilletUnload(ModItems.billet_u238, ModItems.rod_dual_u238);
addDualRodBilletUnload(ModItems.billet_th232, ModItems.rod_dual_th232);
addDualRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_dual_plutonium);
addDualRodBilletUnload(ModItems.billet_pu238, ModItems.rod_dual_pu238);
addDualRodBilletUnload(ModItems.billet_pu239, ModItems.rod_dual_pu239);
addDualRodBilletUnload(ModItems.billet_pu240, ModItems.rod_dual_pu240);
addDualRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_dual_neptunium);
addDualRodBilletUnload(ModItems.billet_polonium, ModItems.rod_dual_polonium);
addDualRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_dual_schrabidium);
addDualRodBilletUnload(ModItems.billet_solinium, ModItems.rod_dual_solinium);
addDualRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_dual_uranium_fuel);
addDualRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_dual_thorium_fuel);
addDualRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_dual_plutonium_fuel);
addDualRodBillet(ModItems.billet_mox_fuel, ModItems.rod_dual_mox_fuel);
addDualRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_dual_schrabidium_fuel);
//Lithium and tritium rods
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_lithium, 1), new Object[] { ModItems.rod_empty, ModItems.lithium });
@ -138,52 +139,52 @@ public class RodRecipes {
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 });
//...with billets
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_uranium, ModItems.rod_quad_uranium);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u233, ModItems.rod_quad_u233);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u235, ModItems.rod_quad_u235);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_u238, ModItems.rod_quad_u238);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_th232, ModItems.rod_quad_th232);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_quad_plutonium);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu238, ModItems.rod_quad_pu238);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu239, ModItems.rod_quad_pu239);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_pu240, ModItems.rod_quad_pu240);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_quad_neptunium);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_polonium, ModItems.rod_quad_polonium);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_quad_schrabidium);
RecipesCommon.addQuadRodBilletUnload(ModItems.billet_solinium, ModItems.rod_quad_solinium);
RecipesCommon.addQuadRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_quad_uranium_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_quad_thorium_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_quad_plutonium_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_mox_fuel, ModItems.rod_quad_mox_fuel);
RecipesCommon.addQuadRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_quad_schrabidium_fuel);
addQuadRodBilletUnload(ModItems.billet_uranium, ModItems.rod_quad_uranium);
addQuadRodBilletUnload(ModItems.billet_u233, ModItems.rod_quad_u233);
addQuadRodBilletUnload(ModItems.billet_u235, ModItems.rod_quad_u235);
addQuadRodBilletUnload(ModItems.billet_u238, ModItems.rod_quad_u238);
addQuadRodBilletUnload(ModItems.billet_th232, ModItems.rod_quad_th232);
addQuadRodBilletUnload(ModItems.billet_plutonium, ModItems.rod_quad_plutonium);
addQuadRodBilletUnload(ModItems.billet_pu238, ModItems.rod_quad_pu238);
addQuadRodBilletUnload(ModItems.billet_pu239, ModItems.rod_quad_pu239);
addQuadRodBilletUnload(ModItems.billet_pu240, ModItems.rod_quad_pu240);
addQuadRodBilletUnload(ModItems.billet_neptunium, ModItems.rod_quad_neptunium);
addQuadRodBilletUnload(ModItems.billet_polonium, ModItems.rod_quad_polonium);
addQuadRodBilletUnload(ModItems.billet_schrabidium, ModItems.rod_quad_schrabidium);
addQuadRodBilletUnload(ModItems.billet_solinium, ModItems.rod_quad_solinium);
addQuadRodBillet(ModItems.billet_uranium_fuel, ModItems.rod_quad_uranium_fuel);
addQuadRodBillet(ModItems.billet_thorium_fuel, ModItems.rod_quad_thorium_fuel);
addQuadRodBillet(ModItems.billet_plutonium_fuel, ModItems.rod_quad_plutonium_fuel);
addQuadRodBillet(ModItems.billet_mox_fuel, ModItems.rod_quad_mox_fuel);
addQuadRodBillet(ModItems.billet_schrabidium_fuel, ModItems.rod_quad_schrabidium_fuel);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.rbmk_fuel_empty, 1), new Object[] { "ZRZ", "Z Z", "ZRZ", 'Z', "ingotZirconium", 'R', ModItems.rod_quad_empty }));
RecipesCommon.addRBMKRod(ModItems.billet_uranium, ModItems.rbmk_fuel_ueu);
RecipesCommon.addRBMKRod(ModItems.billet_uranium_fuel, ModItems.rbmk_fuel_meu);
RecipesCommon.addRBMKRod(ModItems.billet_u233, ModItems.rbmk_fuel_heu233);
RecipesCommon.addRBMKRod(ModItems.billet_u235, ModItems.rbmk_fuel_heu235);
RecipesCommon.addRBMKRod(ModItems.billet_thorium_fuel, ModItems.rbmk_fuel_thmeu);
RecipesCommon.addRBMKRod(ModItems.billet_mox_fuel, ModItems.rbmk_fuel_mox);
RecipesCommon.addRBMKRod(ModItems.billet_plutonium_fuel, ModItems.rbmk_fuel_lep);
RecipesCommon.addRBMKRod(ModItems.billet_pu_mix, ModItems.rbmk_fuel_mep);
RecipesCommon.addRBMKRod(ModItems.billet_pu239, ModItems.rbmk_fuel_hep239);
RecipesCommon.addRBMKRod(ModItems.billet_pu241, ModItems.rbmk_fuel_hep241);
RecipesCommon.addRBMKRod(ModItems.billet_americium_fuel, ModItems.rbmk_fuel_lea);
RecipesCommon.addRBMKRod(ModItems.billet_am_mix, ModItems.rbmk_fuel_mea);
RecipesCommon.addRBMKRod(ModItems.billet_am241, ModItems.rbmk_fuel_hea241);
RecipesCommon.addRBMKRod(ModItems.billet_am242, ModItems.rbmk_fuel_hea242);
RecipesCommon.addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men);
RecipesCommon.addRBMKRod(ModItems.billet_neptunium, ModItems.rbmk_fuel_hen);
RecipesCommon.addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be);
RecipesCommon.addRBMKRod(ModItems.billet_ra226be, ModItems.rbmk_fuel_ra226be);
RecipesCommon.addRBMKRod(ModItems.billet_pu238be, ModItems.rbmk_fuel_pu238be);
RecipesCommon.addRBMKRod(ModItems.billet_australium_lesser, ModItems.rbmk_fuel_leaus);
RecipesCommon.addRBMKRod(ModItems.billet_australium_greater, ModItems.rbmk_fuel_heaus);
RecipesCommon.addRBMKRod(ModItems.egg_balefire_shard, ModItems.rbmk_fuel_balefire);
RecipesCommon.addRBMKRod(ModItems.billet_les, ModItems.rbmk_fuel_les);
RecipesCommon.addRBMKRod(ModItems.billet_schrabidium_fuel, ModItems.rbmk_fuel_mes);
RecipesCommon.addRBMKRod(ModItems.billet_hes, ModItems.rbmk_fuel_hes);
RecipesCommon.addRBMKRod(ModItems.billet_balefire_gold, ModItems.rbmk_fuel_balefire_gold);
addRBMKRod(ModItems.billet_uranium, ModItems.rbmk_fuel_ueu);
addRBMKRod(ModItems.billet_uranium_fuel, ModItems.rbmk_fuel_meu);
addRBMKRod(ModItems.billet_u233, ModItems.rbmk_fuel_heu233);
addRBMKRod(ModItems.billet_u235, ModItems.rbmk_fuel_heu235);
addRBMKRod(ModItems.billet_thorium_fuel, ModItems.rbmk_fuel_thmeu);
addRBMKRod(ModItems.billet_mox_fuel, ModItems.rbmk_fuel_mox);
addRBMKRod(ModItems.billet_plutonium_fuel, ModItems.rbmk_fuel_lep);
addRBMKRod(ModItems.billet_pu_mix, ModItems.rbmk_fuel_mep);
addRBMKRod(ModItems.billet_pu239, ModItems.rbmk_fuel_hep239);
addRBMKRod(ModItems.billet_pu241, ModItems.rbmk_fuel_hep241);
addRBMKRod(ModItems.billet_americium_fuel, ModItems.rbmk_fuel_lea);
addRBMKRod(ModItems.billet_am_mix, ModItems.rbmk_fuel_mea);
addRBMKRod(ModItems.billet_am241, ModItems.rbmk_fuel_hea241);
addRBMKRod(ModItems.billet_am242, ModItems.rbmk_fuel_hea242);
addRBMKRod(ModItems.billet_neptunium_fuel, ModItems.rbmk_fuel_men);
addRBMKRod(ModItems.billet_neptunium, ModItems.rbmk_fuel_hen);
addRBMKRod(ModItems.billet_po210be, ModItems.rbmk_fuel_po210be);
addRBMKRod(ModItems.billet_ra226be, ModItems.rbmk_fuel_ra226be);
addRBMKRod(ModItems.billet_pu238be, ModItems.rbmk_fuel_pu238be);
addRBMKRod(ModItems.billet_australium_lesser, ModItems.rbmk_fuel_leaus);
addRBMKRod(ModItems.billet_australium_greater, ModItems.rbmk_fuel_heaus);
addRBMKRod(ModItems.egg_balefire_shard, ModItems.rbmk_fuel_balefire);
addRBMKRod(ModItems.billet_les, ModItems.rbmk_fuel_les);
addRBMKRod(ModItems.billet_schrabidium_fuel, ModItems.rbmk_fuel_mes);
addRBMKRod(ModItems.billet_hes, ModItems.rbmk_fuel_hes);
addRBMKRod(ModItems.billet_balefire_gold, ModItems.rbmk_fuel_balefire_gold);
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rbmk_fuel_drx, 1), new Object[] { ModItems.rbmk_fuel_balefire, ModItems.particle_digamma });
//Water rods
@ -227,4 +228,57 @@ public class RodRecipes {
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.waste_schrabidium_hot, 2), new Object[] { ModItems.rod_dual_schrabidium_fuel_depleted });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.waste_schrabidium_hot, 4), new Object[] { ModItems.rod_quad_schrabidium_fuel_depleted });
}
//Fill rods with 6 nuggets
public static void addRod(Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, nugget, nugget, nugget, nugget, nugget, nugget });
}
//Fill rods with 12 nuggets
public static void addDualRod(Item ingot, Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, ingot, nugget, nugget, nugget });
}
//Fill rods with 24 nuggets
public static void addQuadRod(Item ingot, Item nugget, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, ingot, ingot, nugget, nugget, nugget, nugget, nugget, nugget });
}
//Fill rods with one billet
public static void addRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet });
}
//Fill rods with two billets
public static void addDualRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet });
}
//Fill rods with three billets
public static void addQuadRodBillet(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet });
}
//Fill rods with one billet + unload
public static void addRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_empty, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 1), new Object[] { out });
}
//Fill rods with two billets + unload
public static void addDualRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_dual_empty, billet, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 2), new Object[] { out });
}
//Fill rods with three billets + unload
public static void addQuadRodBilletUnload(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rod_quad_empty, billet, billet, billet, billet });
GameRegistry.addShapelessRecipe(new ItemStack(billet, 4), new Object[] { out });
}
//Fill rods with 6 nuggets
public static void addRBMKRod(Item billet, Item out) {
GameRegistry.addShapelessRecipe(new ItemStack(out), new Object[] { ModItems.rbmk_fuel_empty, billet, billet, billet, billet, billet, billet, billet, billet });
}
}

108
src/main/java/com/hbm/crafting/ToolRecipes.java
View File

@ -8,6 +8,7 @@ import com.hbm.items.machine.ItemBattery;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
@ -21,42 +22,43 @@ public class ToolRecipes {
public static void register() {
//Regular tools
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_sword, 1), new Object[] { "I", "I", "S", 'I', "ingotSteel", '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 ShapedOreRecipe(new ItemStack(ModItems.steel_axe, 1), new Object[] { "II", "IS", " S", 'I', "ingotSteel", '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 ShapedOreRecipe(new ItemStack(ModItems.steel_hoe, 1), new Object[] { "II", " S", " S", 'I', "ingotSteel", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_titanium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_titanium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_titanium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_titanium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.titanium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_titanium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_cobalt, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_cobalt, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_cobalt, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_cobalt, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_cobalt, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.alloy_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_advanced_alloy, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.alloy_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_advanced_alloy, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.alloy_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_advanced_alloy, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.alloy_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_advanced_alloy, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.alloy_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_advanced_alloy, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cmb_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cmb_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_combine_steel, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cmb_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cmb_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.cmb_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick });
addSword( "ingotSteel", ModItems.steel_sword);
addPickaxe( "ingotSteel", ModItems.steel_pickaxe);
addAxe( "ingotSteel", ModItems.steel_axe);
addShovel( "ingotSteel", ModItems.steel_shovel);
addHoe( "ingotSteel", ModItems.steel_hoe);
addSword( "ingotTitanium", ModItems.titanium_sword);
addPickaxe( "ingotTitanium", ModItems.titanium_pickaxe);
addAxe( "ingotTitanium", ModItems.titanium_axe);
addShovel( "ingotTitanium", ModItems.titanium_shovel);
addHoe( "ingotTitanium", ModItems.titanium_hoe);
addSword( "ingotCobalt", ModItems.cobalt_sword);
addPickaxe( "ingotCobalt", ModItems.cobalt_pickaxe);
addAxe( "ingotCobalt", ModItems.cobalt_axe);
addShovel( "ingotCobalt", ModItems.cobalt_shovel);
addHoe( "ingotCobalt", ModItems.cobalt_hoe);
addSword( ModItems.ingot_advanced_alloy, ModItems.alloy_sword);
addPickaxe( ModItems.ingot_advanced_alloy, ModItems.alloy_pickaxe);
addAxe( ModItems.ingot_advanced_alloy, ModItems.alloy_axe);
addShovel( ModItems.ingot_advanced_alloy, ModItems.alloy_shovel);
addHoe( ModItems.ingot_advanced_alloy, ModItems.alloy_shovel);
addSword( ModItems.ingot_combine_steel, ModItems.cmb_sword);
addPickaxe( ModItems.ingot_combine_steel, ModItems.cmb_pickaxe);
addAxe( ModItems.ingot_combine_steel, ModItems.cmb_axe);
addShovel( ModItems.ingot_combine_steel, ModItems.cmb_shovel);
addHoe( ModItems.ingot_combine_steel, ModItems.cmb_hoe);
addSword( "ingotDesh", ModItems.desh_sword);
addPickaxe( "ingotDesh", ModItems.desh_pickaxe);
addAxe( "ingotDesh", ModItems.desh_pickaxe);
addShovel( "ingotDesh", ModItems.desh_shovel);
addHoe( "ingotDesh", ModItems.desh_hoe);
GameRegistry.addRecipe(new ItemStack(ModItems.elec_sword, 1), new Object[] { "RPR", "RPR", " B ", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium });
GameRegistry.addRecipe(new ItemStack(ModItems.elec_pickaxe, 1), new Object[] { "RDM", " PB", " P ", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium });
GameRegistry.addRecipe(new ItemStack(ModItems.elec_axe, 1), new Object[] { " DP", "RRM", " PB", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium });
GameRegistry.addRecipe(new ItemStack(ModItems.elec_shovel, 1), new Object[] { " P", "RRM", " B", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_lithium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.centri_stick, 1), new Object[] { ModItems.centrifuge_element, ModItems.energy_core, Items.stick });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.smashing_hammer, 1), new Object[] { "STS", "SPS", " P ", 'S', "blockSteel", 'T', "blockTungsten", 'P', "ingotPolymer" }));
GameRegistry.addRecipe(new ItemStack(ModItems.desh_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_desh, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.desh_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_desh, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.desh_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_desh, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.desh_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_desh, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.desh_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_desh, 'S', Items.stick });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.meteorite_sword, 1), new Object[] { " B", "GB ", "SG ", 'B', ModItems.blade_meteorite, 'G', "plateGold", 'S', Items.stick }));
GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_decorated_sword, 1), new Object[] { " I ", " I ", "SBS", 'I', ModItems.ingot_cobalt, 'S', ModItems.ingot_meteorite_forged, 'B', ModItems.cobalt_sword });
@ -136,11 +138,11 @@ public class ToolRecipes {
//Configged
if(GeneralConfig.enableBabyMode) {
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "III", " S ", " 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_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick });
addSword( "ingotSchrabidium", ModItems.schrabidium_sword);
addPickaxe( "ingotSchrabidium", ModItems.schrabidium_pickaxe);
addAxe( "ingotSchrabidium", ModItems.schrabidium_axe);
addShovel( "ingotSchrabidium", ModItems.schrabidium_shovel);
addHoe( "ingotSchrabidium", ModItems.schrabidium_hoe);
} else {
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', ModBlocks.block_schrabidium, 'W', ModItems.desh_sword, 'S', ModItems.ingot_polymer });
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', ModItems.ingot_polymer });
@ -149,4 +151,40 @@ public class ToolRecipes {
GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', ModItems.ingot_schrabidium, 'W', ModItems.desh_hoe, 'S', ModItems.ingot_polymer });
}
}
//Common wrappers
public static void addSword(Object ingot, Item sword) {
addTool(ingot, sword, patternSword);
}
public static void addPickaxe(Object ingot, Item pick) {
addTool(ingot, pick, patternPick);
}
public static void addAxe(Object ingot, Item axe) {
addTool(ingot, axe, patternAxe);
}
public static void addShovel(Object ingot, Item shovel) {
addTool(ingot, shovel, patternShovel);
}
public static void addHoe(Object ingot, Item hoe) {
addTool(ingot, hoe, patternHoe);
}
//Generic, pattern-driven
public static void addTool(Object ingot, Item tool, String[] pattern) {
if(ingot instanceof Item) addToolRec(ingot, tool, pattern);
if(ingot instanceof ItemStack) addToolRec(ingot, tool, pattern);
if(ingot instanceof String) addToolDict(ingot, tool, pattern);
}
public static void addToolRec(Object ingot, Item tool, String[] pattern) {
GameRegistry.addRecipe(new ItemStack(tool), new Object[] { pattern, 'X', ingot, '#', Items.stick });
}
public static void addToolDict(Object ingot, Item tool, String[] pattern) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(tool), new Object[] { pattern, 'X', ingot, '#', Items.stick }));
}
public static final String[] patternSword = new String[] {"X", "X", "#"};
public static final String[] patternPick = new String[] {"XXX", " # ", " # "};
public static final String[] patternAxe = new String[] {"XX", "X#", " #"};
public static final String[] patternShovel = new String[] {"X", "#", "#"};
public static final String[] patternHoe = new String[] {"XX", " #", " #"};
}

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

@ -731,7 +731,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModBlocks.reactor_conductor, 1), new AStack[] {new OreDictStack("ingotSteel", 4), new OreDictStack("plateCopper", 12), new ComparableStack(ModItems.wire_tungsten, 4), },130);
makeRecipe(new ComparableStack(ModBlocks.reactor_computer, 1), new AStack[] {new ComparableStack(ModBlocks.reactor_conductor, 2), new ComparableStack(ModItems.circuit_targeting_tier3, 4), new ComparableStack(ModItems.circuit_gold, 1), },250);
makeRecipe(new ComparableStack(ModBlocks.machine_radgen, 1), new AStack[] {new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 32), new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new ComparableStack(ModItems.wire_magnetized_tungsten, 24), new ComparableStack(ModItems.circuit_gold, 4), new ComparableStack(ModItems.reactor_core, 3), new ComparableStack(ModItems.ingot_starmetal, 1), new OreDictStack("dyeRed", 1), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_reactor, 1), new AStack[] {new ComparableStack(ModItems.reactor_core, 1), new OreDictStack("ingotSteel", 12), new OreDictStack("plateLead", 16), new ComparableStack(ModBlocks.reinforced_glass, 4), new ComparableStack(ModItems.ingot_asbestos, 4)},150);
makeRecipe(new ComparableStack(ModBlocks.machine_reactor, 1), new AStack[] {new ComparableStack(ModItems.reactor_core, 1), new OreDictStack("ingotSteel", 12), new OreDictStack("plateLead", 16), new ComparableStack(ModBlocks.reinforced_glass, 4), new ComparableStack(ModItems.ingot_asbestos, 4), new ComparableStack(ModItems.ingot_tcalloy, 4)},150);
makeRecipe(new ComparableStack(ModBlocks.machine_reactor_small, 1), new AStack[] {new OreDictStack("ingotSteel", 6), new ComparableStack(ModItems.ingot_polymer, 4), new OreDictStack("plateLead", 8), new OreDictStack("plateCopper", 4), new OreDictStack("ingotLead", 12), new OreDictStack("ingotMingrade", 6), new ComparableStack(ModItems.circuit_copper, 8), new ComparableStack(ModItems.circuit_red_copper, 4), },300);
} else {

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

@ -1695,7 +1695,7 @@ public class MachineRecipes {
break;
case UF6:
list.add(new ItemStack(ModItems.powder_yellowcake, 1));
list.add(new ItemStack(ModItems.fluorite, 3));
list.add(new ItemStack(ModItems.fluorite, 1));
break;
case PUF6:
list.add(new ItemStack(ModItems.powder_plutonium, 1));

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

@ -3697,7 +3697,7 @@ public class ModItems {
missile_drill = new Item().setUnlocalizedName("missile_drill").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_drill");
missile_nuclear = new Item().setUnlocalizedName("missile_nuclear").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_nuclear");
missile_nuclear_cluster = new Item().setUnlocalizedName("missile_nuclear_cluster").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_nuclear_cluster");
missile_volcano = new Item().setUnlocalizedName("missile_volcano").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_volcano");
missile_volcano = new ItemCustomLore().setUnlocalizedName("missile_volcano").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_volcano");
missile_endo = new Item().setUnlocalizedName("missile_endo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_endo");
missile_exo = new Item().setUnlocalizedName("missile_exo").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_exo");
missile_doomsday = new Item().setUnlocalizedName("missile_doomsday").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_doomsday");

5
src/main/java/com/hbm/lib/HbmChestContents.java
View File

@ -73,7 +73,6 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.gas_mask_filter, 0, 1, 1, 2) };
private static WeightedRandomChestContent[] expensive = new WeightedRandomChestContent[] {
new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.chlorine_pinwheel, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.circuit_targeting_tier3, 0, 1, 1, 4),
new WeightedRandomChestContent(ModItems.circuit_gold, 0, 1, 2, 3),
@ -282,8 +281,7 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.gun_revolver_pip, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.clip_revolver_pip, 0, 2, 4, 1),
new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 18, 32, 1),
new WeightedRandomChestContent(ModItems.circuit_gold, 0, 6, 12, 1),
new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 6, 12, 1) };
new WeightedRandomChestContent(ModItems.circuit_gold, 0, 6, 12, 1) };
private static WeightedRandomChestContent[] vault4 = new WeightedRandomChestContent[] {
new WeightedRandomChestContent(ModItems.ammo_container, 0, 3, 6, 1),
@ -294,7 +292,6 @@ public class HbmChestContents {
new WeightedRandomChestContent(ModItems.gun_proto, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.gun_b92, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.ingot_combine_steel, 0, 16, 28, 1),
new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 8, 18, 1),
new WeightedRandomChestContent(ModItems.man_core, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.boy_kit, 0, 1, 1, 1),
new WeightedRandomChestContent(ModItems.nuke_starter_kit, 0, 1, 1, 1),

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

@ -161,6 +161,7 @@ public class ClientProxy extends ServerProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineChemplant.class, new RenderChemplant());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineFluidTank.class, new RenderFluidTank());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineBAT9000.class, new RenderBAT9000());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineOrbus.class, new RenderOrbus());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRefinery.class, new RenderRefinery());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachinePumpjack.class, new RenderPumpjack());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineTurbofan.class, new RenderTurbofan());

3
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -222,7 +222,7 @@ public class MainRegistry {
startupTime = System.currentTimeMillis();
logger.info("TEST LOG AAAAAAAAAA");
logger.info("Let us celebrate the fact that the logger finally works again!");
// Reroll Polaroid
@ -483,6 +483,7 @@ public class MainRegistry {
GameRegistry.registerTileEntity(TileEntityCableBaseNT.class, "tileentity_ohgod");
GameRegistry.registerTileEntity(TileEntityWatz.class, "tileentity_watz");
GameRegistry.registerTileEntity(TileEntityMachineBAT9000.class, "tileentity_bat9000");
GameRegistry.registerTileEntity(TileEntityMachineOrbus.class, "tileentity_orbus");
GameRegistry.registerTileEntity(TileEntityRBMKRod.class, "tileentity_rbmk_rod");
GameRegistry.registerTileEntity(TileEntityRBMKRodReaSim.class, "tileentity_rbmk_rod_reasim");

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

@ -69,6 +69,7 @@ public class ResourceManager {
//Tank
public static final IModelCustom fluidtank = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/fluidtank.obj"));
public static final IModelCustom bat9000 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/bat9000.obj"));
public static final IModelCustom orbus = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/orbus.obj"));
//Turbofan
public static final IModelCustom turbofan_body = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/turbofan_body.obj"));
@ -322,6 +323,7 @@ public class ResourceManager {
public static final ResourceLocation tank_tex = new ResourceLocation(RefStrings.MODID, "textures/models/tank.png");
public static final ResourceLocation tank_label_tex = new ResourceLocation(RefStrings.MODID, "textures/models/tank_NONE.png");
public static final ResourceLocation bat9000_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/bat9000.png");
public static final ResourceLocation orbus_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/orbus.png");
//Turbofan
public static final ResourceLocation turbofan_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/turbofan_body.png");

1
src/main/java/com/hbm/render/entity/mob/RenderUFO.java
View File

@ -2,7 +2,6 @@ package com.hbm.render.entity.mob;
import org.lwjgl.opengl.GL11;
import com.hbm.entity.mob.EntityHunterChopper;
import com.hbm.entity.mob.EntityUFO;
import com.hbm.main.ResourceManager;
import com.hbm.render.util.BeamPronter;

72
src/main/java/com/hbm/render/tileentity/RenderOrbus.java Normal file
View File

@ -0,0 +1,72 @@
package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.main.ResourceManager;
import com.hbm.render.util.BeamPronter;
import com.hbm.render.util.BeamPronter.EnumBeamType;
import com.hbm.render.util.BeamPronter.EnumWaveType;
import com.hbm.tileentity.machine.TileEntityMachineOrbus;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Vec3;
public class RenderOrbus extends TileEntitySpecialRenderer {
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float interp) {
TileEntityMachineOrbus orbus = (TileEntityMachineOrbus) te;
GL11.glPushMatrix();
GL11.glTranslated(x, y, z);
switch(te.getBlockMetadata() - BlockDummyable.offset) {
case 2:
GL11.glTranslated(1F, 0F, 1F); break;
case 4:
GL11.glTranslated(1F, 0F, 0F); break;
case 3:
GL11.glTranslated(0F, 0F, 0F); break;
case 5:
GL11.glTranslated(0F, 0F, 1F); break;
}
double scale = (double)orbus.tank.getFill() / (double)orbus.tank.getMaxFill();
if(orbus.tank.getFill() > 0) {
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_TEXTURE_2D);
int c = orbus.tank.getTankType().getColor();
GL11.glColor3ub((byte)((c & 0xff0000) >> 16), (byte)((c & 0x00ff00) >> 8), (byte)((c & 0x0000ff)));
GL11.glPushMatrix();
GL11.glTranslated(0, 2.5D + Math.sin(((te.getWorldObj().getTotalWorldTime() + interp) * 0.1D) % (Math.PI * 2D)) * 0.125 * scale, 0);
GL11.glScaled(scale, scale, scale);
ResourceManager.sphere_uv.renderAll();
GL11.glPopMatrix();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glEnable(GL11.GL_TEXTURE_2D);
}
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.orbus_tex);
GL11.glShadeModel(GL11.GL_SMOOTH);
ResourceManager.orbus.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
if(orbus.tank.getFill() > 0) {
GL11.glTranslated(0, 1, 0);
BeamPronter.prontBeam(Vec3.createVectorHelper(0, 3, 0), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0x101020, 0x101020, 0, 1, 0F, 6, (float)scale * 0.5F);
BeamPronter.prontBeam(Vec3.createVectorHelper(0, 3, 0), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0x202060, 0x202060, (int)(te.getWorldObj().getTotalWorldTime() / 2) % 1000, 6, (float)scale, 2, 0.0625F * (float)scale);
BeamPronter.prontBeam(Vec3.createVectorHelper(0, 3, 0), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0x202060, 0x202060, (int)(te.getWorldObj().getTotalWorldTime() / 4) % 1000, 6, (float)scale, 2, 0.0625F * (float)scale);
}
GL11.glPopMatrix();
}
}

59
src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java Normal file
View File

@ -0,0 +1,59 @@
package com.hbm.tileentity.machine;
import com.hbm.handler.FluidTypeHandler.FluidType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.AxisAlignedBB;
public class TileEntityMachineOrbus extends TileEntityBarrel {
public TileEntityMachineOrbus() {
super(512000);
}
@Override
public String getName() {
return "container.orbus";
}
@Override
public void checkFluidInteraction() { } //NO!
@Override
public void fillFluidInit(FluidType type) {
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord + 3, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord + 3, getTact(), type);
fillFluid(this.xCoord + 1, this.yCoord, this.zCoord - 3, getTact(), type);
fillFluid(this.xCoord - 1, this.yCoord, this.zCoord - 3, getTact(), type);
fillFluid(this.xCoord + 3, this.yCoord, this.zCoord + 1, getTact(), type);
fillFluid(this.xCoord - 3, this.yCoord, this.zCoord + 1, getTact(), type);
fillFluid(this.xCoord + 3, this.yCoord, this.zCoord - 1, getTact(), type);
fillFluid(this.xCoord - 3, this.yCoord, this.zCoord - 1, getTact(), type);
}
AxisAlignedBB bb = null;
@Override
public AxisAlignedBB getRenderBoundingBox() {
if(bb == null) {
bb = AxisAlignedBB.getBoundingBox(
xCoord - 2,
yCoord,
zCoord - 2,
xCoord + 2,
yCoord + 5,
zCoord + 2
);
}
return bb;
}
@Override
@SideOnly(Side.CLIENT)
public double getMaxRenderDistanceSquared() {
return 65536.0D;
}
}

6
src/main/java/com/hbm/world/dungeon/Factory.java
View File

@ -20,7 +20,7 @@ import net.minecraft.world.gen.feature.WorldGenerator;
public class Factory extends WorldGenerator
{
Block Block1 = ModBlocks.steel_scaffold;
Block Block2 = ModBlocks.machine_difurnace_off;
Block Block2 = ModBlocks.red_barrel;
Block Block3 = ModBlocks.factory_titanium_core;
Block Block4 = ModBlocks.steel_wall;
Block Block5 = ModBlocks.reinforced_light;
@ -701,13 +701,13 @@ public class Factory extends WorldGenerator
world.setBlock(x + 3, y + 0, z + 20, Blocks.stone_brick_stairs, 0, 3);
world.setBlock(x + 4, y + 0, z + 20, Blocks.iron_block, 0, 3);
world.setBlock(x + 5, y + 0, z + 20, Blocks.stone_brick_stairs, 1, 3);
world.setBlock(x + 7, y + 0, z + 20, Blocks.anvil, 0, 3);
world.setBlock(x + 7, y + 0, z + 20, ModBlocks.anvil_iron, 4, 3);
world.setBlock(x + 14, y + 0, z + 20, Blocks.stonebrick, 0, 3);
world.setBlock(x + 0, y + 0, z + 21, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 0, z + 21, Blocks.stone_brick_stairs, 0, 3);
world.setBlock(x + 4, y + 0, z + 21, Blocks.iron_block, 0, 3);
world.setBlock(x + 5, y + 0, z + 21, Blocks.stone_brick_stairs, 1, 3);
world.setBlock(x + 7, y + 0, z + 21, Blocks.anvil, 0, 3);
world.setBlock(x + 7, y + 0, z + 21, ModBlocks.anvil_iron, 4, 3);
world.setBlock(x + 14, y + 0, z + 21, Blocks.stonebrick, 0, 3);
world.setBlock(x + 0, y + 0, z + 22, Blocks.stonebrick, 0, 3);
world.setBlock(x + 3, y + 0, z + 22, Blocks.stone_brick_stairs, 0, 3);

8
src/main/java/com/hbm/world/dungeon/Relay.java
View File

@ -794,7 +794,7 @@ public class Relay extends WorldGenerator
world.setBlock(x + 3, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 5, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 6, y + 2, z + 0, Blocks.anvil, 3, 3);
world.setBlock(x + 6, y + 2, z + 0, ModBlocks.deco_steel, 3, 3);
world.setBlock(x + 7, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 8, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 9, y + 2, z + 0, ModBlocks.barbed_wire, 0, 3);
@ -839,7 +839,7 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 2, z + 7, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 7, Block2, 0, 3);
world.setBlock(x + 8, y + 2, z + 7, Block2, 0, 3);
world.setBlock(x + 10, y + 2, z + 7, Blocks.anvil, 0, 3);
world.setBlock(x + 10, y + 2, z + 7, ModBlocks.deco_steel, 0, 3);
world.setBlock(x + 0, y + 2, z + 8, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 3, y + 2, z + 8, ModBlocks.fence_metal, 0, 3);
world.setBlock(x + 4, y + 2, z + 8, ModBlocks.fence_metal, 0, 3);
@ -847,7 +847,7 @@ public class Relay extends WorldGenerator
world.setBlock(x + 6, y + 2, z + 8, Block2, 0, 3);
world.setBlock(x + 7, y + 2, z + 8, Block2, 0, 3);
world.setBlock(x + 8, y + 2, z + 8, Block2, 0, 3);
world.setBlock(x + 10, y + 2, z + 8, Blocks.anvil, 0, 3);
world.setBlock(x + 10, y + 2, z + 8, ModBlocks.deco_steel, 0, 3);
world.setBlock(x + 0, y + 2, z + 9, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 9, Blocks.brick_block, 0, 3);
world.setBlock(x + 5, y + 2, z + 9, Blocks.brick_block, 0, 3);
@ -889,7 +889,7 @@ public class Relay extends WorldGenerator
world.setBlock(x + 2, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 3, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 4, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 5, y + 2, z + 15, Blocks.anvil, 1, 3);
world.setBlock(x + 5, y + 2, z + 15, ModBlocks.deco_steel, 1, 3);
world.setBlock(x + 6, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 7, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);
world.setBlock(x + 8, y + 2, z + 15, ModBlocks.barbed_wire, 0, 3);

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

@ -1211,6 +1211,7 @@ item.gas_mask_mono.name=Kohlenstoffmonoxidmaske
item.gas_petroleum.name=Petroleumgastank
item.geiger_counter.name=Mobiler Geigerzähler
item.gem_tantalium.name=Tantal-Polykristall
item.gem_volcanic.name=Vulkanischer Edelstein
item.generator_front.name=Generatorfront
item.generator_steel.name=Generator
item.glitch.name=Glitch
@ -2596,6 +2597,7 @@ tile.basalt.name=Basalt
tile.basalt_asbestos.name=Asbestreicher Basalt
tile.basalt_brick.name=Basaltziegel
tile.basalt_fluorite.name=Fluoritreicher Basalt
tile.basalt_gem.name=Edelsteinreicher Basalt
tile.basalt_polished.name=Polierter Basalt
tile.basalt_smooth.name=Glatter Basalt
tile.basalt_sulfur.name=Schwefelreicher Basalt
@ -3233,6 +3235,7 @@ tile.vent_cloud.name=Wolken-Auslass
tile.vent_pink_cloud.name=Pinker Wolken-Auslass
tile.vitrified_barrel.name=Fass voll vitrifiziertem Atommüll
tile.volcano_core.name=Vulkankern
item.missile_volcano.desc=Mit der Kraft von Kernwaffen können wir einen Vulkan beschwören!
tile.volcanic_lava_block.name=Vulkanische Lava
tile.waste_earth.name=Totes Gras
tile.waste_log.name=Verkohltes Holz

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

@ -1279,6 +1279,7 @@ item.gas_mask_mono.name=Carbon Monoxide Mask
item.gas_petroleum.name=Petroleum Gas Tank
item.geiger_counter.name=Handheld Geiger Counter
item.gem_tantalium.name=Tantalium Polycrystal
item.gem_volcanic.name=Volcanic Gem
item.generator_front.name=Generator Front
item.generator_steel.name=Generator Body
item.glitch.name=Glitch
@ -1696,6 +1697,7 @@ item.missile_soyuz_lander.name=Orbital Module
item.missile_strong.name=Strong HE Missile
item.missile_taint.name=Taint-Tipped Missile
item.missile_volcano.name=Tectonic Missile
item.missile_volcano.desc=Using the power of nuclear explosives, we can summon a volcano!
item.morning_glory.name=Morning Glory
item.motor.name=Motor
item.motor_desh.name=Desh Motor
@ -2662,6 +2664,7 @@ tile.basalt.name=Basalt
tile.basalt_asbestos.name=Asbestos-Rich Basalt
tile.basalt_brick.name=Basalt Bricks
tile.basalt_fluorite.name=Fluorite-Rich Basalt
tile.basalt_gem.name=Gem-Rich Basalt
tile.basalt_polished.name=Polished Basalt
tile.basalt_smooth.name=Smooth Basalt
tile.basalt_sulfur.name=Sulfur-Rich Basalt

6129
src/main/resources/assets/hbm/models/machines/orbus.obj Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
src/main/resources/assets/hbm/textures/models/machines/orbus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 24 KiB