diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index bd4d894f2..d7bea7ba1 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -585,7 +585,7 @@ public class ModEventHandlerClient { private ResourceLocation ashes = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_ash.png"); @SideOnly(Side.CLIENT) - @SubscribeEvent + //@SubscribeEvent public void onRenderStorm(RenderHandEvent event) { if(BlockAshes.ashes == 0) diff --git a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java index 91c8a06d7..30c29a402 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java +++ b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java @@ -1,15 +1,26 @@ package com.hbm.main; +import org.lwjgl.opengl.GL11; + +import com.hbm.blocks.generic.BlockAshes; import com.hbm.items.armor.IArmorDisableModel; import com.hbm.items.armor.IArmorDisableModel.EnumPlayerPart; +import com.hbm.lib.RefStrings; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; public class ModEventHandlerRenderer { @@ -69,4 +80,74 @@ public class ModEventHandlerRenderer { default: return null; } } + + private ResourceLocation ashes = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_ash.png"); + public static int currentBrightness = 0; + public static int lastBrightness = 0; + + @SubscribeEvent + public void onOverlayRender(RenderGameOverlayEvent.Pre event) { + + if(event.type == ElementType.AIR) { + + Minecraft mc = Minecraft.getMinecraft(); + + ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.0F); + + int w = resolution.getScaledWidth(); + int h = resolution.getScaledHeight(); + double off = System.currentTimeMillis() / 10000D % 10000D; + double aw = 1; + + Tessellator tessellator = Tessellator.instance; + + int cX = currentBrightness % 65536; + int cY = currentBrightness / 65536; + int lX = lastBrightness % 65536; + int lY = lastBrightness / 65536; + float interp = (mc.theWorld.getTotalWorldTime() % 20) * 0.05F; + + if(mc.theWorld.getTotalWorldTime() == 1) + lastBrightness = currentBrightness; + + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)(lX + (cX - lX) * interp) / 1.0F, (float)(lY + (cY - lY) * interp) / 1.0F); + + //mc.entityRenderer.enableLightmap((double)event.partialTicks); + + mc.getTextureManager().bindTexture(ashes); + + for(int i = 1; i < 3; i++) { + + GL11.glTranslated(w, h, 0); + GL11.glRotatef(-15, 0, 0, 1); + GL11.glTranslated(-w, -h, 0); + GL11.glColor4f(1.0F, 1.0F, 1.0F, BlockAshes.ashes / 256F * 0.98F / i); + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-w * 1.25, h * 1.25, aw, 0.0D + off * i, 1.0D); + tessellator.addVertexWithUV(w * 1.25, h * 1.25, aw, 1.0D + off * i, 1.0D); + tessellator.addVertexWithUV(w * 1.25, -h * 1.25, aw, 1.0D + off * i, 0.0D); + tessellator.addVertexWithUV(-w * 1.25, -h * 1.25, aw, 0.0D + off * i, 0.0D); + tessellator.draw(); + } + + mc.entityRenderer.disableLightmap((double)event.partialTicks); + + GL11.glDepthMask(true); + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glAlphaFunc(GL11.GL_GEQUAL, 0.1F); + + GL11.glPopMatrix(); + } + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java index 87600125e..da47131a8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java @@ -30,7 +30,7 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen super(0); tanks = new FluidTank[2]; tanks[0] = new FluidTank(Fluids.WATER, 1000, 0); - tanks[1] = new FluidTank(Fluids.HEAVYWATER, 100, 0); + tanks[1] = new FluidTank(Fluids.HEAVYWATER, 100, 1); } @Override diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index e40fd2465..80ac65a75 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3488,7 +3488,7 @@ 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.plant_flower.weed.name=Hanf tile.plasma.name=Plasma tile.plasma_heater.name=Plasmaerhitzer tile.pole_satellite_receiver.name=Satellitenschüssel diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 97c9a30c7..248ae199d 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3862,7 +3862,7 @@ 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.plant_flower.weed.name=Hemp tile.plasma.name=Plasma tile.plasma_heater.name=Plasma Heater tile.pole_satellite_receiver.name=Satellite Dish diff --git a/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png index 79e0723bf..1300c56f9 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png and b/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/gui_field.png b/src/main/resources/assets/hbm/textures/gui/gui_field.png index 850c67f60..a503c6030 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/gui_field.png and b/src/main/resources/assets/hbm/textures/gui/gui_field.png differ diff --git a/src/main/resources/assets/hbm/textures/items/rope.png b/src/main/resources/assets/hbm/textures/items/rope.png new file mode 100644 index 000000000..1ce320241 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/rope.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_1.png index 556089052..20da9273d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_2.png index cf4e88294..b9085de10 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_3.png index 8c76babfe..8d2d8c7af 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_afterburn_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_centrifuge.png b/src/main/resources/assets/hbm/textures/items/upgrade_centrifuge.png index ebcc18fd4..41e4f565b 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_centrifuge.png and b/src/main/resources/assets/hbm/textures/items/upgrade_centrifuge.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_crystallizer.png b/src/main/resources/assets/hbm/textures/items/upgrade_crystallizer.png index 2ed360b64..352391668 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_crystallizer.png and b/src/main/resources/assets/hbm/textures/items/upgrade_crystallizer.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_effect_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_effect_1.png index 2c04ab73b..c74bcfdb7 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_effect_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_effect_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_effect_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_effect_2.png index e9a3832ac..2575ffc16 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_effect_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_effect_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_effect_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_effect_3.png index 449a42e87..e1d3b4d40 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_effect_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_effect_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_1.png index 762eb24df..748ef593d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_2.png index ad713c35b..4cb00479a 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_3.png index 2e020a71a..7073d3010 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_fortune_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_fortune_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_gc_speed.png b/src/main/resources/assets/hbm/textures/items/upgrade_gc_speed.png index ee98c7201..faaf919f3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_gc_speed.png and b/src/main/resources/assets/hbm/textures/items/upgrade_gc_speed.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_health.png b/src/main/resources/assets/hbm/textures/items/upgrade_health.png index c019e249a..0febff32d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_health.png and b/src/main/resources/assets/hbm/textures/items/upgrade_health.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_nullifier.png b/src/main/resources/assets/hbm/textures/items/upgrade_nullifier.png index 6251dfbf5..a16b434aa 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_nullifier.png and b/src/main/resources/assets/hbm/textures/items/upgrade_nullifier.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_1.png index 7e56997dc..246316531 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_2.png index 632c2f66a..018759321 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_3.png index 43048abfe..834360273 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_overdrive_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_power_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_power_1.png index e148acce3..924ab8f19 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_power_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_power_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_power_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_power_2.png index 95d1caa9b..158b78449 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_power_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_power_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_power_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_power_3.png index 0a7b6c638..81eda76d8 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_power_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_power_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_radius.png b/src/main/resources/assets/hbm/textures/items/upgrade_radius.png index 17c7a1663..d27134599 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_radius.png and b/src/main/resources/assets/hbm/textures/items/upgrade_radius.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_screm.png b/src/main/resources/assets/hbm/textures/items/upgrade_screm.png index 279095b17..39558cb5f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_screm.png and b/src/main/resources/assets/hbm/textures/items/upgrade_screm.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_shredder.png b/src/main/resources/assets/hbm/textures/items/upgrade_shredder.png index a7772f063..35950de9f 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_shredder.png and b/src/main/resources/assets/hbm/textures/items/upgrade_shredder.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_smelter.png b/src/main/resources/assets/hbm/textures/items/upgrade_smelter.png index 188953738..d15f22f32 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_smelter.png and b/src/main/resources/assets/hbm/textures/items/upgrade_smelter.png differ