From b41b2e538312213bea5f7412e01c1fa404b1b107 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Mon, 15 Feb 2016 18:07:45 +0100 Subject: [PATCH] Fixed stuff --- com/hbm/blocks/Guide.java | 3 +++ com/hbm/explosion/ExplosionNukeGeneric.java | 2 +- com/hbm/items/ItemWaffle.java | 3 +++ com/hbm/lib/Library.java | 26 ++++++++++----------- com/hbm/main/CraftingManager.java | 10 ++++---- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/com/hbm/blocks/Guide.java b/com/hbm/blocks/Guide.java index e945d63e2..f56bd825d 100644 --- a/com/hbm/blocks/Guide.java +++ b/com/hbm/blocks/Guide.java @@ -251,6 +251,9 @@ public class Guide extends Block { pages5.appendTag(new NBTTagString(Library.book53)); pages5.appendTag(new NBTTagString(Library.book54)); pages5.appendTag(new NBTTagString(Library.book55)); + pages5.appendTag(new NBTTagString(Library.book56)); + pages5.appendTag(new NBTTagString(Library.book57)); + pages5.appendTag(new NBTTagString(Library.book58)); book5.stackTagCompound.setTag("pages", pages5); player.inventory.addItemStackToInventory(book5); diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index d14510ddd..e26f08dfe 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -131,7 +131,7 @@ public class ExplosionNukeGeneric { if(!(entity instanceof EntityPlayerMP) || (entity instanceof EntityPlayerMP && ((EntityPlayerMP)entity).theItemInWorldManager.getGameType() != GameType.CREATIVE)) { //entity.attackEntityFrom(DamageSource.generic, ((int)((d11 * d11 + d11) / 2.0D * 8.0D * bombStartStrength + 1.0D))); - entity.attackEntityFrom(ModDamageSource.nuclearBlast, 2.5F); + entity.attackEntityFrom(ModDamageSource.nuclearBlast, 5F); entity.setFire(5); double d8 = EnchantmentProtection.func_92092_a(entity, d11); entity.motionX += d5 * d8; diff --git a/com/hbm/items/ItemWaffle.java b/com/hbm/items/ItemWaffle.java index ef86cc7a7..1ee440b87 100644 --- a/com/hbm/items/ItemWaffle.java +++ b/com/hbm/items/ItemWaffle.java @@ -1,6 +1,7 @@ package com.hbm.items; import com.hbm.entity.EntityNukeExplosionAdvanced; +import com.hbm.explosion.ExplosionParticle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; @@ -24,6 +25,8 @@ public class ItemWaffle extends ItemFood { explosion.posY = player.posY; explosion.posZ = player.posZ; world.spawnEntityInWorld(explosion); + + ExplosionParticle.spawnMush(world, (int)player.posX, (int)player.posY - 3, (int)player.posZ); } } diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index d6c8e22fb..f840e0184 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -24,8 +24,8 @@ public class Library { public static String book18 = "§lMinecraft Grade Copper§r\nMinecraft Grade Copper (aka §oRed Copper§r) can be created by combining copper ingots and redstone in the alloy furnace. It is used for crafting advanced electronics and batteries."; public static String book19 = "§lTungsten§r\nTungsten can be used to make neutron reflectors by combining it in the alloy furnace with coal. It is also needed for heating coils, which are importand for storing uranium and plutonium hexafluorite."; public static String book110 = "§lAluminium§r\nAluminium is a commonly found metal that is used for crafting hulls and machines. Basic circuits are also made out of aluminium wires."; - public static String book111 = "§lFuorite§r\nFluorite is a powderr which can be found in form of ores. It is used to make uranium and plutonium hexafluorite, gasses which can be enriched in a gas centrifuge."; - public static String book112 = "§lBeryllium§r\nBeryllium is an ingot which can be simply obtained from it's ore. Beryllium is used for Schrabidium-fuel and plutonium cores."; + public static String book111 = "§lFuorite§r\nFluorite is a powder which can be found in form of ores. It is used to make uranium and plutonium hexafluorite, gasses which can be enriched in a gas centrifuge."; + public static String book112 = "§lBeryllium§r\nBeryllium is an ingot which can be simply obtained from it's ore. Beryllium is used for Schrabidium fuel and plutonium cores."; public static String book113 = "§lLead§r\nLead is a very common ore that can be smelted into an ingot. It can be used to craft breeding reactors, RTG-Units and if combined with copper in the alloy furnace, it can be processed into neutron reflectors."; public static String book114 = "§lSchrabidium§r\nSchrabidium is a very odd element only found near nuclear testing sites. It has violent behaviours if used the right way, making it perfect for bombs. If a big ammount is hit by neutrons, it will create other elements."; public static String book115 = "§lAdvanced Alloy§r\nThe advanced alloy is a very durable and useful material, only used for the best factories which can handle four operations at once. It is composed of Minecraft grade copper and steel, combined by an alloy furnace."; @@ -49,14 +49,14 @@ public class Library { public static String book31 = "§lBombs§r\nThis mod also features many different bombs, some of them work like regular TNT, others are nukes and need additional items to ignite."; public static String book32 = "§lThe Gadget§r\nThe Gadget was the first functional nuclear explosive ever built. It needs four special propellants, a plutonium core and a cable drum. It's crater has a radius up to 150 meters."; - public static String book33 = "§lLittle Boy§r\nLittle Boy is a gun-type nuke which uses a tungsten-carbide neutron reflector, two different uranium 235 elements, a propellant and it's igniter. It has a explosion radius of 120."; + public static String book33 = "§lLittle Boy§r\nLittle Boy is a gun-type nuke which uses a tungsten-carbide neutron reflector, two different uranium 235 elements, a propellant and it's igniter. It has an explosion radius of 120."; public static String book34 = "§lFat Man§r\nFat Man is very similar to the Gadged in terms of it's inner parts, even though it uses alternate versions of these items. It's explosion radius is 175 meters."; public static String book35 = "§lIvy Mike§r\nIvy Mike is a hydrogen bomb which needs Fat Man's parts to work. Additionally, you can add an uranium tank, deuterium and a cooler to increase the radius by a lot. Radius with Fat Man parts: 175 meters, radius with additional items: 250 meters."; public static String book36 = "§lTsar Bomba§r\nThe Tsar Bomba was the strongest bomb ever built and is a hydrogen bomb much like Ivy Mike. It needs Fat Man's parts to work and with the fusion core, the explosion radius reaches an astounding 500 meters."; public static String book37 = "§lThe Prototype§r\nThe Prototype was the first (and strongest) Schrabidium-powered bomb. It was made from a pimped makeshift nuclear reactor using liquid Schrabidiumtrisulfide. Like any other Schrabidium bomb, the Prototype's crater is 100% spherical,"; - public static String book38 = "leaving no blocks untouched, besides Bedrock on Y: 0. It needs four quad rods of regular uranium, four quad rods filled with lead, two quad rods of neptunium and four Schrabidiumtrisulfide cells in order to explode. It has a crater radius of only 150 meters,"; - public static String book39 = "but because it's shape, it can destroy a whopping 14 million blocks, the seven million blocks of the bottom half are ten times more than the ammount of blocks the Gadhet will destroy below it's Y axis."; - public static String book310 = "§lF.L.E.I.J.A.§r\nF.L.E.I.J.A. (pronounced §oFreija§r) is a high-tech Schrabidium bomb which consists of two special impulse igniters, three Schrabidium propellants and six magnetized F.L.E.I.J.A. uranium 235 cores. It has a range of 50 meters."; + public static String book38 = "leaving no blocks untouched, besides Bedrock on Y: 0. It needs four quad rods of regular uranium, four quad rods filled with lead, two quad rods of neptunium and four Schrabidiumtrisulfide cells in order to explode. It has a crater radius of only"; + public static String book39 = "150 meters, but because it's shape, it can destroy a whopping 14 million blocks, the seven million blocks of the bottom half are ten times more than the ammount of blocks the Gadget will destroy below it's Y axis."; + public static String book310 = "§lF.L.E.I.J.A.§r\nF.L.E.I.J.A. (pronounced §oFre-ja§r) is a high-tech Schrabidium bomb which consists of two special impulse igniters, three Schrabidium propellants and six magnetized F.L.E.I.J.A. uranium 235 cores. It has a range of 50 meters."; public static String book311 = "§lMulti Purpose Bomb§r\nThe multi purpose bomb is a small customizable explosive which requires four blocks of TNT to work. It has a base explosion value which can be modified with different items. You can either use two of a kind (the small box will show"; public static String book312 = "you what kind of explosion it will create), only one item (with half the radius/effect of the modifier) or two different items (two different items or one single are part of scambled mode, indicated by a question mark. It will have two different effects.)"; public static String book313 = "Modifying items:\nBase Value: 8\nGunpowder: +1\nTNT: +4\nExplosive Pellets: +50 bomblets\nFire Powder: +10 fire radius\nPoison Powder: +15 poison radius\nGas Cartridge: +15 gas radius"; @@ -68,21 +68,21 @@ public class Library { public static String book319 = "§lExplosive Barrel§r\nThis is a red barrel filled with fuel. It will explode if it catches fire, explodes or gets shot with a revolver. It will blow up in a big firey explosion, great for demolishing houses or forests."; public static String book320 = "§lRadioactive Barrel§r\nA yellow barrel filled to the top with nuclear waste. It has a much bigger explosion radius than it's non-nuclear counterpart, and can only be triggered by explosions. It will give creatures bad effects when they stay to close."; - public static String book41 = "§lMissiles§r\nThere are four different ties and four major groups of missiles. They need a launch pad to work and will fly to a maked target where they will explode. Most missiles are easily recognizable by their shape and color."; + public static String book41 = "§lMissiles§r\nThere are four different tiers and four major groups of missiles. They need a launch pad to work and will fly to a maked target where they will explode. Most missiles are easily recognizable by their shape and color."; public static String book42 = "§lHE Missiles§r\nHE missiles (often just referred to as generic missiles) are the simplest type of missiles. They will fly in an arc shape and explode on impact. There are three different HE missiles, one for each of the first three tiers."; public static String book43 = "§lIncendiary Missiles§r\nIncendiary missiles work just like generic missiles, with the slight difference that the explosion will spawn fire. The higher the tier, the more fire the impact will create. There are three different tiers of incendiary missiles."; public static String book44 = "§lCluster Missiles§r\nCluster missiles will fly the same arc shape as all the other missiles do, with the exception that it will explode just before impact, releasing hundrets of small bomblets. They are avalible in three different sizes (tiers)"; public static String book45 = "§lBunker Busters§r\nA bunker buster behaves much like a normal missile, except that it's explosion goes further down, digging holes and revealing underground structures or destroying bunkers. They also come in three different sizes."; - public static String book46 = "§lEndothermic Missile§rA tier 3 missile which works exactly like an endothermic bomb, but has double the effect radius."; - public static String book47 = "§lExothermic Missile§rAnother tier 3 missile with an exothermic warhead and double the radius of it's stationary counterpart."; - public static String book48 = "§lNuclear Missile§rIt's basically a small nuke mounted on a missile. It has an explosion radius of 100 meters, making it the smallest nuke (next to the waffle of mass destruction, the nuclear creeper and the MIRV.)"; - public static String book49 = "§lNuclear MIRV Missile§rThe nuclear MIRV is the most destructive intercontinental ballistic missile ever created. It combines a cluster bomb with the destructive force of a nuke, splitting into eight small warheads just before impact."; + public static String book46 = "§lEndothermic Missile§r\nA tier 3 missile which works exactly like an endothermic bomb, but has double the effect radius."; + public static String book47 = "§lExothermic Missile§r\nAnother tier 3 missile with an exothermic warhead and double the radius of it's stationary counterpart."; + public static String book48 = "§lNuclear Missile§r\nIt's basically a small nuke mounted on a missile. It has an explosion radius of 100 meters, making it the smallest nuke (next to the waffle of mass destruction, the nuclear creeper and the MIRV.)"; + public static String book49 = "§lNuclear MIRV Missile§r\nThe nuclear MIRV is the most destructive intercontinental ballistic missile ever created. It combines a cluster bomb with the destructive force of a nuke, splitting into eight small warheads just before impact."; public static String book51 = "§lMisc§r\nNext to nuclear technology and weapons of mass destruction, this mod also offers some gimmicks, handguns, different armor sets, randomly generated dungeons and more! (Please, do not touch any objects you don't know. You will probably explode and die.)"; public static String book52 = "§lRevolvers§r\nLike in the good old Western films, you can shoot with your own revolver! There are four different tiers of revolvers, dealing about 5 - infinite damage, depending on the tier. Note: A revolver can not hurt mobs like the ender dragon!"; public static String book53 = "§lRPG§r\nTo use the RPG, charge it like a bow and release the charge when it reached it's maximum. The rocket will cause a small explosion about half the size of a creeper's explosion."; - public static String book54 = "§lNuke Launcher§r\nThe M42 NNuclear Catapult \"Fat Man\" is the perfect christmas present for every small child! It shoots small tactical nuclear warheads causing chaos and destrucion. (What did you expect?)"; - public static String book55 = "§lGrenades§r\nA renade are a very easy-to-use type of explosive. Simply throw it like a snowball and watch the explosion. Remember: Never, NEVER throw a Schrabidium Grenade."; + public static String book54 = "§lNuke Launcher§r\nThe M42 Nuclear Catapult \"Fat Man\" is the perfect christmas present for every small child! It shoots small tactical nuclear warheads causing chaos and destrucion. (What did you expect?)"; + public static String book55 = "§lGrenades§r\nA grenade is a very easy-to-use type of explosive. Simply throw it like a snowball and watch the explosion. Remember: Never, NEVER throw a Schrabidium Grenade."; public static String book56 = "§lSyringes§r\nDon't do drugs! (except in Minecraft) Need some health? Take a Stimpak. You demand damage resistance? Inject a Med-X. Want to go nuts? Take AWESOME (only one dose per hour will help) Warning: Hitting enemies with syinges will give them the effect!"; public static String book57 = "§lMobile Stealth Device§r\nThis useful machine will make you invisibile, even without the annoying particles! Just remember that the effect will wear off in 30 seconds, so don't rely too much on it."; public static String book58 = "§lFood§r\nSurprisingly enough, this mod offers a great variety of different food. Be sure not to eat anything, you may explode/combust/die of radiation poisoning/starve to death/experience a rare case of waffles taking over the world."; diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 0b9a6488c..ef8c52a5f 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -371,16 +371,18 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " S ", 'S', ModItems.plate_steel, 'W', Item.getItemFromBlock(Blocks.log) }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', ModItems.plate_steel, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', ModItems.plate_iron }); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_steel, 'W', Item.getItemFromBlock(Blocks.planks), 'R', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_steel, 'W', Item.getItemFromBlock(Blocks.planks), 'R', ModItems.wire_aluminium }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_ammo, 16), new Object[] { "L", "S", 'L', ModItems.plate_lead, 'S', Items.gunpowder }); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_iron, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_iron, 'W', Item.getItemFromBlock(Blocks.planks), 'R', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_iron, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_iron, 'W', Item.getItemFromBlock(Blocks.planks), 'R', ModItems.wire_aluminium }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_iron_ammo, 16), new Object[] { "L", "S", 'L', ModItems.plate_iron, 'S', Items.gunpowder }); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_gold, 'W', Items.gold_ingot, 'R', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_gold, 'W', Items.gold_ingot, 'R', ModItems.wire_gold }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_gold_ammo, 16), new Object[] { "L", "S", 'L', ModItems.plate_gold, 'S', Items.gunpowder }); - GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_schrabidium, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_schrabidium, 'W', ModItems.ingot_tungsten, 'R', ModItems.wire_red_copper }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_schrabidium, 1), new Object[] { "SSS", " RW", 'S', ModItems.plate_schrabidium, 'W', ModItems.ingot_tungsten, 'R', ModItems.wire_schrabidium }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 16), new Object[] { "L", "S", 'L', ModItems.plate_schrabidium, 'S', Items.gunpowder }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_cursed, 1), new Object[] { "TTT", "SRI", 'S', ModItems.plate_steel, 'I', ModItems.ingot_steel, 'R', ModItems.wire_red_copper, 'T', ModItems.plate_titanium }); GameRegistry.addRecipe(new ItemStack(ModItems.gun_revolver_cursed_ammo, 16), new Object[] { "L", "S", 'L', ModItems.plate_steel, 'S', Items.gunpowder }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_fatman, 1), new Object[] { "SSI", "III", "WPH", 'S', ModItems.plate_steel, 'I', ModItems.ingot_steel, 'W', ModItems.wire_aluminium, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston) }); + GameRegistry.addRecipe(new ItemStack(ModItems.gun_fatman_ammo, 2), new Object[] { " S ", "SPS", "ITI", 'S', ModItems.plate_steel, 'P', ModItems.ingot_pu239, 'T', Item.getItemFromBlock(Blocks.tnt), 'I', ModItems.plate_iron }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', ModItems.plate_iron, 'R', ModItems.wire_red_copper, 'S', ModItems.plate_steel, 'T', Item.getItemFromBlock(Blocks.tnt) }); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder });