Direct rendering is now the default on windows

SakiiCode · SakiiCode · commit 1bf288b9e71d · 2024-02-01T13:58:44.000+01:00
diff --git a/src/main/java/ml/sakii/factoryisland/Config.java b/src/main/java/ml/sakii/factoryisland/Config.java
@@ -56,6 +56,8 @@ public static void save(){
 	}
 	
 	public static void load() {
+		boolean win = System.getProperty("os.name").toLowerCase().contains("win");
+
 		renderDistance = getInt("renderDistance", 128);
 		sensitivity = getInt("sensitivity", 5);
 		useTextures = getBoolean("useTextures", false);
@@ -67,7 +69,7 @@ public static void load() {
 		creative=getBoolean("creative", true);
 		selectedMap=get("selectedMap", "");
 		brightness=7;
-		renderMethod = RenderMethod.values()[getInt("renderMethod", 1)];
+		renderMethod = RenderMethod.values()[getInt("renderMethod", win?2:1)];
 		targetMarkerType = TargetMarkerType.values()[getInt("targetMarkerType", 0)];
 		ambientOcclusion = getBoolean("ambientOcclusion", true);
 		zoom=FOVToZoom(FOV);
diff --git a/src/main/java/ml/sakii/factoryisland/screens/SettingsGUI.java b/src/main/java/ml/sakii/factoryisland/screens/SettingsGUI.java
@@ -249,7 +249,7 @@ public void componentShown( ComponentEvent e ) {
 		l7.setForeground(Color.WHITE);
 		add(l7);
 		
-		JLabel l8 = new JLabel("<html><body align='right'>Buffered rendering is recommended for small resolutions.<br>Volatile should be good for everything else</body></html>");
+		JLabel l8 = new JLabel("<html><body align='right'>Buffered rendering is recommended only for small resolutions.<br>You cannot use the resolution slider in Direct mode.</body></html>");
 		l8.setLocation(textureButton.getX()-500-EntrySpacing, renderMethodButton.getY());
 		l8.setSize(500, EntryHeight);
 		l8.setHorizontalAlignment(SwingConstants.RIGHT);
@@ -370,6 +370,7 @@ private void updateButtons() {
 	}
 	
 	private String[] getButtonLabels() {
+		boolean win = System.getProperty("os.name").toLowerCase().contains("win");
 		return new String[] {
 				"Textures: " + (useTextures?"ON":"OFF"),
 				"Show Fog: " + (fogEnabled?"ON":"OFF"),
@@ -381,8 +382,8 @@ private String[] getButtonLabels() {
 				"Ambient Occlusion: " + (ambientOcclusion?"ON":"OFF"),
 				"Rendering Method: " + switch(renderMethod) {
 				case BUFFERED -> "BUFFERED";
-				case VOLATILE -> "VOLATILE (default)";
-				case DIRECT -> "DIRECT";
+				case VOLATILE -> "VOLATILE"+(!win?" (default)":"");
+				case DIRECT -> "DIRECT"+(win?" (default)":"");
 				}
 				
 		};
