From 8a3e4d9062f5979f7a128c7695865e4f871e8ded Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 11 Jun 2019 13:55:00 +0200 Subject: [PATCH] finished a few things --- assets/hbm/lang/de_DE.lang | 11 +++- assets/hbm/lang/en_US.lang | 11 +++- assets/hbm/textures/blocks/steel_beam.png | Bin 210 -> 266 bytes com/hbm/blocks/ModBlocks.java | 3 + com/hbm/blocks/bomb/CompactLauncher.java | 59 ++++++++++++++++++ com/hbm/blocks/bomb/LaunchTable.java | 8 +++ com/hbm/blocks/machine/MachineSatDock.java | 36 ++++++++++- .../gui/GUIMachineCompactLauncher.java | 9 +++ .../inventory/gui/GUIMachineLaunchTable.java | 9 +++ com/hbm/items/tool/ItemAssemblyTemplate.java | 4 +- com/hbm/main/CraftingManager.java | 19 +++++- 11 files changed, 162 insertions(+), 7 deletions(-) diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index d242e357e..2fe5afa1b 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -323,6 +323,7 @@ tile.emp_bomb.name=EMP-Ladung tile.crashed_bomb.name=Blindgänger tile.boxcar.name=Güterwagon +tile.boat.name=Boot tile.bomber.name=Abgestürtzer Bomber tile.crate.name=Vorratskiste @@ -387,6 +388,10 @@ tile.machine_turbine.name=Dampfturbine container.machineTurbine=Dampfturbine tile.launch_pad.name=Raketenabschussrampe container.launchPad=Raketenabschussrampe +tile.compact_launcher.name=Kompakt-Startrampe +container.compactLauncher=Kompakt-Startrampe +tile.launch_table.name=Große Startrampe +container.launchTable=Große Startrampe tile.machine_missile_assembly.name=Raketenmontagestation container.missileAssembly=Raketenmontagestation tile.sat_dock.name=Frachtlandeplattform @@ -750,6 +755,7 @@ tile.block_daffergon.name=Daffergonblock tile.block_verticium.name=Verticiumblock tile.block_desh.name=Verstärketer Deshblock tile.block_yellowcake.name=Yellowcakeblock +tile.block_starmetal.name=Sternenmetallblock tile.ore_aluminium.name=Aluminiumerz tile.ore_copper.name=Kupfererz @@ -1361,7 +1367,7 @@ item.gun_calamity_dual.name=Sattelkanone item.gun_fatman.name=M42 Nukleares Katapult "Fat Man" item.gun_proto.name=M42 Nukleares Katapult "Proto MIRV" item.gun_mirv.name=M42 Nukleares Katapult "Experimentelles MIRV" -item.gun_bf.name=M42_2 Nukleares Katapult "Antimaterienwerfer" +item.gun_bf.name=BEL item.gun_mp40.name=Maschinenpistole item.gun_uzi.name=IMI Uzi item.gun_uzi_silencer.name=IMI Uzi mit Schalldämpfer @@ -2000,6 +2006,9 @@ tile.machine_transformer_dnt_20.name=DNT-1Hz-Transformator tile.vent_chlorine.name=Chlorgas-Auslass tile.vent_cloud.name=Wolken-Auslass tile.vent_pink_cloud.name=Pinker Wolken-Auslass +tile.vent_chlorine_seal.name=Chlorgassiegel +tile.chlorine_gas.name=Chlorgas +item.chlorine_pinwheel.name=Chlorgas-Konverter tile.absorber.name=Strahlungs-Absorber tile.absorber_red.name=Verbesserter Strahlungs-Absorber diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 26ae8f1fe..c6ffcc6a2 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -284,6 +284,7 @@ tile.emp_bomb.name=EMP Device tile.crashed_bomb.name=Dud tile.boxcar.name=Boxcar +tile.boat.name=Boat tile.bomber.name=Crashed Bomber tile.turret_light.name=Light Machine Gun Turret @@ -387,6 +388,10 @@ tile.machine_turbine.name=Steam Turbine container.machineTurbine=Steam Turbine tile.launch_pad.name=Missile Launch Pad container.launchPad=Missile Launch Pad +tile.compact_launcher.name=Compact Launch Pad +container.compactLauncher=Compact Launch Pad +tile.launch_table.name=Large Launch Pad +container.launchTable=Large Launch Pad tile.machine_missile_assembly.name=Missile Assembly Station container.missileAssembly=Missile Assembly Station tile.sat_dock.name=Cargo Landing Pad @@ -750,6 +755,7 @@ tile.block_daffergon.name=Block of Daffergon tile.block_verticium.name=Block of Verticium tile.block_desh.name=Reinforced Block of Desh tile.block_yellowcake.name=Block of Yellowcake +tile.block_starmetal.name=Block of Starmetal tile.ore_aluminium.name=Aluminium Ore tile.ore_copper.name=Copper Ore @@ -1361,7 +1367,7 @@ item.gun_lacunae.name=CZ33 Abaddon item.gun_fatman.name=M42 Nuclear Catapult "Fat Man" item.gun_proto.name=M42 Nuclear Catapult "Proto MIRV" item.gun_mirv.name=M42 Nuclear Catapult "Experimental MIRV" -item.gun_bf.name=M42_2 Nuclear Catapult "Antimatter Launcher" +item.gun_bf.name=BEL item.gun_mp40.name=Submachine Gun item.gun_uzi.name=IMI Uzi item.gun_uzi_silencer.name=IMI Uzi with Silencer @@ -2000,6 +2006,9 @@ tile.machine_transformer_dnt_20.name=DNT-1Hz Transformer tile.vent_chlorine.name=Chlorine Vent tile.vent_cloud.name=Cloud Vent tile.vent_pink_cloud.name=Pink Cloud Vent +tile.vent_chlorine_seal.name=Chlorine Seal +tile.chlorine_gas.name=Chlorine Gas +item.chlorine_pinwheel.name=Chlorine Pinwheel tile.absorber.name=Radiation Absorber tile.absorber_red.name=Enhanced Radiation Absorber diff --git a/assets/hbm/textures/blocks/steel_beam.png b/assets/hbm/textures/blocks/steel_beam.png index 2b6aa158db15d05ecbfe71178bf3294e7d7ed388..a32f0e36c93a5eff6822b58e753d5db772a163a1 100644 GIT binary patch delta 222 zcmV<403rX<0g3{UG=ITKL_t(Ijh&HAiiJQ7gsa=2HvV18gL@?v=_Uj+i=l?Mm_>XA zp*Hmu2}%3DyO}{mU}iXuBOxGid7fu?x4Rp!QCO}c|uiTX0J{lm$z+0DFyVXn9uHx&xwlp{JFlFg$tPf Y0g5-9HoScoRR91007*qoM6N<$f>C5=E&u=k delta 166 zcmV;X09pTv0@4AHG=GUnL_t(Ijir(?4uBvGMSn{dBgm0(VB`J=0YWsyq)r~d@|RBU zrA 0) { + int j1 = this.field_149933_a.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, + p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) { + entityitem.getEntityItem() + .setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float) this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float) this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } + + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } + } diff --git a/com/hbm/blocks/bomb/LaunchTable.java b/com/hbm/blocks/bomb/LaunchTable.java index 4ffc5e7ca..9d2d0330f 100644 --- a/com/hbm/blocks/bomb/LaunchTable.java +++ b/com/hbm/blocks/bomb/LaunchTable.java @@ -1,5 +1,7 @@ package com.hbm.blocks.bomb; +import java.util.Random; + import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IMultiblock; @@ -16,6 +18,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -46,6 +49,11 @@ public class LaunchTable extends BlockContainer implements IMultiblock, IBomb { public boolean renderAsNormalBlock() { return false; } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return Item.getItemFromBlock(ModBlocks.struct_launcher_core_large); + } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { diff --git a/com/hbm/blocks/machine/MachineSatDock.java b/com/hbm/blocks/machine/MachineSatDock.java index da0bd1864..2e6435ec6 100644 --- a/com/hbm/blocks/machine/MachineSatDock.java +++ b/com/hbm/blocks/machine/MachineSatDock.java @@ -3,7 +3,9 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineSatDock; @@ -11,6 +13,7 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -21,7 +24,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class MachineSatDock extends BlockContainer { +public class MachineSatDock extends BlockContainer implements IMultiblock { private final Random field_149933_a = new Random(); private Random rand; @@ -127,4 +130,35 @@ public class MachineSatDock extends BlockContainer { super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); } + @Override + public void onBlockPlacedBy(World worldObj, int xCoord, int yCoord, int zCoord, EntityLivingBase player, ItemStack itemStack) { + + for(int k = -1; k <= 1; k++) + for(int l = -1; l <= 1; l++) + if(l != 0 || k != 0) + if(!worldObj.getBlock(xCoord + k, yCoord, zCoord + l).isReplaceable(worldObj, xCoord + k, yCoord, zCoord + l)) { + worldObj.func_147480_a(xCoord, yCoord, zCoord, true); + return; + } + + for(int k = -1; k <= 1; k++) + for(int l = -1; l <= 1; l++) + if(l != 0 || k != 0) + placeDummy(worldObj, xCoord + k, yCoord, zCoord + l, xCoord, yCoord, zCoord, ModBlocks.dummy_plate_cargo); + } + + private void placeDummy(World world, int x, int y, int z, int xCoord, int yCoord, int zCoord, Block block) { + + world.setBlock(x, y, z, block); + + TileEntity te = world.getTileEntity(x, y, z); + + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = xCoord; + dummy.targetY = yCoord; + dummy.targetZ = zCoord; + } + } + } diff --git a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index 39ecf7ce9..ea9e29318 100644 --- a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -44,6 +44,12 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer { launcher.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 88 - 52, 16, 52); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 88 - 52, 16, 52, new String[] { "Solid Fuel: " + launcher.solid + "l" }); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 113, 34, 6, launcher.power, launcher.maxPower); + + String[] text = new String[] { "Only accepts custom missiles", "of all sizes" }; + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text); + + String[] text1 = new String[] { "Detonator can only trigger center block." }; + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1); } @Override @@ -87,6 +93,9 @@ public class GUIMachineCompactLauncher extends GuiInfoContainer { if(launcher.solidState() == 0) drawTexturedModalRect(guiLeft + 157, guiTop + 23, 182, 0, 6, 8); + this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); + this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); + Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 88, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); diff --git a/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/com/hbm/inventory/gui/GUIMachineLaunchTable.java index 4e9cdd76d..08bc0e617 100644 --- a/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -46,6 +46,12 @@ public class GUIMachineLaunchTable extends GuiInfoContainer { this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 7, guiTop + 98, 18, 18, new String[] { "Size 10 & 10/15" }); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 25, guiTop + 98, 18, 18, new String[] { "Size 15 & 15/20" }); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 43, guiTop + 98, 18, 18, new String[] { "Size 20" }); + + String[] text = new String[] { "Only accepts custom missiles", "of size 10 and 10/15." }; + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text); + + String[] text1 = new String[] { "Detonator can only trigger center block." }; + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1); } protected void mouseClicked(int x, int y, int i) { @@ -127,6 +133,9 @@ public class GUIMachineLaunchTable extends GuiInfoContainer { } + this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); + this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 11); + Minecraft.getMinecraft().getTextureManager().bindTexture(launcher.tanks[0].getSheet()); launcher.tanks[0].renderTank(this, guiLeft + 116, guiTop + 88, launcher.tanks[0].getTankType().textureX() * FluidTank.x, launcher.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52); diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index 3619e1240..aefcefad0 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -367,7 +367,7 @@ public class ItemAssemblyTemplate extends Item { new ItemStack(ModItems.plate_steel, 6), new ItemStack(ModItems.tank_steel, 1), new ItemStack(ModItems.ingot_desh, 1)), - new ItemStack(ModItems.mp_thruster_15_hydrogen)), + new ItemStack(ModItems.mp_thruster_15_hydrogen_dual)), MP_T_15_BALEFIRE_SHORT(500, Arrays.asList( new ItemStack(ModItems.seg_15, 1), new ItemStack(ModItems.plate_polymer, 8), @@ -455,7 +455,7 @@ public class ItemAssemblyTemplate extends Item { new ItemStack(ModBlocks.steel_scaffold, 6), new ItemStack(ModItems.plate_titanium, 24), new ItemStack(ModItems.plate_aluminium, 6)), - new ItemStack(ModItems.mp_fuselage_10_long_kerosene)), + new ItemStack(ModItems.mp_fuselage_10_long_solid)), MP_F_10_15_KEROSENE(300, Arrays.asList( new ItemStack(ModItems.seg_10, 1), new ItemStack(ModItems.seg_15, 1), diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index acd35dcfc..03a42658a 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -135,6 +135,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_cobble), 1), new Object[] { "##", "##", '#', ModItems.fragment_meteorite }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_broken), 1), new Object[] { "###", "###", "###", '#', ModItems.fragment_meteorite }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_yellowcake), 1), new Object[] { "###", "###", "###", '#', ModItems.powder_yellowcake }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.block_starmetal, 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_starmetal }); GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth }); GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat }); @@ -179,6 +180,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ingot_verticium, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_verticium) }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_desh, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_desh) }); GameRegistry.addRecipe(new ItemStack(ModItems.powder_yellowcake, 9), new Object[] { "#", '#', Item.getItemFromBlock(ModBlocks.block_yellowcake) }); + GameRegistry.addRecipe(new ItemStack(ModItems.ingot_starmetal, 9), new Object[] { "#", '#', ModBlocks.block_starmetal }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_plutonium, 1), new Object[] { "###", "###", "###", '#', ModItems.nugget_plutonium }); GameRegistry.addRecipe(new ItemStack(ModItems.nugget_plutonium, 9), new Object[] { "#", '#', ModItems.ingot_plutonium }); @@ -1525,6 +1527,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', "dustSulfur", 'P', ModItems.powder_poison, 'C', "dustCopper", 'A', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()) })); GameRegistry.addRecipe(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.vent_chlorine), new Object[] { "IGI", "ICI", "IDI", 'I', "plateIron", 'G', Blocks.iron_bars, 'C', ModItems.pellet_gas, 'D', Blocks.dispenser })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.vent_chlorine_seal), new Object[] { "ISI", "SCS", "ISI", 'I', ModItems.ingot_saturnite, 'S', ModItems.ingot_starmetal, 'C', ModItems.chlorine_pinwheel }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.vent_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', "plateIron", 'G', Blocks.iron_bars, 'C', ModItems.grenade_cloud, 'D', Blocks.dispenser })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.vent_pink_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', "plateIron", 'G', Blocks.iron_bars, 'C', ModItems.grenade_pink_cloud, 'D', Blocks.dispenser })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.mine_ap, 4), new Object[] { "C", "P", "T", 'C', ModItems.circuit_targeting_tier2, 'P', "plateIron", 'T', Blocks.tnt })); @@ -1628,7 +1631,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_hydrogen, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', "plateTitanium", 'F', ModItems.mp_fuselage_10_long_kerosene, 'L', ModItems.mp_fuselage_10_15_hydrogen })); GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_15_balefire, 1), new Object[] { "SP ", "PFP", " PL", 'S', ModBlocks.steel_scaffold, 'P', ModItems.plate_saturnite, 'F', ModItems.mp_fuselage_10_long_solid, 'L', ModItems.mp_fuselage_10_15_balefire });*/ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_he, 1), new Object[] { " P ", "PTP", "TST", 'P', "plateSteel", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold })); + /*GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_he, 1), new Object[] { " P ", "PTP", "TST", 'P', "plateSteel", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_incendiary, 1), new Object[] { "PIP", "ITI", "TST", 'P', "plateTitanium", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold, 'I', ModItems.powder_fire })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_buster, 1), new Object[] { "PPP", "DCD", "DSD", 'P', "plateTitanium", 'D', ModBlocks.det_cord, 'C', ModBlocks.det_charge, 'S', ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_10_nuclear, 1), new Object[] { " U ", "PTP", "PSP", 'U', "Pu239", 'P', "plateLead", 'T', Blocks.tnt, 'S', ModBlocks.steel_scaffold })); @@ -1637,7 +1640,19 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_he, 1), new Object[] { "PTP", "CWC", "STS", 'P', "plateSteel", 'T', Blocks.tnt, 'C', ModBlocks.det_charge, 'W', ModItems.mp_warhead_10_he, 'S', ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_incendiary, 1), new Object[] { "PTP", "CWC", "STS", 'P', "plateTitanium", 'T', ModItems.powder_fire, 'C', ModBlocks.det_charge, 'W', ModItems.mp_warhead_10_incendiary, 'S', ModBlocks.steel_scaffold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_warhead_15_nuclear, 1), new Object[] { "PUP", "CUC", "SUS", 'P', ModItems.plate_saturnite, 'U', "Pu239", 'C', ModBlocks.det_charge, 'S', ModBlocks.steel_scaffold })); - GameRegistry.addRecipe(new ItemStack(ModItems.mp_warhead_15_n2, 1), new Object[] { "PCP", "CUC", "SCS", 'P', ModItems.plate_saturnite, 'U', ModItems.mp_warhead_15_he, 'C', ModItems.n2_charge, 'S', ModBlocks.steel_scaffold }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_warhead_15_n2, 1), new Object[] { "PCP", "CUC", "SCS", 'P', ModItems.plate_saturnite, 'U', ModItems.mp_warhead_15_he, 'C', ModItems.n2_charge, 'S', ModBlocks.steel_scaffold });*/ + + GameRegistry.addRecipe(new ItemStack(ModItems.mp_thruster_15_balefire_large_rad, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.board_copper, 'T', ModItems.mp_thruster_15_balefire_large }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_10_kerosene_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_10_kerosene }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_10_long_kerosene_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_10_long_kerosene }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_15_kerosene_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_15_kerosene }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_10_solid_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_10_solid }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_10_long_solid_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_10_long_solid }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_15_solid_insulation, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.plate_polymer, 'T', ModItems.mp_fuselage_15_solid }); + GameRegistry.addRecipe(new ItemStack(ModItems.mp_fuselage_15_solid_desh, 1), new Object[] { "CCC", "CTC", "CCC", 'C', ModItems.ingot_desh, 'T', ModItems.mp_fuselage_15_solid }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_10_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_long_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_10_long_kerosene })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_15_kerosene })); GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_1, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier1, 'S', ModBlocks.steel_scaffold }); GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_2, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier2, 'S', ModBlocks.steel_scaffold });