Fixed died screen

Author: SakiiCode

src/main/java/ml/sakii/factoryisland/AssetLibrary.java

@@ -26,6 +26,7 @@ public class AssetLibrary {
 	public static BufferedImage StandardBG, FreezeBG;
 	public static BufferedImage PausedBG, PausedTitle;
 	public static BufferedImage SettingsTitle;
+	public static BufferedImage DeadTitle;
 
 
 	public static void load() {
@@ -34,6 +35,7 @@ public static void load() {
 
 		SettingsTitle = loadTexture("textures/settings_title.png");
 		PausedTitle = loadTexture("textures/paused_title.png");
+		DeadTitle = loadTexture("textures/dead_title.png");
 		StandardBG = loadTexture("textures/BG.png");
 		Logo = loadTexture("textures/logo.png");
 		MainMenuBG = loadTexture("textures/mainmenu.png");

src/main/java/ml/sakii/factoryisland/Game.java

@@ -92,7 +92,7 @@ public class Game extends JPanel implements KeyListener, MouseListener, MouseWhe
 	VolatileImage VolatileFrameBuffer;
 	BufferedImage FrameBuffer;
 	BufferedImage prevFrame;
-	private BufferedImageOp op;
+	private BufferedImageOp pauseOp, deadOp;
 
 
 	private BlockFace SelectedFace;
@@ -281,10 +281,15 @@ private void init()
 		resizeScreen(Config.getWidth(), Config.getHeight());
 
 
-	    op = new RescaleOp(
+	    pauseOp = new RescaleOp(
 	            new float[]{0.2f, 0.2f, 0.2f, 1f}, // scale factors for red, green, blue, alpha
 	            new float[]{0, 0, 0, 0}, // offsets for red, green, blue, alpha
 	            null);
+	    
+	    deadOp = new RescaleOp(
+	            new float[]{4f, 0.6f, 0.6f, 1f}, // scale factors for red, green, blue, alpha
+	            new float[]{0, 0, 0, 0}, // offsets for red, green, blue, alpha
+	            null);
 
 		try
 		{
@@ -1297,9 +1302,18 @@ private void pauseTo(String UiName) {
 		}else if(Config.renderMethod == RenderMethod.VOLATILE){
 			BufferedImage tmp = new BufferedImage(VolatileFrameBuffer.getWidth(),VolatileFrameBuffer.getHeight(),BufferedImage.TYPE_INT_ARGB);
 			tmp.getGraphics().drawImage(VolatileFrameBuffer, 0,0,tmp.getWidth(), tmp.getHeight(), null);
-			AssetLibrary.FreezeBG = op.filter(tmp, null);
+			
+			if(UiName=="died") {
+				AssetLibrary.FreezeBG = deadOp.filter(tmp, null);
+			}else {
+				AssetLibrary.FreezeBG = pauseOp.filter(tmp, null);
+			}
 		}else {
-			AssetLibrary.FreezeBG = op.filter(FrameBuffer, null);
+			if(UiName=="died") {
+				AssetLibrary.FreezeBG = deadOp.filter(FrameBuffer, null);
+			}else {
+				AssetLibrary.FreezeBG = pauseOp.filter(FrameBuffer, null);
+			}
 		}
 		if (Engine.isSingleplayer()) { // ezek multiplayerben nem allhatnak le
 			//Engine.ticker.stop();

src/main/java/ml/sakii/factoryisland/screens/DeadGUI.java

@@ -1,5 +1,6 @@
 package ml.sakii.factoryisland.screens;
 
+import java.awt.Graphics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
@@ -10,11 +11,13 @@
 import javax.swing.JButton;
 
 import ml.sakii.factoryisland.AssetLibrary;
+import ml.sakii.factoryisland.Config;
 import ml.sakii.factoryisland.GUIManager;
 import ml.sakii.factoryisland.Main;
+import ml.sakii.factoryisland.RenderMethod;
 import ml.sakii.factoryisland.screens.components.Button;
 
-public class DeadGUI extends PaintedScreen implements ActionListener, KeyListener {
+public class DeadGUI extends TexturedScreen implements ActionListener, KeyListener {
 	private static final long serialVersionUID = 334783618749307739L;
 
 	private JButton respawnButton, exitButton;
@@ -40,7 +43,7 @@ public void componentShown( ComponentEvent e ) {
 		add(respawnButton);
 
 
-		exitButton = new Button("Save & Exit to Main Menu",Main.Width/2-EntryWidth/2, (int)(Main.Height/3.4+EntrySpacing-EntryHeight/2), EntryWidth, EntryHeight);
+		exitButton = new Button("Save & Exit to Main Menu",Main.Width/2-EntryWidth/2, (int)(Main.Height/3.4+EntrySpacing+EntryHeight-EntryHeight/2), EntryWidth, EntryHeight);
 		exitButton.setActionCommand("exit");
 		exitButton.setVisible(true);
 		exitButton.addActionListener(this);
@@ -49,6 +52,24 @@ public void componentShown( ComponentEvent e ) {
 
 
 
+	}
+	
+	@Override
+	protected void paintComponent(Graphics g) {
+	    if(Config.renderMethod==RenderMethod.DIRECT || AssetLibrary.FreezeBG == AssetLibrary.StandardBG) { //utobbi akkor ha most valtott at directrol masra
+	    	super.paintComponent(g);
+	    }else{
+	    	g.drawImage(AssetLibrary.FreezeBG, 0, 0, this.getWidth(), this.getHeight(), null);
+	    	
+	    }
+	    
+	    
+	    int titleHeight = Main.Height/7;
+	    int titleWidth = titleHeight*AssetLibrary.DeadTitle.getWidth()/AssetLibrary.DeadTitle.getHeight();
+	    
+	    g.drawImage(AssetLibrary.DeadTitle, Main.Width/2-titleWidth/2, Main.Height/15, titleWidth, titleHeight, null);
+	    
+	    
 	}