KY_dev

src/Game/GUI/GameMenu.java

@@ -1,7 +1,6 @@
 package Game.GUI;
 
 import java.awt.Graphics;
-import java.awt.Point;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
@@ -15,6 +14,7 @@
 import Game.Loader.ImageLoader;
 import Game.PLUG.GameStateMethod;
 import Game.gameBase.GameCalculator;
+import Game.gameBase.GamePoint;
 import Game.gameBase.GameUnitPair;
 import Game.state.GameState;
 import Game.state.MouseState;
@@ -30,8 +30,8 @@ public class GameMenu extends GameStateBase implements GameStateMethod {
     private GameMenuButton[] buttons = new GameMenuButton[MENU_BUTTON_NUMBER];
     private BufferedImage backgroundImage, backgroundMenuImage;
 
-    private Point menuWH;
-    private Point menuBgPoint;
+    private GameUnitPair menuWH;
+    private GamePoint menuBgPoint;
 
     private static final float[] xMenuArray = { GAME_WIDTH / 2.0F, GAME_WIDTH / 2.0F, GAME_WIDTH / 2.0F };
     private static final float[] yMenuArray = { 150 * SCALE, 220 * SCALE, 290 * SCALE };
@@ -54,15 +54,11 @@ private void loadGameMenuSelectBackgroundImage() throws IOException {
     private void loadGameMenuBackgroundImage() throws IOException {
         this.backgroundImage = ImageLoader.loadImage(GameSourceFilePath.MENU_BACKGROUND_IMAGE);
 
-        this.menuWH = GameCalculator
-                .calculate(
-                        this.backgroundImage.getWidth(), this.backgroundImage.getHeight(),
-                        x -> (int) (x * SCALE))
-                .toIntPoint();
+        this.menuWH = GameCalculator.calculate(
+                this.backgroundImage.getWidth(), this.backgroundImage.getHeight(),
+                x -> (int) (x * SCALE));
 
-        this.menuBgPoint = GameUnitPair
-                .buildGameUnitPair(GAME_WIDTH / 2.0F - menuWH.x / 2.0F, 45 * SCALE)
-                .toIntPoint();
+        this.menuBgPoint = GamePoint.buildGamePoint(GAME_WIDTH / 2.0F - menuWH.x / 2.0F, 45 * SCALE);
     }
 
     private void loadGameMenuButton() throws IOException {
@@ -74,8 +70,8 @@ public void render(Graphics g) {
         g.drawImage(this.backgroundMenuImage, 0, 0, GAME_WIDTH, GAME_HEIGHT, null);
 
         g.drawImage(backgroundImage,
-                this.menuBgPoint.x, this.menuBgPoint.y,
-                this.menuWH.x, this.menuWH.y,
+                this.menuBgPoint.getIntX(), this.menuBgPoint.getIntY(),
+                this.menuWH.getIntW(), this.menuWH.getIntH(),
                 null);
 
         Arrays.stream(this.buttons).forEach(item -> item.render(g));

src/Game/GUI/GamePlaying.java

@@ -52,7 +52,6 @@ public GamePlaying(Game game) {
             e.printStackTrace();
         }
 
-
         Random random = new Random();
 
         smallCloudPosArrayY = IntStream
@@ -84,7 +83,8 @@ public void initClass() throws IOException {
         this.maxTileOffset = levelTileWide - TILES_IN_WIDTH;
         this.maxLevelOffset = this.maxTileOffset * TILES_SIZE;
 
-        this.bigCloudNumber = (int) Math.round((double) GameEnvironment.BIG_CLOUD_WIDTH.value / (double) this.gameLevelManager.getGameLevel().getMaxWidth());
+        this.bigCloudNumber = (int) Math.round((double) GameEnvironment.BIG_CLOUD_WIDTH.value
+                / (double) this.gameLevelManager.getGameLevel().getMaxWidth());
     }
 
     public GameCharacter getPlayer() {
@@ -146,7 +146,7 @@ public void render(Graphics g) {
     private void drawCloud(Graphics g) {
         for (int i = 0; i < this.bigCloudNumber; i++) {
             g.drawImage(this.bigCloudImage,
-                    i * GameEnvironment.BIG_CLOUD_WIDTH.value - (int) (xLevelOffset - 0.3), // slower
+                    i * GameEnvironment.BIG_CLOUD_WIDTH.value - (int) (xLevelOffset - 0.1), // slower
                     (int) (204 * SCALE),
                     GameEnvironment.BIG_CLOUD_WIDTH.value,
                     GameEnvironment.BIG_CLOUD_HEIGHT.value,

src/Game/GUI/ui/GamePauseDisplayLayer.java

@@ -107,8 +107,8 @@ public void render(Graphics g) {
 
         // background
         g.drawImage(this.backgroundImage,
-                (int) this.bgPoint.x, (int) this.bgPoint.y,
-                (int) this.bgWH.x, (int) this.bgWH.y,
+                this.bgPoint.getIntX(), this.bgPoint.getIntY(),
+                this.bgWH.getIntW(), this.bgWH.getIntH(),
                 null);
 
         this.allButtons.forEach(btn -> btn.render(g));

src/Game/GUI/ui/buttons/GameMenuButton.java

@@ -33,7 +33,7 @@ public GameMenuButton(GamePoint point, BufferedImage[] images, GameState state)
     @Override
     protected void initBounds() {
         this.bounds = new Rectangle(
-                (int) this.point.x - xOffsetCenter, (int) this.point.y,
+                (int) this.point.getX() - xOffsetCenter, this.point.getIntY(),
                 MenuButtons.B_WIDTH.value,
                 MenuButtons.B_HEIGHT.value);
     }
@@ -46,7 +46,7 @@ public void update() {
     @Override
     public void render(Graphics g) {
         g.drawImage(this.images[this.mouseState.toDisplayIndex],
-                (int) this.point.x - xOffsetCenter, (int) this.point.y,
+                (int) this.point.getX() - xOffsetCenter, this.point.getIntY(),
                 MenuButtons.B_WIDTH.value, MenuButtons.B_HEIGHT.value, null);
     }
 

src/Game/GUI/ui/buttons/GameSoundButton.java

@@ -40,8 +40,8 @@ public void setSoundImages(BufferedImage[][] soundImages) {
 
     @Override
     protected void initBounds() {
-        this.bounds = new Rectangle((int) this.point.x,
-                (int) this.point.y, PauseLayerButtons.SOUND_SIZE.value,
+        this.bounds = new Rectangle(this.point.getIntX(), this.point.getIntY(),
+                PauseLayerButtons.SOUND_SIZE.value,
                 PauseLayerButtons.SOUND_SIZE.value);
     }
 
@@ -53,10 +53,9 @@ public void update() {
     @Override
     public void render(Graphics g) {
         g.drawImage(this.soundImages[!isMul ? 0 : 1][this.mouseState.toDisplayIndex],
-                (int) this.point.x, (int) this.point.y,
+                this.point.getIntX(), this.point.getIntY(),
                 PauseLayerButtons.SOUND_SIZE.value,
                 PauseLayerButtons.SOUND_SIZE.value,
                 null);
-
     }
 }

src/Game/GUI/ui/buttons/GameURMButton.java

@@ -31,7 +31,7 @@ public void update() {
     @Override
     public void render(Graphics g) {
         g.drawImage(this.image[this.mouseState.toDisplayIndex],
-                (int) this.point.x, (int) this.point.y,
+                this.point.getIntX(), this.point.getIntY(),
                 URMButtons.URM_SIZE.value, URMButtons.URM_SIZE.value,
                 null);
 
@@ -40,7 +40,7 @@ public void render(Graphics g) {
     @Override
     protected void initBounds() {
         this.bounds = new Rectangle(
-                (int) this.point.x, (int) this.point.y,
+                this.point.getIntX(), this.point.getIntY(),
                 URMButtons.URM_SIZE.value, URMButtons.URM_SIZE.value);
     }
 

src/Game/GUI/ui/buttons/GameVolumeButton.java

@@ -23,7 +23,8 @@ protected void initBounds() {
         // this.point.addToX(this.point.x + VolumeButtons.SLIDER_WIDTH.value / 2.0F);
         this.buttonX = (int) (this.point.x + VolumeButtons.SLIDER_WIDTH.value / 2.0F);
 
-        this.bounds = new Rectangle(this.buttonX, (int) this.point.y,
+        this.bounds = new Rectangle(
+                this.buttonX, this.point.getIntY(),
                 VolumeButtons.VOLUME_WIDTH.value,
                 VolumeButtons.VOLUME_HEIGHT.value);
 
@@ -75,14 +76,16 @@ public void update() {
     @Override
     public void render(Graphics g) {
         g.drawImage(slider,
-                (int) this.point.x, (int) this.point.y,
+                this.point.getIntX(), this.point.getIntY(),
                 VolumeButtons.SLIDER_WIDTH.value,
-                VolumeButtons.VOLUME_HEIGHT.value, null);
+                VolumeButtons.VOLUME_HEIGHT.value,
+                null);
 
         g.drawImage(this.image[this.mouseState.toDisplayIndex],
-                (int) (buttonX - sliderXOffset), (int) this.point.y,
+                (int) (buttonX - sliderXOffset), this.point.getIntY(),
                 VolumeButtons.VOLUME_WIDTH.value,
-                VolumeButtons.VOLUME_HEIGHT.value, null);
+                VolumeButtons.VOLUME_HEIGHT.value,
+                null);
     }
 
 }

src/Game/gameBase/GameUnitPair.java

@@ -92,4 +92,51 @@ public GameUnitPair div(float scale) {
         return new GameUnitPair(this.x / scale, this.y / scale);
     }
 
+    public void setX(float x) {
+        this.x = x;
+    }
+
+    public void setY(float y) {
+        this.y = y;
+    }
+
+    public float getX() {
+        return this.x;
+    }
+
+    public float getY() {
+        return this.y;
+    }
+
+    public int getIntX() {
+        return (int) this.x;
+    }
+
+    public int getIntY() {
+        return (int) this.y;
+    }
+
+    public void setW(float w) {
+        this.x = w;
+    }
+
+    public void setH(float h) {
+        this.y = h;
+    }
+
+    public float getW() {
+        return this.x;
+    }
+
+    public float getH() {
+        return this.y;
+    }
+
+    public int getIntW() {
+        return (int) this.x;
+    }
+
+    public int getIntH() {
+        return (int) this.y;
+    }
 }