diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 6a45a6a48..e8b7417e0 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -29,6 +29,10 @@ achievement.space=Die finale Grenz-ach vergiss es achievement.space.desc=Scheitere in jeder möglichen Weise und verschwende 90 Millionen Dollar an Forschungsgeldern. achievement.FOEQ=Pegasi und Raketensilos achievement.FOEQ.desc=Sende ein Relais in den Mars-...ich meine Duna-Orbit. +achievement.fiend=Unhold +achievement.fiend.desc=Sei gemein. +achievement.fiend2=Unhold 2: Noch unholdiger +achievement.fiend2.desc=Sei gemeiner. potion.hbm_taint=Verdorben potion.hbm_mutation=Verdorbenes Herz @@ -1014,6 +1018,7 @@ item.mike_kit.name=Ivy Mike Kit item.tsar_kit.name=Tsar Bomba Kit item.fleija_kit.name=F.L.E.I.J.A. Kit item.multi_kit.name=Mehrzweckbomben Kit +item.custom_kit.name=Anpassbare Bombe-Kit item.grenade_kit.name=Granaten Kit item.nuke_electric_kit.name=Kit des Elektronikingenieurs item.prototype_kit.name=Prototyp Kit @@ -1626,6 +1631,9 @@ item.cap_fritz.name=Fritz-Kola Kronkorken item.cap_sunset.name=Sunset Sarsaparilla Kronkorken item.ring_pull.name=Dosenring +item.canteen_13.name=Vault 13 Kantine +item.canteen_vodka.name=Stylischer Flachmann + item.bottle_opener.name=Hbms eigener selbstgebauter Flaschenöffner item.blades_aluminium.name=Aluminiumsägeblatt diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 954bd0019..6c655d968 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -29,6 +29,10 @@ achievement.space=The Final Front-ah forget it achievement.space.desc=Fail in every way possible and waste funds worth 90 million dollars. achievement.FOEQ=Pegasi and Missile Silos achievement.FOEQ.desc=Send a relay into martian...I mean dunaian orbit. +achievement.fiend=Delinquent +achievement.fiend.desc=Be mean. +achievement.fiend2=Delinquent 2: Delinquent Harder +achievement.fiend2.desc=Be meaner. potion.hbm_taint=Tainted potion.hbm_mutation=Tainted Heart @@ -1014,6 +1018,7 @@ item.mike_kit.name=Ivy Mike Kit item.tsar_kit.name=Tsar Bomba Kit item.fleija_kit.name=F.L.E.I.J.A. Kit item.multi_kit.name=Multi Purpose Bomb Kit +item.custom_kit.name=Custom Nuke Kit item.grenade_kit.name=Grenade Kit item.nuke_electric_kit.name=Electronic Engineer's Kit item.prototype_kit.name=Prototype Kit @@ -1626,6 +1631,9 @@ item.cap_fritz.name=Fritz Cola Bottle Cap item.cap_sunset.name=Sunset Sarsaparilla Bottle Cap item.ring_pull.name=Ring Pull +item.canteen_13.name=Vault 13 Canteen +item.canteen_vodka.name=Stylish Flask + item.bottle_opener.name=Hbm's Own Self-Made Bottle Opener item.blades_aluminium.name=Aluminium Shredder Blades diff --git a/assets/hbm/textures/items/canteen_13.png b/assets/hbm/textures/items/canteen_13.png new file mode 100644 index 000000000..b053a464b Binary files /dev/null and b/assets/hbm/textures/items/canteen_13.png differ diff --git a/assets/hbm/textures/items/canteen_vodka.png b/assets/hbm/textures/items/canteen_vodka.png new file mode 100644 index 000000000..2ddf40de4 Binary files /dev/null and b/assets/hbm/textures/items/canteen_vodka.png differ diff --git a/assets/hbm/textures/items/custom_kit.png b/assets/hbm/textures/items/custom_kit.png new file mode 100644 index 000000000..e30361c34 Binary files /dev/null and b/assets/hbm/textures/items/custom_kit.png differ diff --git a/assets/hbm/textures/models/CapeRed.png b/assets/hbm/textures/models/CapeRed.png index a91fdab4c..bfdb63ef0 100644 Binary files a/assets/hbm/textures/models/CapeRed.png and b/assets/hbm/textures/models/CapeRed.png differ diff --git a/assets/hbm/textures/models/CapeRed_old.png b/assets/hbm/textures/models/CapeRed_old.png new file mode 100644 index 000000000..a91fdab4c Binary files /dev/null and b/assets/hbm/textures/models/CapeRed_old.png differ diff --git a/com/hbm/entity/logic/EntityBomber.java b/com/hbm/entity/logic/EntityBomber.java index cede2c94b..ba3546a33 100644 --- a/com/hbm/entity/logic/EntityBomber.java +++ b/com/hbm/entity/logic/EntityBomber.java @@ -114,8 +114,8 @@ public class EntityBomber extends Entity implements IChunkLoader { } } - //if(this.ticksExisted > timer) - // this.setDead(); + if(this.ticksExisted > timer) + this.setDead(); if(!worldObj.isRemote && this.health > 0 && this.ticksExisted > bombStart && this.ticksExisted < bombStop && this.ticksExisted % bombRate == 0) { @@ -150,12 +150,8 @@ public class EntityBomber extends Entity implements IChunkLoader { Vec3 vector = Vec3.createVectorHelper(world.rand.nextDouble() - 0.5, 0, world.rand.nextDouble() - 0.5); vector = vector.normalize(); - vector.xCoord *= 2; - vector.zCoord *= 2; - - /*this.posX = ; - this.posY = ; - this.posZ = ;*/ + vector.xCoord *= MainRegistry.enableBomberShortMode ? 1 : 2; + vector.zCoord *= MainRegistry.enableBomberShortMode ? 1 : 2; this.setLocationAndAngles(x - vector.xCoord * 100, y + 50, z - vector.zCoord * 100, 0.0F, 0.0F); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 1ad6035aa..57706da0f 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -849,6 +849,9 @@ public class ModItems { public static Item med_ipecac; public static Item med_ptsd; public static Item med_schizophrenia; + + public static Item canteen_13; + public static Item canteen_vodka; public static Item defuser; @@ -1135,6 +1138,7 @@ public class ModItems { public static Item mike_kit; public static Item tsar_kit; public static Item multi_kit; + public static Item custom_kit; public static Item grenade_kit; public static Item fleija_kit; public static Item prototype_kit; @@ -2105,6 +2109,8 @@ public class ModItems { loops = new ItemLemon(4, 5, false).setUnlocalizedName("loops").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loops"); loop_stew = new ItemLemon(10, 10, false).setUnlocalizedName("loop_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loop_stew"); fooditem = new ItemLemon(2, 5, false).setUnlocalizedName("fooditem").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fooditem"); + canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); + canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); defuser = new Item().setUnlocalizedName("defuser").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":defuser"); @@ -2247,6 +2253,7 @@ public class ModItems { mike_kit = new ItemStarterKit().setUnlocalizedName("mike_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":mike_kit"); tsar_kit = new ItemStarterKit().setUnlocalizedName("tsar_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tsar_kit"); multi_kit = new ItemStarterKit().setUnlocalizedName("multi_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multi_kit"); + custom_kit = new ItemStarterKit().setUnlocalizedName("custom_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":custom_kit"); grenade_kit = new ItemStarterKit().setUnlocalizedName("grenade_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":grenade_kit"); fleija_kit = new ItemStarterKit().setUnlocalizedName("fleija_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fleija_kit"); prototype_kit = new ItemStarterKit().setUnlocalizedName("prototype_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":prototype_kit"); @@ -3672,6 +3679,8 @@ public class ModItems { GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName()); GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); //GameRegistry.registerItem(med_schizophrenia, med_schizophrenia.getUnlocalizedName()); + GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName()); + GameRegistry.registerItem(canteen_vodka, canteen_vodka.getUnlocalizedName()); //Energy Drinks GameRegistry.registerItem(can_empty, can_empty.getUnlocalizedName()); @@ -3860,6 +3869,7 @@ public class ModItems { GameRegistry.registerItem(fleija_kit, fleija_kit.getUnlocalizedName()); GameRegistry.registerItem(solinium_kit, solinium_kit.getUnlocalizedName()); GameRegistry.registerItem(multi_kit, multi_kit.getUnlocalizedName()); + GameRegistry.registerItem(custom_kit, custom_kit.getUnlocalizedName()); GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName()); GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName()); GameRegistry.registerItem(t45_kit, t45_kit.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemCanteen.java b/com/hbm/items/food/ItemCanteen.java new file mode 100644 index 000000000..b85a52b03 --- /dev/null +++ b/com/hbm/items/food/ItemCanteen.java @@ -0,0 +1,96 @@ +package com.hbm.items.food; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.main.MainRegistry; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +public class ItemCanteen extends Item { + + public ItemCanteen(int cooldown) { + + this.setMaxDamage(cooldown); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + + if (stack.getItemDamage() > 0) + stack.setItemDamage(stack.getItemDamage() - 1); + } + + @Override + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + stack.setItemDamage(stack.getMaxDamage()); + + if (this == ModItems.canteen_13) { + player.heal(5F); + } + if (this == ModItems.canteen_vodka) { + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0)); + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 2)); + } + + return stack; + } + + @Override + public int getMaxItemUseDuration(ItemStack p_77626_1_) { + return 10; + } + + @Override + public EnumAction getItemUseAction(ItemStack p_77661_1_) { + return EnumAction.drink; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 0) + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + + return stack; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) + { + if(this == ModItems.canteen_13) + { + list.add("Cooldown: 1 minute"); + list.add("Restores 2.5 hearts"); + list.add(""); + + if(MainRegistry.polaroidID == 11) + list.add("You sip a sip from your trusty Vault 13 SIPPP"); + else + list.add("You take a sip from your trusty Vault 13 canteen."); + } + if(this == ModItems.canteen_vodka) + { + list.add("Cooldown: 3 minutes"); + list.add("Nausea I for 10 seconds"); + list.add("Strength III for 30 seconds"); + list.add(""); + + if(MainRegistry.polaroidID == 11) + //list.add("Why sipp when you can succ?"); + list.add("Time to get hammered & sickled!"); + else + list.add("Smells like desinfectant, tastes like desinfectant."); + } + } + +} diff --git a/com/hbm/items/gear/WeaponSpecial.java b/com/hbm/items/gear/WeaponSpecial.java index 7ad0cec3a..d126030a8 100644 --- a/com/hbm/items/gear/WeaponSpecial.java +++ b/com/hbm/items/gear/WeaponSpecial.java @@ -6,8 +6,10 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityRubble; import com.hbm.items.ModItems; +import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -172,6 +174,18 @@ public class WeaponSpecial extends ItemSword { return multimap; } + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + + if(entity instanceof EntityPlayer) { + if(Library.checkForFiend((EntityPlayer) entity)) { + ((EntityPlayer) entity).triggerAchievement(MainRegistry.achFiend); + } else if(Library.checkForFiend2((EntityPlayer) entity)) { + ((EntityPlayer) entity).triggerAchievement(MainRegistry.achFiend2); + } + } + } + @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { diff --git a/com/hbm/items/special/ItemStarterKit.java b/com/hbm/items/special/ItemStarterKit.java index 2cb211784..0715f5a7f 100644 --- a/com/hbm/items/special/ItemStarterKit.java +++ b/com/hbm/items/special/ItemStarterKit.java @@ -389,6 +389,29 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_gas, 2)); } + if(this == ModItems.custom_kit) + { + player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.nuke_custom)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_tnt, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_nuke, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_nuke, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_nuke, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_nuke, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_hydro, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_hydro, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_amat, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_amat, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_dirty, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_dirty, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_dirty, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_schrab, 1)); + } + if(this == ModItems.grenade_kit) { player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_generic, 16)); diff --git a/com/hbm/items/tool/ItemTurretBiometry.java b/com/hbm/items/tool/ItemTurretBiometry.java index e0ee3ef4a..025a91659 100644 --- a/com/hbm/items/tool/ItemTurretBiometry.java +++ b/com/hbm/items/tool/ItemTurretBiometry.java @@ -1,5 +1,6 @@ package com.hbm.items.tool; +import java.util.Arrays; import java.util.List; import com.hbm.blocks.bomb.TurretBase; @@ -12,7 +13,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import scala.actors.threadpool.Arrays; public class ItemTurretBiometry extends Item { diff --git a/com/hbm/items/tool/ItemTurretChip.java b/com/hbm/items/tool/ItemTurretChip.java index aa8f2a808..4839c0e9e 100644 --- a/com/hbm/items/tool/ItemTurretChip.java +++ b/com/hbm/items/tool/ItemTurretChip.java @@ -3,8 +3,6 @@ package com.hbm.items.tool; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; - import com.hbm.blocks.bomb.TurretBase; import com.hbm.tileentity.bomb.TileEntityTurretBase; diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 782b757f1..be7e7a63f 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -327,6 +327,24 @@ public class Library { return false; } + public static boolean checkForHeld(EntityPlayer player, Item item) { + + if(player.getHeldItem() == null) + return false; + + return player.getHeldItem().getItem() == item; + } + + public static boolean checkForFiend(EntityPlayer player) { + + return checkArmorPiece(player, ModItems.jackt, 2) && checkForHeld(player, ModItems.shimmer_sledge); + } + + public static boolean checkForFiend2(EntityPlayer player) { + + return checkArmorPiece(player, ModItems.jackt2, 2) && checkForHeld(player, ModItems.shimmer_axe); + } + public static boolean checkCableConnectables(World world, int x, int y, int z) { TileEntity tileentity = world.getTileEntity(x, y, z); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 0ff6974b4..1c1c1a9bf 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (red edition)"; + public static final String VERSION = "1.0.27 BETA (2904)"; //HBM's Beta Naming Convention: //V T (X-Y-Z) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 2c33da46d..052e48080 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -565,6 +565,7 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_refinery), 1), new Object[] { "PTP", "CTC", "WFW", 'P', "plateTitanium", 'T', ModItems.tank_steel, 'C', ModItems.coil_tungsten, 'W', ModBlocks.red_wire_coated, 'F', ModBlocks.machine_electric_furnace_off })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_iron), 1), new Object[] { "PPP", "I I", "III", 'P', "plateIron", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.crate_steel), 1), new Object[] { "PPP", "I I", "III", 'P', "plateSteel", 'I', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.safe), 1), new Object[] { "LAL", "ACA", "LAL", 'L', "plateLead", 'A', "plateAdvanced", 'C', ModBlocks.crate_steel })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', "ingotIron", 'R', "dustRedstone", 'B', "blockIron", 'P', Blocks.piston })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_siren, 1), new Object[] { "SIS", "ICI", "SRS", 'S', "plateSteel", 'I', ModItems.plate_polymer, 'C', ModItems.circuit_copper, 'R', "dustRedstone" })); @@ -834,6 +835,9 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.can_overcharge, 1), new Object[] { ModItems.can_empty, Items.potionitem, Items.sugar, ModItems.sulfur }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.can_luna, 1), new Object[] { ModItems.can_empty, Items.potionitem, Items.sugar, ModItems.powder_meteorite_tiny }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_13, 1), new Object[] { "O", "P", 'O', Items.potionitem, 'P', "plateSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_vodka, 1), new Object[] { "O", "P", 'O', Items.potato, 'P', "plateSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_empty, 6), new Object[] { " G ", "G G", "GGG", 'G', "paneGlass" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bottle_nuka, 1), new Object[] { ModItems.bottle_empty, Items.potionitem, Items.sugar, ModItems.powder_coal }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bottle_cherry, 1), new Object[] { ModItems.bottle_empty, Items.potionitem, Items.sugar, Items.redstone }); @@ -941,6 +945,13 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.n2_charge, 1), new Object[] { " D ", "ERE", " D ", 'D', ModItems.ducttape, 'E', ModBlocks.det_charge, 'R', "blockRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_tnt, 1), new Object[] { " C ", "TIT", "TIT", 'C', "plateCopper", 'I', "plateIron", 'T', Blocks.tnt })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_nuke, 1), new Object[] { " C ", "LUL", "LUL", 'C', "plateCopper", 'L', "plateLead", 'U', "ingotUranium235" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_hydro, 1), new Object[] { " C ", "LTL", "LIL", 'C', "plateCopper", 'L', "plateLead", 'I', "plateIron", 'T', ModItems.cell_tritium })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_amat, 1), new Object[] { " C ", "MMM", "AAA", 'C', "plateCopper", 'A', "plateAluminum", 'M', ModItems.cell_antimatter })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_dirty, 1), new Object[] { " C ", "WLW", "WLW", 'C', "plateCopper", 'L', "plateLead", 'W', ModItems.nuclear_waste })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.custom_schrab, 1), new Object[] { " C ", "LUL", "LUL", 'C', "plateCopper", 'L', "plateLead", 'U', "ingotSchrabidium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_generic), new Object[] { " A ", "PRP", "PRP", 'A', ModItems.wire_aluminium, 'P', "plateAluminum", 'R', "dustRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PSP", "PLP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_advanced), new Object[] { " A ", "PLP", "PSP", 'A', ModItems.wire_red_copper, 'P', "plateCopper", 'S', "sulfur", 'L', "dustLead" })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 6404e640b..b710f5cd7 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -443,6 +443,8 @@ public class MainRegistry public static Achievement achC20_5; public static Achievement achSpace; public static Achievement achFOEQ; + public static Achievement achFiend; + public static Achievement achFiend2; public static boolean enableDebugMode = true; public static boolean enableMycelium = false; @@ -458,6 +460,7 @@ public class MainRegistry public static boolean enableMeteorShowers = true; public static boolean enableMeteorTails = true; public static boolean enableSpecialMeteors = true; + public static boolean enableBomberShortMode = false; public static int uraniumSpawn = 7; public static int titaniumSpawn = 8; @@ -1055,6 +1058,8 @@ public class MainRegistry achC20_5 = new Achievement("achievement.c20_5", "c20_5", 4, -2, ModItems.gun_dampfmaschine, null).initIndependentStat().setSpecial().registerStat(); achSpace = new Achievement("achievement.space", "space", 4, 0, ModItems.missile_carrier, null).initIndependentStat().setSpecial().registerStat(); achFOEQ = new Achievement("achievement.FOEQ", "FOEQ", 4, 2, ModItems.sat_foeq, null).initIndependentStat().setSpecial().registerStat(); + achFiend = new Achievement("achievement.fiend", "fiend", 6, 0, ModItems.shimmer_sledge, null).initIndependentStat().setSpecial().registerStat(); + achFiend2 = new Achievement("achievement.fiend2", "fiend2", 6, 2, ModItems.shimmer_axe, null).initIndependentStat().setSpecial().registerStat(); AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{ achSacrifice, @@ -1066,7 +1071,9 @@ public class MainRegistry achC44, achC20_5, achSpace, - achFOEQ + achFOEQ, + achFiend, + achFiend2 })); OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium); @@ -1419,6 +1426,7 @@ public class MainRegistry enableMeteorShowers = config.get(Configuration.CATEGORY_GENERAL, "1.11_enableMeteorShowers", true).getBoolean(true); enableMeteorTails = config.get(Configuration.CATEGORY_GENERAL, "1.12_enableMeteorTails", true).getBoolean(true); enableSpecialMeteors = config.get(Configuration.CATEGORY_GENERAL, "1.13_enableSpecialMeteors", false).getBoolean(false); + enableBomberShortMode = config.get(Configuration.CATEGORY_GENERAL, "1.14_enableBomberShortMode", false).getBoolean(false); Property PuraniumSpawn = config.get(Configuration.CATEGORY_GENERAL, "2.00_uraniumSpawnrate", 7); PuraniumSpawn.comment = "Ammount of uranium ore veins per chunk";