From 61a51f184c4ee341f08abfba73ebf179a5239aef Mon Sep 17 00:00:00 2001 From: Maurice Date: Fri, 28 Nov 2025 19:17:56 +0100 Subject: [PATCH] extracted duplicated code --- src/de/miaurizius/jgame2d/entity/Entity.java | 19 +++++++++++-------- src/de/miaurizius/jgame2d/entity/Player.java | 8 +------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/de/miaurizius/jgame2d/entity/Entity.java b/src/de/miaurizius/jgame2d/entity/Entity.java index d903127..5066f75 100644 --- a/src/de/miaurizius/jgame2d/entity/Entity.java +++ b/src/de/miaurizius/jgame2d/entity/Entity.java @@ -64,17 +64,20 @@ public class Entity { worldY + panel.tileSize > panel.player.worldY - panel.player.screenY && worldY - panel.tileSize < panel.player.worldY + panel.player.screenY ) { - BufferedImage image = switch (direction) { - case UP -> (spriteNum == 1) ? up1 : up2; - case DOWN -> (spriteNum == 1) ? down1 : down2; - case LEFT -> (spriteNum == 1) ? left1 : left2; - case RIGHT -> (spriteNum == 1) ? right1 : right2; - }; - graphics2d.drawImage(image, screenX, screenY, panel.tileSize, panel.tileSize, null); + graphics2d.drawImage(parseSprite(), screenX, screenY, panel.tileSize, panel.tileSize, null); } } - public BufferedImage initEntitySprites(String name) { + BufferedImage parseSprite() { + return switch (direction) { + case UP -> (spriteNum == 1) ? up1 : up2; + case DOWN -> (spriteNum == 1) ? down1 : down2; + case LEFT -> (spriteNum == 1) ? left1 : left2; + case RIGHT -> (spriteNum == 1) ? right1 : right2; + }; + } + + BufferedImage initEntitySprites(String name) { try { return Utility.scaleImage(ImageIO.read(new FileInputStream("assets/" + name + ".png")), panel.tileSize, panel.tileSize); } catch (IOException e) { diff --git a/src/de/miaurizius/jgame2d/entity/Player.java b/src/de/miaurizius/jgame2d/entity/Player.java index 74823a1..1b8e0f2 100644 --- a/src/de/miaurizius/jgame2d/entity/Player.java +++ b/src/de/miaurizius/jgame2d/entity/Player.java @@ -100,13 +100,7 @@ public class Player extends Entity { } public void draw(Graphics2D graphics2d) { - BufferedImage image = switch (direction) { - case UP -> (spriteNum == 1) ? up1 : up2; - case DOWN -> (spriteNum == 1) ? down1 : down2; - case LEFT -> (spriteNum == 1) ? left1 : left2; - case RIGHT -> (spriteNum == 1) ? right1 : right2; - }; - graphics2d.drawImage(image, screenX, screenY, null); + graphics2d.drawImage(parseSprite(), screenX, screenY, null); } }