diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 1900be645..8931df5ad 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -746,6 +746,8 @@ public class ModBlocks { public static Block fluid_duct_neo; public static Block conveyor; + public static Block conveyor_double; + public static Block conveyor_chute; public static Block crane_extractor; public static Block crane_inserter; @@ -1898,6 +1900,8 @@ public class ModBlocks { fluid_duct_neo = new FluidDuctStandard(Material.iron).setBlockName("fluid_duct_neo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":pipe_neo"); conveyor = new BlockConveyor().setBlockName("conveyor").setHardness(0.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor"); + conveyor_double = new BlockConveyorDouble().setBlockName("conveyor_double").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor_double"); + conveyor_chute = new BlockConveyorChute().setBlockName("conveyor_chute").setHardness(2.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor_chute"); crane_extractor = new CraneExtractor().setBlockName("crane_extractor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); crane_inserter = new CraneInserter().setBlockName("crane_inserter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); @@ -3057,6 +3061,7 @@ public class ModBlocks { GameRegistry.registerBlock(crane_extractor, crane_extractor.getUnlocalizedName()); GameRegistry.registerBlock(crane_inserter, crane_inserter.getUnlocalizedName()); GameRegistry.registerBlock(conveyor, conveyor.getUnlocalizedName()); + GameRegistry.registerBlock(conveyor_double, conveyor_double.getUnlocalizedName()); GameRegistry.registerBlock(chain, chain.getUnlocalizedName()); GameRegistry.registerBlock(ladder_sturdy, ladder_sturdy.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index 93b95e163..e06d18d0c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -143,7 +143,7 @@ public class BlockOre extends Block { case 31: return ModItems.ammo_nuke_low; case 32: - return ModItems.gun_mirv_ammo; + return ModItems.ammo_mirv; case 33: return ModItems.gun_defabricator_ammo; case 34: diff --git a/src/main/java/com/hbm/blocks/network/BlockConveyor.java b/src/main/java/com/hbm/blocks/network/BlockConveyor.java index 988fb696c..2b945aad6 100644 --- a/src/main/java/com/hbm/blocks/network/BlockConveyor.java +++ b/src/main/java/com/hbm/blocks/network/BlockConveyor.java @@ -77,7 +77,7 @@ public class BlockConveyor extends Block implements IConveyorBelt { return Vec3.createVectorHelper(snap.xCoord - dir.offsetX * speed, snap.yCoord, snap.zCoord - dir.offsetZ * speed);*/ /// /// - ForgeDirection dir = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)); + ForgeDirection dir = getTravelDirection(world, x, y, z, itemPos, speed); //snapping point Vec3 snap = this.getClosestSnappingPosition(world, x, y, z, itemPos); //snapping point + speed @@ -89,6 +89,10 @@ public class BlockConveyor extends Block implements IConveyorBelt { Vec3 ret = Vec3.createVectorHelper(itemPos.xCoord + motion.xCoord / len * speed, itemPos.yCoord + motion.yCoord / len * speed, itemPos.zCoord + motion.zCoord / len * speed); return ret; } + + public ForgeDirection getTravelDirection(World world, int x, int y, int z, Vec3 itemPos, double speed) { + return ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)); + } @Override public Vec3 getClosestSnappingPosition(World world, int x, int y, int z, Vec3 itemPos) { @@ -120,7 +124,9 @@ public class BlockConveyor extends Block implements IConveyorBelt { EntityMovingItem item = new EntityMovingItem(world); item.setItemStack(((EntityItem) entity).getEntityItem().copy()); - item.setPositionAndRotation(x + 0.5, y + 0.25, z + 0.5, 0, 0); + Vec3 pos = Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ); + Vec3 snap = this.getClosestSnappingPosition(world, x, y, z, pos); + item.setPositionAndRotation(snap.xCoord, snap.yCoord, snap.zCoord, 0, 0); world.spawnEntityInWorld(item); entity.setDead(); diff --git a/src/main/java/com/hbm/blocks/network/BlockConveyorChute.java b/src/main/java/com/hbm/blocks/network/BlockConveyorChute.java new file mode 100644 index 000000000..8e84098e1 --- /dev/null +++ b/src/main/java/com/hbm/blocks/network/BlockConveyorChute.java @@ -0,0 +1,29 @@ +package com.hbm.blocks.network; + +import api.hbm.conveyor.IConveyorBelt; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockConveyorChute extends BlockConveyor { + + @Override + public ForgeDirection getTravelDirection(World world, int x, int y, int z, Vec3 itemPos, double speed) { + + if(world.getBlock(x, y - 1, z) instanceof IConveyorBelt && itemPos.yCoord - speed < y) { + return ForgeDirection.DOWN; + } + + return ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)); + } + + @Override + public Vec3 getClosestSnappingPosition(World world, int x, int y, int z, Vec3 itemPos) { + + if(world.getBlock(x, y - 1, z) instanceof IConveyorBelt && itemPos.yCoord <= y + 0.25) { + return super.getClosestSnappingPosition(world, x, y, z, itemPos); + } else { + return Vec3.createVectorHelper(x + 0.5, y, z + 0.5); + } + } +} diff --git a/src/main/java/com/hbm/blocks/network/BlockConveyorDouble.java b/src/main/java/com/hbm/blocks/network/BlockConveyorDouble.java new file mode 100644 index 000000000..b83cb95cb --- /dev/null +++ b/src/main/java/com/hbm/blocks/network/BlockConveyorDouble.java @@ -0,0 +1,32 @@ +package com.hbm.blocks.network; + +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockConveyorDouble extends BlockConveyor { + + @Override + public Vec3 getClosestSnappingPosition(World world, int x, int y, int z, Vec3 itemPos) { + + ForgeDirection dir = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)); + + itemPos.xCoord = MathHelper.clamp_double(itemPos.xCoord, x, x + 1); + itemPos.zCoord = MathHelper.clamp_double(itemPos.zCoord, z, z + 1); + + double posX = x + 0.5; + double posZ = z + 0.5; + + if(dir.offsetX != 0) { + posX = itemPos.xCoord; + posZ += itemPos.zCoord > posZ ? 0.25 : -0.25; + } + if(dir.offsetZ != 0) { + posZ = itemPos.zCoord; + posX += itemPos.xCoord > posX ? 0.25 : -0.25; + } + + return Vec3.createVectorHelper(posX, y + 0.25, posZ); + } +} diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index dca056ea8..be12d3896 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -150,21 +150,6 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_fireext, 1), new Object[] { "HB", " T", 'H', ModItems.hull_small_steel, 'B', ModItems.bolt_tungsten, 'T', ModItems.tank_steel }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_spas12, 1), new Object[] { "TPS", "HHR", " L", 'T', ModItems.bolt_tungsten, 'P', STEEL.plate(), 'S', STEEL.ingot(), 'H', ModItems.hull_small_steel, 'R', ModItems.mechanism_rifle_1, 'L', ANY_PLASTIC.ingot()}); - //Legacy ammo recycling - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_44, 1), new Object[] { ModItems.gun_revolver_nopip_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_44_pip, 1), new Object[] { ModItems.gun_revolver_pip_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_50bmg, 1), new Object[] { ModItems.gun_calamity_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_5mm, 1), new Object[] { ModItems.gun_lacunae_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_rocket, 1), new Object[] { ModItems.gun_rpg_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_9mm, 1), new Object[] { ModItems.gun_mp40_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_22lr, 1), new Object[] { ModItems.gun_uzi_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_12gauge, 1), new Object[] { ModItems.gun_uboinik_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_20gauge, 1), new Object[] { ModItems.gun_lever_action_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_20gauge_slug, 1), new Object[] { ModItems.gun_bolt_action_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_nuke_high, 1), new Object[] { ModItems.gun_fatman_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_mirv_high, 1), new Object[] { ModItems.gun_mirv_ammo }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_stinger_rocket, 1), new Object[] { ModItems.gun_stinger_ammo }); - //Ammo assemblies CraftingManager.addRecipeAuto(new ItemStack(ModItems.pellet_flechette, 1), new Object[] { " L ", " L ", "LLL", 'L', PB.nugget() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.pellet_claws, 1), new Object[] { " X ", "X X", " XX", 'X', STEEL.plate() }); diff --git a/src/main/java/com/hbm/entity/projectile/EntityBullet.java b/src/main/java/com/hbm/entity/projectile/EntityBullet.java index ee6300933..acabc493d 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityBullet.java +++ b/src/main/java/com/hbm/entity/projectile/EntityBullet.java @@ -762,11 +762,6 @@ public class EntityBullet extends Entity implements IProjectile { if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 - && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); this.setDead(); diff --git a/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java b/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java index 7c5fa0031..6ed531ce3 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java +++ b/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java @@ -483,11 +483,6 @@ public class EntityCombineBall extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); diff --git a/src/main/java/com/hbm/entity/projectile/EntityDischarge.java b/src/main/java/com/hbm/entity/projectile/EntityDischarge.java index 09e0e9cf3..0c889a8c3 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityDischarge.java +++ b/src/main/java/com/hbm/entity/projectile/EntityDischarge.java @@ -507,11 +507,6 @@ public class EntityDischarge extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); diff --git a/src/main/java/com/hbm/entity/projectile/EntityFire.java b/src/main/java/com/hbm/entity/projectile/EntityFire.java index cee78465b..a0d6ad316 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityFire.java +++ b/src/main/java/com/hbm/entity/projectile/EntityFire.java @@ -484,11 +484,6 @@ public class EntityFire extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); diff --git a/src/main/java/com/hbm/entity/projectile/EntityLN2.java b/src/main/java/com/hbm/entity/projectile/EntityLN2.java index 0c0e3ab6d..56d283091 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityLN2.java +++ b/src/main/java/com/hbm/entity/projectile/EntityLN2.java @@ -481,11 +481,6 @@ public class EntityLN2 extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); diff --git a/src/main/java/com/hbm/entity/projectile/EntityRocket.java b/src/main/java/com/hbm/entity/projectile/EntityRocket.java index 2d2ae1eb1..9adaeaa04 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRocket.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRocket.java @@ -559,11 +559,6 @@ public class EntityRocket extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { p_70100_1_.onItemPickup(this, 1); diff --git a/src/main/java/com/hbm/entity/projectile/EntitySchrab.java b/src/main/java/com/hbm/entity/projectile/EntitySchrab.java index 7cbec714a..c2974df2f 100644 --- a/src/main/java/com/hbm/entity/projectile/EntitySchrab.java +++ b/src/main/java/com/hbm/entity/projectile/EntitySchrab.java @@ -557,11 +557,6 @@ public class EntitySchrab extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) - { - flag = false; - } - if (flag) { this.playSound("random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 114a43423..29cb1e87f 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -167,8 +167,8 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.hazmat_cloth, 4), new AStack[] {new OreDictStack(PB.dust(), 4), new ComparableStack(Items.string, 8), },50); makeRecipe(new ComparableStack(ModItems.asbestos_cloth, 4), new AStack[] {new OreDictStack(ASBESTOS.ingot(), 2), new ComparableStack(Items.string, 6), new ComparableStack(Blocks.wool, 1), },50); makeRecipe(new ComparableStack(ModItems.filter_coal, 1), new AStack[] {new OreDictStack(COAL.dust(), 4), new ComparableStack(Items.string, 6), new ComparableStack(Items.paper, 1), },50); - makeRecipe(new ComparableStack(ModItems.centrifuge_element, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 1), new ComparableStack(ModItems.coil_tungsten, 1), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.motor, 1), },200); - makeRecipe(new ComparableStack(ModItems.centrifuge_tower, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack(ANY_PLASTIC.ingot(), 2), },150); + makeRecipe(new ComparableStack(ModItems.centrifuge_element, 1), new AStack[] {new OreDictStack(STEEL.plate(), 4), new OreDictStack(TI.plate(), 4), new ComparableStack(ModItems.motor, 1), }, 100); + //makeRecipe(new ComparableStack(ModItems.centrifuge_tower, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack(ANY_PLASTIC.ingot(), 2), },150); makeRecipe(new ComparableStack(ModItems.magnet_circular, 1), new AStack[] {new ComparableStack(ModBlocks.fusion_conductor, 5), new OreDictStack(STEEL.ingot(), 4), new OreDictStack(ALLOY.plate(), 6), },150); makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack(PB.ingot(), 8), new OreDictStack(BE.ingot(), 6), new OreDictStack(STEEL.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(FIBER.ingot(), 2) },100); makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 2), new ComparableStack(ModItems.board_copper, 1), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.circuit_copper, 1), },100); @@ -273,8 +273,8 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.cmb_brick_reinforced, 8), new AStack[] {new ComparableStack(ModBlocks.block_magnetized_tungsten, 4), new ComparableStack(ModBlocks.brick_concrete, 4), new ComparableStack(ModBlocks.cmb_brick, 1), new OreDictStack(STEEL.plate(), 4), },200); makeRecipe(new ComparableStack(ModBlocks.seal_frame, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 3), new ComparableStack(ModItems.wire_aluminium, 4), new OreDictStack(REDSTONE.dust(), 2), new ComparableStack(ModBlocks.steel_roof, 5), },50); makeRecipe(new ComparableStack(ModBlocks.seal_controller, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 3), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(MINGRADE.ingot(), 1), new OreDictStack(REDSTONE.dust(), 4), new ComparableStack(ModBlocks.steel_roof, 5), },100); - makeRecipe(new ComparableStack(ModBlocks.machine_centrifuge, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_tower, 1), new OreDictStack(STEEL.ingot(), 4), new OreDictStack(IRON.ingot(), 4), new OreDictStack(STEEL.plate(), 2), new OreDictStack(CU.plate(), 2), new ComparableStack(ModItems.wire_red_copper, 8), },250); - makeRecipe(new ComparableStack(ModBlocks.machine_gascent, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_tower, 1), new OreDictStack(STEEL.ingot(), 4), new OreDictStack(DESH.ingot(), 2), new ComparableStack(ModItems.coil_tungsten, 4), new ComparableStack(ModItems.wire_red_copper, 16) },300); + makeRecipe(new ComparableStack(ModBlocks.machine_centrifuge, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 2), new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.circuit_copper, 1), }, 200); + makeRecipe(new ComparableStack(ModBlocks.machine_gascent, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(DESH.ingot(), 2), new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.coil_tungsten, 4), new ComparableStack(ModItems.circuit_red_copper, 1) }, 300); makeRecipe(new ComparableStack(ModBlocks.machine_rtg_furnace_off, 1), new AStack[] {new ComparableStack(Blocks.furnace, 1), new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(PB.plate(), 6), new OreDictStack(OreDictManager.getReflector(), 4), new OreDictStack(CU.plate(), 2), },150); makeRecipe(new ComparableStack(ModBlocks.machine_diesel, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 4), new ComparableStack(Blocks.piston, 4), new OreDictStack(STEEL.ingot(), 6), new OreDictStack(MINGRADE.ingot(), 2), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 6), },200); makeRecipe(new ComparableStack(ModBlocks.machine_selenium, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(TI.plate(), 6), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.hull_small_steel, 9), new ComparableStack(ModItems.pedestal_steel, 1), new ComparableStack(ModItems.coil_copper, 4), },250); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 795fce278..479020721 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -513,7 +513,7 @@ public class ModItems { public static Item motor; public static Item motor_desh; public static Item centrifuge_element; - public static Item centrifuge_tower; + //public static Item centrifuge_tower; public static Item reactor_core; public static Item rtg_unit; public static Item thermo_unit_empty; @@ -531,9 +531,9 @@ public class ModItems { public static Item coil_magnetized_tungsten; public static Item coil_gold; public static Item coil_gold_torus; - public static Item magnet_dee; + //public static Item magnet_dee; public static Item magnet_circular; - public static Item cyclotron_tower; + //public static Item cyclotron_tower; public static Item component_limiter; public static Item component_emitter; public static Item chlorine_pinwheel; @@ -1594,14 +1594,14 @@ public class ModItems { public static Item ammo_stinger_rocket_bones; public static Item gun_rpg; - public static Item gun_rpg_ammo; + //public static Item gun_rpg_ammo; public static Item gun_karl; public static Item gun_panzerschreck; public static Item gun_quadro; public static Item gun_hk69; public static Item gun_stinger; public static Item gun_skystinger; - public static Item gun_stinger_ammo; + //public static Item gun_stinger_ammo; public static Item gun_revolver; public static Item gun_revolver_saturnite; public static Item gun_revolver_ammo; @@ -1620,40 +1620,40 @@ public class ModItems { public static Item gun_revolver_nightmare2; public static Item gun_revolver_nightmare2_ammo; public static Item gun_revolver_pip; - public static Item gun_revolver_pip_ammo; + //public static Item gun_revolver_pip_ammo; public static Item gun_revolver_nopip; public static Item gun_revolver_blackjack; public static Item gun_revolver_silver; public static Item gun_revolver_red; - public static Item gun_revolver_nopip_ammo; + //public static Item gun_revolver_nopip_ammo; public static Item gun_deagle; public static Item gun_flechette; public static Item gun_ar15; public static Item gun_calamity; public static Item gun_calamity_dual; - public static Item gun_calamity_ammo; + //public static Item gun_calamity_ammo; public static Item gun_minigun; public static Item gun_avenger; public static Item gun_lacunae; - public static Item gun_lacunae_ammo; + //public static Item gun_lacunae_ammo; public static Item gun_folly; public static Item gun_fatman; public static Item gun_proto; - public static Item gun_fatman_ammo; + //public static Item gun_fatman_ammo; public static Item gun_mirv; - public static Item gun_mirv_ammo; + //public static Item gun_mirv_ammo; public static Item gun_bf; public static Item gun_bf_ammo; public static Item gun_mp40; - public static Item gun_mp40_ammo; + //public static Item gun_mp40_ammo; public static Item gun_thompson; public static Item gun_uzi; public static Item gun_uzi_silencer; public static Item gun_uzi_saturnite; public static Item gun_uzi_saturnite_silencer; - public static Item gun_uzi_ammo; + //public static Item gun_uzi_ammo; public static Item gun_uboinik; - public static Item gun_uboinik_ammo; + //public static Item gun_uboinik_ammo; public static Item gun_spas12; public static Item gun_supershotgun; public static Item gun_ks23; @@ -1661,11 +1661,11 @@ public class ModItems { public static Item gun_lever_action; public static Item gun_lever_action_dark; public static Item gun_lever_action_sonata; - public static Item gun_lever_action_ammo; + //public static Item gun_lever_action_ammo; public static Item gun_bolt_action; public static Item gun_bolt_action_green; public static Item gun_bolt_action_saturnite; - public static Item gun_bolt_action_ammo; + //public static Item gun_bolt_action_ammo; public static Item gun_mymy; public static Item gun_b92; public static Item gun_b92_ammo; @@ -3015,7 +3015,7 @@ public class ModItems { motor = new Item().setUnlocalizedName("motor").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":motor"); motor_desh = new Item().setUnlocalizedName("motor_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":motor_desh"); centrifuge_element = new Item().setUnlocalizedName("centrifuge_element").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":centrifuge_element"); - centrifuge_tower = new Item().setUnlocalizedName("centrifuge_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":centrifuge_tower"); + //centrifuge_tower = new Item().setUnlocalizedName("centrifuge_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":centrifuge_tower"); reactor_core = new Item().setUnlocalizedName("reactor_core").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":reactor_core"); rtg_unit = new Item().setUnlocalizedName("rtg_unit").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":rtg_unit"); thermo_unit_empty = new Item().setUnlocalizedName("thermo_unit_empty").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thermo_unit_empty"); @@ -3030,9 +3030,9 @@ public class ModItems { coil_magnetized_tungsten = new Item().setUnlocalizedName("coil_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_magnetized_tungsten"); coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); coil_gold_torus = new Item().setUnlocalizedName("coil_gold_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold_torus"); - magnet_dee = new Item().setUnlocalizedName("magnet_dee").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_dee"); + //magnet_dee = new Item().setUnlocalizedName("magnet_dee").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_dee"); magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_circular"); - cyclotron_tower = new Item().setUnlocalizedName("cyclotron_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cyclotron_tower"); + //cyclotron_tower = new Item().setUnlocalizedName("cyclotron_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cyclotron_tower"); pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_coal"); component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_limiter"); component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter"); @@ -4324,11 +4324,11 @@ public class ModItems { gun_karl = new ItemGunBase(GunRocketFactory.getKarlConfig()).setUnlocalizedName("gun_karl").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_karl"); gun_panzerschreck = new ItemGunBase(GunRocketFactory.getPanzConfig()).setUnlocalizedName("gun_panzerschreck").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_panzerschreck"); gun_quadro = new ItemGunBase(GunRocketFactory.getQuadroConfig()).setUnlocalizedName("gun_quadro").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_quadro"); - gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt"); + //gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt"); gun_hk69 = new ItemGunBase(GunGrenadeFactory.getHK69Config()).setUnlocalizedName("gun_hk69").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_hk69"); gun_stinger = new ItemGunBase(GunRocketHomingFactory.getStingerConfig()).setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger"); gun_skystinger = new ItemGunBase(GunRocketHomingFactory.getSkyStingerConfig()).setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger"); - gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); + //gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); gun_revolver_ammo = new Item().setUnlocalizedName("gun_revolver_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_ammo"); gun_revolver = new ItemGunBase(Gun357MagnumFactory.getRevolverConfig()).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver"); gun_revolver_saturnite = new ItemGunBase(Gun357MagnumFactory.getRevolverSaturniteConfig()).setUnlocalizedName("gun_revolver_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_saturnite"); @@ -4346,9 +4346,9 @@ public class ModItems { gun_revolver_nightmare = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmareConfig()).setUnlocalizedName("gun_revolver_nightmare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare"); gun_revolver_nightmare2_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_nightmare2_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2_ammo"); gun_revolver_nightmare2 = new ItemGunBase(Gun357MagnumFactory.getRevolverNightmare2Config()).setUnlocalizedName("gun_revolver_nightmare2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nightmare2"); - gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo"); + //gun_revolver_pip_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_pip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_pip_ammo"); gun_revolver_pip = new ItemGunBase(Gun44MagnumFactory.getMacintoshConfig()).setUnlocalizedName("gun_revolver_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_pip"); - gun_revolver_nopip_ammo = new Item().setUnlocalizedName("gun_revolver_nopip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_nopip_ammo"); + //gun_revolver_nopip_ammo = new Item().setUnlocalizedName("gun_revolver_nopip_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_revolver_nopip_ammo"); gun_revolver_nopip = new ItemGunBase(Gun44MagnumFactory.getNovacConfig()).setUnlocalizedName("gun_revolver_nopip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_nopip"); gun_revolver_blackjack = new ItemGunBase(Gun44MagnumFactory.getBlackjackConfig()).setUnlocalizedName("gun_revolver_blackjack").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_blackjack"); gun_revolver_silver = new ItemGunBase(Gun44MagnumFactory.getSilverConfig()).setUnlocalizedName("gun_revolver_silver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_silver"); @@ -4356,40 +4356,40 @@ public class ModItems { gun_deagle = new ItemGunBase(Gun50AEFactory.getDeagleConfig()).setUnlocalizedName("gun_deagle").setFull3D().setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_deagle"); gun_flechette = new ItemGunBase(Gun556mmFactory.getSPIWConfig(), Gun556mmFactory.getGLauncherConfig()).setUnlocalizedName("gun_flechette").setFull3D().setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_flechette"); gun_ar15 = new ItemGunBase(Gun50BMGFactory.getAR15Config()).setUnlocalizedName("gun_ar15").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_ar15"); - gun_calamity_ammo = new ItemCustomLore().setUnlocalizedName("gun_calamity_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_calamity_ammo"); + //gun_calamity_ammo = new ItemCustomLore().setUnlocalizedName("gun_calamity_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_calamity_ammo"); gun_calamity = new ItemGunBase(Gun50BMGFactory.getCalamityConfig()).setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity"); gun_calamity_dual = new ItemGunBase(Gun50BMGFactory.getSaddleConfig()).setUnlocalizedName("gun_calamity_dual").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity_dual"); - gun_lacunae_ammo = new ItemCustomLore().setUnlocalizedName("gun_lacunae_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lacunae_ammo"); + //gun_lacunae_ammo = new ItemCustomLore().setUnlocalizedName("gun_lacunae_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lacunae_ammo"); gun_minigun = new ItemGunLacunae(Gun5mmFactory.get53Config()).setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun"); gun_avenger = new ItemGunLacunae(Gun5mmFactory.get57Config()).setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger"); gun_lacunae = new ItemGunLacunae(Gun5mmFactory.getLacunaeConfig()).setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae"); gun_folly = new GunFolly().setUnlocalizedName("gun_folly").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly"); - gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); + //gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new ItemGunBase(GunFatmanFactory.getFatmanConfig()).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); gun_proto = new ItemGunBase(GunFatmanFactory.getProtoConfig()).setUnlocalizedName("gun_proto").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); - gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mirv_ammo"); + //gun_mirv_ammo = new Item().setUnlocalizedName("gun_mirv_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mirv_ammo"); gun_mirv = new ItemGunBase(GunFatmanFactory.getMIRVConfig()).setUnlocalizedName("gun_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mirv"); gun_bf_ammo = new Item().setUnlocalizedName("gun_bf_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf_ammo"); gun_bf = new ItemGunBase(GunFatmanFactory.getBELConfig()).setUnlocalizedName("gun_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bf"); - gun_mp40_ammo = new Item().setUnlocalizedName("gun_mp40_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mp40_ammo"); + //gun_mp40_ammo = new Item().setUnlocalizedName("gun_mp40_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_mp40_ammo"); gun_mp40 = new ItemGunBase(Gun9mmFactory.getMP40Config()).setUnlocalizedName("gun_mp40").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_mp40"); gun_thompson = new ItemGunBase(Gun9mmFactory.getThompsonConfig()).setUnlocalizedName("gun_thompson").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_thompson"); - gun_uzi_ammo = new Item().setUnlocalizedName("gun_uzi_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uzi_ammo"); + //gun_uzi_ammo = new Item().setUnlocalizedName("gun_uzi_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uzi_ammo"); gun_uzi = new ItemGunBase(Gun22LRFactory.getUziConfig()).setUnlocalizedName("gun_uzi").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uzi"); gun_uzi_silencer = new ItemGunBase(Gun22LRFactory.getUziConfig().silenced()).setUnlocalizedName("gun_uzi_silencer").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uzi_silencer"); gun_uzi_saturnite = new ItemGunBase(Gun22LRFactory.getSaturniteConfig()).setUnlocalizedName("gun_uzi_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uzi_saturnite"); gun_uzi_saturnite_silencer = new ItemGunBase(Gun22LRFactory.getSaturniteConfig().silenced()).setUnlocalizedName("gun_uzi_saturnite_silencer").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uzi_saturnite_silencer"); - gun_uboinik_ammo = new Item().setUnlocalizedName("gun_uboinik_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uboinik_ammo"); + //gun_uboinik_ammo = new Item().setUnlocalizedName("gun_uboinik_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_uboinik_ammo"); gun_uboinik = new ItemGunBase(Gun12GaugeFactory.getUboinikConfig()).setUnlocalizedName("gun_uboinik").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik"); gun_spas12 = new ItemGunBase(Gun12GaugeFactory.getSpas12Config(), Gun12GaugeFactory.getSpas12AltConfig()).setUnlocalizedName("gun_spas12").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_spas12"); gun_supershotgun = new ItemGunShotty(Gun12GaugeFactory.getShottyConfig()).setUnlocalizedName("gun_supershotgun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik"); gun_ks23 = new ItemGunBase(Gun4GaugeFactory.getKS23Config()).setUnlocalizedName("gun_ks23").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik"); gun_sauer = new ItemGunBase(Gun4GaugeFactory.getSauerConfig()).setUnlocalizedName("gun_sauer").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_uboinik"); - gun_lever_action_ammo = new Item().setUnlocalizedName("gun_lever_action_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lever_action_ammo"); + //gun_lever_action_ammo = new Item().setUnlocalizedName("gun_lever_action_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_lever_action_ammo"); gun_lever_action = new ItemGunBase(Gun20GaugeFactory.getMareConfig()).setUnlocalizedName("gun_lever_action").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lever_action"); gun_lever_action_dark = new ItemGunBase(Gun20GaugeFactory.getMareDarkConfig()).setUnlocalizedName("gun_lever_action_dark").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lever_action_dark"); gun_lever_action_sonata = new GunLeverActionS().setUnlocalizedName("gun_lever_action_sonata").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lever_action_sonata"); - gun_bolt_action_ammo = new Item().setUnlocalizedName("gun_bolt_action_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bolt_action_ammo"); + //gun_bolt_action_ammo = new Item().setUnlocalizedName("gun_bolt_action_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_bolt_action_ammo"); gun_bolt_action = new ItemGunBase(Gun20GaugeFactory.getBoltConfig()).setUnlocalizedName("gun_bolt_action").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolt_action"); gun_bolt_action_green = new ItemGunBase(Gun20GaugeFactory.getBoltGreenConfig()).setUnlocalizedName("gun_bolt_action_green").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolt_action_green"); gun_bolt_action_saturnite = new ItemGunBase(Gun20GaugeFactory.getBoltSaturniteConfig()).setUnlocalizedName("gun_bolt_action_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_bolt_action_saturnite"); @@ -6179,10 +6179,10 @@ public class ModItems { GameRegistry.registerItem(motor, motor.getUnlocalizedName()); GameRegistry.registerItem(motor_desh, motor_desh.getUnlocalizedName()); GameRegistry.registerItem(centrifuge_element, centrifuge_element.getUnlocalizedName()); - GameRegistry.registerItem(centrifuge_tower, centrifuge_tower.getUnlocalizedName()); - GameRegistry.registerItem(magnet_dee, magnet_dee.getUnlocalizedName()); + //GameRegistry.registerItem(centrifuge_tower, centrifuge_tower.getUnlocalizedName()); + //GameRegistry.registerItem(magnet_dee, magnet_dee.getUnlocalizedName()); GameRegistry.registerItem(magnet_circular, magnet_circular.getUnlocalizedName()); - GameRegistry.registerItem(cyclotron_tower, cyclotron_tower.getUnlocalizedName()); + //GameRegistry.registerItem(cyclotron_tower, cyclotron_tower.getUnlocalizedName()); GameRegistry.registerItem(reactor_core, reactor_core.getUnlocalizedName()); GameRegistry.registerItem(rtg_unit, rtg_unit.getUnlocalizedName()); GameRegistry.registerItem(thermo_unit_empty, thermo_unit_empty.getUnlocalizedName()); @@ -7222,21 +7222,21 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_nightmare_ammo, gun_revolver_nightmare_ammo.getUnlocalizedName()); GameRegistry.registerItem(ammo_357_desh, ammo_357_desh.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_nightmare2_ammo, gun_revolver_nightmare2_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_nopip_ammo, gun_revolver_nopip_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_calamity_ammo, gun_calamity_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_lacunae_ammo, gun_lacunae_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_revolver_pip_ammo, gun_revolver_pip_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_revolver_nopip_ammo, gun_revolver_nopip_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_calamity_ammo, gun_calamity_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_lacunae_ammo, gun_lacunae_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_stinger_ammo, gun_stinger_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_mirv_ammo, gun_mirv_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_stinger_ammo, gun_stinger_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_mirv_ammo, gun_mirv_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_bf_ammo, gun_bf_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_mp40_ammo, gun_mp40_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_uzi_ammo, gun_uzi_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_uboinik_ammo, gun_uboinik_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_lever_action_ammo, gun_lever_action_ammo.getUnlocalizedName()); - GameRegistry.registerItem(gun_bolt_action_ammo, gun_bolt_action_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_mp40_ammo, gun_mp40_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_uzi_ammo, gun_uzi_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_uboinik_ammo, gun_uboinik_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_lever_action_ammo, gun_lever_action_ammo.getUnlocalizedName()); + //GameRegistry.registerItem(gun_bolt_action_ammo, gun_bolt_action_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo, gun_osipr_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo2, gun_osipr_ammo2.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/GunCalamity.java b/src/main/java/com/hbm/items/weapon/GunCalamity.java deleted file mode 100644 index 47f79635d..000000000 --- a/src/main/java/com/hbm/items/weapon/GunCalamity.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.hbm.items.weapon; - -import java.util.List; -import java.util.Random; - -import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.items.ModItems; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.ArrowNockEvent; - -public class GunCalamity extends Item { - - Random rand = new Random(); - - public GunCalamity() - { - this.maxStackSize = 1; - } - - @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; - } - - @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { - return 72000; - } - - @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - new ArrowNockEvent(p_77659_3_, p_77659_1_); - { - p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); - } - - return p_77659_1_; - } - - @Override - public void onUsingTick(ItemStack stack, EntityPlayer player, int count) - { - World world = player.worldObj; - - boolean flag = player.capabilities.isCreativeMode - || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; - - if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_calamity_ammo)) && count % 6 == 0) { - EntityBullet entityarrow = new EntityBullet(world, player, 3.0F, 15, 25, false, false); - entityarrow.setDamage(15 + rand.nextInt(25)); - - world.playSoundAtEntity(player, "hbm:weapon.calShoot", 1.0F, 1.0F); - - if (flag) { - entityarrow.canBePickedUp = 2; - } else { - player.inventory.consumeInventoryItem(ModItems.ammo_50bmg); - } - - if (!world.isRemote) { - world.spawnEntityInWorld(entityarrow); - } - } - - if (this == ModItems.gun_calamity_dual && (player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.gun_calamity_ammo)) && count % 6 == 3) { - EntityBullet entityarrow = new EntityBullet(world, player, 3.0F, 15, 25, false, false); - entityarrow.setDamage(15 + rand.nextInt(25)); - - world.playSoundAtEntity(player, "hbm:weapon.calShoot", 1.0F, 0.7F); - - if (flag) { - entityarrow.canBePickedUp = 2; - } else { - player.inventory.consumeInventoryItem(ModItems.ammo_50bmg); - } - - if (!world.isRemote) { - world.spawnEntityInWorld(entityarrow); - } - } - } - - @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - - if(this == ModItems.gun_calamity) { - list.add("Handheld Maxim"); - } - if(this == ModItems.gun_calamity_dual) { - list.add("You may be thinking, 'This gun makes no"); - list.add("sense, why is there only one receiver for"); - list.add("two barrels, and how do the bullets even"); - list.add("come out of this thing? The barrels are"); - list.add("just taped onto a plate with no connection"); - list.add("to the rest of the gun!' Well my boy, this"); - list.add("question has a simple, easy to understand"); - list.add("answer, it's because " + EnumChatFormatting.OBFUSCATED + "gkjin soi unsi"); - list.add("and " + EnumChatFormatting.OBFUSCATED + "aslfnu isnfi uo fnafaoin fsj afakjkk abk"); - } - list.add(""); - list.add("Ammo: .50 BMG Round"); - list.add("Damage: 15 - 25"); - } - - @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = super.getItemAttributeModifiers(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", 3, 0)); - return multimap; - } -} diff --git a/src/main/java/com/hbm/items/weapon/ItemClip.java b/src/main/java/com/hbm/items/weapon/ItemClip.java index 5199e2f63..a77b89528 100644 --- a/src/main/java/com/hbm/items/weapon/ItemClip.java +++ b/src/main/java/com/hbm/items/weapon/ItemClip.java @@ -330,7 +330,7 @@ public class ItemClip extends Item { if(player.inventory.hasItem(ModItems.gun_proto)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_nuke, 8)); if(player.inventory.hasItem(ModItems.gun_mirv)) - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_mirv_ammo, 1)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_mirv, 1)); if(player.inventory.hasItem(ModItems.gun_bf)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_bf_ammo, 1)); if(player.inventory.hasItem(ModItems.gun_mp40)) diff --git a/src/main/java/com/hbm/lib/HbmChestContents.java b/src/main/java/com/hbm/lib/HbmChestContents.java index 0b5b3d295..242f67ceb 100644 --- a/src/main/java/com/hbm/lib/HbmChestContents.java +++ b/src/main/java/com/hbm/lib/HbmChestContents.java @@ -322,7 +322,7 @@ public class HbmChestContents { public static WeightedRandomChestContent[] vault4 = new WeightedRandomChestContent[] { new WeightedRandomChestContent(ModItems.ammo_container, 0, 3, 6, 1), new WeightedRandomChestContent(ModItems.clip_fatman, 0, 2, 3, 1), - new WeightedRandomChestContent(ModItems.gun_mirv_ammo, 0, 2, 3, 1), + new WeightedRandomChestContent(ModItems.ammo_mirv, 0, 2, 3, 1), new WeightedRandomChestContent(ModItems.gun_mirv, 0, 1, 1, 1), new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1), new WeightedRandomChestContent(ModItems.gun_proto, 0, 1, 1, 1), diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index fc95215d2..72ffe6905 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -30,6 +30,7 @@ import cpw.mods.fml.common.Mod.Metadata; import cpw.mods.fml.common.ModMetadata; import java.io.File; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map.Entry; @@ -1069,19 +1070,46 @@ public class MainRegistry { } private static HashSet ignoreMappings = new HashSet(); + private static HashMap remapItems = new HashMap(); static { - for(int i = 1; i <= 8; i++) - ignoreMappings.add("hbm:item.gasflame" + i); + /// IGNORE /// + for(int i = 1; i <= 8; i++) ignoreMappings.add("hbm:item.gasflame" + i); + ignoreMappings.add("hbm:item.cyclotron_tower"); + ignoreMappings.add("hbm:item.magnet_dee"); + /// REMAP /// + remapItems.put("hbm:item.centrifuge_tower", Item.getItemFromBlock(ModBlocks.machine_centrifuge)); + remapItems.put("hbm:item.gun_revolver_nopip_ammo", ModItems.ammo_44); + remapItems.put("hbm:item.gun_revolver_pip_ammo", ModItems.ammo_44_pip); + remapItems.put("hbm:item.gun_calamity_ammo", ModItems.ammo_50bmg); + remapItems.put("hbm:item.gun_lacunae_ammo", ModItems.ammo_5mm); + remapItems.put("hbm:item.gun_rpg_ammo", ModItems.ammo_rocket); + remapItems.put("hbm:item.gun_mp40_ammo", ModItems.ammo_9mm); + remapItems.put("hbm:item.gun_uzi_ammo", ModItems.ammo_22lr); + remapItems.put("hbm:item.gun_uboinik_ammo", ModItems.ammo_12gauge); + remapItems.put("hbm:item.gun_lever_action_ammo", ModItems.ammo_20gauge); + remapItems.put("hbm:item.gun_bolt_action_ammo", ModItems.ammo_20gauge_slug); + remapItems.put("hbm:item.gun_fatman_ammo", ModItems.ammo_nuke_high); + remapItems.put("hbm:item.gun_mirv_ammo", ModItems.ammo_mirv_high); + remapItems.put("hbm:item.gun_stinger_ammo", ModItems.ammo_stinger_rocket); } + @EventHandler public void handleMissingMappings(FMLMissingMappingsEvent event) { for(MissingMapping mapping : event.get()) { + + if(ignoreMappings.contains(mapping.name)) { + mapping.ignore(); + continue; + } + if(mapping.type == GameRegistry.Type.ITEM) { - if(ignoreMappings.contains(mapping.name)) { - mapping.ignore(); + + if(remapItems.containsKey(mapping.name)) { + mapping.remap(remapItems.get(mapping.name)); + continue; } } } diff --git a/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png b/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png new file mode 100644 index 000000000..4b8ccb039 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/conveyor_double.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo.png deleted file mode 100644 index 02934aa44..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png deleted file mode 100644 index 28a7dd962..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_buckshot_dragon.png b/src/main/resources/assets/hbm/textures/items/gun_buckshot_dragon.png deleted file mode 100644 index af6b5dbf8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_buckshot_dragon.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_buckshot_explosive.png b/src/main/resources/assets/hbm/textures/items/gun_buckshot_explosive.png deleted file mode 100644 index 23ccbd54a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_buckshot_explosive.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_buckshot_poison.png b/src/main/resources/assets/hbm/textures/items/gun_buckshot_poison.png deleted file mode 100644 index 4f8e2e4c5..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_buckshot_poison.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_buckshot_shock.png b/src/main/resources/assets/hbm/textures/items/gun_buckshot_shock.png deleted file mode 100644 index 193c51cff..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_buckshot_shock.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_buckshot_wither.png b/src/main/resources/assets/hbm/textures/items/gun_buckshot_wither.png deleted file mode 100644 index d45ee0f56..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_buckshot_wither.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_calamity_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_calamity_ammo.png deleted file mode 100644 index cc26b5bab..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_calamity_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_fatman_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_fatman_ammo.png deleted file mode 100644 index d12fd606f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_fatman_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lacunae_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_lacunae_ammo.png deleted file mode 100644 index 8a55130cb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lacunae_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo.png deleted file mode 100644 index 114d8367f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo_alt.png deleted file mode 100644 index 56afc548b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lever_action_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mirv_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_mirv_ammo.png deleted file mode 100644 index 8a99d897a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mirv_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo.png deleted file mode 100644 index 593603884..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo_alt.png deleted file mode 100644 index 6c4ae2d18..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mp40_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo.png deleted file mode 100644 index 1d741d30a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo_alt.png deleted file mode 100644 index 7e061d457..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo.png deleted file mode 100644 index b0b384f74..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo_alt.png deleted file mode 100644 index e204667a4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo.png deleted file mode 100644 index 1316d10a4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_alt.png deleted file mode 100644 index 21192e91d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_new.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_new.png deleted file mode 100644 index 188aa1311..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg_ammo_new.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_stinger_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_stinger_ammo.png deleted file mode 100644 index 132e23ffe..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_stinger_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo.png deleted file mode 100644 index 5f3e67b68..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo_alt.png b/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo_alt.png deleted file mode 100644 index 085ae1ba4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uboinik_ammo_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uzi_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_uzi_ammo.png deleted file mode 100644 index d6444f096..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uzi_ammo.png and /dev/null differ