Texture support

Bug fixes: Catch RuntimeException in BlockColourGen when requesting the render colour for blocks added by mods. Fix underground mode exception in End dimension (thanks tterrag1098)
antonio68223 · Dec 17, 2013 · 58bd7dd · 58bd7dd
1 parent 917ae0a
commit 58bd7dd
Show file tree

Hide file tree

Showing 14 changed files with 225 additions and 127 deletions.
diff --git a/BlockColourGen.java b/BlockColourGen.java
@@ -52,9 +52,7 @@ private static int adjustBlockColourFromType(BlockColours bc, int blockAndMeta,
 				if (renderColour != 0xffffff) {
 					blockColour = Render.multiplyColours(blockColour, 0xff000000 | renderColour);
 				}
-			} catch (ArrayIndexOutOfBoundsException e) {
-				// do nothing
-			} catch (NullPointerException e) {
+			} catch (RuntimeException e) {
 				// do nothing
 			}
 			break;

diff --git a/Mw.java b/Mw.java
@@ -115,6 +115,7 @@ public class Mw {
 	public String saveDirOverride = "";
 	public boolean regionFileOutputEnabledSP = true;
 	public boolean regionFileOutputEnabledMP = true;
+	public int backgroundTextureMode = 0;
 	//public boolean lightingEnabled = false;
 
 	// flags and counters
@@ -221,6 +222,7 @@ public void loadConfig() {
 		this.undergroundMode = this.config.getOrSetBoolean(catOptions, "undergroundMode", this.undergroundMode);
 		this.regionFileOutputEnabledSP = this.config.getOrSetBoolean(catOptions, "regionFileOutputEnabledSP", this.regionFileOutputEnabledSP);
 		this.regionFileOutputEnabledMP = this.config.getOrSetBoolean(catOptions, "regionFileOutputEnabledMP", this.regionFileOutputEnabledMP);
+		this.backgroundTextureMode = this.config.getOrSetInt(catOptions, "backgroundTextureMode", this.backgroundTextureMode, 0, 1);
 		//this.lightingEnabled = this.config.getOrSetBoolean(catOptions, "lightingEnabled", this.lightingEnabled);
 
 		this.maxZoom = this.config.getOrSetInt(catOptions, "zoomOutLevels", this.maxZoom, 1, 256);
@@ -251,6 +253,7 @@ public void saveConfig() {
 		this.config.setInt(catOptions, "maxDeathMarkers", this.maxDeathMarkers);
 		this.config.setInt(catOptions, "chunksPerTick", this.chunksPerTick);
 		this.config.setBoolean(catOptions, "undergroundMode", this.undergroundMode);
+		this.config.setInt(catOptions, "backgroundTextureMode", this.backgroundTextureMode);
 		//this.config.setBoolean(catOptions, "lightingEnabled", this.lightingEnabled);
 
 		// save config

diff --git a/Texture.java b/Texture.java
@@ -88,17 +88,6 @@ public synchronized void setRGB(int x, int y, int w, int h, int[] pixels, int of
 		}
 	}
 
-	public synchronized void setRGBOpaque(int x, int y, int w, int h, int[] pixels, int offset, int scanSize) {
-		int bufOffset = (y * this.w) + x;
-		for (int i = 0; i < h; i++) {
-			this.pixelBuf.position(bufOffset + (i * this.w));
-			int rowOffset = offset + (i * scanSize);
-			for (int j = 0; j < w; j++) {
-				this.pixelBuf.put(pixels[rowOffset + j] | 0xff000000);
-			}
-		}
-	}
-
 	public synchronized void setRGB(int x, int y, int colour) {
 		this.pixelBuf.put((y * this.w) + x, colour);
 	}

diff --git a/gui/MwGuiOptionSlot.java b/gui/MwGuiOptionSlot.java
@@ -30,8 +30,13 @@ public class MwGuiOptionSlot extends GuiSlot {
 		"small",
 		"large"
 	};
+	private static final String[] backgroundModeStringArray = {
+		"none",
+		"static",
+		"panning"
+	};
 
-	private GuiButton[] buttons = new GuiButton[11];
+	private GuiButton[] buttons = new GuiButton[12];
 
     static final ResourceLocation WIDGET_TEXTURE_LOC = new ResourceLocation("textures/gui/widgets.png");
 
@@ -50,13 +55,13 @@ public void updateButtonLabel(int i) {
 			this.buttons[i].displayString = "Texture scaling: " + (this.mw.linearTextureScalingEnabled ? "linear" : "nearest");
 			break;
 		case 4:
-			this.buttons[i].displayString = "Trail Markers: " + (this.mw.playerTrail.enabled);
+			this.buttons[i].displayString = "Trail markers: " + (this.mw.playerTrail.enabled);
 			break;
 		case 5:
-			this.buttons[i].displayString = "Map Colours: " + (this.mw.useSavedBlockColours ? "Frozen" : "Auto");
+			this.buttons[i].displayString = "Map colours: " + (this.mw.useSavedBlockColours ? "frozen" : "auto");
 			break;
 		case 6:
-			this.buttons[i].displayString = "Max Draw Distance: " + Math.round(Math.sqrt(this.mw.maxChunkSaveDistSq));
+			this.buttons[i].displayString = "Max draw distance: " + Math.round(Math.sqrt(this.mw.maxChunkSaveDistSq));
 			break;
 		case 7:
 			this.buttons[i].displayString = "Mini map size: " + this.mw.miniMap.smallMapMode.heightPercent;
@@ -68,7 +73,10 @@ public void updateButtonLabel(int i) {
 			this.buttons[i].displayString = "Map pixel snapping: " + (this.mw.mapPixelSnapEnabled ? "enabled" : "disabled");
 			break;
 		case 10:
-			this.buttons[i].displayString = "Max Death Markers: " + this.mw.maxDeathMarkers;
+			this.buttons[i].displayString = "Max death markers: " + this.mw.maxDeathMarkers;
+			break;
+		case 11:
+			this.buttons[i].displayString = "Background mode: " + backgroundModeStringArray[this.mw.backgroundTextureMode];
 			break;
 		//case 11:
 		//	this.buttons[i].displayString = "Map Lighting: " + (this.mw.lightingEnabled ? "enabled" : "disabled");
@@ -122,6 +130,7 @@ protected void elementClicked(int i, boolean doubleClicked) {
 			// linear scaling
 			this.mw.linearTextureScalingEnabled = !this.mw.linearTextureScalingEnabled;
 			this.mw.mapTexture.setLinearScaling(this.mw.linearTextureScalingEnabled);
+			this.mw.undergroundMapTexture.setLinearScaling(this.mw.linearTextureScalingEnabled);
 			break;
 		case 4:
 			// player trail
@@ -183,6 +192,10 @@ protected void elementClicked(int i, boolean doubleClicked) {
 				this.mw.maxDeathMarkers = 0;
 			}
 			break;
+		case 11:
+			// background texture mode
+			this.mw.backgroundTextureMode = (this.mw.backgroundTextureMode + 1) % 3;
+			break;
 		//case 11:
 		//	// lighting
 		//	this.mw.lightingEnabled = !this.mw.lightingEnabled;