mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
c4 and semtex timed explosives, slight recipe tweaks
This commit is contained in:
parent
5ed9d3126f
commit
e619042446
@ -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());
|
||||
|
||||
31
src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java
Normal file
31
src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java
Normal file
@ -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;
|
||||
}
|
||||
}
|
||||
31
src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java
Normal file
31
src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java
Normal file
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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_);
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -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) });
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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");
|
||||
|
||||
@ -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
|
||||
109
src/main/resources/assets/hbm/models/blocks/charge_c4.obj
Normal file
109
src/main/resources/assets/hbm/models/blocks/charge_c4.obj
Normal file
@ -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
|
||||
BIN
src/main/resources/assets/hbm/textures/blocks/charge_c4.png
Normal file
BIN
src/main/resources/assets/hbm/textures/blocks/charge_c4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 260 B |
BIN
src/main/resources/assets/hbm/textures/blocks/charge_semtex.png
Normal file
BIN
src/main/resources/assets/hbm/textures/blocks/charge_semtex.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 257 B |
Binary file not shown.
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 389 B |
Binary file not shown.
|
After Width: | Height: | Size: 754 B |
@ -0,0 +1,3 @@
|
||||
{
|
||||
"animation": { }
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 436 B |
Loading…
x
Reference in New Issue
Block a user