From e6190424468710fcd631d75af40da95148b1937c Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 23 Feb 2022 14:18:11 +0100 Subject: [PATCH] c4 and semtex timed explosives, slight recipe tweaks --- src/main/java/com/hbm/blocks/ModBlocks.java | 10 +- .../com/hbm/blocks/bomb/BlockChargeC4.java | 31 +++++ .../hbm/blocks/bomb/BlockChargeSemtex.java | 31 +++++ .../blocks/machine/DummyBlockChemplant.java | 11 -- .../hbm/blocks/machine/MachineChemplant.java | 4 +- src/main/java/com/hbm/handler/GUIHandler.java | 8 +- .../java/com/hbm/hazard/HazardRegistry.java | 3 +- .../container/ContainerMachineChemplant.java | 6 +- .../com/hbm/inventory/fluid/FluidType.java | 3 +- .../inventory/gui/GUIMachineChemplant.java | 6 +- .../inventory/recipes/AssemblerRecipes.java | 6 +- src/main/java/com/hbm/items/ModItems.java | 3 + src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 1 + .../render/tileentity/RenderChemplant.java | 4 +- .../java/com/hbm/tileentity/TileMappings.java | 2 +- ...w.java => TileEntityMachineChemplant.java} | 4 +- .../assets/hbm/models/blocks/charge_c4.obj | 109 ++++++++++++++++++ .../assets/hbm/textures/blocks/charge_c4.png | Bin 0 -> 260 bytes .../hbm/textures/blocks/charge_semtex.png | Bin 0 -> 257 bytes .../textures/items/chem_icon_SF_DIESEL.png | Bin 257 -> 389 bytes .../hbm/textures/items/holotape_damaged.png | Bin 0 -> 754 bytes .../items/holotape_damaged.png.mcmeta | 3 + .../textures/items/holotape_damaged_base.png | Bin 0 -> 436 bytes 24 files changed, 210 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java create mode 100644 src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java delete mode 100644 src/main/java/com/hbm/blocks/machine/DummyBlockChemplant.java rename src/main/java/com/hbm/tileentity/machine/{TileEntityMachineChemplantNew.java => TileEntityMachineChemplant.java} (98%) create mode 100644 src/main/resources/assets/hbm/models/blocks/charge_c4.obj create mode 100644 src/main/resources/assets/hbm/textures/blocks/charge_c4.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/charge_semtex.png create mode 100644 src/main/resources/assets/hbm/textures/items/holotape_damaged.png create mode 100644 src/main/resources/assets/hbm/textures/items/holotape_damaged.png.mcmeta create mode 100644 src/main/resources/assets/hbm/textures/items/holotape_damaged_base.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 53a487000..2117c7119 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -492,6 +492,8 @@ public class ModBlocks { public static Block charge_dynamite; public static Block charge_miner; + public static Block charge_c4; + public static Block charge_semtex; public static Block mine_ap; public static Block mine_he; @@ -1699,6 +1701,8 @@ public class ModBlocks { fireworks = new BlockFireworks(Material.iron).setBlockName("fireworks").setCreativeTab(MainRegistry.nukeTab).setResistance(5.0F); charge_dynamite = new BlockChargeDynamite().setBlockName("charge_dynamite").setCreativeTab(MainRegistry.nukeTab).setResistance(1.0F); charge_miner = new BlockChargeMiner().setBlockName("charge_miner").setCreativeTab(MainRegistry.nukeTab).setResistance(1.0F); + charge_c4 = new BlockChargeC4().setBlockName("charge_c4").setCreativeTab(MainRegistry.nukeTab).setResistance(1.0F); + charge_semtex = new BlockChargeSemtex().setBlockName("charge_semtex").setCreativeTab(MainRegistry.nukeTab).setResistance(1.0F); mine_ap = new Landmine(Material.iron).setBlockName("mine_ap").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_ap"); mine_he = new Landmine(Material.iron).setBlockName("mine_he").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_he"); mine_shrap = new Landmine(Material.iron).setBlockName("mine_shrap").setCreativeTab(MainRegistry.nukeTab).setHardness(1.0F).setBlockTextureName(RefStrings.MODID + ":mine_shrap"); @@ -2178,8 +2182,8 @@ public class ModBlocks { dummy_port_drill = new DummyBlockDrill(Material.iron, true).setBlockName("dummy_port_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_lead"); dummy_block_assembler = new DummyBlockAssembler(Material.iron, false).setBlockName("dummy_block_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_assembler = new DummyBlockAssembler(Material.iron, true).setBlockName("dummy_port_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_chemplant = new DummyBlockChemplant(Material.iron).setBlockName("dummy_block_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_chemplant = new DummyBlockChemplant(Material.iron).setBlockName("dummy_port_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_chemplant = new BlockGeneric(Material.iron).setBlockName("dummy_block_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_port_chemplant = new BlockGeneric(Material.iron).setBlockName("dummy_port_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_fluidtank = new DummyBlockFluidTank(Material.iron, false).setBlockName("dummy_block_fluidtank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_fluidtank = new DummyBlockFluidTank(Material.iron, true).setBlockName("dummy_port_fluidtank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_refinery = new DummyBlockRefinery(Material.iron, false).setBlockName("dummy_block_refinery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); @@ -2699,6 +2703,8 @@ public class ModBlocks { //Wall-mounted Explosives GameRegistry.registerBlock(charge_dynamite, ItemBlockBase.class, charge_dynamite.getUnlocalizedName()); GameRegistry.registerBlock(charge_miner, ItemBlockBase.class, charge_miner.getUnlocalizedName()); + GameRegistry.registerBlock(charge_c4, ItemBlockBase.class, charge_c4.getUnlocalizedName()); + GameRegistry.registerBlock(charge_semtex, ItemBlockBase.class, charge_semtex.getUnlocalizedName()); //Mines GameRegistry.registerBlock(mine_ap, mine_ap.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java b/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java new file mode 100644 index 000000000..915c2594d --- /dev/null +++ b/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java @@ -0,0 +1,31 @@ +package com.hbm.blocks.bomb; + +import com.hbm.explosion.ExplosionLarge; +import com.hbm.explosion.ExplosionNT; + +import net.minecraft.world.World; + +public class BlockChargeC4 extends BlockChargeBase { + + @Override + public BombReturnCode explode(World world, int x, int y, int z) { + + if(!world.isRemote) { + safe = true; + world.setBlockToAir(x, y, z); + safe = false; + ExplosionNT exp = new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 4F); + exp.explode(); + ExplosionLarge.spawnParticles(world, x + 0.5, y + 0.5, z + 0.5, 20); + + return BombReturnCode.DETONATED; + } + + return BombReturnCode.UNDEFINED; + } + + @Override + public int getRenderType() { + return BlockChargeDynamite.renderID; + } +} diff --git a/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java b/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java new file mode 100644 index 000000000..163b93578 --- /dev/null +++ b/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java @@ -0,0 +1,31 @@ +package com.hbm.blocks.bomb; + +import com.hbm.explosion.ExplosionLarge; +import com.hbm.explosion.ExplosionNT; + +import net.minecraft.world.World; + +public class BlockChargeSemtex extends BlockChargeBase { + + @Override + public BombReturnCode explode(World world, int x, int y, int z) { + + if(!world.isRemote) { + safe = true; + world.setBlockToAir(x, y, z); + safe = false; + ExplosionNT exp = new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 4F); + exp.explode(); + ExplosionLarge.spawnParticles(world, x + 0.5, y + 0.5, z + 0.5, 20); + + return BombReturnCode.DETONATED; + } + + return BombReturnCode.UNDEFINED; + } + + @Override + public int getRenderType() { + return BlockChargeDynamite.renderID; + } +} diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockChemplant.java b/src/main/java/com/hbm/blocks/machine/DummyBlockChemplant.java deleted file mode 100644 index f00824817..000000000 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockChemplant.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hbm.blocks.machine; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class DummyBlockChemplant extends Block { - - public DummyBlockChemplant(Material p_i45394_1_) { - super(p_i45394_1_); - } -} diff --git a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java index bfcc47949..bd7d2fcd2 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java +++ b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java @@ -3,7 +3,7 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.TileEntityMachineChemplantNew; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +19,7 @@ public class MachineChemplant extends BlockDummyable { @Override public TileEntity createNewTileEntity(World world, int meta) { - if(meta >= 12) return new TileEntityMachineChemplantNew(); + if(meta >= 12) return new TileEntityMachineChemplant(); if(meta >= 6) return new TileEntityProxyCombo(false, true, true); return null; } diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index 15fea4c33..6a17678b6 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -327,8 +327,8 @@ public class GUIHandler implements IGuiHandler { } case ModBlocks.guiID_machine_chemplant: { - if(entity instanceof TileEntityMachineChemplantNew) { - return new ContainerMachineChemplant(player.inventory, (TileEntityMachineChemplantNew) entity); + if(entity instanceof TileEntityMachineChemplant) { + return new ContainerMachineChemplant(player.inventory, (TileEntityMachineChemplant) entity); } return null; } @@ -1167,8 +1167,8 @@ public class GUIHandler implements IGuiHandler { } case ModBlocks.guiID_machine_chemplant: { - if(entity instanceof TileEntityMachineChemplantNew) { - return new GUIMachineChemplant(player.inventory, (TileEntityMachineChemplantNew) entity); + if(entity instanceof TileEntityMachineChemplant) { + return new GUIMachineChemplant(player.inventory, (TileEntityMachineChemplant) entity); } return null; } diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 897d9ff9b..d781030cc 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -449,7 +449,8 @@ public class HazardRegistry { HazardSystem.register(solinium_core, makeData().addEntry(RADIATION, sa327 * nugget * 8).addEntry(BLINDING, 5F)); HazardSystem.register(nuke_fstbmb, makeData(DIGAMMA, 0.01F)); - HazardSystem.register(new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_RESTORED.ordinal()), makeData(DIGAMMA, 1F)); + HazardSystem.register(DictFrame.fromOne(ModItems.holotape_image, EnumHoloImage.HOLO_RESTORED), makeData(DIGAMMA, 1F)); + HazardSystem.register(holotape_damaged, makeData(DIGAMMA, 1_000F)); /* * Blacklist diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java b/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java index 7f6a0563f..2ccb2081a 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineChemplantNew; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -11,9 +11,9 @@ import net.minecraft.item.ItemStack; public class ContainerMachineChemplant extends Container { - private TileEntityMachineChemplantNew nukeBoy; + private TileEntityMachineChemplant nukeBoy; - public ContainerMachineChemplant(InventoryPlayer invPlayer, TileEntityMachineChemplantNew tedf) { + public ContainerMachineChemplant(InventoryPlayer invPlayer, TileEntityMachineChemplant tedf) { nukeBoy = tedf; // Battery diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index d87321234..42825eaf9 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.List; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.lib.RefStrings; import com.hbm.render.util.EnumSymbol; @@ -81,7 +80,7 @@ public class FluidType { return this.unlocalized; } public String getDict(int quantity) { - return "container" + quantity + this.stringId.replace("_", ""); + return "container" + quantity + this.stringId.replace("_", "").toLowerCase(); } public boolean isHot() { diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java b/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java index 81093952d..fc03ff008 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineChemplant; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineChemplantNew; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; @@ -16,9 +16,9 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineChemplant extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_chemplant.png"); - private TileEntityMachineChemplantNew chemplant; + private TileEntityMachineChemplant chemplant; - public GUIMachineChemplant(InventoryPlayer invPlayer, TileEntityMachineChemplantNew tedf) { + public GUIMachineChemplant(InventoryPlayer invPlayer, TileEntityMachineChemplant tedf) { super(new ContainerMachineChemplant(invPlayer, tedf)); chemplant = tedf; diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index a5b96f5b3..e4c19722a 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -370,7 +370,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.boy_bullet, 1), new AStack[] {new OreDictStack(U235.nugget(), 3), },100); makeRecipe(new ComparableStack(ModItems.boy_propellant, 1), new AStack[] {new ComparableStack(Blocks.tnt, 3), new OreDictStack(IRON.plate(), 8), new OreDictStack(AL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), },100); makeRecipe(new ComparableStack(ModItems.boy_igniter, 1), new AStack[] {new OreDictStack(AL.plate(), 6), new OreDictStack(STEEL.plate(), 1), new ComparableStack(ModItems.circuit_red_copper, 1), new ComparableStack(ModItems.wire_red_copper, 3), },150); - makeRecipe(new ComparableStack(ModItems.man_explosive, 1), new AStack[] {new ComparableStack(Blocks.tnt, 2), new ComparableStack(ModItems.ingot_semtex, 3), new OreDictStack(STEEL.plate(), 2), new OreDictStack(TI.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 3), },200); + makeRecipe(new ComparableStack(ModItems.man_explosive, 1), new AStack[] {new ComparableStack(Blocks.tnt, 2), new ComparableStack(ModItems.ball_tnt, 3), new OreDictStack(STEEL.plate(), 2), new OreDictStack(TI.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 3), },200); makeRecipe(new ComparableStack(ModItems.man_igniter, 1), new AStack[] {new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.circuit_red_copper, 1), new ComparableStack(ModItems.wire_red_copper, 9), },150); makeRecipe(new ComparableStack(ModItems.man_core, 1), new AStack[] {new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2), },250); makeRecipe(new ComparableStack(ModItems.mike_core, 1), new AStack[] {new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.ingot(), 6), },250); @@ -435,7 +435,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.mp_warhead_15_incendiary, 1), new AStack[] {new ComparableStack(ModItems.seg_15, 1), new OreDictStack(STEEL.plate(), 16), new ComparableStack(ModBlocks.det_charge, 2), new OreDictStack(P_RED.dust(), 8), new ComparableStack(ModItems.circuit_targeting_tier3, 1), },200); makeRecipe(new ComparableStack(ModItems.mp_warhead_15_nuclear, 1), new AStack[] {new ComparableStack(ModItems.seg_15, 1), new OreDictStack(STEEL.plate(), 24), new OreDictStack(TI.plate(), 12), new OreDictStack(PU239.ingot(), 3), new ComparableStack(ModBlocks.det_charge, 4), new ComparableStack(ModItems.circuit_targeting_tier4, 1), },500); makeRecipe(new ComparableStack(ModItems.mp_warhead_15_n2, 1), new AStack[] {new ComparableStack(ModItems.seg_15, 1), new OreDictStack(STEEL.plate(), 8), new OreDictStack(TI.plate(), 20), new ComparableStack(ModBlocks.det_charge, 24), new ComparableStack(Blocks.redstone_block, 12), new OreDictStack(MAGTUNG.dust(), 6), new ComparableStack(ModItems.circuit_targeting_tier4, 1), },400); - makeRecipe(new ComparableStack(ModItems.mp_warhead_15_balefire, 1), new AStack[] {new ComparableStack(ModItems.seg_15, 1), new OreDictStack(OreDictManager.getReflector(), 16), new ComparableStack(ModItems.powder_magic, 6), new ComparableStack(ModItems.egg_balefire_shard, 4), new ComparableStack(ModItems.ingot_semtex, 8), new ComparableStack(ModItems.circuit_targeting_tier4, 1), }, 60); + makeRecipe(new ComparableStack(ModItems.mp_warhead_15_balefire, 1), new AStack[] {new ComparableStack(ModItems.seg_15, 1), new OreDictStack(OreDictManager.getReflector(), 16), new ComparableStack(ModItems.powder_magic, 6), new ComparableStack(ModItems.egg_balefire_shard, 4), new ComparableStack(ModItems.ball_tnt, 8), new ComparableStack(ModItems.circuit_targeting_tier4, 1), }, 60); makeRecipe(new ComparableStack(ModItems.missile_soyuz, 1), new AStack[] {new ComparableStack(ModItems.rocket_fuel, 40), new ComparableStack(ModBlocks.det_cord, 20), new ComparableStack(ModItems.thruster_medium, 12), new ComparableStack(ModItems.thruster_small, 12), new ComparableStack(ModItems.tank_steel, 10), new ComparableStack(ModItems.circuit_targeting_tier4, 4), new ComparableStack(ModItems.circuit_targeting_tier3, 8), new ComparableStack(ModItems.plate_polymer, 64), new ComparableStack(ModItems.fins_small_steel, 4), new ComparableStack(ModItems.hull_big_titanium, 40), new ComparableStack(ModItems.hull_big_steel, 24), new OreDictStack(FIBER.ingot(), 64), },600); makeRecipe(new ComparableStack(ModItems.missile_soyuz_lander, 1), new AStack[] {new ComparableStack(ModItems.rocket_fuel, 10), new ComparableStack(ModItems.thruster_small, 3), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModItems.circuit_targeting_tier3, 4), new ComparableStack(ModItems.plate_polymer, 32), new ComparableStack(ModItems.hull_big_aluminium, 2), new ComparableStack(ModItems.sphere_steel, 1), new OreDictStack(FIBER.ingot(), 12), },600); makeRecipe(new ComparableStack(ModItems.fusion_shield_tungsten, 1), new AStack[] {new OreDictStack(W.block(), 32), new OreDictStack(OreDictManager.getReflector(), 96)}, 600); @@ -578,7 +578,7 @@ public class AssemblerRecipes { new OreDictStack(CU.plate(), 1), new ComparableStack(ModItems.primer_50, 5), new ComparableStack(ModItems.casing_50, 5), - new ComparableStack(ModItems.ingot_semtex, 5), + new ComparableStack(ModItems.ball_tnt, 5), new ComparableStack(ModItems.cordite, 5), new OreDictStack(REDSTONE.dust(), 3) }, 60); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 49cdcf991..95e2c6fb7 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2381,6 +2381,7 @@ public class ModItems { public static Item book_guide; public static Item holotape_image; + public static Item holotape_damaged; public static Item polaroid; public static Item glitch; @@ -5428,6 +5429,7 @@ public class ModItems { book_guide = new ItemGuideBook().setUnlocalizedName("book_guide").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":book_guide"); holotape_image = new ItemHolotapeImage().setUnlocalizedName("holotape_image").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":holotape"); + holotape_damaged = new Item().setUnlocalizedName("holotape_damaged").setCreativeTab(null).setTextureName(RefStrings.MODID + ":holotape_damaged"); polaroid = new ItemPolaroid().setUnlocalizedName("polaroid").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":polaroid_" + MainRegistry.polaroidID); glitch = new ItemGlitch().setUnlocalizedName("glitch").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":glitch_" + MainRegistry.polaroidID); @@ -7945,6 +7947,7 @@ public class ModItems { //wow we're far down the item registry, is this the cellar? GameRegistry.registerItem(book_guide, book_guide.getUnlocalizedName()); GameRegistry.registerItem(holotape_image, holotape_image.getUnlocalizedName()); + GameRegistry.registerItem(holotape_damaged, holotape_damaged.getUnlocalizedName()); //Technical Items GameRegistry.registerItem(smoke1, smoke1.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index a95fca3f8..554b38a1a 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -168,7 +168,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMiningDrill.class, new RenderMiningDrill()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMiningLaser.class, new RenderLaserMiner()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineAssembler.class, new RenderAssembler()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineChemplantNew.class, new RenderChemplant()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineChemplant.class, new RenderChemplant()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineFluidTank.class, new RenderFluidTank()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineBAT9000.class, new RenderBAT9000()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineOrbus.class, new RenderOrbus()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index a253eac48..c0455066a 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -864,6 +864,7 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModItems.book_guide, 1, BookType.STARTER.ordinal()), new Object[] { Items.book, Items.iron_ingot }); addShapelessAuto(new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_RESTORED.ordinal()), new Object[] { new ItemStack(ModItems.holotape_image, 1, EnumHoloImage.HOLO_DIGAMMA.ordinal()), KEY_TOOL_SCREWDRIVER, ModItems.ducttape, ModItems.armor_polish }); + addShapelessAuto(new ItemStack(ModItems.holotape_damaged), new Object[] { DictFrame.fromOne(ModItems.holotape_image, EnumHoloImage.HOLO_RESTORED), ModBlocks.muffler, ModItems.crt_display, ModItems.gem_alexandrite /* placeholder for amplifier */ }); if(GeneralConfig.enableBabyMode) { addShapelessAuto(new ItemStack(ModItems.cordite, 3), new Object[] { ModItems.ballistite, Items.gunpowder, new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/src/main/java/com/hbm/render/tileentity/RenderChemplant.java b/src/main/java/com/hbm/render/tileentity/RenderChemplant.java index e0f6082bd..da86e40ec 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderChemplant.java +++ b/src/main/java/com/hbm/render/tileentity/RenderChemplant.java @@ -6,7 +6,7 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.inventory.fluid.Fluids; import com.hbm.main.ResourceManager; import com.hbm.render.loader.HmfController; -import com.hbm.tileentity.machine.TileEntityMachineChemplantNew; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -55,7 +55,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glRotatef(180, 0F, 1F, 0F); - TileEntityMachineChemplantNew chem = (TileEntityMachineChemplantNew) tileEntity; + TileEntityMachineChemplant chem = (TileEntityMachineChemplant) tileEntity; switch(tileEntity.getBlockMetadata() - BlockDummyable.offset) { case 5: GL11.glRotatef(180, 0F, 1F, 0F); diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 1bcc0013f..4edfbd02e 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -244,7 +244,7 @@ public class TileMappings { put(TileEntityMachineLiquefactor.class, "tileentity_liquefactor"); put(TileEntityMachineSolidifier.class, "tileentity_solidifier"); - put(TileEntityMachineChemplantNew.class, "tileentity_chemical_plant"); + put(TileEntityMachineChemplant.class, "tileentity_chemical_plant"); put(TileEntityMachineOilWell.class, "tileentity_derrick"); put(TileEntityMachinePumpjack.class, "tileentity_machine_pumpjack"); put(TileEntityMachineFrackingTower.class, "tileentity_fracking_tower"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantNew.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java similarity index 98% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantNew.java rename to src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 3987dde91..2ce304464 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantNew.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -29,7 +29,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineChemplantNew extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor { +public class TileEntityMachineChemplant extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor { public long power; public static final long maxPower = 100000; @@ -43,7 +43,7 @@ public class TileEntityMachineChemplantNew extends TileEntityMachineBase impleme int consumption = 100; int speed = 100; - public TileEntityMachineChemplantNew() { + public TileEntityMachineChemplant() { super(21); /* * 0 Battery diff --git a/src/main/resources/assets/hbm/models/blocks/charge_c4.obj b/src/main/resources/assets/hbm/models/blocks/charge_c4.obj new file mode 100644 index 000000000..2c7440e73 --- /dev/null +++ b/src/main/resources/assets/hbm/models/blocks/charge_c4.obj @@ -0,0 +1,109 @@ +# Blender v2.79 (sub 0) OBJ File: 'charge_c4.blend' +# www.blender.org +o Plane +v -0.250000 -0.312500 -0.250000 +v 0.250000 -0.312500 0.250000 +v -0.250000 -0.312500 0.250000 +v 0.250000 -0.187500 0.250000 +v -0.250000 -0.187500 -0.250000 +v -0.250000 -0.187500 0.250000 +v 0.250000 -0.187500 -0.250000 +v 0.250000 -0.312500 -0.250000 +v -0.468750 -0.500000 0.468750 +v 0.468750 -0.250000 -0.468750 +v -0.031250 -0.500000 0.468750 +v 0.468750 -0.250000 0.468750 +v 0.031250 -0.250000 -0.468750 +v -0.468750 -0.500000 -0.468750 +v 0.031250 -0.250000 0.468750 +v -0.031250 -0.500000 -0.468750 +v 0.031250 -0.500000 0.468750 +v -0.031250 -0.250000 -0.468750 +v 0.468750 -0.500000 0.468750 +v -0.468750 -0.250000 -0.468750 +v -0.468750 -0.250000 0.468750 +v 0.031250 -0.500000 -0.468750 +v -0.031250 -0.250000 0.468750 +v 0.468750 -0.500000 -0.468750 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.250000 0.875000 +vt 0.750000 0.375000 +vt 0.750000 0.875000 +vt 0.250000 0.375000 +vt 0.750000 0.875000 +vt 0.250000 0.875000 +vt 0.750000 0.250000 +vt 0.250000 0.375000 +vt 0.250000 0.250000 +vt 0.750000 0.250000 +vt 0.250000 0.375000 +vt 0.250000 0.250000 +vt 0.750000 0.250000 +vt 0.250000 0.250000 +vt 0.750000 0.250000 +vt 0.250000 0.375000 +vt 0.250000 0.250000 +vt 0.250000 0.375000 +vt 0.750000 0.375000 +vt 0.750000 0.375000 +vt 0.750000 0.375000 +vt 0.750000 0.375000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 23/1/1 20/2/1 21/3/1 +f 12/4/1 13/5/1 15/6/1 +f 22/7/2 19/8/2 17/9/2 +f 14/10/2 11/11/2 9/12/2 +f 22/7/3 10/13/3 24/14/3 +f 23/1/4 9/12/4 11/11/4 +f 24/14/5 12/4/5 19/8/5 +f 20/2/3 16/15/3 14/10/3 +f 21/3/6 14/10/6 9/12/6 +f 18/16/5 11/11/5 16/15/5 +f 19/8/4 15/6/4 17/9/4 +f 17/9/6 13/5/6 22/7/6 +f 23/1/1 18/16/1 20/2/1 +f 12/4/1 10/13/1 13/5/1 +f 22/7/2 24/14/2 19/8/2 +f 14/10/2 16/15/2 11/11/2 +f 22/7/3 13/5/3 10/13/3 +f 23/1/4 21/3/4 9/12/4 +f 24/14/5 10/13/5 12/4/5 +f 20/2/3 18/16/3 16/15/3 +f 21/3/6 20/2/6 14/10/6 +f 18/16/5 23/1/5 11/11/5 +f 19/8/4 12/4/4 15/6/4 +f 17/9/6 15/6/6 13/5/6 +s 1 +f 1/17/2 2/18/2 3/19/2 +f 4/20/1 5/21/1 6/22/1 +f 1/23/3 7/24/3 8/25/3 +f 2/26/4 6/27/4 3/28/4 +f 8/29/5 4/20/5 2/30/5 +f 3/31/6 5/32/6 1/33/6 +f 1/17/2 8/34/2 2/18/2 +f 4/20/1 7/35/1 5/21/1 +f 1/23/3 5/36/3 7/24/3 +f 2/26/4 4/37/4 6/27/4 +f 8/29/5 7/35/5 4/20/5 +f 3/31/6 6/38/6 5/32/6 diff --git a/src/main/resources/assets/hbm/textures/blocks/charge_c4.png b/src/main/resources/assets/hbm/textures/blocks/charge_c4.png new file mode 100644 index 0000000000000000000000000000000000000000..9c947873f4f52334bfbff1666bd02e33d9e61719 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#)iiVpovq+i5Zll)_4gllu?H1;Ey0F5Y5_b6K=5GVgd`CC z%uERmSF;ArNdg15gV_jFCXy5`lLLmcId{VgKR0-FVx y&&O--VLNa|VfT!x#1DPJT@O!}|4D50vz8Xa@OEf zex8>8JniBAj$bVuCJdpWm3s`?7(&0MJyHx0mA#{;#3(Lt@&Xu4}nNTA<3pdT1KUHx3vIVCg! E0OGo6ZvX%Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_DIESEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_DIESEL.png index 14832b7ea4cc34a44c1b8d149b3e9eafb3d89b8e..338ac8dddd6934b8e8a0353b365dbb780450a323 100644 GIT binary patch delta 347 zcmV-h0i^zc0)+#RGk*a*Nkl&}y~FvWzH-n9t|6r%N2iVvLc8`ztZV zNF2w~?RI4{nTRn)j4^v2?400v9+#t2(liBNeDjD>ilQiR&K=z9)#}*{R7$Z}EKo`j zMNz#6z|QvU{8So%r{@;{oO3Lf%ik%`;Yn4m*K4NJDFCzC41PTQ!2uuduT`DrIeDIc tyTA8uwj0uHHo3bURgJTYaUJ###V2yTX?G}=UjYCB002ovPDHLkV1i-`q=Wzf delta 214 zcmV;{04e{41AzjNGk*ZMNkl=1G=$5)qM97cp|s!TEAc8A`eeBACZLDpHo^;ZO3qt^le4Xxf_s+|vFI zptW}Mwry^X78P@#wGN2J7yy<14}7w<*3DT0dtR)y0U0tQ;Pvx@T>cO71hhd)G)x(i Qg#Z8m07*qoM6N<$f`bxY7ytkO diff --git a/src/main/resources/assets/hbm/textures/items/holotape_damaged.png b/src/main/resources/assets/hbm/textures/items/holotape_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..35b2bc4be0ee9c3d19f912c9083495db244c7a28 GIT binary patch literal 754 zcmVuIs}_o$C4Y;#N^tvNxEqH9ta8Hdmg^`O`iAtz7O6k ztleF^S18!?#z|r1%<(Z823n^BKvCDHj-7bvCj*en%@mTSlE=7ix4|&DZnse@71TYBkt7fSuZS4u3d3I}0YM+vWM{%Hg;n*ww0yX*vV;_Fj{xs?hDC zbvg`3BU+Zlm$fz2jSaMZpQ5fyDS*$T(U0}bO|-i^)?Z%W@e#6F7!GNipHn|NVxa46 zt*r3dH2F9hd0)dzVy{rJi@Gk^)vA+W-;5f~Cg1aU{tkzXIC<@mP50vlk1DvUUmtV{kabun}K2#)%Czc6O>wt?uR^!xx34yqEz=a$jj}fH~ zcr!>^2fP_1tphI7N$Y?Yf?X~n49=}K|OUF6Uo7vi;oaluf z2Lh2!^yCTh7*S93B#)f%L{DC%F9M_&>5Bl;B7G4cwMbv|l9;qFdIBzzoalxAVWKYz kyd8)YiUYAic@Ha;e;JJ*1ypET#{d8T07*qoM6N<$f-1pMZvX%Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/holotape_damaged.png.mcmeta b/src/main/resources/assets/hbm/textures/items/holotape_damaged.png.mcmeta new file mode 100644 index 000000000..d7b41bbd3 --- /dev/null +++ b/src/main/resources/assets/hbm/textures/items/holotape_damaged.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": { } +} diff --git a/src/main/resources/assets/hbm/textures/items/holotape_damaged_base.png b/src/main/resources/assets/hbm/textures/items/holotape_damaged_base.png new file mode 100644 index 0000000000000000000000000000000000000000..2d3c0c1d031917b47c0777baeed973e3c0fd1ed0 GIT binary patch literal 436 zcmV;l0ZaagP)2#C z04{w0E_-l*Jsgsq&EV|~(rNHK8c$DLou4xmf_yT`v+J_w`_VR{Ar3SxC<>tjra7PR zQbmnci`!g|SI?s@B@feS#I4-H@{07sLvUT*U6+)q(jSjG9*ttm+Ur_23r)hFH|f7M e`OTmBb9?|^j;OvT22r5^0000