fixed crash on start, updated textures, more hazards

src/main/java/com/hbm/hazard/HazardRegistry.java

@@ -3,9 +3,11 @@ package com.hbm.hazard;
 import static com.hbm.blocks.ModBlocks.*;
 import static com.hbm.items.ModItems.*;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.hazard.modifier.*;
 import com.hbm.hazard.transformer.HazardTransformerRadiationNBT;
 import com.hbm.hazard.type.*;
+import com.hbm.items.ModItems;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -157,6 +159,12 @@ public class HazardRegistry {
 		HazardSystem.register(nuclear_waste_tiny, makeData(RADIATION, wst * nugget));
 		HazardSystem.register(nuclear_waste_vitrified, makeData(RADIATION, wstv * ingot));
 		HazardSystem.register(nuclear_waste_vitrified_tiny, makeData(RADIATION, wstv * nugget));
+		HazardSystem.register(block_waste, makeData(RADIATION, wst * block));
+		HazardSystem.register(block_waste_painted, makeData(RADIATION, wst * block));
+		HazardSystem.register(block_waste_vitrified, makeData(RADIATION, wstv * block));
+		HazardSystem.register(ancient_scrap, makeData(RADIATION, 150F));
+		HazardSystem.register(block_corium, makeData(RADIATION, 150F));
+		HazardSystem.register(block_corium_cobble, makeData(RADIATION, 150F));
 		
 		HazardSystem.register(waste_uranium, makeData(RADIATION, 15F));
 		HazardSystem.register(waste_thorium, makeData(RADIATION, 10F));
@@ -251,6 +259,12 @@ public class HazardRegistry {
 		registerRBMKPellet(rbmk_pellet_hep239, pu239 * billet, pu239 * billet * 100);
 		registerRBMKPellet(rbmk_pellet_hep241, pu241 * billet, pu241 * billet * 100);
 
+		HazardSystem.register(powder_yellowcake, makeData(RADIATION, yc * powder));
+		HazardSystem.register(block_yellowcake, makeData(RADIATION, yc * block * powder_mult));
+		HazardSystem.register(ModItems.fallout, makeData(RADIATION, fo * powder));
+		HazardSystem.register(ModBlocks.fallout, makeData(RADIATION, fo * powder * 2));
+		HazardSystem.register(ModBlocks.block_fallout, makeData(RADIATION, yc * block * powder_mult));
+		
 		//TODO
 	}
 	

src/main/java/com/hbm/inventory/OreDictManager.java

@@ -63,7 +63,8 @@ public class OreDictManager {
 		new DictFrame("Gold198", "Au198")					.rad(HazardRegistry.au198).hot(5)		.nugget(nugget_au198)		.billet(billet_au198)		.ingot(ingot_au198)			.dust(powder_au198);
 		new DictFrame("Schrabidium")						.rad(HazardRegistry.sa326).blinding(3F)	.nugget(nugget_schrabidium)	.billet(billet_schrabidium)	.ingot(ingot_schrabidium)	.dust(powder_schrabidium)	.plate(plate_schrabidium)	.block(block_schrabidium)	.ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium);
 		new DictFrame("Solinium")							.rad(HazardRegistry.sa327).blinding(3F)	.nugget(nugget_solinium)	.billet(billet_solinium)	.ingot(ingot_solinium)																.block(block_solinium);
-		new DictFrame("Schrabidate")						.rad(HazardRegistry.sb)																			.ingot(ingot_schrabidate)	.dust(powder_schrabidate)								.block(block_schrabidate);
+		new DictFrame("Schrabidate")						.rad(HazardRegistry.sb).blinding(1F)															.ingot(ingot_schrabidate)	.dust(powder_schrabidate)								.block(block_schrabidate);
+		new DictFrame("Schraranium")						.rad(HazardRegistry.sr).blinding(1F)															.ingot(ingot_schraranium)															.block(block_schraranium);
 
 		/*
 		 * STABLE

src/main/java/com/hbm/main/ModEventHandlerClient.java

@@ -408,7 +408,7 @@ public class ModEventHandlerClient {
 		EntityPlayer player = MainRegistry.proxy.me();
 		Minecraft mc = Minecraft.getMinecraft();
 		
-		if(player != null) {
+		if(player != null && mc.theWorld != null) {
 			int i = MathHelper.floor_double(player.posX);
 			int j = MathHelper.floor_double(player.posY);
 			int k = MathHelper.floor_double(player.posZ);

src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java

@@ -40,14 +40,9 @@ public class RenderBlocksCT extends RenderBlocks {
 	
 	private void initSideInfo() {
 		
-		if(!this.enableAO || true)
+		/*if(!this.enableAO)
 			return;
 
-		/*this.tl = new VertInfo(this.colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, this.brightnessTopLeft);
-		this.tr = new VertInfo(this.colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, this.brightnessTopRight);
-		this.bl = new VertInfo(this.colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, this.brightnessBottomLeft);
-		this.br = new VertInfo(this.colorRedBottomRight, this.colorGreenBottomRight, this.colorBlueBottomRight, this.brightnessBottomRight);*/
-
 		this.tl = new VertInfo(this.colorRedTopLeft, this.colorGreenTopLeft, this.colorBlueTopLeft, this.brightnessTopLeft);
 		this.tr = new VertInfo(this.colorRedTopRight, this.colorGreenTopRight, this.colorBlueTopRight, this.brightnessTopRight);
 		this.bl = new VertInfo(this.colorRedBottomLeft, this.colorGreenBottomLeft, this.colorBlueBottomLeft, this.brightnessBottomLeft);
@@ -58,7 +53,7 @@ public class RenderBlocksCT extends RenderBlocks {
 		this.cl = VertInfo.avg(tl, bl);
 		this.cr = VertInfo.avg(tr, br);
 		
-		this.cc = VertInfo.avg(tl, tr, bl, br);
+		this.cc = VertInfo.avg(tl, tr, bl, br);*/
 	}
 
 	@Override
@@ -201,12 +196,12 @@ public class RenderBlocksCT extends RenderBlocks {
 		drawSubFace(fcc, this.cc, fcr, this.cr, fbc, this.bc, fbr, this.br, ibr);
 	}
 	
-	/// ORDER: GOD IS DEAD ///
+	/// ORDER: LEXICAL ///
 	private void drawSubFace(double[] ftl, VertInfo ntl, double[] ftr, VertInfo ntr, double[] fbl, VertInfo nbl, double[] fbr, VertInfo nbr, IIcon icon) {
 		
 		boolean debugColor = false;
 		
-		/// ORDER: I DON'T FUCKING KNOW AT THIS POINT ///
+		/// ORDER: ROTATIONAL ///
 		if(debugColor) tess.setColorOpaque_F(1F, 1F, 0F);
 		drawVert(ftr, icon.getMaxU(), icon.getMinV(), ntr);
 		if(debugColor) tess.setColorOpaque_F(1F, 0F, 0F);
@@ -223,10 +218,10 @@ public class RenderBlocksCT extends RenderBlocks {
 	
 	private void drawVert(double x, double y, double z, double u, double v, VertInfo info) {
 		
-		if(this.enableAO && false) {
+		/*if(this.enableAO) {
 			tess.setColorOpaque_F(info.red, info.green, info.blue);
 			tess.setBrightness(info.brightness);
-		}
+		}*/
 		
 		tess.addVertexWithUV(x, y, z, u, v);
 	}