From 4e0622ff9ca59aced0efd59832e11dda8ea18bee Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Mon, 23 Nov 2020 19:49:43 +0100
Subject: [PATCH] will you calm down

---
 src/main/java/assets/hbm/lang/de_DE.lang      |   2 +
 src/main/java/assets/hbm/lang/en_US.lang      |   2 +
 .../hbm/textures/blocks/ore_coal_oil.png      | Bin 0 -> 585 bytes
 .../textures/blocks/ore_coal_oil_burning.png  | Bin 0 -> 724 bytes
 src/main/java/com/hbm/blocks/ModBlocks.java   |  11 ++-
 .../hbm/blocks/generic/BlockCoalBurning.java  |  66 ++++++++++++++++++
 .../com/hbm/blocks/generic/BlockCoalOil.java  |  48 +++++++++++++
 src/main/java/com/hbm/config/WorldConfig.java |  32 +++++----
 .../com/hbm/items/tool/ItemToolAbility.java   |   3 +-
 src/main/java/com/hbm/lib/HbmWorldGen.java    |   4 +-
 src/main/java/com/hbm/lib/RefStrings.java     |   2 +-
 11 files changed, 150 insertions(+), 20 deletions(-)
 create mode 100755 src/main/java/assets/hbm/textures/blocks/ore_coal_oil.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/ore_coal_oil_burning.png
 create mode 100644 src/main/java/com/hbm/blocks/generic/BlockCoalBurning.java
 create mode 100644 src/main/java/com/hbm/blocks/generic/BlockCoalOil.java

diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang
index 8fc2f4077..812cb3471 100644
--- a/src/main/java/assets/hbm/lang/de_DE.lang
+++ b/src/main/java/assets/hbm/lang/de_DE.lang
@@ -2313,6 +2313,8 @@ tile.ore_aluminium.name=Aluminiumerz
 tile.ore_asbestos.name=Asbesterz
 tile.ore_australium.name=Australisches Erz
 tile.ore_beryllium.name=Berylliumerz
+tile.ore_coal_oil.name=Öliges Kohleerz
+tile.ore_coal_oil_burning.name=Brennendes Öliges Kohleerz
 tile.ore_copper.name=Kupfererz
 tile.ore_daffergon.name=Dellit
 tile.ore_fluorite.name=Fluoriterz
diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang
index 04b3cad36..29fa13572 100644
--- a/src/main/java/assets/hbm/lang/en_US.lang
+++ b/src/main/java/assets/hbm/lang/en_US.lang
@@ -2313,6 +2313,8 @@ tile.ore_aluminium.name=Aluminium Ore
 tile.ore_asbestos.name=Asbestos Ore
 tile.ore_australium.name=Australian Ore
 tile.ore_beryllium.name=Beryllium Ore
+tile.ore_coal_oil.name=Oily Coal Ore
+tile.ore_coal_oil_burning.name=Burning Oily Coal Ore
 tile.ore_copper.name=Copper Ore
 tile.ore_daffergon.name=Dellite
 tile.ore_fluorite.name=Fluorite Ore
diff --git a/src/main/java/assets/hbm/textures/blocks/ore_coal_oil.png b/src/main/java/assets/hbm/textures/blocks/ore_coal_oil.png
new file mode 100755
index 0000000000000000000000000000000000000000..d7123472efbb17d360d94179f457888b00eae11a
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00062Nkl<ZIE`(SF>C5j9L0a-rKz{ckWeI$WN?un6*_d0PIYl}5m#~T($A3h
zK^!_}kSu-xC%bg*5~R>VBXnwp1eHkILGG>gy)$0UJ@@?o=iHMp48Mw^;1GskU|ALb
zNs<r*0a=#uKc4pc!f%+S34mo;Se8YSBsh)(Kv5KXfsc<5r5?vIgTX)vc%Da^rWl3+
zz<fTZEK5eC(T@XZ5un@clIJ;&;}As=+wGR|c&r|{zP?tkD*<USO;c>!R)j;c=XuJ}
z>+36?=aD1{T2T~AP1>AJr|fn+`u#qipP%G;&SWxCXQ!v9Y8RSR&azBhEXz^}jmKjE
z*6TG@RVgPjAx+K>aCLR{PYOj*kmos_P6vQAO;v=B<Lq}3MG<9L((CmIf`F%|Cxj6A
zzOP)}-QB6#4{;KP;n#Ax1i*D&09LCNuIn<J&Dd_YiaZ<+kK)a;Z0|q_LA%{1O;h4H
z=KlU(MYdkA5kgR}*E!sm9Q{wL)%sgi6}qmY>pJJ>=NN{;X0zeq;)1iYGcGSL0eE<L
zV6j+mdwWZ*R^#pMZ9l^Ajvrz+o1tmiQ94ysF&qwmiX`hQXO_{)GCe*%0&sJ4gAhXP
z0N4v;S%zU4N6nLHHk$|`Fin$2qrvm@Gq!E3|Dhd{UDxI1<>hEu0KV_@{{DVcb=lf)
Xr;`bNCu5gu00000NkvXXu0mjfBLfI2

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/ore_coal_oil_burning.png b/src/main/java/assets/hbm/textures/blocks/ore_coal_oil_burning.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c3eb4be29376f4b5df1a5ef708ff071f6801e8
GIT binary patch
literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0007uNkl<ZIE_`4Pfrs;7{-64TVOj2%nGDtry5GE6)iy}jR#|5y!cW47<>si
zc+{&GZ{9eliGLH*NN5)M)4)zm0mF(NX_nS{n3m#unoMTi`OWh@Z)#;_rDu#`P^J71
z(eWZuN&vzzq*N*q$1%njO8FhTAI&3#zyT0KoL^WdY|!f2_1sJiFLgw#S3*jOl#<zr
zH+Y^$bSyB&*appJlL5u@{!jFXwlp&vEEFbr^;RQ<0ATjerQ0?z!H{5p2=F{AbGx{K
zl#;1hnvOX@$O?J?8vv`H6ac}988!frQsSlFlJ`MPp8zMka~!IN*9kI)g}ZG4TD=F<
z>vfb;gkgwdjKLV&ZSkh1$ktqXNy6enhfVF$YPA^odPXlv(1|9K$q<Gixm*rMDaG7O
zjh1PUt)=ND37xjpLwxD-uyP8V(%C$r*X^R_)VX6}7~;fn%tWxo#3(#{bD4{^bgjXn
z*ds|2-g{Z9TLD4F3M_=M1ORTeOSj!-a&nT#_y6+pbqm*ZS-v&W|4y2jds!O4W>HH0
z_lN_qTJI|xc#QD@xQg%lxYaGr%!xg@W+)fNfqlYg9;Fm<9QO%amvXs`)*A2Y8I?-K
zTK2iYjVrs1jg2uiHAT5#ofsc)u=T^{!f7^}0K{?3(zOQf8!mtPnJ5;E+?n6Sms#5F
z-=scv=@>)d5geULD`GB}V_@a9*kif~Yt`XwTna}?jh^8qR;N@tO?T}8ozX)Pl~QP}
z`^hs1Y4MCPtkxAzW;X$Nc6c4vbpa@s)lkGZjuAqz`n@k^W=K#h7I_i5c%Db4GROM*
zI==6twVe;=;wT3}!1ng`xmAPt$mjD!QH0hS-}ldR0PqilU>V|9qM^Y60000<MNUMn
GLSTaDgHVA0

literal 0
HcmV?d00001

diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java
index 626a511b1..7ca4ce996 100644
--- a/src/main/java/com/hbm/blocks/ModBlocks.java
+++ b/src/main/java/com/hbm/blocks/ModBlocks.java
@@ -98,6 +98,8 @@ public class ModBlocks {
 	public static Block ore_oil_sand;
 	public static Block ore_lignite;
 	public static Block ore_asbestos;
+	public static Block ore_coal_oil;
+	public static Block ore_coal_oil_burning;
 
 	public static Block ore_tikite;
 
@@ -872,7 +874,9 @@ public class ModBlocks {
 		ore_beryllium = new BlockGeneric(Material.rock).setBlockName("ore_beryllium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_beryllium");
 		ore_lignite = new BlockOre(Material.rock).setBlockName("ore_lignite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_lignite");
 		ore_asbestos = new BlockOre(Material.rock).setBlockName("ore_asbestos").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_asbestos");
-
+		ore_coal_oil = new BlockCoalOil(Material.rock).setBlockName("ore_coal_oil").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_coal_oil");
+		ore_coal_oil_burning = new BlockCoalBurning(Material.rock).setBlockName("ore_coal_oil_burning").setCreativeTab(MainRegistry.blockTab).setLightLevel(10F/15F).setHardness(5.0F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":ore_coal_oil_burning");
+		
 		ore_nether_uranium = new BlockOre(Material.rock).setBlockName("ore_nether_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium");
 		ore_nether_uranium_scorched = new BlockOre(Material.rock).setBlockName("ore_nether_uranium_scorched").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_uranium_scorched");
 		ore_nether_plutonium = new BlockGeneric(Material.rock).setBlockName("ore_nether_plutonium").setCreativeTab(MainRegistry.blockTab).setHardness(0.4F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_nether_plutonium");
@@ -1561,6 +1565,11 @@ public class ModBlocks {
 		GameRegistry.registerBlock(ore_verticium, ItemOreBlock.class, ore_verticium.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_rare, ItemOreBlock.class, ore_rare.getUnlocalizedName());
 		
+		//Nice Meme
+		GameRegistry.registerBlock(ore_coal_oil, ore_coal_oil.getUnlocalizedName());
+		GameRegistry.registerBlock(ore_coal_oil_burning, ore_coal_oil_burning.getUnlocalizedName());
+
+		
 		//Nether Ores
 		GameRegistry.registerBlock(ore_nether_uranium, ore_nether_uranium.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_nether_uranium_scorched, ore_nether_uranium_scorched.getUnlocalizedName());
diff --git a/src/main/java/com/hbm/blocks/generic/BlockCoalBurning.java b/src/main/java/com/hbm/blocks/generic/BlockCoalBurning.java
new file mode 100644
index 000000000..a70e463c5
--- /dev/null
+++ b/src/main/java/com/hbm/blocks/generic/BlockCoalBurning.java
@@ -0,0 +1,66 @@
+package com.hbm.blocks.generic;
+
+import java.util.Random;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockCoalBurning extends Block {
+
+	public BlockCoalBurning(Material mat) {
+		super(mat);
+	}
+    
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
+        super.randomDisplayTick(world, x, y, z, rand);
+        
+        for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+        	
+        	if(dir == ForgeDirection.DOWN)
+        		continue;
+        	
+        	if(world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial() == Material.air) {
+
+        		double ix = x + 0.5F + dir.offsetX + rand.nextDouble() - 0.5D;
+        		double iy = y + 0.5F + dir.offsetY + rand.nextDouble() - 0.5D;
+        		double iz = z + 0.5F + dir.offsetZ + rand.nextDouble() - 0.5D;
+
+        		if(dir.offsetX != 0)
+        			ix = x + 0.5F + dir.offsetX * 0.5 + rand.nextDouble() * 0.125 * dir.offsetX;
+        		if(dir.offsetY != 0)
+        			iy = y + 0.5F + dir.offsetY * 0.5 + rand.nextDouble() * 0.125 * dir.offsetY;
+        		if(dir.offsetZ != 0)
+        			iz = z + 0.5F + dir.offsetZ * 0.5 + rand.nextDouble() * 0.125 * dir.offsetZ;
+
+        		world.spawnParticle("flame", ix, iy, iz, 0.0, 0.0, 0.0);
+        		world.spawnParticle("smoke", ix, iy, iz, 0.0, 0.0, 0.0);
+        		world.spawnParticle("smoke", ix, iy, iz, 0.0, 0.1, 0.0);
+        	}
+        }
+    }
+
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+		return null;
+    }
+
+	public void breakBlock(World world, int x, int y, int z, Block block, int i) {
+		super.breakBlock(world, x, y, z, block, i);
+		
+		world.setBlock(x, y, z, Blocks.fire);
+	}
+
+    @Override
+	public void onEntityWalking(World world, int x, int y, int z, Entity entity) {
+    	entity.setFire(3);
+    }
+}
diff --git a/src/main/java/com/hbm/blocks/generic/BlockCoalOil.java b/src/main/java/com/hbm/blocks/generic/BlockCoalOil.java
new file mode 100644
index 000000000..87613b9e6
--- /dev/null
+++ b/src/main/java/com/hbm/blocks/generic/BlockCoalOil.java
@@ -0,0 +1,48 @@
+package com.hbm.blocks.generic;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockCoalOil extends Block {
+
+	public BlockCoalOil(Material mat) {
+		super(mat);
+	}
+	
+    @Override
+	public void onNeighborBlockChange(World world, int x, int y, int z, Block b) {
+        
+        for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+        	
+        	Block n = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
+        	
+        	if(n == ModBlocks.ore_coal_oil_burning || n == ModBlocks.balefire || n == Blocks.fire || n.getMaterial() == Material.lava) {
+        		world.scheduleBlockUpdate(x, y, z, this, world.rand.nextInt(20) + 2);
+        	}
+        }
+    }
+	
+    @Override
+	public void updateTick(World world, int x, int y, int z, Random rand) {
+    	world.setBlock(x, y, z, ModBlocks.ore_coal_oil_burning);
+    }
+
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+		return Items.coal;
+    }
+    
+    @Override
+	public int quantityDropped(Random rand) {
+    	return 2 + rand.nextInt(2);
+    }
+}
diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java
index 8ff8f570a..a91540e5f 100644
--- a/src/main/java/com/hbm/config/WorldConfig.java
+++ b/src/main/java/com/hbm/config/WorldConfig.java
@@ -20,6 +20,7 @@ public class WorldConfig {
 	public static int asbestosSpawn = 4;
 	public static int rareSpawn = 6;
 	public static int lithiumSpawn = 6;
+	public static int oilcoalSpawn = 128;
 
 	public static int radioStructure = 500;
 	public static int antennaStructure = 250;
@@ -53,21 +54,22 @@ public class WorldConfig {
 	public static void loadFromConfig(Configuration config) {
 
 		final String CATEGORY_OREGEN = "02_ores";
-		uraniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.00_uraniumSpawnrate", "Ammount of uranium ore veins per chunk", 7);
-		titaniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.01_titaniumSpawnrate", "Ammount of titanium ore veins per chunk", 8);
-		sulfurSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.02_sulfurSpawnrate", "Ammount of sulfur ore veins per chunk", 5);
-		aluminiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.03_aluminiumSpawnrate", "Ammount of aluminium ore veins per chunk", 7);
-		copperSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.04_copperSpawnrate", "Ammount of copper ore veins per chunk", 12);
-		fluoriteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.05_fluoriteSpawnrate", "Ammount of fluorite ore veins per chunk", 6);
-		niterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.06_niterSpawnrate", "Ammount of niter ore veins per chunk", 6);
-		tungstenSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.07_tungstenSpawnrate", "Ammount of tungsten ore veins per chunk", 10);
-		leadSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.08_leadSpawnrate", "Ammount of lead ore veins per chunk", 6);
-		berylliumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.09_berylliumSpawnrate", "Ammount of beryllium ore veins per chunk", 6);
-		thoriumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.10_thoriumSpawnrate", "Ammount of thorium ore veins per chunk", 7);
-		ligniteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.11_ligniteSpawnrate", "Ammount of lignite ore veins per chunk", 2);
-		asbestosSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.12_asbestosSpawnRate", "Ammount of asbestos ore veins per chunk", 2);
-		lithiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.13_lithiumSpawnRate", "Ammount of schist lithium ore veins per chunk", 6);
-		rareSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.14_rareEarthSpawnRate", "Ammount of rare earth ore veins per chunk", 6);
+		uraniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.00_uraniumSpawnrate", "Amount of uranium ore veins per chunk", 7);
+		titaniumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.01_titaniumSpawnrate", "Amount of titanium ore veins per chunk", 8);
+		sulfurSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.02_sulfurSpawnrate", "Amount of sulfur ore veins per chunk", 5);
+		aluminiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.03_aluminiumSpawnrate", "Amount of aluminium ore veins per chunk", 7);
+		copperSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.04_copperSpawnrate", "Amount of copper ore veins per chunk", 12);
+		fluoriteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.05_fluoriteSpawnrate", "Amount of fluorite ore veins per chunk", 6);
+		niterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.06_niterSpawnrate", "Amount of niter ore veins per chunk", 6);
+		tungstenSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.07_tungstenSpawnrate", "Amount of tungsten ore veins per chunk", 10);
+		leadSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.08_leadSpawnrate", "Amount of lead ore veins per chunk", 6);
+		berylliumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.09_berylliumSpawnrate", "Amount of beryllium ore veins per chunk", 6);
+		thoriumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.10_thoriumSpawnrate", "Amount of thorium ore veins per chunk", 7);
+		ligniteSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.11_ligniteSpawnrate", "Amount of lignite ore veins per chunk", 2);
+		asbestosSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.12_asbestosSpawnRate", "Amount of asbestos ore veins per chunk", 2);
+		lithiumSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.13_lithiumSpawnRate", "Amount of schist lithium ore veins per chunk", 6);
+		rareSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.14_rareEarthSpawnRate", "Amount of rare earth ore veins per chunk", 6);
+		oilcoalSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.15_oilCoalSpawnRate", "Spawns an oily coal vein every nTH chunk", 128);
 
 		final String CATEGORY_DUNGEON = "04_dungeons";
 		radioStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.00_radioSpawn", "Spawn radio station on every nTH chunk", 500);
diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbility.java b/src/main/java/com/hbm/items/tool/ItemToolAbility.java
index 314823b7c..8833f682f 100644
--- a/src/main/java/com/hbm/items/tool/ItemToolAbility.java
+++ b/src/main/java/com/hbm/items/tool/ItemToolAbility.java
@@ -8,7 +8,6 @@ import java.util.Set;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
-import com.hbm.config.ToolConfig;
 import com.hbm.handler.ToolAbility;
 import com.hbm.handler.ToolAbility.*;
 import com.hbm.handler.WeaponAbility;
@@ -294,7 +293,7 @@ public class ItemToolAbility extends ItemTool implements IItemAbility {
     	
     	setAbility(stack, i % this.breakAbility.size());
     	
-    	while(!getCurrentAbility(stack).isAllowed()) {
+    	while(getCurrentAbility(stack) != null && !getCurrentAbility(stack).isAllowed()) {
     		
     		player.addChatComponentMessage(
     				new ChatComponentText("[Ability ")
diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java
index 16f027778..777363b4a 100644
--- a/src/main/java/com/hbm/lib/HbmWorldGen.java
+++ b/src/main/java/com/hbm/lib/HbmWorldGen.java
@@ -43,7 +43,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.NoiseGeneratorOctaves;
-import net.minecraft.world.gen.NoiseGeneratorPerlin;
 import net.minecraft.world.gen.feature.WorldGenMinable;
 import cpw.mods.fml.common.IWorldGenerator;
 
@@ -145,6 +144,9 @@ public class HbmWorldGen implements IWorldGenerator {
 		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.rareSpawn, 5, 5, 20, ModBlocks.ore_rare);
 		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.ligniteSpawn, 24, 35, 25, ModBlocks.ore_lignite);
 		DungeonToolbox.generateOre(world, rand, i, j, WorldConfig.asbestosSpawn, 4, 16, 16, ModBlocks.ore_asbestos);
+		
+		if(WorldConfig.oilcoalSpawn > 0 && rand.nextInt(WorldConfig.oilcoalSpawn) == 0)
+			DungeonToolbox.generateOre(world, rand, i, j, 1, 64, 32, 32, ModBlocks.ore_coal_oil);
 
 		for (int k = 0; k < 6; k++) {
 			int randPosX = i + rand.nextInt(16);
diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java
index decba40aa..77414c90e 100644
--- a/src/main/java/com/hbm/lib/RefStrings.java
+++ b/src/main/java/com/hbm/lib/RefStrings.java
@@ -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 (3696)";
+	public static final String VERSION = "1.0.27 BETA (3697)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version