diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 299aec66e..bffdcac72 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/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)); @@ -250,6 +258,12 @@ public class HazardRegistry { registerRBMKPellet(rbmk_pellet_mep, purg * billet, purg * billet * 100); 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 } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 8132b130f..812d4a903 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/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 diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 0eb821966..ba5abe21a 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/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); diff --git a/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java b/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java index e1553bde4..2cd8f8b62 100644 --- a/src/main/java/com/hbm/render/block/ct/RenderBlocksCT.java +++ b/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); } diff --git a/src/main/resources/assets/hbm/textures/items/alloy_shovel.png b/src/main/resources/assets/hbm/textures/items/alloy_shovel.png index 85e14f636..e46f91474 100644 Binary files a/src/main/resources/assets/hbm/textures/items/alloy_shovel.png and b/src/main/resources/assets/hbm/textures/items/alloy_shovel.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coal_infernal.png b/src/main/resources/assets/hbm/textures/items/coal_infernal.png index 9e2f93243..0cc03a741 100644 Binary files a/src/main/resources/assets/hbm/textures/items/coal_infernal.png and b/src/main/resources/assets/hbm/textures/items/coal_infernal.png differ diff --git a/src/main/resources/assets/hbm/textures/items/egg_balefire.png b/src/main/resources/assets/hbm/textures/items/egg_balefire.png index 6c435eea8..a4e398d24 100644 Binary files a/src/main/resources/assets/hbm/textures/items/egg_balefire.png and b/src/main/resources/assets/hbm/textures/items/egg_balefire.png differ diff --git a/src/main/resources/assets/hbm/textures/items/egg_balefire_shard.png b/src/main/resources/assets/hbm/textures/items/egg_balefire_shard.png index 394d8a8ba..145a5ab49 100644 Binary files a/src/main/resources/assets/hbm/textures/items/egg_balefire_shard.png and b/src/main/resources/assets/hbm/textures/items/egg_balefire_shard.png differ diff --git a/src/main/resources/assets/hbm/textures/items/radaway.png b/src/main/resources/assets/hbm/textures/items/radaway.png index 2eb1484f0..746686c9c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/radaway.png and b/src/main/resources/assets/hbm/textures/items/radaway.png differ diff --git a/src/main/resources/assets/hbm/textures/items/radaway_flush.png b/src/main/resources/assets/hbm/textures/items/radaway_flush.png index 517f340d3..ed46c7391 100644 Binary files a/src/main/resources/assets/hbm/textures/items/radaway_flush.png and b/src/main/resources/assets/hbm/textures/items/radaway_flush.png differ diff --git a/src/main/resources/assets/hbm/textures/items/radaway_strong.png b/src/main/resources/assets/hbm/textures/items/radaway_strong.png index 0b9863ceb..1fdf8e714 100644 Binary files a/src/main/resources/assets/hbm/textures/items/radaway_strong.png and b/src/main/resources/assets/hbm/textures/items/radaway_strong.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity.png b/src/main/resources/assets/hbm/textures/items/singularity.png index a9cbde444..364b9d632 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity.png and b/src/main/resources/assets/hbm/textures/items/singularity.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_2.png b/src/main/resources/assets/hbm/textures/items/singularity_2.png index 610a975db..be5b273d3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_2.png and b/src/main/resources/assets/hbm/textures/items/singularity_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_3.png b/src/main/resources/assets/hbm/textures/items/singularity_3.png index 0ff6bd5d2..a171074f1 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_3.png and b/src/main/resources/assets/hbm/textures/items/singularity_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_4.png b/src/main/resources/assets/hbm/textures/items/singularity_4.png index b0782bb36..d69d41d60 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_4.png and b/src/main/resources/assets/hbm/textures/items/singularity_4.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_5.png b/src/main/resources/assets/hbm/textures/items/singularity_5.png index 922a3ab86..a1370d3dd 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_5.png and b/src/main/resources/assets/hbm/textures/items/singularity_5.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_alt.png b/src/main/resources/assets/hbm/textures/items/singularity_alt.png index 25ba8d0dc..ae6ae1923 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_alt.png and b/src/main/resources/assets/hbm/textures/items/singularity_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_spark.png b/src/main/resources/assets/hbm/textures/items/singularity_spark.png index d3083e756..c2e97f9a6 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_spark.png and b/src/main/resources/assets/hbm/textures/items/singularity_spark.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_spark_alt.png b/src/main/resources/assets/hbm/textures/items/singularity_spark_alt.png index 26e5efcee..e46f91474 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_spark_alt.png and b/src/main/resources/assets/hbm/textures/items/singularity_spark_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/items/singularity_special.png b/src/main/resources/assets/hbm/textures/items/singularity_special.png index 7ff724e9d..423f4544c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/singularity_special.png and b/src/main/resources/assets/hbm/textures/items/singularity_special.png differ