Improved code efficentiancy for player swimming types

Author: redomar

src/com/redomar/game/entities/Player.java

@@ -20,6 +20,7 @@ public class Player extends Mob {
 	private int tickCount = 0;
 	private String userName;
 	private boolean[] swimType;
+	private int[] swimColour;
 
 	public static String guestPlayerName = customeName.setName("Player ");
 
@@ -97,70 +98,24 @@ public void render(Screen screen) {
 			Game.setChangeLevel(true);
 		}
 
-		if (isSwimming) {
+		if(isSwimming || isMagma || isMuddy){
+			swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
+			
 			int waterColour = 0;
 			yOffset += 4;
 
 			colour = Colours.get(-1, 111, -1, 310);
 
 			if (tickCount % 60 < 15) {
-				waterColour = Colours.get(-1, -1, 255, -1);
+				waterColour = Colours.get(-1, -1, swimColour[0], -1);
 			} else if (15 <= tickCount % 60 && tickCount % 60 < 30) {
 				yOffset--;
-				waterColour = Colours.get(-1, 225, 115, -1);
+				waterColour = Colours.get(-1, swimColour[1], swimColour[2], -1);
 			} else if (30 <= tickCount % 60 && tickCount % 60 < 45) {
-				waterColour = Colours.get(-1, 115, -1, 225);
+				waterColour = Colours.get(-1, swimColour[2], -1, swimColour[1]);
 			} else {
 				yOffset--;
-				waterColour = Colours.get(-1, -1, 225, 115);
-			}
-
-			screen.render(xOffset, yOffset + 3, 31 + 31 * 32, waterColour,
-					0x00, 1);
-			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
-					0x01, 1);
-		}
-
-		if (isMagma) {
-			int waterColour = 0;
-			yOffset += 4;
-
-			colour = Colours.get(-1, 111, -1, 310);
-
-			if (tickCount % 60 < 15) {
-				waterColour = Colours.get(-1, -1, 541, -1);
-			} else if (15 <= tickCount % 60 && tickCount % 60 < 30) {
-				yOffset--;
-				waterColour = Colours.get(-1, 521, 510, -1);
-			} else if (30 <= tickCount % 60 && tickCount % 60 < 45) {
-				waterColour = Colours.get(-1, 510, -1, 521);
-			} else {
-				yOffset--;
-				waterColour = Colours.get(-1, -1, 521, 510);
-			}
-
-			screen.render(xOffset, yOffset + 3, 31 + 31 * 32, waterColour,
-					0x00, 1);
-			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
-					0x01, 1);
-		}
-
-		if (isMuddy) {
-			int waterColour = 0;
-			yOffset += 4;
-
-			colour = Colours.get(-1, 111, -1, 310);
-
-			if (tickCount % 60 < 15) {
-				waterColour = Colours.get(-1, -1, 422, -1);
-			} else if (15 <= tickCount % 60 && tickCount % 60 < 30) {
-				yOffset--;
-				waterColour = Colours.get(-1, 410, 321, -1);
-			} else if (30 <= tickCount % 60 && tickCount % 60 < 45) {
-				waterColour = Colours.get(-1, 321, -1, 410);
-			} else {
-				yOffset--;
-				waterColour = Colours.get(-1, -1, 410, 321);
+				waterColour = Colours.get(-1, -1, swimColour[1], swimColour[2]);
 			}
 
 			screen.render(xOffset, yOffset + 3, 31 + 31 * 32, waterColour,

src/com/redomar/game/entities/efx/Swim.java

@@ -7,12 +7,33 @@ public class Swim {
 	private static LevelHandler level;
 	private int x;
 	private int y;
+	private int[] swimCols = new int[3];
 
 	public Swim(LevelHandler level, int x, int y) {
 		Swim.level = level;
 		this.x = x;
 		this.y = y;
 	}
+	
+	public int[] waveCols(boolean isSwimming, boolean isMagma, boolean isMuddy){
+		
+		if(isSwimming){
+			swimCols[0] = 255;
+			swimCols[1] = 255;
+			swimCols[2] = 115;
+		}
+		if(isMagma){		
+			swimCols[0] = 541;
+			swimCols[1] = 521;
+			swimCols[2] = 510;
+		}
+		if(isMuddy){		
+			swimCols[0] = 422;
+			swimCols[1] = 410;
+			swimCols[2] = 321;
+		}
+		return swimCols;
+	}
 
 	public boolean water(boolean isSwimming) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 4) {