OpenCraft HAECATOMBE

pom.xml

@@ -12,7 +12,7 @@
 		<java.version>8</java.version>
 		<maven.compiler.release>8</maven.compiler.release>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		
+
 		<!-- Dependency versions -->
 		<lombok.version>1.18.20</lombok.version>
 		<joml.version>1.10.8</joml.version>
@@ -30,7 +30,7 @@
 			<artifactId>lombok</artifactId>
 			<version>${lombok.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.joml</groupId>
 			<artifactId>joml</artifactId>

src/main/java/net/opencraft/OpenCraft.java

@@ -93,9 +93,6 @@ public void run() {
 
 		renderTimer.start();
 		tickTimer.start();
-
-		// Finally stops the game
-		//stop();4
 	}
 
 	/**

src/main/java/net/opencraft/renderer/screens/Loadscreen.java

@@ -49,11 +49,11 @@ private void staticLS(Graphics2D g2d) {
 
 		BufferedImage loadingLogo = oc.assets.getLoadingLogo();
 		{	
-			int logoW = (int) (loadingLogo.getWidth() * 1.5f);
-			int logoH = (int) (loadingLogo.getHeight() * 1.5f);
+			int logoW = 840;
+			int logoH = 445;
 
-			int logoX = (854 - logoW) / 2;
-			int logoY = (480 - logoH) / 2 - 27;
+			int logoX = 0;
+			int logoY = 0;
 
 			g2d.drawImage(loadingLogo, logoX, logoY, logoW, logoH, null);
 		}

src/main/java/net/opencraft/renderer/screens/Menuscreen.java

@@ -32,9 +32,8 @@ public void render(Graphics2D g2d) {
 		final int width = oc.width;
 		final int height = oc.height;
 
+		super.drawDirtBackground(g2d);
 		g2d.setColor(Color.BLACK);
-		g2d.setPaint(new TexturePaint(oc.assets.getBackground(), new Rectangle(0, 0, 64, 64)));
-		g2d.fillRect(0, 0, width, height);
 
 		g2d.drawImage(logo.get(), (width - 500) / 2, (480 > height) ? 10 : 30, 500, 87, null);
 

src/main/java/net/opencraft/renderer/screens/Screen.java

@@ -1,6 +1,9 @@
 package net.opencraft.renderer.screens;
 
-import java.awt.Graphics2D;
+import static net.opencraft.OpenCraft.*;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
 
 public abstract class Screen {
 
@@ -31,6 +34,35 @@ public static void renderCurrent(Graphics2D g2d) {
 
 		current.render(g2d);
 	}
+
+	protected void clearScreen(Graphics2D g2d) {
+		g2d.setColor(Color.BLACK);
+		g2d.fillRect(0, 0, oc.width, oc.height);
+	}
+
+	protected void drawOptionsBackground(Graphics2D g2d) {
+		//clearScreen(g2d);
+		BufferedImage dirtTexture = drawDirtBackground(g2d);
+
+		Rectangle area = new Rectangle(0, 60, oc.width, oc.height - 160);
+
+		Composite saveCMP = g2d.getComposite();
+		g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
+		g2d.setColor(Color.BLACK);
+		g2d.fill(area);
+		g2d.setPaint(new TexturePaint(dirtTexture, new Rectangle(0, 0, 64, 64)));
+		g2d.fill(area);
+		g2d.setComposite(saveCMP);
+	}
+
+	protected BufferedImage drawDirtBackground(Graphics2D g2d) {
+		BufferedImage dirtTexture = oc.assets.getBackground();
+		{
+			g2d.setPaint(new TexturePaint(dirtTexture, new Rectangle(0, 0, 64, 64)));
+			g2d.fillRect(0, 0, oc.width, oc.height);
+		}
+		return dirtTexture;
+	}
 
 	@Override
 	public String toString() {

src/main/java/net/opencraft/renderer/screens/SettingsScreen.java

@@ -44,26 +44,11 @@ private SettingsScreen() {
 
 	@Override
 	public void render(Graphics2D g2d) {
-		int width = Display.getWidth();
-		int height = Display.getHeight();
-
-		g2d.setPaintMode();
-		g2d.setColor(Color.WHITE);
-
-		Composite defcomposite = g2d.getComposite();
-		for (int x = 0; x < width; x += 64) {
-			for (int y = 0; y < height; y += 64) {
-				if (y <= 60 || y >= (height - 100))
-					g2d.setComposite(defcomposite);
-				else
-					g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
-
-				g2d.setColor(Color.BLACK);
-				g2d.fillRect(x, y, 64, 64);
-				g2d.drawImage(oc.assets.getBackground(), x, y, 64, 64, null);
-			}
-		}
-		g2d.setComposite(defcomposite);
+		super.clearScreen(g2d);
+		int width = oc.width;
+		int height = oc.height;
+
+		drawOptionsBackground(g2d);
 
 		if (currentTab.equalsIgnoreCase("options.generalTab")) {
 			drawGeneralTab(g2d, oc.assets);