models, fixes, funky concrete, literally just weed
@ -22,12 +22,9 @@ import com.hbm.main.MainRegistry;
|
||||
import com.hbm.tileentity.DoorDecl;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockFalling;
|
||||
import net.minecraft.block.material.*;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
@ -325,6 +322,8 @@ public class ModBlocks {
|
||||
public static Block concrete_colored;
|
||||
public static Block concrete;
|
||||
public static Block concrete_asbestos;
|
||||
public static Block concrete_super;
|
||||
public static Block concrete_super_broken;
|
||||
public static Block ducrete_smooth;
|
||||
public static Block ducrete;
|
||||
public static Block concrete_pillar;
|
||||
@ -1461,9 +1460,9 @@ public class ModBlocks {
|
||||
block_desh = new BlockBeaconable(Material.iron).setBlockName("block_desh").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_desh");
|
||||
block_dura_steel = new BlockBeaconable(Material.iron).setBlockName("block_dura_steel").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_dura_steel");
|
||||
block_starmetal = new BlockBeaconable(Material.iron).setBlockName("block_starmetal").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_starmetal");
|
||||
block_polymer = new BlockBeaconable(Material.ground).setBlockName("block_polymer").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_polymer");
|
||||
block_bakelite = new BlockBeaconable(Material.ground).setBlockName("block_bakelite").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_bakelite");
|
||||
block_rubber = new BlockBeaconable(Material.ground).setBlockName("block_rubber").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_rubber");
|
||||
block_polymer = new BlockBeaconable(Material.rock).setBlockName("block_polymer").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_polymer");
|
||||
block_bakelite = new BlockBeaconable(Material.rock).setBlockName("block_bakelite").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_bakelite");
|
||||
block_rubber = new BlockBeaconable(Material.rock).setBlockName("block_rubber").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypePiston).setHardness(3.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_rubber");
|
||||
block_yellowcake = new BlockHazardFalling().makeBeaconable().setBlockName("block_yellowcake").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeSand).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_yellowcake");
|
||||
block_insulator = new BlockRotatablePillar(Material.cloth, RefStrings.MODID + ":block_insulator_top").setBlockName("block_insulator").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_insulator_side");
|
||||
block_fiberglass = new BlockRotatablePillar(Material.cloth, RefStrings.MODID + ":block_fiberglass_top").setBlockName("block_fiberglass").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeCloth).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_fiberglass_side");
|
||||
@ -1548,6 +1547,8 @@ public class ModBlocks {
|
||||
concrete_colored = new BlockConcreteColored(Material.rock).setBlockName("concrete_colored").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete");
|
||||
concrete = new BlockGeneric(Material.rock).setBlockName("concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_tile");
|
||||
concrete_asbestos = new BlockGeneric(Material.rock).setBlockName("concrete_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_asbestos");
|
||||
concrete_super = new BlockUberConcrete().setBlockName("concrete_super").setCreativeTab(MainRegistry.blockTab).setHardness(150.0F).setResistance(10000.0F);
|
||||
concrete_super_broken = new BlockFalling(Material.rock).setBlockName("concrete_super_broken").setCreativeTab(MainRegistry.blockTab).setHardness(10.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":concrete_super_broken");
|
||||
concrete_pillar = new BlockRotatablePillar(Material.rock, RefStrings.MODID + ":concrete_pillar_top").setBlockName("concrete_pillar").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(4000.0F).setBlockTextureName(RefStrings.MODID + ":concrete_pillar_side");
|
||||
brick_concrete = new BlockGeneric(Material.rock).setBlockName("brick_concrete").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete");
|
||||
brick_concrete_mossy = new BlockGeneric(Material.rock).setBlockName("brick_concrete_mossy").setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":brick_concrete_mossy");
|
||||
@ -1671,7 +1672,7 @@ public class ModBlocks {
|
||||
mush_block = new BlockMushHuge(Material.plants).setBlockName("mush_block").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_skin");
|
||||
mush_block_stem = new BlockMushHuge(Material.plants).setBlockName("mush_block_stem").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_stem");
|
||||
|
||||
plant_flower = new BlockNTMFlower().setBlockName("plant_flower").setStepSound(Block.soundTypeGrass).setHardness(0.0F);
|
||||
plant_flower = new BlockNTMFlower().setBlockName("plant_flower").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGrass).setHardness(0.0F);
|
||||
|
||||
waste_earth = new WasteEarth(Material.ground, true).setBlockName("waste_earth").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.blockTab).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":waste_earth");
|
||||
waste_mycelium = new WasteEarth(Material.ground, true).setBlockName("waste_mycelium").setStepSound(Block.soundTypeGrass).setLightLevel(1F).setCreativeTab(MainRegistry.blockTab).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":waste_mycelium_side");
|
||||
@ -2596,6 +2597,8 @@ public class ModBlocks {
|
||||
GameRegistry.registerBlock(concrete_colored, ItemBlockColoredConcrete.class, concrete_colored.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(concrete, ItemBlockBlastInfo.class, concrete.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(concrete_asbestos, ItemBlockBlastInfo.class, concrete_asbestos.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(concrete_super, ItemBlockBlastInfo.class, concrete_super.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(concrete_super_broken, ItemBlockBlastInfo.class, concrete_super_broken.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(ducrete_smooth, ItemBlockBlastInfo.class, ducrete_smooth.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(ducrete, ItemBlockBlastInfo.class, ducrete.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(concrete_pillar, ItemBlockBlastInfo.class, concrete_pillar.getUnlocalizedName());
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
package com.hbm.blocks.generic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.BlockEnumMulti;
|
||||
import com.hbm.blocks.ITooltipProvider;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
@ -12,7 +17,7 @@ import net.minecraftforge.common.EnumPlantType;
|
||||
import net.minecraftforge.common.IPlantable;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class BlockNTMFlower extends BlockEnumMulti implements IPlantable {
|
||||
public class BlockNTMFlower extends BlockEnumMulti implements IPlantable, ITooltipProvider {
|
||||
|
||||
public BlockNTMFlower() {
|
||||
super(Material.plants, EnumFlowerType.class, true, true);
|
||||
@ -21,7 +26,8 @@ public class BlockNTMFlower extends BlockEnumMulti implements IPlantable {
|
||||
public static enum EnumFlowerType {
|
||||
FOXGLOVE,
|
||||
TOBACCO,
|
||||
NIGHTSHADE
|
||||
NIGHTSHADE,
|
||||
WEED
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -90,4 +96,12 @@ public class BlockNTMFlower extends BlockEnumMulti implements IPlantable {
|
||||
public int damageDropped(int meta) {
|
||||
return meta;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
|
||||
|
||||
if(stack.getItemDamage() == 3) {
|
||||
list.add("haha get it? it's funny because drugs");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
91
src/main/java/com/hbm/blocks/generic/BlockUberConcrete.java
Normal file
@ -0,0 +1,91 @@
|
||||
package com.hbm.blocks.generic;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import com.hbm.blocks.BlockBase;
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.lib.RefStrings;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.item.EntityFallingBlock;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import scala.actors.threadpool.Arrays;
|
||||
|
||||
public class BlockUberConcrete extends BlockBase {
|
||||
|
||||
public BlockUberConcrete() {
|
||||
super();
|
||||
this.setTickRandomly(true);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
protected IIcon[] brokenIcons;
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister iconRegister) {
|
||||
super.registerBlockIcons(iconRegister);
|
||||
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":concrete_super");
|
||||
brokenIcons = new IIcon[4];
|
||||
|
||||
for(int i = 0; i < 4; i++) {
|
||||
this.brokenIcons[i] = iconRegister.registerIcon(RefStrings.MODID + ":concrete_super_m" + i);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
|
||||
if(meta == 15) return brokenIcons[3];
|
||||
if(meta == 14) return brokenIcons[2];
|
||||
if(meta > 11) return brokenIcons[1];
|
||||
if(meta > 9) return brokenIcons[0];
|
||||
|
||||
return this.blockIcon;
|
||||
}
|
||||
|
||||
public void updateTick(World world, int x, int y, int z, Random rand) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
|
||||
if(rand.nextInt(meta + 1) > 0)
|
||||
return;
|
||||
|
||||
if(meta < 15) {
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
|
||||
} else {
|
||||
world.setBlockToAir(x, y, z);
|
||||
|
||||
if(world.getBlock(x, y - 1, z) == Blocks.air) {
|
||||
world.setBlock(x, y, z, ModBlocks.concrete_super_broken);
|
||||
return;
|
||||
}
|
||||
|
||||
List<Integer> sides = new ArrayList(); //i wish the fucking homunculus that made the standard list implementation the nastiest fucking diarrhea of his life
|
||||
Collections.addAll(sides, 2, 3, 4, 5);
|
||||
Collections.shuffle(sides);
|
||||
|
||||
for(Integer i : sides) {
|
||||
ForgeDirection dir = ForgeDirection.getOrientation(i);
|
||||
if(world.getBlock(x + dir.offsetX, y, z + dir.offsetZ) == Blocks.air && world.getBlock(x + dir.offsetX, y - 1, z + dir.offsetZ) == Blocks.air) {
|
||||
EntityFallingBlock debris = new EntityFallingBlock(world, x + 0.5 + dir.offsetX, y + 0.5, z + 0.5 + dir.offsetZ, ModBlocks.concrete_super_broken);
|
||||
debris.field_145812_b = 2;
|
||||
debris.field_145813_c = false;
|
||||
debris.func_145806_a(true);
|
||||
world.spawnEntityInWorld(debris);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
world.setBlock(x, y, z, ModBlocks.concrete_super_broken);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -12,7 +12,6 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.item.EntityFallingBlock;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
package com.hbm.blocks.machine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.blocks.ILookOverlay;
|
||||
import com.hbm.tileentity.TileEntityProxyCombo;
|
||||
import com.hbm.tileentity.machine.TileEntityDeuteriumTower;
|
||||
import com.hbm.util.BobMathUtil;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class DeuteriumTower extends BlockDummyable {
|
||||
public class DeuteriumTower extends BlockDummyable implements ILookOverlay {
|
||||
|
||||
public DeuteriumTower(Material mat) {
|
||||
super(mat);
|
||||
@ -30,7 +37,7 @@ public class DeuteriumTower extends BlockDummyable {
|
||||
|
||||
@Override
|
||||
public int[] getDimensions() {
|
||||
return new int[] {9, 0, 1, 0, 0, 1};
|
||||
return new int[] { 9, 0, 1, 0, 0, 1 };
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -45,10 +52,33 @@ public class DeuteriumTower extends BlockDummyable {
|
||||
x = x + dir.offsetX * o;
|
||||
z = z + dir.offsetZ * o;
|
||||
|
||||
ForgeDirection dr2 = dir.getRotation(ForgeDirection.UP);
|
||||
ForgeDirection dr2 = dir.getRotation(ForgeDirection.UP);
|
||||
|
||||
this.makeExtra(world, x - dir.offsetX - dr2.offsetX, y, z - dir.offsetZ - dr2.offsetZ);
|
||||
this.makeExtra(world, x, y, z - dir.offsetZ - dr2.offsetZ);
|
||||
this.makeExtra(world, x - dir.offsetX - dr2.offsetX, y, z);
|
||||
this.makeExtra(world, x - dir.offsetX - dr2.offsetX, y, z - dir.offsetZ - dr2.offsetZ);
|
||||
this.makeExtra(world, x, y, z - dir.offsetZ - dr2.offsetZ);
|
||||
this.makeExtra(world, x - dir.offsetX - dr2.offsetX, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void printHook(Pre event, World world, int x, int y, int z) {
|
||||
int[] pos = this.findCore(world, x, y, z);
|
||||
|
||||
if(pos == null)
|
||||
return;
|
||||
|
||||
TileEntity te = world.getTileEntity(pos[0], pos[1], pos[2]);
|
||||
|
||||
if(!(te instanceof TileEntityDeuteriumTower))
|
||||
return;
|
||||
|
||||
TileEntityDeuteriumTower tower = (TileEntityDeuteriumTower) te;
|
||||
|
||||
List<String> text = new ArrayList();
|
||||
text.add((tower.power < tower.maxPower / 10 ? EnumChatFormatting.RED : EnumChatFormatting.GREEN) + "Power: " + BobMathUtil.getShortNumber(tower.power) + "HE");
|
||||
|
||||
for(int i = 0; i < tower.tanks.length; i++)
|
||||
text.add((i < 1 ? (EnumChatFormatting.GREEN + "-> ") : (EnumChatFormatting.RED + "<- ")) + EnumChatFormatting.RESET + I18nUtil.resolveKey("hbmfluid." + tower.tanks[i].getTankType().getName().toLowerCase()) + ": " + tower.tanks[i].getFill() + "/" + tower.tanks[i].getMaxFill() + "mB");
|
||||
|
||||
ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text);
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,13 @@
|
||||
package com.hbm.blocks.machine;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.ILookOverlay;
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.tileentity.machine.TileEntityDeuteriumExtractor;
|
||||
import com.hbm.util.BobMathUtil;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@ -9,10 +15,12 @@ import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
|
||||
|
||||
public class MachineDeuteriumExtractor extends BlockContainer {
|
||||
public class MachineDeuteriumExtractor extends BlockContainer implements ILookOverlay {
|
||||
|
||||
public MachineDeuteriumExtractor(Material mat) {
|
||||
super(mat);
|
||||
@ -43,4 +51,23 @@ public class MachineDeuteriumExtractor extends BlockContainer {
|
||||
return blockIcon;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void printHook(Pre event, World world, int x, int y, int z) {
|
||||
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
if(!(te instanceof TileEntityDeuteriumExtractor))
|
||||
return;
|
||||
|
||||
TileEntityDeuteriumExtractor extractor = (TileEntityDeuteriumExtractor) te;
|
||||
|
||||
List<String> text = new ArrayList();
|
||||
text.add((extractor.power < extractor.maxPower / 10 ? EnumChatFormatting.RED : EnumChatFormatting.GREEN) + "Power: " + BobMathUtil.getShortNumber(extractor.power) + "HE");
|
||||
|
||||
for(int i = 0; i < extractor.tanks.length; i++)
|
||||
text.add((i < 1 ? (EnumChatFormatting.GREEN + "-> ") : (EnumChatFormatting.RED + "<- ")) + EnumChatFormatting.RESET + I18nUtil.resolveKey("hbmfluid." + extractor.tanks[i].getTankType().getName().toLowerCase()) + ": " + extractor.tanks[i].getFill() + "/" + extractor.tanks[i].getMaxFill() + "mB");
|
||||
|
||||
ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text);
|
||||
}
|
||||
}
|
||||
@ -20,6 +20,7 @@ public class CommonConfig {
|
||||
public static final String CATEGORY_TOOLS = "11_tools";
|
||||
public static final String CATEGORY_MOBS = "12_mobs";
|
||||
public static final String CATEGORY_RADIATION = "13_radiation";
|
||||
public static final String CATEGORY_HAZARD = "14_hazard";
|
||||
|
||||
public static final String CATEGORY_528 = "528";
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.hbm.config;
|
||||
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
|
||||
public class RadiationConfig {
|
||||
|
||||
@ -15,6 +14,14 @@ public class RadiationConfig {
|
||||
|
||||
public static boolean enableContamination = true;
|
||||
public static boolean enableChunkRads = true;
|
||||
|
||||
public static boolean disableAsbestos = false;
|
||||
public static boolean disableCoal = false;
|
||||
public static boolean disableHot = false;
|
||||
public static boolean disableExplosive = false;
|
||||
public static boolean disableHydro = false;
|
||||
public static boolean disableBlinding = false;
|
||||
public static boolean disableFibrosis = false;
|
||||
|
||||
public static void loadFromConfig(Configuration config) {
|
||||
|
||||
@ -32,5 +39,15 @@ public class RadiationConfig {
|
||||
enableChunkRads = CommonConfig.createConfigBool(config, CATEGORY_NUKE, "RADIATION_01_enableChunkRads", "Toggles the world radiation system (chunk radiation only, some blocks use an AoE!)", true);
|
||||
|
||||
fogCh = CommonConfig.setDef(fogCh, 20);
|
||||
|
||||
final String CATEGORY_HAZ = CommonConfig.CATEGORY_HAZARD;
|
||||
|
||||
disableAsbestos = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_00_disableAsbestos", "When turned off, all asbestos hazards are disabled", false);
|
||||
disableCoal = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_01_disableCoaldust", "When turned off, all coal dust hazards are disabled", false);
|
||||
disableHot = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_02_disableHot", "When turned off, all hot hazards are disabled", false);
|
||||
disableExplosive = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_03_disableExplosive", "When turned off, all explosive hazards are disabled", false);
|
||||
disableHydro = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_04_disableHydroactive", "When turned off, all hydroactive hazards are disabled", false);
|
||||
disableBlinding = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_05_disableBlinding", "When turned off, all blinding hazards are disabled", false);
|
||||
disableFibrosis = CommonConfig.createConfigBool(config, CATEGORY_HAZ, "HAZ_06_disableFibrosis", "When turned off, all firbosis hazards are disabled", false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -76,7 +76,6 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
}
|
||||
|
||||
public static void incrementRadiation(EntityLivingBase entity, float rad) {
|
||||
|
||||
if(!RadiationConfig.enableContamination)
|
||||
return;
|
||||
|
||||
@ -189,10 +188,12 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
|
||||
/// ASBESTOS ///
|
||||
public static int getAsbestos(EntityLivingBase entity) {
|
||||
if(RadiationConfig.disableAsbestos) return 0;
|
||||
return getData(entity).asbestos;
|
||||
}
|
||||
|
||||
public static void setAsbestos(EntityLivingBase entity, int asbestos) {
|
||||
if(RadiationConfig.disableAsbestos) return;
|
||||
getData(entity).asbestos = asbestos;
|
||||
|
||||
if(asbestos >= maxAsbestos) {
|
||||
@ -202,6 +203,7 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
}
|
||||
|
||||
public static void incrementAsbestos(EntityLivingBase entity, int asbestos) {
|
||||
if(RadiationConfig.disableAsbestos) return;
|
||||
setAsbestos(entity, getAsbestos(entity) + asbestos);
|
||||
incrementFibrosis(entity, asbestos);
|
||||
}
|
||||
@ -209,10 +211,12 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
|
||||
/// BLACK LUNG DISEASE ///
|
||||
public static int getBlackLung(EntityLivingBase entity) {
|
||||
if(RadiationConfig.disableCoal) return 0;
|
||||
return getData(entity).blacklung;
|
||||
}
|
||||
|
||||
public static void setBlackLung(EntityLivingBase entity, int blacklung) {
|
||||
if(RadiationConfig.disableCoal) return;
|
||||
getData(entity).blacklung = blacklung;
|
||||
|
||||
if(blacklung >= maxBlacklung) {
|
||||
@ -222,16 +226,19 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
}
|
||||
|
||||
public static void incrementBlackLung(EntityLivingBase entity, int blacklung) {
|
||||
if(RadiationConfig.disableCoal) return;
|
||||
setBlackLung(entity, getBlackLung(entity) + blacklung);
|
||||
incrementFibrosis(entity, blacklung);
|
||||
}
|
||||
|
||||
/// PULMONARY FIBROSIS ///
|
||||
public static int getFibrosis(EntityLivingBase entity) {
|
||||
if(RadiationConfig.disableFibrosis) return 0;
|
||||
return getData(entity).fibrosis;
|
||||
}
|
||||
|
||||
public static void setFibrosis(EntityLivingBase entity, int fibrosis) {
|
||||
if(RadiationConfig.disableFibrosis) return;
|
||||
getData(entity).fibrosis = fibrosis;
|
||||
|
||||
if (fibrosis >= maxFibrosis) {
|
||||
@ -241,6 +248,7 @@ public class HbmLivingProps implements IExtendedEntityProperties {
|
||||
}
|
||||
|
||||
public static void incrementFibrosis(EntityLivingBase entity, int fibrosis) {
|
||||
if(RadiationConfig.disableFibrosis) return;
|
||||
setFibrosis(entity, getFibrosis(entity) + fibrosis);
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.hazard.type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.extprop.HbmLivingProps;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.util.ArmorRegistry;
|
||||
@ -20,6 +21,9 @@ public class HazardTypeAsbestos extends HazardTypeBase {
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableAsbestos)
|
||||
return;
|
||||
|
||||
if(!ArmorRegistry.hasProtection(target, 3, HazardClass.PARTICLE_FINE))
|
||||
HbmLivingProps.incrementAsbestos(target, (int) Math.min(level, 10));
|
||||
else
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.hazard.type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.util.ArmorRegistry;
|
||||
import com.hbm.util.I18nUtil;
|
||||
@ -19,6 +20,9 @@ public class HazardTypeBlinding extends HazardTypeBase {
|
||||
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableBlinding)
|
||||
return;
|
||||
|
||||
if(!ArmorRegistry.hasProtection(target, 3, HazardClass.LIGHT)) {
|
||||
target.addPotionEffect(new PotionEffect(Potion.blindness.id, (int)Math.ceil(level), 0));
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.hazard.type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.extprop.HbmLivingProps;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.util.ArmorRegistry;
|
||||
@ -20,6 +21,9 @@ public class HazardTypeCoal extends HazardTypeBase {
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableCoal)
|
||||
return;
|
||||
|
||||
if(!ArmorRegistry.hasProtection(target, 3, HazardClass.PARTICLE_COARSE))
|
||||
HbmLivingProps.incrementBlackLung(target, (int) Math.min(level, 10));
|
||||
else
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.hazard.type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
@ -15,6 +16,9 @@ public class HazardTypeExplosive extends HazardTypeBase {
|
||||
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableExplosive)
|
||||
return;
|
||||
|
||||
if(!target.worldObj.isRemote && target.isBurning()) {
|
||||
stack.stackSize = 0;
|
||||
@ -24,6 +28,10 @@ public class HazardTypeExplosive extends HazardTypeBase {
|
||||
|
||||
@Override
|
||||
public void updateEntity(EntityItem item, float level) {
|
||||
|
||||
if(RadiationConfig.disableExplosive)
|
||||
return;
|
||||
|
||||
if(item.isBurning()) {
|
||||
item.setDead();
|
||||
item.worldObj.newExplosion(null, item.posX, item.posY + item.height * 0.5, item.posZ, level, false, true);
|
||||
|
||||
@ -3,6 +3,7 @@ package com.hbm.hazard.type;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.GeneralConfig;
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.handler.ArmorModHandler;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.items.ModItems;
|
||||
@ -21,6 +22,9 @@ public class HazardTypeHot extends HazardTypeBase {
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableHot)
|
||||
return;
|
||||
|
||||
boolean reacher = false;
|
||||
boolean gloves = false;
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.hazard.type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.config.RadiationConfig;
|
||||
import com.hbm.hazard.modifier.HazardModifier;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
@ -16,6 +17,10 @@ public class HazardTypeHydroactive extends HazardTypeBase {
|
||||
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(RadiationConfig.disableHydro)
|
||||
return;
|
||||
|
||||
if(target.isWet()) {
|
||||
stack.stackSize = 0;
|
||||
target.worldObj.newExplosion(null, target.posX, target.posY + target.getEyeHeight() - target.getYOffset(), target.posZ, level, false, true);
|
||||
@ -24,6 +29,10 @@ public class HazardTypeHydroactive extends HazardTypeBase {
|
||||
|
||||
@Override
|
||||
public void updateEntity(EntityItem item, float level) {
|
||||
|
||||
if(RadiationConfig.disableHydro)
|
||||
return;
|
||||
|
||||
if(item.worldObj.getBlock((int)Math.floor(item.posX), (int)Math.floor(item.posY), (int)Math.floor(item.posZ)).getMaterial() == Material.water) {
|
||||
item.setDead();
|
||||
item.worldObj.newExplosion(null, item.posX, item.posY + item.height * 0.5, item.posZ, level, false, true);
|
||||
|
||||
@ -284,6 +284,10 @@ public class AnvilRecipes {
|
||||
new AnvilOutput(new ItemStack(ModItems.plate_armor_dnt))).setTier(7));
|
||||
|
||||
pullFromAssembler(new ComparableStack(ModItems.plate_mixed, 4), 3);
|
||||
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(
|
||||
new AStack[] {new ComparableStack(ModItems.ingot_arsenic), new OreDictStack(REDSTONE.dust(), 4), new OreDictStack(ASBESTOS.ingot(), 2)},
|
||||
new AnvilOutput(new ItemStack(ModItems.circuit_arsenic_raw))).setTier(5));
|
||||
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.ingot_u233, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_u233))).setTier(4));
|
||||
constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(ModItems.ingot_u235, 1), new AnvilOutput(new ItemStack(ModItems.plate_fuel_u235))).setTier(4));
|
||||
|
||||
@ -2,6 +2,7 @@ package com.hbm.items.tool;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.entity.mob.siege.EntitySiegeTunneler;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.items.special.ItemKitCustom;
|
||||
@ -29,13 +30,6 @@ public class ItemWandD extends Item {
|
||||
|
||||
if(pos != null) {
|
||||
|
||||
List<EntityZombie> zombies = world.getEntitiesWithinAABB(EntityZombie.class, AxisAlignedBB.getBoundingBox(pos.blockX - 2, pos.blockY - 2, pos.blockZ - 2, pos.blockX + 2, pos.blockY + 2, pos.blockZ + 2));
|
||||
|
||||
for(EntityZombie zombie : zombies) {
|
||||
zombie.setChild(true);
|
||||
zombie.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask_m65));
|
||||
}
|
||||
|
||||
/*EntitySiegeTunneler tunneler = new EntitySiegeTunneler(world);
|
||||
tunneler.setPosition(pos.blockX, pos.blockY + 1, pos.blockZ);
|
||||
tunneler.onSpawnWithEgg(null);
|
||||
@ -43,17 +37,19 @@ public class ItemWandD extends Item {
|
||||
|
||||
//CellularDungeonFactory.meteor.generate(world, x, y, z, world.rand);
|
||||
|
||||
/*int r = 5;
|
||||
int r = 5;
|
||||
|
||||
int x = pos.blockX;
|
||||
int y = pos.blockY;
|
||||
int z = pos.blockZ;
|
||||
for(int i = x - r; i <= x + r; i++) {
|
||||
for(int j = y - r; j <= y + r; j++) {
|
||||
for(int k = z - r; k <= z + r; k++) {
|
||||
|
||||
world.setBlock(i, j, k, ModBlocks.vacuum);
|
||||
//world.getBlock(i, j, k).updateTick(world, i, j, k, world.rand);
|
||||
if(world.getBlock(i, j, k) == ModBlocks.concrete_super)
|
||||
world.getBlock(i, j, k).updateTick(world, i, j, k, world.rand);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
//new Bunker().generate(world, world.rand, x, y, z);
|
||||
|
||||
|
||||
@ -48,7 +48,6 @@ import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraft.world.biome.BiomeGenForest;
|
||||
import net.minecraft.world.biome.BiomeGenJungle;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.gen.feature.WorldGenFlowers;
|
||||
import net.minecraft.world.gen.feature.WorldGenMinable;
|
||||
import cpw.mods.fml.common.IWorldGenerator;
|
||||
|
||||
@ -83,6 +82,10 @@ public class HbmWorldGen implements IWorldGenerator {
|
||||
DungeonToolbox.generateFlowers(world, rand, i, j, ModBlocks.plant_flower, EnumFlowerType.TOBACCO.ordinal());
|
||||
}
|
||||
|
||||
if(rand.nextInt(64) == 0) {
|
||||
DungeonToolbox.generateFlowers(world, rand, i, j, ModBlocks.plant_flower, EnumFlowerType.WEED.ordinal());
|
||||
}
|
||||
|
||||
if(WorldConfig.oilcoalSpawn > 0 && rand.nextInt(WorldConfig.oilcoalSpawn) == 0)
|
||||
DungeonToolbox.generateOre(world, rand, i, j, 1, 64, 32, 32, ModBlocks.ore_coal_oil);
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ package com.hbm.lib;
|
||||
public class RefStrings {
|
||||
public static final String MODID = "hbm";
|
||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
||||
public static final String VERSION = "1.0.27 BETA (4193)";
|
||||
public static final String VERSION = "1.0.27 BETA (4200)";
|
||||
//HBM's Beta Naming Convention:
|
||||
//V T (X)
|
||||
//V -> next release version
|
||||
|
||||
@ -388,7 +388,7 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_schrabidium, new ItemRenderWeaponFFColt(ResourceManager.ff_schrabidium, ResourceManager.ff_schrabidium, ResourceManager.ff_gun_dark));
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_cursed, new ItemRenderWeaponFFCursed());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare, new ItemRenderWeaponFFNightmare());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderRevolverNightmare(ModItems.gun_revolver_nightmare2));
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_nightmare2, new ItemRenderWeaponFFNightmareDark());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman, new ItemRenderFatMan());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_proto, new ItemRenderFatMan());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_mirv, new ItemRenderMIRVLauncher());
|
||||
|
||||
@ -638,6 +638,7 @@ public class ResourceManager {
|
||||
public static final IModelCustom cursed_revolver = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/cursed.obj"));
|
||||
public static final IModelCustom detonator_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/detonator_laser.obj"));
|
||||
public static final IModelCustom spas_12 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/spas-12.obj"));
|
||||
public static final IModelCustom nightmare_dark = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/nightmare_dark.obj"));
|
||||
|
||||
public static final IModelCustom lance = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lance.obj"));
|
||||
|
||||
@ -725,6 +726,7 @@ public class ResourceManager {
|
||||
public static final ResourceLocation ff_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood.png");
|
||||
public static final ResourceLocation ff_wood_red = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/wood_red.png");
|
||||
public static final ResourceLocation ff_cursed = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/cursed.png");
|
||||
public static final ResourceLocation ff_nightmare_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/nightmare.png");
|
||||
|
||||
public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png");
|
||||
public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png");
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
package com.hbm.render.item.weapon;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.main.ResourceManager;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
public class ItemRenderWeaponFFNightmareDark implements IItemRenderer {
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
switch(type) {
|
||||
case EQUIPPED:
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
case ENTITY:
|
||||
case INVENTORY:
|
||||
return true;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
|
||||
return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
|
||||
GL11.glPushMatrix();
|
||||
|
||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
|
||||
switch(type) {
|
||||
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
|
||||
double s0 = 0.4D;
|
||||
GL11.glTranslated(0.75, 0.45, 0);
|
||||
GL11.glScaled(s0, s0, s0);
|
||||
GL11.glRotated(170, 0, 1, 0);
|
||||
GL11.glRotated(25, 0, 0, -1);
|
||||
|
||||
break;
|
||||
|
||||
case EQUIPPED:
|
||||
|
||||
double scale = 0.4D;
|
||||
GL11.glRotated(105, 0, 1, 0);
|
||||
GL11.glRotated(-10, 1, 0, 0);
|
||||
GL11.glRotated(10, 0, 0, 1);
|
||||
GL11.glTranslated(-0.125, 0.1, 0.5);
|
||||
GL11.glScaled(scale, scale, scale);
|
||||
|
||||
break;
|
||||
|
||||
case ENTITY:
|
||||
|
||||
double s1 = 0.25D;
|
||||
GL11.glScaled(s1, s1, s1);
|
||||
GL11.glRotated(90, 0, 1, 0);
|
||||
|
||||
break;
|
||||
|
||||
case INVENTORY:
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
|
||||
double s = 3D;
|
||||
GL11.glTranslated(10, 9, 0);
|
||||
GL11.glRotated(-135, 0, 0, 1);
|
||||
GL11.glRotated(180, 0, 1, 0);
|
||||
GL11.glScaled(s, s, -s);
|
||||
|
||||
break;
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ff_nightmare_tex);
|
||||
ResourceManager.nightmare_dark.renderAll();
|
||||
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
@ -87,7 +87,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
|
||||
}
|
||||
|
||||
public boolean hasPower() {
|
||||
return power > 0;
|
||||
return power >= maxPower / 10;
|
||||
}
|
||||
|
||||
public boolean hasEnoughWater() {
|
||||
@ -195,5 +195,4 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
|
||||
public long getMaxPower() {
|
||||
return maxPower;
|
||||
}
|
||||
|
||||
}
|
||||
@ -119,4 +119,9 @@ public class TileEntityDeuteriumTower extends TileEntityDeuteriumExtractor {
|
||||
public double getMaxRenderDistanceSquared() {
|
||||
return 65536.0D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getMaxPower() {
|
||||
return maxPower;
|
||||
}
|
||||
}
|
||||
@ -227,7 +227,7 @@ public class TileEntityMachineArcFurnace extends TileEntityLoadedBase implements
|
||||
}
|
||||
|
||||
public boolean hasPower() {
|
||||
return power > 0;
|
||||
return power >= 250;
|
||||
}
|
||||
|
||||
public boolean isProcessing() {
|
||||
@ -317,7 +317,6 @@ public class TileEntityMachineArcFurnace extends TileEntityLoadedBase implements
|
||||
//TODO: fix this punjabi trash
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
this.hasPower();
|
||||
boolean flag1 = false;
|
||||
|
||||
if(!worldObj.isRemote) {
|
||||
|
||||
@ -261,7 +261,7 @@ public class TileEntityMachineBoilerElectric extends TileEntityLoadedBase implem
|
||||
heat -= 30;
|
||||
}
|
||||
|
||||
if(power > 0) {
|
||||
if(power >= 150) {
|
||||
power -= 150;
|
||||
heat += Math.min(((double)power / (double)maxPower * 300), 150);
|
||||
} else {
|
||||
|
||||
@ -109,6 +109,7 @@ bomb.triggered=Erfolgreich ausgelöst!
|
||||
|
||||
book.test.page1=Testseite 1
|
||||
|
||||
chem.ARSENIC=Arsenextraktion
|
||||
chem.ASPHALT=Asphaltherstellung
|
||||
chem.BAKELITE=Bakelitherstellung
|
||||
chem.BALEFIRE=BF-Raketentreibstoffherstellung
|
||||
@ -527,6 +528,7 @@ hbmfluid.schrabidic=Schrabidische Säure
|
||||
hbmfluid.smear=Industrieöl
|
||||
hbmfluid.spentsteam=Niedrigdruckdampf
|
||||
hbmfluid.steam=Dampf
|
||||
hbmfluid.sulfuric_acid=Schwefelsäure
|
||||
hbmfluid.superhotsteam=Superverdichteter Dampf
|
||||
hbmfluid.tritium=Tritium
|
||||
hbmfluid.uf6=Uranhexafluorid
|
||||
@ -938,6 +940,7 @@ item.briquette_lignite.name=Braunkohlebrikett
|
||||
item.bucket_acid.name=Säureeimer
|
||||
item.bucket_mud.name=Eimer mit giftigem Schlamm
|
||||
item.bucket_schrabidic_acid.name=Eimer mit Schrabidischer Säure
|
||||
item.bucket_sulfuric_acid.name=Eimer mit Schwefelsäure
|
||||
item.bucket_toxic.name=Eimer mit stereotypischem grünen Schleim
|
||||
item.burnt_bark.name=Verbrannte Rinde
|
||||
item.can_bepis.name=Bepis
|
||||
@ -2139,7 +2142,7 @@ item.pin.name=Haarklammer
|
||||
item.pipes_steel.name=Stahlrohre
|
||||
item.pirfenidone.name=Pirfenidon
|
||||
item.pipes_steel.desc=Auf Recycling-Rezepte wurden wegen$Steuerhinterziehung verzichtet.
|
||||
item.piston_selenium.name=Sternmotorenkolben
|
||||
item.piston_selenium.name=Motorkolben
|
||||
item.plan_c.name=Plan C
|
||||
item.plate_advanced_alloy.name=Fortgeschrittene Legierungsplatte
|
||||
item.plate_aluminium.name=Aluminiumplatte
|
||||
@ -3072,6 +3075,8 @@ tile.concrete_colored.white.name=Weißer Beton
|
||||
tile.concrete_colored.yellow.name=Gelber Beton
|
||||
tile.concrete_pillar.name=Stahlbetonsäule
|
||||
tile.concrete_smooth.name=Beton
|
||||
tile.concrete_super.name=Super Beton
|
||||
tile.concrete_super_broken.name=Schimmliger Schutt
|
||||
tile.corium_block.name=Corium
|
||||
tile.crashed_bomb.name=Blindgänger
|
||||
tile.crate.name=Vorratskiste
|
||||
@ -3257,6 +3262,7 @@ tile.lamp_tritium_green_off.name=Grüne Tritiumlampe
|
||||
tile.lamp_tritium_green_on.name=Grüne Tritiumlampe
|
||||
tile.launch_pad.name=Raketenabschussrampe
|
||||
tile.launch_table.name=Große Startrampe
|
||||
tile.leaves_layer.name=Totes Laub
|
||||
tile.lox_barrel.name=LOX-Fass
|
||||
tile.machine_amgen.name=Umgebungsstrahlungs-Generator
|
||||
tile.machine_arc_furnace_off.name=Lichtbogenofen
|
||||
@ -3473,6 +3479,10 @@ tile.pink_log.name=Pinkes Holz
|
||||
tile.pink_planks.name=Pinke Holzbretter
|
||||
tile.pink_slab.name=Pinke Holzstufe
|
||||
tile.pink_stairs.name=Pinke Holztreppen
|
||||
tile.plant_flower.foxglove.name=Roter Fingerhut
|
||||
tile.plant_flower.nightshade.name=Schwarze Tollkirsche
|
||||
tile.plant_flower.tobacco.name=Tabakpflanze
|
||||
tile.plant_flower.weed.name=Weed Version 420(0)
|
||||
tile.plasma.name=Plasma
|
||||
tile.plasma_heater.name=Plasmaerhitzer
|
||||
tile.pole_satellite_receiver.name=Satellitenschüssel
|
||||
@ -3574,6 +3584,7 @@ tile.steel_poles.name=Stahlmasten
|
||||
tile.steel_roof.name=Flaches Stachldach
|
||||
tile.steel_scaffold.name=Stahlgerüst
|
||||
tile.steel_wall.name=Stahlwand
|
||||
tile.stone_cracked.name=Rissiger Stein
|
||||
tile.stone_depth.name=Tiefenfels
|
||||
tile.stone_depth_nether.name=Nether-Tiefenfels
|
||||
tile.stone_gneiss.name=Graphitschiefer
|
||||
|
||||
@ -277,6 +277,7 @@ book.starter.page18=vær is just a guy who has been trapped in the grey void fea
|
||||
#book.rbmk.title16=Meltdown
|
||||
#book.rbmk.page16=§4§lAvoid.
|
||||
|
||||
chem.ARSENIC=Arsenic Extraction
|
||||
chem.ASPHALT=Asphalt Production
|
||||
chem.BAKELITE=Bakelite Production
|
||||
chem.BALEFIRE=BF Rocket Fuel Mixing
|
||||
@ -721,6 +722,7 @@ hbmfluid.schrabidic=Schrabidic Acid
|
||||
hbmfluid.smear=Industrial Oil
|
||||
hbmfluid.spentsteam=Low-Pressure Steam
|
||||
hbmfluid.steam=Steam
|
||||
hbmfluid.sulfuric_acid=Sulfuric Acid
|
||||
hbmfluid.superhotsteam=Super Dense Steam
|
||||
hbmfluid.tritium=Tritium
|
||||
hbmfluid.uf6=Uranium Hexafluoride
|
||||
@ -1148,6 +1150,7 @@ item.briquette_lignite.name=Lignite Briquette
|
||||
item.bucket_acid.name=Bucket of Acid
|
||||
item.bucket_mud.name=Bucket of Poisonous Mud
|
||||
item.bucket_schrabidic_acid.name=Bucket of Schrabidic Acid
|
||||
item.bucket_sulfuric_acid.name=Bucket of Sulfuric Acid
|
||||
item.bucket_toxic.name=Bucket of Stereotypical Green Ooze
|
||||
item.burnt_bark.name=Burnt Bark
|
||||
item.burnt_bark.desc=A piece of bark from an exploded golden oak tree.
|
||||
@ -2430,7 +2433,7 @@ item.pin.desc="*Unmodified* success rate of picking a standard lock is ~10%.
|
||||
item.pipes_steel.name=Steel Pipes
|
||||
item.pipes_steel.desc=Uncrafting was omitted due to tax evasion.
|
||||
item.pirfenidone.name=Pirfenidone
|
||||
item.piston_selenium.name=Radial Engine Piston
|
||||
item.piston_selenium.name=Combustion Engine Piston
|
||||
item.plan_c.name=Plan C
|
||||
item.plate_advanced_alloy.name=Advanced Alloy Plate
|
||||
item.plate_aluminium.name=Aluminium Plate
|
||||
@ -3445,6 +3448,8 @@ tile.concrete_colored.white.name=White Concrete
|
||||
tile.concrete_colored.yellow.name=Yellow Concrete
|
||||
tile.concrete_pillar.name=Rebar Reinforced Concrete Pillar
|
||||
tile.concrete_smooth.name=Concrete
|
||||
tile.concrete_super.name=Über Concrete
|
||||
tile.concrete_super_broken.name=Moldy Debris
|
||||
tile.corium_block.name=Corium
|
||||
tile.crashed_bomb.name=Dud
|
||||
tile.crate.name=Supply Crate
|
||||
@ -3630,6 +3635,7 @@ tile.lamp_tritium_green_off.name=Green Tritium Lamp
|
||||
tile.lamp_tritium_green_on.name=Green Tritium Lamp
|
||||
tile.launch_pad.name=Missile Launch Pad
|
||||
tile.launch_table.name=Large Launch Pad
|
||||
tile.leaves_layer.name=Fallen Leaves
|
||||
tile.lox_barrel.name=LOX Barrel
|
||||
tile.machine_amgen.name=Ambience Radiation Generator
|
||||
tile.machine_arc_furnace_off.name=Arc Furnace
|
||||
@ -3847,6 +3853,10 @@ tile.pink_log.name=Pink Log
|
||||
tile.pink_planks.name=Pink Wood Planks
|
||||
tile.pink_slab.name=Pink Wood Slab
|
||||
tile.pink_stairs.name=Pink Wood Stairs
|
||||
tile.plant_flower.foxglove.name=Foxglove
|
||||
tile.plant_flower.nightshade.name=Deadly Nightshade
|
||||
tile.plant_flower.tobacco.name=Tobacco Plant
|
||||
tile.plant_flower.weed.name=Weed Version 420(0)
|
||||
tile.plasma.name=Plasma
|
||||
tile.plasma_heater.name=Plasma Heater
|
||||
tile.pole_satellite_receiver.name=Satellite Dish
|
||||
@ -3948,6 +3958,7 @@ tile.steel_poles.name=Steel Pole
|
||||
tile.steel_roof.name=Flat Steel Roof
|
||||
tile.steel_scaffold.name=Steel Scaffold
|
||||
tile.steel_wall.name=Steel Wall
|
||||
tile.stone_cracked.name=Cracked Stone
|
||||
tile.stone_depth.name=Depth Rock
|
||||
tile.stone_depth_nether.name=Nether Depth Rock
|
||||
tile.stone_gneiss.name=Graphitic Schist
|
||||
|
||||
12086
src/main/resources/assets/hbm/models/weapons/nightmare_dark.obj
Normal file
BIN
src/main/resources/assets/hbm/textures/blocks/concrete_super.png
Normal file
|
After Width: | Height: | Size: 486 B |
|
After Width: | Height: | Size: 879 B |
|
After Width: | Height: | Size: 625 B |
|
After Width: | Height: | Size: 694 B |
|
After Width: | Height: | Size: 733 B |
|
After Width: | Height: | Size: 764 B |
|
After Width: | Height: | Size: 267 B |
|
After Width: | Height: | Size: 624 B |
BIN
src/main/resources/assets/hbm/textures/items/plasma_spear.png
Normal file
|
After Width: | Height: | Size: 241 B |
|
After Width: | Height: | Size: 327 B |
@ -3,7 +3,7 @@
|
||||
"modid": "hbm",
|
||||
"name": "Hbm's Nuclear Tech",
|
||||
"description": "A mod that adds weapons, nuclear themed stuff and machines",
|
||||
"version":"1.0.27_X4193",
|
||||
"version":"1.0.27_X4200",
|
||||
"mcversion": "1.7.10",
|
||||
"url": "",
|
||||
"updateUrl": "",
|
||||
|
||||