I dunno what I did, but it did something good I think

BlazingTwist · Jan 14, 2020 · 77c92b6 · 77c92b6
1 parent e41d6d3
commit 77c92b6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 72 deletions.
diff --git a/src/main/java/the_dark_jumper/cannonTracer/gui/guiElements/ScrollableTable.java b/src/main/java/the_dark_jumper/cannonTracer/gui/guiElements/ScrollableTable.java
@@ -91,6 +91,9 @@ public void updateScrollbarRanges() {
 			//nothing to do here;
 			return;
 		}
+		if(rows.size() < 1 || getAmountOfColumns() < 1) {
+			return;
+		}
 		FrameConfig lastConfig = getCellConfig(getAmountOfColumns() - 1, rows.size() - 1);
 		if(horizontalScrollbar != null) {
 			horizontalScrollbar.setScrollbarSize(100d / lastConfig.xEnd);

diff --git a/src/main/java/the_dark_jumper/cannonTracer/settings/MultiPlayerSettings.java b/src/main/java/the_dark_jumper/cannonTracer/settings/MultiPlayerSettings.java
@@ -7,42 +7,17 @@
 public class MultiPlayerSettings {
 	public final Main main;
 
-	private int renderTick = 0;
-	public GetterAndSetter<Integer> renderTickGNS = new GetterAndSetter<Integer>(this::getRenderTick, this::setRenderTick);
-	private boolean xRayTrace = false;
-	public GetterAndSetter<Boolean> xRayTraceGNS = new GetterAndSetter<Boolean>(this::getXRayTrace, this::setXRayTrace);
-	private boolean renderBoxes = false;
-	public GetterAndSetter<Boolean> renderBoxesGNS = new GetterAndSetter<Boolean>(this::getRenderBoxes, this::setRenderBoxes);
+	public GetterAndSetter<Integer> renderTickGNS = new GetterAndSetter<Integer>(0);
+	public GetterAndSetter<Boolean> xRayTraceGNS = new GetterAndSetter<Boolean>(false);
+	public GetterAndSetter<Boolean> renderBoxesGNS = new GetterAndSetter<Boolean>(false);
 	private boolean renderMenu = false;
 	public GetterAndSetter<Boolean> renderMenuGNS = new GetterAndSetter<Boolean>(this::getRenderMenu, this::setRenderMenu);
-	private boolean bLog = false;
-	public GetterAndSetter<Boolean> bLogGNS = new GetterAndSetter<Boolean>(this::getBLog, this::setBLog);
+	public GetterAndSetter<Boolean> bLogGNS = new GetterAndSetter<Boolean>(false);
 
 	public MultiPlayerSettings(Main main) {
 		this.main = main;
 	}
 
-	private int getRenderTick() {
-		return this.renderTick;
-	}
-	private void setRenderTick(int renderTick) {
-		this.renderTick = renderTick;
-	}
-
-	private boolean getXRayTrace() {
-		return this.xRayTrace;
-	}
-	private void setXRayTrace(boolean xRayTrace) {
-		this.xRayTrace = xRayTrace;
-	}
-
-	private boolean getRenderBoxes() {
-		return this.renderBoxes;
-	}
-	private void setRenderBoxes(boolean renderBoxes) {
-		this.renderBoxes = renderBoxes;
-	}
-
 	private boolean getRenderMenu() {
 		return this.renderMenu;
 	}
@@ -58,13 +33,6 @@ private void setRenderMenu(boolean renderMenu) {
 		this.renderMenu = renderMenu;
 	}
 
-	private boolean getBLog() {
-		return this.bLog;
-	}
-	private void setBLog(boolean b) {
-		this.bLog = b;
-	}
-
 	public void pullData(boolean b) {
 		if(!b) {
 			return;

diff --git a/src/main/java/the_dark_jumper/cannonTracer/settings/SinglePlayerSettings.java b/src/main/java/the_dark_jumper/cannonTracer/settings/SinglePlayerSettings.java
@@ -10,16 +10,12 @@ public class SinglePlayerSettings {
 
 	private int mode = 0;
 	public GetterAndSetter<Integer> modeGNS = new GetterAndSetter<Integer>(this::getMode, this::setMode);
-	private int renderTick = 0;
-	public GetterAndSetter<Integer> renderTickGNS = new GetterAndSetter<Integer>(this::getRenderTick, this::setRenderTick);
-	private boolean xRayTrace = false;
-	public GetterAndSetter<Boolean> xRayTraceGNS = new GetterAndSetter<Boolean>(this::getXRayTrace, this::setXRayTrace);
-	private boolean renderBoxes = false;
-	public GetterAndSetter<Boolean> renderBoxesGNS = new GetterAndSetter<Boolean>(this::getRenderBoxes, this::setRenderBoxes);
+	public GetterAndSetter<Integer> renderTickGNS = new GetterAndSetter<Integer>(0);
+	public GetterAndSetter<Boolean> xRayTraceGNS = new GetterAndSetter<Boolean>(false);
+	public GetterAndSetter<Boolean> renderBoxesGNS = new GetterAndSetter<Boolean>(false);
 	private boolean renderMenu = false;
 	public GetterAndSetter<Boolean> renderMenuGNS = new GetterAndSetter<Boolean>(this::getRenderMenu, this::setRenderMenu);
-	private boolean bLog = false;
-	public GetterAndSetter<Boolean> bLogGNS = new GetterAndSetter<Boolean>(this::getBLog, this::setBLog);
+	public GetterAndSetter<Boolean> bLogGNS = new GetterAndSetter<Boolean>(false);
 
 	public SinglePlayerSettings(Main main) {
 		this.main = main;
@@ -36,27 +32,6 @@ private void setMode(int mode) {
 		}
 	}
 
-	private int getRenderTick() {
-		return this.renderTick;
-	}
-	private void setRenderTick(int renderTick) {
-		this.renderTick = renderTick;
-	}
-
-	private boolean getXRayTrace() {
-		return this.xRayTrace;
-	}
-	private void setXRayTrace(boolean xRayTrace) {
-		this.xRayTrace = xRayTrace;
-	}
-
-	private boolean getRenderBoxes() {
-		return this.renderBoxes;
-	}
-	private void setRenderBoxes(boolean renderBoxes) {
-		this.renderBoxes = renderBoxes;
-	}
-
 	private boolean getRenderMenu() {
 		return this.renderMenu;
 	}
@@ -71,13 +46,6 @@ private void setRenderMenu(boolean renderMenu) {
 		this.renderMenu = renderMenu;
 	}
 
-	private boolean getBLog() {
-		return this.bLog;
-	}
-	private void setBLog(boolean b) {
-		this.bLog = b;
-	}
-
 	public void loadLastSeconds(boolean b) {
 		if(!b) {
 			return;