diff --git a/pom.xml b/pom.xml
index 06ba9f4..012f560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,22 @@
+
+ net.revelc.code.formatter
+ formatter-maven-plugin
+ 2.25.0
+
+
+
+ format
+
+
+ ${basedir}/checkstyle.xml
+
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -70,6 +86,24 @@
compile
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 3.6.0
+
+ src/main/resources/config/checkstyle/checkstyle.xml
+ true
+
+
+
+ validate
+
+ check
+
+
+
+
diff --git a/src/main/java/cz/jzitnik/Main.java b/src/main/java/cz/jzitnik/Main.java
index 522af45..5e87555 100644
--- a/src/main/java/cz/jzitnik/Main.java
+++ b/src/main/java/cz/jzitnik/Main.java
@@ -30,7 +30,7 @@ public class Main {
var screenRenderer = new ScreenRenderer(spriteList, terminal);
var game = new Game();
- final boolean[] isRunning = {true};
+ final boolean[] isRunning = { true };
Thread inputHandlerThread = new InputHandlerThread(game, terminal, screenRenderer, isRunning);
Thread healingThread = new HealthRegenerationThread(game.getPlayer());
@@ -51,9 +51,10 @@ public class Main {
}
try {
customLogicProvider.update(game);
- } catch (Exception _) {}
+ } catch (Exception _) {
+ }
- if (game.getWindow() == Window.WORLD) {
+ if ( game.getWindow() == Window.WORLD) {
screenRenderer.render(game);
}
diff --git a/src/main/java/cz/jzitnik/game/Game.java b/src/main/java/cz/jzitnik/game/Game.java
index e2f7580..46df254 100644
--- a/src/main/java/cz/jzitnik/game/Game.java
+++ b/src/main/java/cz/jzitnik/game/Game.java
@@ -49,8 +49,9 @@ public class Game {
for (int i = 0; i < world.length; i++) {
for (int j = 0; j < world[i].length; j++) {
for (Block block : world[i][j]) {
- if (block.getBlockId().equals("steve") && block.getSpriteState().isPresent() && block.getSpriteState().get() == Steve.SteveState.SECOND) {
- return new int[]{j, i};
+ if (block.getBlockId().equals("steve") && block.getSpriteState().isPresent()
+ && block.getSpriteState().get() == Steve.SteveState.SECOND) {
+ return new int[] { j, i };
}
}
}
@@ -70,8 +71,8 @@ public class Game {
world[cords[1]][cords[0] + 1].add(player.getPlayerBlock2());
world[cords[1]][cords[0]].remove(player.getPlayerBlock2());
- world[cords[1]-1][cords[0] + 1].add(player.getPlayerBlock1());
- world[cords[1]-1][cords[0]].remove(player.getPlayerBlock1());
+ world[cords[1] - 1][cords[0] + 1].add(player.getPlayerBlock1());
+ world[cords[1] - 1][cords[0]].remove(player.getPlayerBlock1());
screenRenderer.render(this);
entitySpawnProvider.update(this, terminal);
@@ -91,8 +92,8 @@ public class Game {
world[cords[1]][cords[0] - 1].add(player.getPlayerBlock2());
world[cords[1]][cords[0]].remove(player.getPlayerBlock2());
- world[cords[1]-1][cords[0] - 1].add(player.getPlayerBlock1());
- world[cords[1]-1][cords[0]].remove(player.getPlayerBlock1());
+ world[cords[1] - 1][cords[0] - 1].add(player.getPlayerBlock1());
+ world[cords[1] - 1][cords[0]].remove(player.getPlayerBlock1());
screenRenderer.render(this);
entitySpawnProvider.update(this, terminal);
@@ -141,7 +142,8 @@ public class Game {
world[y][x].remove(mob);
} else {
mob.decreaseHp(dealDamage);
- mob.setSpriteState(gameStates.dependencies.entityHurtAnimation.get(mob.getBlockId()).setHurtAnimation(true, mob.getSpriteState().get()));
+ mob.setSpriteState(gameStates.dependencies.entityHurtAnimation.get(mob.getBlockId())
+ .setHurtAnimation(true, mob.getSpriteState().get()));
}
}
screenRenderer.render(this);
@@ -154,7 +156,8 @@ public class Game {
}
for (Block mob : mobs) {
- mob.setSpriteState(gameStates.dependencies.entityHurtAnimation.get(mob.getBlockId()).setHurtAnimation(false, mob.getSpriteState().get()));
+ mob.setSpriteState(gameStates.dependencies.entityHurtAnimation.get(mob.getBlockId())
+ .setHurtAnimation(false, mob.getSpriteState().get()));
}
screenRenderer.render(this);
}).start();
@@ -169,7 +172,8 @@ public class Game {
world[y][x].add(breakingBlock);
screenRenderer.render(this);
- double hardness = world[y][x].stream().filter(block -> !block.isGhost()).toList().getFirst().calculateHardness(inventory);
+ double hardness = world[y][x].stream().filter(block -> !block.isGhost()).toList().getFirst()
+ .calculateHardness(inventory);
this.mining = true;
@@ -200,7 +204,7 @@ public class Game {
var blocks = world[y][x];
for (Block block : blocks) {
- if (!block.isMineable()) {
+ if (!block.isMineable()) {
continue;
}
@@ -211,7 +215,10 @@ public class Game {
}
var toolVariants = block.getToolVariants();
- if (inventory.getItemInHand().isPresent() && inventory.getItemInHand().get().getToolVariant().isPresent() && block.getTool().isPresent() && block.getTool().get().equals(inventory.getItemInHand().get().getType()) && toolVariants.contains(inventory.getItemInHand().get().getToolVariant().get())) {
+ if (inventory.getItemInHand().isPresent()
+ && inventory.getItemInHand().get().getToolVariant().isPresent() && block.getTool().isPresent()
+ && block.getTool().get().equals(inventory.getItemInHand().get().getType())
+ && toolVariants.contains(inventory.getItemInHand().get().getToolVariant().get())) {
block.getDrops().forEach(inventory::addItem);
}
}
@@ -224,7 +231,8 @@ public class Game {
}
}
- CustomPlaceHandler customPlaceHandler = gameStates.dependencies.placeHandler.get(blocks.stream().filter(Block::isMineable).toList().getFirst().getBlockId());
+ CustomPlaceHandler customPlaceHandler = gameStates.dependencies.placeHandler
+ .get(blocks.stream().filter(Block::isMineable).toList().getFirst().getBlockId());
customPlaceHandler.mine(this, x, y);
inventory.getItemInHand().ifPresent(Item::use);
@@ -245,18 +253,16 @@ public class Game {
int distanceX = Math.abs(playerX - x);
int distanceY = Math.abs(playerY - y);
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), world[0].length, world.length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), world[0].length, world.length);
int startX = data[0];
int endX = data[1];
int startY = data[2];
int endY = data[3];
- return
- y >= startY && y < endY - 1 && x >= startX && x < endX - 1
- && distanceX <= 5 && distanceY <= 5
- && !(playerX == x && playerY == y)
- && !(playerX == x && playerY - 1 == y)
+ return y >= startY && y < endY - 1 && x >= startX && x < endX - 1 && distanceX <= 5 && distanceY <= 5
+ && !(playerX == x && playerY == y) && !(playerX == x && playerY - 1 == y)
&& blocks.stream().anyMatch(Block::isMineable);
}
@@ -271,18 +277,16 @@ public class Game {
int distanceX = Math.abs(playerX - x);
int distanceY = Math.abs(playerY - y);
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), world[0].length, world.length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), world[0].length, world.length);
int startX = data[0];
int endX = data[1];
int startY = data[2];
int endY = data[3];
- return
- y >= startY && y < endY - 1 && x >= startX && x < endX - 1
- && distanceX <= 5 && distanceY <= 5
- && !(playerX == x && playerY == y)
- && !(playerX == x && playerY - 1 == y)
+ return y >= startY && y < endY - 1 && x >= startX && x < endX - 1 && distanceX <= 5 && distanceY <= 5
+ && !(playerX == x && playerY == y) && !(playerX == x && playerY - 1 == y)
&& blocks.stream().anyMatch(Block::isMob);
}
@@ -340,9 +344,11 @@ public class Game {
}
if (inventory.getItemInHand().isPresent() && inventory.getItemInHand().get().getType() == ItemType.PICKUPER) {
- if (gameStates.dependencies.pickupHandlerProvider.get(inventory.getItemInHand().get().getId()).handle(this, x, y)) {
+ if (gameStates.dependencies.pickupHandlerProvider.get(inventory.getItemInHand().get().getId()).handle(this,
+ x, y)) {
screenRenderer.render(this);
- };
+ }
+ ;
return;
}
@@ -376,4 +382,4 @@ public class Game {
public boolean isSolid(List blocks) {
return !blocks.stream().allMatch(Block::isGhost);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java
index 1d6e077..9bc1f27 100644
--- a/src/main/java/cz/jzitnik/game/SpriteLoader.java
+++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java
@@ -12,127 +12,54 @@ public class SpriteLoader {
// BLOCKS
// Blocks
- AIR,
- WATER,
- LAVA,
- DIRT,
- GRASS,
- STONE,
- BEDROCK,
- COBBLESTONE,
- WOOL,
- OAK_LOG,
- OAK_LEAF,
- OAK_PLANKS,
- OAK_DOOR,
+ AIR, WATER, LAVA, DIRT, GRASS, STONE, BEDROCK, COBBLESTONE, WOOL, OAK_LOG, OAK_LEAF, OAK_PLANKS, OAK_DOOR,
// Ores
- COAL_ORE,
- IRON_ORE,
- GOLD_ORE,
- DIAMOND_ORE,
+ COAL_ORE, IRON_ORE, GOLD_ORE, DIAMOND_ORE,
- COAL_BLOCK,
- IRON_BLOCK,
- GOLD_BLOCK,
- DIAMOND_BLOCK,
+ COAL_BLOCK, IRON_BLOCK, GOLD_BLOCK, DIAMOND_BLOCK,
// Work
- FURNACE,
- CHEST,
- CRAFTING_TABLE,
- BED,
+ FURNACE, CHEST, CRAFTING_TABLE, BED,
// ENTITIES
- STEVE,
- PIG,
- SHEEP,
- COW,
+ STEVE, PIG, SHEEP, COW,
// UI
- BREAKING,
- HEART,
- HUNGER,
+ BREAKING, HEART, HUNGER,
// ITEMS
// Items
- ITEM_STICK,
- ITEM_LEATHER,
+ ITEM_STICK, ITEM_LEATHER,
// Block Items
- ITEM_DIRT,
- ITEM_OAK_LOG,
- ITEM_OAK_PLANKS,
- ITEM_COBBLESTONE,
- ITEM_STONE,
- ITEM_OAK_DOOR,
- ITEM_WOOL,
+ ITEM_DIRT, ITEM_OAK_LOG, ITEM_OAK_PLANKS, ITEM_COBBLESTONE, ITEM_STONE, ITEM_OAK_DOOR, ITEM_WOOL,
// Ore Items
- ITEM_COAL_ORE,
- ITEM_IRON_ORE,
- ITEM_GOLD_ORE,
- ITEM_DIAMOND_ORE,
+ ITEM_COAL_ORE, ITEM_IRON_ORE, ITEM_GOLD_ORE, ITEM_DIAMOND_ORE,
- ITEM_COAL_BLOCK,
- ITEM_IRON_BLOCK,
- ITEM_GOLD_BLOCK,
- ITEM_DIAMOND_BLOCK,
+ ITEM_COAL_BLOCK, ITEM_IRON_BLOCK, ITEM_GOLD_BLOCK, ITEM_DIAMOND_BLOCK,
- COAL,
- ITEM_IRON_INGOT,
- ITEM_GOLD_INGOT,
- DIAMOND,
+ COAL, ITEM_IRON_INGOT, ITEM_GOLD_INGOT, DIAMOND,
// Work Items
- ITEM_CRAFTING_TABLE,
- ITEM_CHEST,
- ITEM_FURNACE,
- ITEM_BED,
+ ITEM_CRAFTING_TABLE, ITEM_CHEST, ITEM_FURNACE, ITEM_BED,
// Tools
- WOODEN_SWORD,
- WOODEN_PICKAXE,
- WOODEN_AXE,
- WOODEN_SHOVEL,
- WOODEN_HOE,
+ WOODEN_SWORD, WOODEN_PICKAXE, WOODEN_AXE, WOODEN_SHOVEL, WOODEN_HOE,
- STONE_SWORD,
- STONE_PICKAXE,
- STONE_AXE,
- STONE_SHOVEL,
- STONE_HOE,
+ STONE_SWORD, STONE_PICKAXE, STONE_AXE, STONE_SHOVEL, STONE_HOE,
- IRON_SWORD,
- IRON_PICKAXE,
- IRON_AXE,
- IRON_SHOVEL,
- IRON_HOE,
+ IRON_SWORD, IRON_PICKAXE, IRON_AXE, IRON_SHOVEL, IRON_HOE,
- GOLDEN_SWORD,
- GOLDEN_PICKAXE,
- GOLDEN_AXE,
- GOLDEN_SHOVEL,
- GOLDEN_HOE,
+ GOLDEN_SWORD, GOLDEN_PICKAXE, GOLDEN_AXE, GOLDEN_SHOVEL, GOLDEN_HOE,
- DIAMOND_SWORD,
- DIAMOND_PICKAXE,
- DIAMOND_AXE,
- DIAMOND_SHOVEL,
- DIAMOND_HOE,
+ DIAMOND_SWORD, DIAMOND_PICKAXE, DIAMOND_AXE, DIAMOND_SHOVEL, DIAMOND_HOE,
- BUCKET,
- WATER_BUCKET,
- LAVA_BUCKET,
- MILK_BUCKET,
+ BUCKET, WATER_BUCKET, LAVA_BUCKET, MILK_BUCKET,
// Food
- ITEM_PORKCHOP,
- ITEM_COOKED_PORKCHOP,
- ITEM_MUTTON,
- ITEM_COOKED_MUTTON,
- ITEM_BEEF,
- ITEM_STEAK,
+ ITEM_PORKCHOP, ITEM_COOKED_PORKCHOP, ITEM_MUTTON, ITEM_COOKED_MUTTON, ITEM_BEEF, ITEM_STEAK,
}
public static final HashMap SPRITES_MAP = new HashMap<>();
@@ -164,7 +91,7 @@ public class SpriteLoader {
SPRITES_MAP.put(SPRITES.COAL_BLOCK, new SimpleSprite("coal_block.ans"));
SPRITES_MAP.put(SPRITES.IRON_BLOCK, new SimpleSprite("iron_block.ans"));
SPRITES_MAP.put(SPRITES.GOLD_BLOCK, new SimpleSprite("gold_block.ans"));
- SPRITES_MAP.put(SPRITES.DIAMOND_BLOCK, new SimpleSprite("diamond_block.ans")); //NEWW
+ SPRITES_MAP.put(SPRITES.DIAMOND_BLOCK, new SimpleSprite("diamond_block.ans")); // NEWW
// Work
SPRITES_MAP.put(SPRITES.CRAFTING_TABLE, new SimpleSprite("crafting_table.ans"));
diff --git a/src/main/java/cz/jzitnik/game/annotations/BlockRegistry.java b/src/main/java/cz/jzitnik/game/annotations/BlockRegistry.java
index 421e2f4..0c39e6d 100644
--- a/src/main/java/cz/jzitnik/game/annotations/BlockRegistry.java
+++ b/src/main/java/cz/jzitnik/game/annotations/BlockRegistry.java
@@ -9,5 +9,6 @@ import java.lang.annotation.ElementType;
@Target(ElementType.TYPE)
public @interface BlockRegistry {
String value();
+
String drops() default "";
}
diff --git a/src/main/java/cz/jzitnik/game/annotations/CraftingRecipeRegistry.java b/src/main/java/cz/jzitnik/game/annotations/CraftingRecipeRegistry.java
index 07a56bf..6d85085 100644
--- a/src/main/java/cz/jzitnik/game/annotations/CraftingRecipeRegistry.java
+++ b/src/main/java/cz/jzitnik/game/annotations/CraftingRecipeRegistry.java
@@ -6,7 +6,10 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME)
public @interface CraftingRecipeRegistry {
String[] recipe();
+
String result();
+
int amount();
+
boolean usingRegex() default false;
}
diff --git a/src/main/java/cz/jzitnik/game/annotations/ItemRegistry.java b/src/main/java/cz/jzitnik/game/annotations/ItemRegistry.java
index 78d2edd..7b33a68 100644
--- a/src/main/java/cz/jzitnik/game/annotations/ItemRegistry.java
+++ b/src/main/java/cz/jzitnik/game/annotations/ItemRegistry.java
@@ -9,5 +9,6 @@ import java.lang.annotation.ElementType;
@Target(ElementType.TYPE)
public @interface ItemRegistry {
String value();
+
String block() default "";
}
diff --git a/src/main/java/cz/jzitnik/game/blocks/Chest.java b/src/main/java/cz/jzitnik/game/blocks/Chest.java
index dfb2d7c..319793b 100644
--- a/src/main/java/cz/jzitnik/game/blocks/Chest.java
+++ b/src/main/java/cz/jzitnik/game/blocks/Chest.java
@@ -70,13 +70,16 @@ public class Chest implements RightClickHandler {
int heightPixels = ROW_AMOUNT * (CELL_HEIGHT) - 10;
int moveLeft = Math.max(0, (terminal.getWidth() / 2) - (widthPixels / 2));
- if (x > moveLeft && x <= moveLeft + widthPixels && y > 0 && y <= heightPixels && mouseEvent.getType() == MouseEvent.Type.Pressed) {
- if (mouseEvent.getType() != MouseEvent.Type.Pressed) return;
+ if (x > moveLeft && x <= moveLeft + widthPixels && y > 0 && y <= heightPixels
+ && mouseEvent.getType() == MouseEvent.Type.Pressed) {
+ if (mouseEvent.getType() != MouseEvent.Type.Pressed)
+ return;
int blockX = (x - moveLeft) / 52;
int blockY = y / 26;
- InventoryClickHandler.handleItemClick(mouseEvent, game.getInventory(), items, blockY * COLUMN_AMOUNT + blockX, 50, Optional.of(items));
+ InventoryClickHandler.handleItemClick(mouseEvent, game.getInventory(), items,
+ blockY * COLUMN_AMOUNT + blockX, 50, Optional.of(items));
screenRenderer.render(game);
@@ -84,7 +87,8 @@ public class Chest implements RightClickHandler {
}
// TODO: Why I need to add 20 here. Like wtf
- InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20), Optional.of(items));
+ InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20),
+ Optional.of(items));
}
public void breakBlock(Game game) {
diff --git a/src/main/java/cz/jzitnik/game/blocks/Furnace.java b/src/main/java/cz/jzitnik/game/blocks/Furnace.java
index 3739fd2..bab4b93 100644
--- a/src/main/java/cz/jzitnik/game/blocks/Furnace.java
+++ b/src/main/java/cz/jzitnik/game/blocks/Furnace.java
@@ -43,12 +43,13 @@ public class Furnace implements RightClickHandler {
List sprites = game.getInventory().getSprites(items, spriteList, inventory.getSelectedItemInv() - 50);
- String[] outputSprite = outputItem == null ? null : SpriteCombiner.combineTwoSprites(
- outputItem.getItem().getFirst().getSpriteState().isPresent() ?
- spriteList.getSprite(outputItem.getItem().getFirst().getSprite()).getSprite(outputItem.getItem().getFirst().getSpriteState().get()) :
- spriteList.getSprite(outputItem.getItem().getFirst().getSprite()).getSprite() ,
- Numbers.getNumberSprite(outputItem.getAmount())
- ).split("\n");
+ String[] outputSprite = outputItem == null ? null
+ : SpriteCombiner.combineTwoSprites(
+ outputItem.getItem().getFirst().getSpriteState().isPresent()
+ ? spriteList.getSprite(outputItem.getItem().getFirst().getSprite())
+ .getSprite(outputItem.getItem().getFirst().getSpriteState().get())
+ : spriteList.getSprite(outputItem.getItem().getFirst().getSprite()).getSprite(),
+ Numbers.getNumberSprite(outputItem.getAmount())).split("\n");
for (int j = 0; j < CELL_HEIGHT; j++) {
buffer.append("\033[0m").append(" ".repeat(moveLeft));
@@ -122,7 +123,8 @@ public class Furnace implements RightClickHandler {
int widthPixels = COLUMN_AMOUNT * (CELL_WIDTH + BORDER_SIZE) + BORDER_SIZE;
int moveLeft = Math.max(0, (terminal.getWidth() / 2) - (widthPixels / 2));
- if (x > moveLeft && x <= moveLeft + CELL_WIDTH + BORDER_SIZE && y > 0 && y < CELL_HEIGHT && mouseEvent.getType() == MouseEvent.Type.Pressed) {
+ if (x > moveLeft && x <= moveLeft + CELL_WIDTH + BORDER_SIZE && y > 0 && y < CELL_HEIGHT
+ && mouseEvent.getType() == MouseEvent.Type.Pressed) {
InventoryItem selectedItem = game.getInventory().getSelectedItemNo(Optional.of(items));
if (selectedItem != null && !Smelting.smeltingList.containsKey(selectedItem.getItem().getFirst().getId())) {
return;
@@ -132,10 +134,13 @@ public class Furnace implements RightClickHandler {
screenRenderer.render(game);
checkSmelt(game, screenRenderer);
- } else if (x > moveLeft + (2 * (2 * BORDER_SIZE + CELL_WIDTH)) && x <= moveLeft + (3 * (2 * BORDER_SIZE + CELL_WIDTH)) && y > CELL_HEIGHT && y <= 2*CELL_HEIGHT && mouseEvent.getType() == MouseEvent.Type.Pressed) {
+ } else if (x > moveLeft + (2 * (2 * BORDER_SIZE + CELL_WIDTH))
+ && x <= moveLeft + (3 * (2 * BORDER_SIZE + CELL_WIDTH)) && y > CELL_HEIGHT && y <= 2 * CELL_HEIGHT
+ && mouseEvent.getType() == MouseEvent.Type.Pressed) {
pickup(game);
screenRenderer.render(game);
- } else if (x > moveLeft && x <= moveLeft + CELL_WIDTH + BORDER_SIZE && y > 2 * CELL_HEIGHT && y < 3 * CELL_HEIGHT && mouseEvent.getType() == MouseEvent.Type.Pressed) {
+ } else if (x > moveLeft && x <= moveLeft + CELL_WIDTH + BORDER_SIZE && y > 2 * CELL_HEIGHT
+ && y < 3 * CELL_HEIGHT && mouseEvent.getType() == MouseEvent.Type.Pressed) {
InventoryItem selectedItem = game.getInventory().getSelectedItemNo(Optional.of(items));
if (selectedItem != null && !Smelting.fuelList.containsKey(selectedItem.getItem().getFirst().getId())) {
return;
@@ -146,13 +151,15 @@ public class Furnace implements RightClickHandler {
screenRenderer.render(game);
checkSmelt(game, screenRenderer);
} else {
- InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20), Optional.of(items));
+ InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20),
+ Optional.of(items));
}
}
public void setSmelting(boolean smelting) {
this.smelting = smelting;
- this.block.setSpriteState(smelting ? cz.jzitnik.game.sprites.Furnace.FurnaceState.ON : cz.jzitnik.game.sprites.Furnace.FurnaceState.OFF);
+ this.block.setSpriteState(smelting ? cz.jzitnik.game.sprites.Furnace.FurnaceState.ON
+ : cz.jzitnik.game.sprites.Furnace.FurnaceState.OFF);
}
public void checkSmelt(Game game, ScreenRenderer screenRenderer) {
diff --git a/src/main/java/cz/jzitnik/game/blocks/OakDoorData.java b/src/main/java/cz/jzitnik/game/blocks/OakDoorData.java
index d9683d5..b58a9ae 100644
--- a/src/main/java/cz/jzitnik/game/blocks/OakDoorData.java
+++ b/src/main/java/cz/jzitnik/game/blocks/OakDoorData.java
@@ -30,15 +30,14 @@ public class OakDoorData implements RightClickHandler {
var blocks = game.getWorld()[y][x];
var door = blocks.stream().filter(block -> block.getBlockId().equals("oak_door")).toList().getFirst();
-
switch (door.getSpriteState().get()) {
case OakDoor.OakDoorState.TOP, OakDoor.OakDoorState.TOPCLOSED -> {
- var blocks2 = game.getWorld()[y+1][x];
+ var blocks2 = game.getWorld()[y + 1][x];
var door2 = blocks2.stream().filter(block -> block.getBlockId().equals("oak_door")).toList().getFirst();
change(door2);
}
case OakDoor.OakDoorState.BOTTOM, OakDoor.OakDoorState.BOTTOMCLOSED -> {
- var blocks2 = game.getWorld()[y-1][x];
+ var blocks2 = game.getWorld()[y - 1][x];
var door2 = blocks2.stream().filter(block -> block.getBlockId().equals("oak_door")).toList().getFirst();
change(door2);
}
diff --git a/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java b/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java
index 5f035b0..af3c569 100644
--- a/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java
+++ b/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java
@@ -24,7 +24,8 @@ public class CraftingRecipeList {
String[][] recipeGrid = convertTo2DGrid(annotation.recipe());
recipes.add(new CraftingRecipe(recipeGrid,
- () -> new InventoryItem(annotation.amount(), ItemBlockSupplier.getItem(annotation.result())), annotation.usingRegex()));
+ () -> new InventoryItem(annotation.amount(), ItemBlockSupplier.getItem(annotation.result())),
+ annotation.usingRegex()));
} catch (Exception e) {
e.printStackTrace();
}
@@ -104,7 +105,8 @@ public class CraftingRecipeList {
if (array1[i][j] == null && array2[i][j] != null) {
return false;
}
- if (array1[i][j] != null && (usingRegex ? !array2[i][j].matches(array1[i][j]) : !array1[i][j].equals(array2[i][j])) ) {
+ if (array1[i][j] != null
+ && (usingRegex ? !array2[i][j].matches(array1[i][j]) : !array1[i][j].equals(array2[i][j]))) {
return false;
}
}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/BedRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/BedRecipe.java
index 34ff870..3c4a6c6 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/BedRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/BedRecipe.java
@@ -2,14 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "^.*_wool$", "^.*_wool$", "^.*_wool$",
- "^oak_planks$", "^oak_planks$", "^oak_planks$",
- "_", "_", "_"
- },
- result = "bed",
- amount = 1,
- usingRegex = true
-)
-public class BedRecipe {}
+@CraftingRecipeRegistry(recipe = { "^.*_wool$", "^.*_wool$", "^.*_wool$", "^oak_planks$", "^oak_planks$",
+ "^oak_planks$", "_", "_", "_" }, result = "bed", amount = 1, usingRegex = true)
+public class BedRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java
index 637cea3..0794bc6 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/BucketRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_ingot", "_", "iron_ingot",
- "_", "iron_ingot", "_",
- "_", "_", "_"
- },
- result = "bucket",
- amount = 1
-)
-public class BucketRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "iron_ingot", "_", "iron_ingot", "_", "iron_ingot", "_", "_", "_",
+ "_" }, result = "bucket", amount = 1)
+public class BucketRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/ChestRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/ChestRecipe.java
index 9cc55d6..fdcd062 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/ChestRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/ChestRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "oak_planks",
- "oak_planks", "_", "oak_planks",
- "oak_planks", "oak_planks", "oak_planks"
- },
- result = "chest",
- amount = 1
-)
-public class ChestRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "oak_planks", "oak_planks", "_", "oak_planks",
+ "oak_planks", "oak_planks", "oak_planks" }, result = "chest", amount = 1)
+public class ChestRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/CoalBlockRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/CoalBlockRecipe.java
index 56916e6..f160c17 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/CoalBlockRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/CoalBlockRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "coal", "coal", "coal",
- "coal", "coal", "coal",
- "coal", "coal", "coal"
- },
- result = "coal_block",
- amount = 1
-)
-public class CoalBlockRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "coal", "coal", "coal", "coal", "coal", "coal", "coal", "coal",
+ "coal" }, result = "coal_block", amount = 1)
+public class CoalBlockRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/CoalRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/CoalRecipe.java
index 5721ea2..125ecd6 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/CoalRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/CoalRecipe.java
@@ -2,13 +2,6 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "coal_block", "_", "_",
- "_", "_", "_",
- "_", "_", "_"
- },
- result = "coal",
- amount = 9
-)
-public class CoalRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "coal_block", "_", "_", "_", "_", "_", "_", "_", "_" }, result = "coal", amount = 9)
+public class CoalRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/CraftingTableRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/CraftingTableRecipe.java
index 68b19fd..3337ede 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/CraftingTableRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/CraftingTableRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "_",
- "oak_planks", "oak_planks", "_",
- "_", "_", "_"
- },
- result = "crafting_table",
- amount = 1
-)
-public class CraftingTableRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "_", "oak_planks", "oak_planks", "_", "_", "_",
+ "_" }, result = "crafting_table", amount = 1)
+public class CraftingTableRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java
index c39c0cf..c854d81 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "diamond", "diamond",
- "_", "stick", "diamond",
- "_", "stick", "_"
- },
- result = "diamond_axe",
- amount = 1
-)
-public class DiamondAxe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "diamond", "diamond", "_", "stick", "diamond", "_", "stick",
+ "_" }, result = "diamond_axe", amount = 1)
+public class DiamondAxe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java
index 2032223..d13a5ea 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondAxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "diamond", "diamond", "_",
- "diamond", "stick", "_",
- "_", "stick", "_"
- },
- result = "diamond_axe",
- amount = 1
-)
-public class DiamondAxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "diamond", "diamond", "_", "diamond", "stick", "_", "_", "stick",
+ "_" }, result = "diamond_axe", amount = 1)
+public class DiamondAxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java
index 50e3066..3ba56c5 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondBlockRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "diamond", "diamond", "diamond",
- "diamond", "diamond", "diamond",
- "diamond", "diamond", "diamond"
- },
- result = "diamond_block",
- amount = 1
-)
-public class DiamondBlockRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "diamond", "diamond", "diamond", "diamond", "diamond", "diamond", "diamond",
+ "diamond", "diamond" }, result = "diamond_block", amount = 1)
+public class DiamondBlockRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java
index b99c838..a7b7640 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "diamond", "diamond",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "diamond_hoe",
- amount = 1
-)
-public class DiamondHoe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "diamond", "diamond", "_", "stick", "_", "_", "stick",
+ "_" }, result = "diamond_hoe", amount = 1)
+public class DiamondHoe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java
index e76a024..05b69a5 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondHoeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "diamond", "diamond", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "diamond_hoe",
- amount = 1
-)
-public class DiamondHoeRecipe {}
+@CraftingRecipeRegistry(recipe = { "diamond", "diamond", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "diamond_hoe", amount = 1)
+public class DiamondHoeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java
index 4838f43..eeb4252 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondPickaxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "diamond", "diamond", "diamond",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "diamond_pickaxe",
- amount = 1
-)
-public class DiamondPickaxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "diamond", "diamond", "diamond", "_", "stick", "_", "_", "stick",
+ "_" }, result = "diamond_pickaxe", amount = 1)
+public class DiamondPickaxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java
index aab018e..a1bdd65 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "diamond_block", "_", "_",
- "_", "_", "_",
- "_", "_", "_"
- },
- result = "diamond",
- amount = 9
-)
-public class DiamondRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "diamond_block", "_", "_", "_", "_", "_", "_", "_",
+ "_" }, result = "diamond", amount = 9)
+public class DiamondRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java
index 13d5e9e..6e7a808 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondShovelRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "diamond", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "diamond_shovel",
- amount = 1
-)
-public class DiamondShovelRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "diamond", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "diamond_shovel", amount = 1)
+public class DiamondShovelRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java
index 7479801..9be75ed 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/DiamondSwordRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "diamond", "_",
- "_", "diamond", "_",
- "_", "stick", "_"
- },
- result = "diamond_sword",
- amount = 1
-)
-public class DiamondSwordRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "diamond", "_", "_", "diamond", "_", "_", "stick",
+ "_" }, result = "diamond_sword", amount = 1)
+public class DiamondSwordRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/FurnaceRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/FurnaceRecipe.java
index 6026117..d473188 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/FurnaceRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/FurnaceRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "cobblestone", "cobblestone", "cobblestone",
- "cobblestone", "_", "cobblestone",
- "cobblestone", "cobblestone", "cobblestone"
- },
- result = "furnace",
- amount = 1
-)
-public class FurnaceRecipe {}
+@CraftingRecipeRegistry(recipe = { "cobblestone", "cobblestone", "cobblestone", "cobblestone", "_", "cobblestone",
+ "cobblestone", "cobblestone", "cobblestone" }, result = "furnace", amount = 1)
+public class FurnaceRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldBlockRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldBlockRecipe.java
index 90c4ac3..c74b145 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldBlockRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldBlockRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "gold_ingot", "gold_ingot", "gold_ingot",
- "gold_ingot", "gold_ingot", "gold_ingot",
- "gold_ingot", "gold_ingot", "gold_ingot"
- },
- result = "gold_block",
- amount = 1
-)
-public class GoldBlockRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "gold_ingot", "gold_ingot", "gold_ingot", "gold_ingot", "gold_ingot", "gold_ingot",
+ "gold_ingot", "gold_ingot", "gold_ingot" }, result = "gold_block", amount = 1)
+public class GoldBlockRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldIngotRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldIngotRecipe.java
index 002d6be..b0960f5 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldIngotRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldIngotRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "gold_block", "_", "_",
- "_", "_", "_",
- "_", "_", "_"
- },
- result = "gold_ingot",
- amount = 9
-)
-public class GoldIngotRecipe {}
+@CraftingRecipeRegistry(recipe = { "gold_block", "_", "_", "_", "_", "_", "_", "_",
+ "_" }, result = "gold_ingot", amount = 9)
+public class GoldIngotRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxe2Recipe.java
index 52de133..d3ce061 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "gold_ingot", "gold_ingot",
- "_", "stick", "gold_ingot",
- "_", "stick", "_"
- },
- result = "golden_axe",
- amount = 1
-)
-public class GoldenAxe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "gold_ingot", "gold_ingot", "_", "stick", "gold_ingot", "_", "stick",
+ "_" }, result = "golden_axe", amount = 1)
+public class GoldenAxe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxeRecipe.java
index 8bc6eaa..563bd09 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenAxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "gold_ingot", "gold_ingot", "_",
- "gold_ingot", "stick", "_",
- "_", "stick", "_"
- },
- result = "golden_axe",
- amount = 1
-)
-public class GoldenAxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "gold_ingot", "gold_ingot", "_", "gold_ingot", "stick", "_", "_", "stick",
+ "_" }, result = "golden_axe", amount = 1)
+public class GoldenAxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java
index d708873..8a3f198 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "gold_ingot", "gold_ingot",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "golden_hoe",
- amount = 1
-)
-public class GoldenHoe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "gold_ingot", "gold_ingot", "_", "stick", "_", "_", "stick",
+ "_" }, result = "golden_hoe", amount = 1)
+public class GoldenHoe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java
index cfcae25..ff9369f 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenHoeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "gold_ingot", "gold_ingot", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "golden_hoe",
- amount = 1
-)
-public class GoldenHoeRecipe {}
+@CraftingRecipeRegistry(recipe = { "gold_ingot", "gold_ingot", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "golden_hoe", amount = 1)
+public class GoldenHoeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenPickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenPickaxeRecipe.java
index 4453b52..bf8fd61 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenPickaxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenPickaxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "gold_ingot", "gold_ingot", "gold_ingot",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "golden_pickaxe",
- amount = 1
-)
-public class GoldenPickaxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "gold_ingot", "gold_ingot", "gold_ingot", "_", "stick", "_", "_", "stick",
+ "_" }, result = "golden_pickaxe", amount = 1)
+public class GoldenPickaxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenShovelRecipe.java
index 37663ed..cf344eb 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenShovelRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenShovelRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "gold_ingot", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "golden_shovel",
- amount = 1
-)
-public class GoldenShovelRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "gold_ingot", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "golden_shovel", amount = 1)
+public class GoldenShovelRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenSwordRecipe.java
index 6eab0b1..1992b96 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenSwordRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/GoldenSwordRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "gold_ingot", "_",
- "_", "gold_ingot", "_",
- "_", "stick", "_"
- },
- result = "golden_sword",
- amount = 1
-)
-public class GoldenSwordRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "gold_ingot", "_", "_", "gold_ingot", "_", "_", "stick",
+ "_" }, result = "golden_sword", amount = 1)
+public class GoldenSwordRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxe2Recipe.java
index 2a85e83..35827ee 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "iron_ingot", "iron_ingot",
- "_", "stick", "iron_ingot",
- "_", "stick", "_"
- },
- result = "iron_axe",
- amount = 1
-)
-public class IronAxe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "iron_ingot", "iron_ingot", "_", "stick", "iron_ingot", "_", "stick",
+ "_" }, result = "iron_axe", amount = 1)
+public class IronAxe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxeRecipe.java
index 849cf2e..e323dad 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronAxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_ingot", "iron_ingot", "_",
- "iron_ingot", "stick", "_",
- "_", "stick", "_"
- },
- result = "iron_axe",
- amount = 1
-)
-public class IronAxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "iron_ingot", "iron_ingot", "_", "iron_ingot", "stick", "_", "_", "stick",
+ "_" }, result = "iron_axe", amount = 1)
+public class IronAxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronBlockRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronBlockRecipe.java
index 601b5cf..26fa02c 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronBlockRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronBlockRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_ingot", "iron_ingot", "iron_ingot",
- "iron_ingot", "iron_ingot", "iron_ingot",
- "iron_ingot", "iron_ingot", "iron_ingot"
- },
- result = "iron_block",
- amount = 1
-)
-public class IronBlockRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "iron_ingot", "iron_ingot", "iron_ingot", "iron_ingot", "iron_ingot", "iron_ingot",
+ "iron_ingot", "iron_ingot", "iron_ingot" }, result = "iron_block", amount = 1)
+public class IronBlockRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java
index b658e71..4bace86 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "iron_ingot", "iron_ingot",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "iron_hoe",
- amount = 1
-)
-public class IronHoe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "iron_ingot", "iron_ingot", "_", "stick", "_", "_", "stick",
+ "_" }, result = "iron_hoe", amount = 1)
+public class IronHoe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java
index 2f2a5dd..8a7bfb8 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronHoeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_ingot", "iron_ingot", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "iron_hoe",
- amount = 1
-)
-public class IronHoeRecipe {}
+@CraftingRecipeRegistry(recipe = { "iron_ingot", "iron_ingot", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "iron_hoe", amount = 1)
+public class IronHoeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronIngotRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronIngotRecipe.java
index c4f8745..bb1c919 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronIngotRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronIngotRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_block", "_", "_",
- "_", "_", "_",
- "_", "_", "_"
- },
- result = "iron_ingot",
- amount = 9
-)
-public class IronIngotRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "iron_block", "_", "_", "_", "_", "_", "_", "_",
+ "_" }, result = "iron_ingot", amount = 9)
+public class IronIngotRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronPickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronPickaxeRecipe.java
index d2e7ef6..3a37330 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronPickaxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronPickaxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "iron_ingot", "iron_ingot", "iron_ingot",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "iron_pickaxe",
- amount = 1
-)
-public class IronPickaxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "iron_ingot", "iron_ingot", "iron_ingot", "_", "stick", "_", "_", "stick",
+ "_" }, result = "iron_pickaxe", amount = 1)
+public class IronPickaxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronShovelRecipe.java
index f19c193..cbacc6c 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronShovelRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronShovelRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "iron_shovel", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "iron_shovel",
- amount = 1
-)
-public class IronShovelRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "iron_shovel", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "iron_shovel", amount = 1)
+public class IronShovelRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/IronSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/IronSwordRecipe.java
index 3d65589..fa7151b 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/IronSwordRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/IronSwordRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "iron_ingot", "_",
- "_", "iron_ingot", "_",
- "_", "stick", "_"
- },
- result = "iron_sword",
- amount = 1
-)
-public class IronSwordRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "iron_ingot", "_", "_", "iron_ingot", "_", "_", "stick",
+ "_" }, result = "iron_sword", amount = 1)
+public class IronSwordRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/OakDoorRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/OakDoorRecipe.java
index a6e0a42..72eddc2 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/OakDoorRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/OakDoorRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "_",
- "oak_planks", "oak_planks", "_",
- "oak_planks", "oak_planks", "_"
- },
- result = "oak_door",
- amount = 3
-)
-public class OakDoorRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "_", "oak_planks", "oak_planks", "_", "oak_planks",
+ "oak_planks", "_" }, result = "oak_door", amount = 3)
+public class OakDoorRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/OakPlanksRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/OakPlanksRecipe.java
index 1e8b763..440e582 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/OakPlanksRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/OakPlanksRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_log", "_", "_",
- "_", "_", "_",
- "_", "_", "_"
- },
- result = "oak_planks",
- amount = 4
-)
-public class OakPlanksRecipe {}
\ No newline at end of file
+@CraftingRecipeRegistry(recipe = { "oak_log", "_", "_", "_", "_", "_", "_", "_",
+ "_" }, result = "oak_planks", amount = 4)
+public class OakPlanksRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StickRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StickRecipe.java
index d05609a..1aa585e 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StickRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StickRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "_", "_",
- "oak_planks", "_", "_",
- "_", "_", "_"
- },
- result = "stick",
- amount = 4
-)
-public class StickRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "_", "_", "oak_planks", "_", "_", "_", "_",
+ "_" }, result = "stick", amount = 4)
+public class StickRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxe2Recipe.java
index 3b1e52d..f3d7227 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "cobblestone", "cobblestone",
- "_", "stick", "cobblestone",
- "_", "stick", "_"
- },
- result = "stone_pickaxe",
- amount = 1
-)
-public class StoneAxe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "cobblestone", "cobblestone", "_", "stick", "cobblestone", "_", "stick",
+ "_" }, result = "stone_pickaxe", amount = 1)
+public class StoneAxe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxeRecipe.java
index 73838c9..b0f5c87 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneAxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "cobblestone", "cobblestone", "_",
- "cobblestone", "stick", "_",
- "_", "stick", "_"
- },
- result = "stone_pickaxe",
- amount = 1
-)
-public class StoneAxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "cobblestone", "cobblestone", "_", "cobblestone", "stick", "_", "_", "stick",
+ "_" }, result = "stone_pickaxe", amount = 1)
+public class StoneAxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java
index 06fe48e..c9bc632 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "stone", "stone",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "stone_hoe",
- amount = 1
-)
-public class StoneHoe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "stone", "stone", "_", "stick", "_", "_", "stick",
+ "_" }, result = "stone_hoe", amount = 1)
+public class StoneHoe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoeRecipe.java
index 4af70f6..59c5434 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneHoeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "stone", "stone", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "stone_hoe",
- amount = 1
-)
-public class StoneHoeRecipe {}
+@CraftingRecipeRegistry(recipe = { "stone", "stone", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "stone_hoe", amount = 1)
+public class StoneHoeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StonePickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StonePickaxeRecipe.java
index ca7d5ce..08c8da4 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StonePickaxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StonePickaxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "cobblestone", "cobblestone", "cobblestone",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "stone_pickaxe",
- amount = 1
-)
-public class StonePickaxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "cobblestone", "cobblestone", "cobblestone", "_", "stick", "_", "_", "stick",
+ "_" }, result = "stone_pickaxe", amount = 1)
+public class StonePickaxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneShovelRecipe.java
index d1757c2..4a62b8b 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneShovelRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneShovelRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "cobblestone", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "stone_shovel",
- amount = 1
-)
-public class StoneShovelRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "cobblestone", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "stone_shovel", amount = 1)
+public class StoneShovelRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneSwordRecipe.java
index 2828055..715b7d3 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/StoneSwordRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/StoneSwordRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "cobblestone", "_",
- "_", "cobblestone", "_",
- "_", "stick", "_"
- },
- result = "stone_sword",
- amount = 1
-)
-public class StoneSwordRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "cobblestone", "_", "_", "cobblestone", "_", "_", "stick",
+ "_" }, result = "stone_sword", amount = 1)
+public class StoneSwordRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxe2Recipe.java
index a84f1ab..827c418 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "oak_planks", "oak_planks",
- "_", "stick", "oak_planks",
- "_", "stick", "_"
- },
- result = "wooden_axe",
- amount = 1
-)
-public class WoodenAxe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "oak_planks", "oak_planks", "_", "stick", "oak_planks", "_", "stick",
+ "_" }, result = "wooden_axe", amount = 1)
+public class WoodenAxe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxeRecipe.java
index 3d6ba65..23f8f61 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenAxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "_",
- "oak_planks", "stick", "_",
- "_", "stick", "_"
- },
- result = "wooden_axe",
- amount = 1
-)
-public class WoodenAxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "_", "oak_planks", "stick", "_", "_", "stick",
+ "_" }, result = "wooden_axe", amount = 1)
+public class WoodenAxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java
index 98b348c..0ada4d7 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoe2Recipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "oak_planks", "oak_planks",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "wooden_hoe",
- amount = 1
-)
-public class WoodenHoe2Recipe {}
+@CraftingRecipeRegistry(recipe = { "_", "oak_planks", "oak_planks", "_", "stick", "_", "_", "stick",
+ "_" }, result = "wooden_hoe", amount = 1)
+public class WoodenHoe2Recipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoeRecipe.java
index 31d2155..3803c3f 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenHoeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "wooden_hoe",
- amount = 1
-)
-public class WoodenHoeRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "wooden_hoe", amount = 1)
+public class WoodenHoeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenPickaxeRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenPickaxeRecipe.java
index 34a9d6a..907a0a8 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenPickaxeRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenPickaxeRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "oak_planks", "oak_planks", "oak_planks",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "wooden_pickaxe",
- amount = 1
-)
-public class WoodenPickaxeRecipe {}
+@CraftingRecipeRegistry(recipe = { "oak_planks", "oak_planks", "oak_planks", "_", "stick", "_", "_", "stick",
+ "_" }, result = "wooden_pickaxe", amount = 1)
+public class WoodenPickaxeRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenShovelRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenShovelRecipe.java
index 8cd9696..f723542 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenShovelRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenShovelRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "oak_planks", "_",
- "_", "stick", "_",
- "_", "stick", "_"
- },
- result = "wooden_shovel",
- amount = 1
-)
-public class WoodenShovelRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "oak_planks", "_", "_", "stick", "_", "_", "stick",
+ "_" }, result = "wooden_shovel", amount = 1)
+public class WoodenShovelRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenSwordRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenSwordRecipe.java
index c8fc96a..aeafc5a 100644
--- a/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenSwordRecipe.java
+++ b/src/main/java/cz/jzitnik/game/crafting/recipes/WoodenSwordRecipe.java
@@ -2,13 +2,7 @@ package cz.jzitnik.game.crafting.recipes;
import cz.jzitnik.game.annotations.CraftingRecipeRegistry;
-@CraftingRecipeRegistry(
- recipe = {
- "_", "oak_planks", "_",
- "_", "oak_planks", "_",
- "_", "stick", "_"
- },
- result = "wooden_sword",
- amount = 1
-)
-public class WoodenSwordRecipe {}
+@CraftingRecipeRegistry(recipe = { "_", "oak_planks", "_", "_", "oak_planks", "_", "_", "stick",
+ "_" }, result = "wooden_sword", amount = 1)
+public class WoodenSwordRecipe {
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/Block.java b/src/main/java/cz/jzitnik/game/entities/Block.java
index 3473143..f90b3b0 100644
--- a/src/main/java/cz/jzitnik/game/entities/Block.java
+++ b/src/main/java/cz/jzitnik/game/entities/Block.java
@@ -47,7 +47,8 @@ public class Block {
this.hardness = hardness;
}
- public Block(String blockId, SpriteLoader.SPRITES sprite, int hardness, ItemType tool, List toolVariants) {
+ public Block(String blockId, SpriteLoader.SPRITES sprite, int hardness, ItemType tool,
+ List toolVariants) {
this.blockId = blockId;
this.sprite = sprite;
this.hardness = hardness;
@@ -55,7 +56,8 @@ public class Block {
this.toolVariants = toolVariants;
}
- public Block(String blockId, SpriteLoader.SPRITES sprite, int hardness, ItemType tool, List toolVariants, Object data) {
+ public Block(String blockId, SpriteLoader.SPRITES sprite, int hardness, ItemType tool,
+ List toolVariants, Object data) {
this.blockId = blockId;
this.sprite = sprite;
this.hardness = hardness;
@@ -70,7 +72,8 @@ public class Block {
public double calculateHardness(Inventory inventory) {
double holdingDecrease = 0;
- if (inventory.getItemInHand().isPresent() && tool.isPresent() && inventory.getItemInHand().get().getType().equals(tool.get())) {
+ if (inventory.getItemInHand().isPresent() && tool.isPresent()
+ && inventory.getItemInHand().get().getType().equals(tool.get())) {
holdingDecrease = inventory.getItemInHand().get().getMiningDecrease();
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/Item.java b/src/main/java/cz/jzitnik/game/entities/items/Item.java
index e4dc2ee..514067c 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/Item.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/Item.java
@@ -26,7 +26,8 @@ public class Item {
private int dealDamage = 1;
private Optional block = Optional.empty();
- public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant, int durability, boolean stackable, int dealDamage) {
+ public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant,
+ int durability, boolean stackable, int dealDamage) {
this.id = id;
this.name = name;
this.type = type;
@@ -37,7 +38,8 @@ public class Item {
this.dealDamage = dealDamage;
}
- public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant, double miningDecrease, int durability, boolean stackable) {
+ public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant,
+ double miningDecrease, int durability, boolean stackable) {
this.id = id;
this.name = name;
this.type = type;
@@ -77,8 +79,10 @@ public class Item {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
Item item = (Item) o;
return name.equals(item.name);
diff --git a/src/main/java/cz/jzitnik/game/entities/items/ItemBlockSupplier.java b/src/main/java/cz/jzitnik/game/entities/items/ItemBlockSupplier.java
index 14e2ad6..e4e2cd8 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/ItemBlockSupplier.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/ItemBlockSupplier.java
@@ -66,7 +66,8 @@ public class ItemBlockSupplier {
ItemRegistry annotation = clazz.getAnnotation(ItemRegistry.class);
registeredItems.put(annotation.value(), itemInstance);
- blockList.put(annotation.value(), annotation.block().isEmpty() ? annotation.value() : annotation.block());
+ blockList.put(annotation.value(),
+ annotation.block().isEmpty() ? annotation.value() : annotation.block());
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/ItemType.java b/src/main/java/cz/jzitnik/game/entities/items/ItemType.java
index 78c452c..a666d9f 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/ItemType.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/ItemType.java
@@ -1,14 +1,5 @@
package cz.jzitnik.game.entities.items;
public enum ItemType {
- PICKAXE,
- SHOVEL,
- AXE,
- SHEARS,
- BLOCK,
- FOOD,
- USELESS_ITEM,
- HOE,
- SWORD,
- PICKUPER
+ PICKAXE, SHOVEL, AXE, SHEARS, BLOCK, FOOD, USELESS_ITEM, HOE, SWORD, PICKUPER
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/ToolVariant.java b/src/main/java/cz/jzitnik/game/entities/items/ToolVariant.java
index 69aa995..97b4f43 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/ToolVariant.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/ToolVariant.java
@@ -1,9 +1,5 @@
package cz.jzitnik.game.entities.items;
public enum ToolVariant {
- WOODEN,
- STONE,
- IRON,
- GOLDEN,
- DIAMOND,
+ WOODEN, STONE, IRON, GOLDEN, DIAMOND,
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java
index f97e3c6..042bfa2 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("coal_block")
public class CoalBlock extends Block {
public CoalBlock() {
- super("coal_block", SpriteLoader.SPRITES.COAL_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("coal_block", SpriteLoader.SPRITES.COAL_BLOCK, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java
index fe80ca7..514f560 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("coal_ore")
public class CoalOreBlock extends Block {
public CoalOreBlock() {
- super("coal_ore", SpriteLoader.SPRITES.COAL_ORE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("coal_ore", SpriteLoader.SPRITES.COAL_ORE, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CobblestoneBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CobblestoneBlock.java
index 48af622..b885be5 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CobblestoneBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CobblestoneBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("cobblestone")
public class CobblestoneBlock extends Block {
public CobblestoneBlock() {
- super("cobblestone", SpriteLoader.SPRITES.COBBLESTONE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("cobblestone", SpriteLoader.SPRITES.COBBLESTONE, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java
index 5f83a5a..d3ad041 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("diamond_block")
public class DiamondBlock extends Block {
public DiamondBlock() {
- super("diamond_block", SpriteLoader.SPRITES.DIAMOND_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("diamond_block", SpriteLoader.SPRITES.DIAMOND_BLOCK, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java
index a1cf88f..cdd54f8 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/DiamondOreBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("diamond_ore")
public class DiamondOreBlock extends Block {
public DiamondOreBlock() {
- super("diamond_ore", SpriteLoader.SPRITES.DIAMOND_ORE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("diamond_ore", SpriteLoader.SPRITES.DIAMOND_ORE, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/FurnaceBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/FurnaceBlock.java
index 331e8cc..b0d4491 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/FurnaceBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/FurnaceBlock.java
@@ -12,7 +12,8 @@ import java.util.Arrays;
@BlockRegistry("furnace")
public class FurnaceBlock extends Block {
public FurnaceBlock() {
- super("furnace", SpriteLoader.SPRITES.FURNACE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("furnace", SpriteLoader.SPRITES.FURNACE, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
setData(new Furnace(this));
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java
index 56a0972..6c134e4 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("gold_block")
public class GoldBlock extends Block {
public GoldBlock() {
- super("gold_block", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("gold_block", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java
index 164757a..9ca3e35 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("gold_ore")
public class GoldOreBlock extends Block {
public GoldOreBlock() {
- super("gold_ore", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("gold_ore", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java
index 09fec9f..b3df6e5 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("iron_block")
public class IronBlock extends Block {
public IronBlock() {
- super("iron_block", SpriteLoader.SPRITES.IRON_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("iron_block", SpriteLoader.SPRITES.IRON_BLOCK, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronOreBlock.java
index 21cc506..ea6d63e 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronOreBlock.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronOreBlock.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
@BlockRegistry("iron_ore")
public class IronOreBlock extends Block {
public IronOreBlock() {
- super("iron_ore", SpriteLoader.SPRITES.IRON_ORE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList());
+ super("iron_ore", SpriteLoader.SPRITES.IRON_ORE, 15, ItemType.PICKAXE,
+ Arrays.stream(ToolVariant.values()).toList());
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java
index ae8e1d9..ceb920f 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondAxe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("diamond_axe")
public class DiamondAxe extends Item {
public DiamondAxe() {
- super("diamond_axe", "Diamond axe", ItemType.AXE, SpriteLoader.SPRITES.DIAMOND_AXE, ToolVariant.DIAMOND, 2, 1561, false);
+ super("diamond_axe", "Diamond axe", ItemType.AXE, SpriteLoader.SPRITES.DIAMOND_AXE, ToolVariant.DIAMOND, 2,
+ 1561, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java
index bca6c3c..af664ce 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondHoe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("diamond_hoe")
public class DiamondHoe extends Item {
public DiamondHoe() {
- super("diamond_hoe", "Diamond hoe", ItemType.HOE, SpriteLoader.SPRITES.DIAMOND_HOE, ToolVariant.DIAMOND, 0, 1561, false);
+ super("diamond_hoe", "Diamond hoe", ItemType.HOE, SpriteLoader.SPRITES.DIAMOND_HOE, ToolVariant.DIAMOND, 0,
+ 1561, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java
index f06471d..e42b3c9 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondPickaxe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("diamond_pickaxe")
public class DiamondPickaxe extends Item {
public DiamondPickaxe() {
- super("diamond_pickaxe", "Diamond pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.DIAMOND_PICKAXE, ToolVariant.DIAMOND, 14, 1561, false);
+ super("diamond_pickaxe", "Diamond pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.DIAMOND_PICKAXE,
+ ToolVariant.DIAMOND, 14, 1561, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java
index 359d426..6cf1f68 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondShovel.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("diamond_shovel")
public class DiamondShovel extends Item {
public DiamondShovel() {
- super("diamond_shovel", "Diamond shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.DIAMOND_SHOVEL, ToolVariant.DIAMOND, 0.5, 1561, false);
+ super("diamond_shovel", "Diamond shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.DIAMOND_SHOVEL,
+ ToolVariant.DIAMOND, 0.5, 1561, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java
index 02de620..9f12973 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/DiamondSword.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("diamond_sword")
public class DiamondSword extends Item {
public DiamondSword() {
- super("diamond_sword", "Diamond sword", ItemType.SWORD, SpriteLoader.SPRITES.DIAMOND_SWORD, ToolVariant.DIAMOND, 1562, false, 4);
+ super("diamond_sword", "Diamond sword", ItemType.SWORD, SpriteLoader.SPRITES.DIAMOND_SWORD, ToolVariant.DIAMOND,
+ 1562, false, 4);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldIngotItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldIngotItem.java
index 9c825a9..0ca7faa 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldIngotItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldIngotItem.java
@@ -10,4 +10,4 @@ public class GoldIngotItem extends Item {
public GoldIngotItem() {
super("gold_ingot", "Gold ingot", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.ITEM_GOLD_INGOT);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenAxe.java
index a6d1395..4c0bc37 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenAxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenAxe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("golden_axe")
public class GoldenAxe extends Item {
public GoldenAxe() {
- super("golden_axe", "Golden axe", ItemType.AXE, SpriteLoader.SPRITES.GOLDEN_AXE, ToolVariant.GOLDEN, 2.25, 32, false);
+ super("golden_axe", "Golden axe", ItemType.AXE, SpriteLoader.SPRITES.GOLDEN_AXE, ToolVariant.GOLDEN, 2.25, 32,
+ false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenHoe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenHoe.java
index 6867e13..820e86b 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenHoe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenHoe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("golden_hoe")
public class GoldenHoe extends Item {
public GoldenHoe() {
- super("golden_hoe", "Golden hoe", ItemType.HOE, SpriteLoader.SPRITES.GOLDEN_HOE, ToolVariant.GOLDEN, 0, 32, false);
+ super("golden_hoe", "Golden hoe", ItemType.HOE, SpriteLoader.SPRITES.GOLDEN_HOE, ToolVariant.GOLDEN, 0, 32,
+ false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenPickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenPickaxe.java
index adaa376..c8b696b 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenPickaxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenPickaxe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("golden_pickaxe")
public class GoldenPickaxe extends Item {
public GoldenPickaxe() {
- super("golden_pickaxe", "Golden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.GOLDEN_PICKAXE, ToolVariant.GOLDEN, 14.5, 32, false);
+ super("golden_pickaxe", "Golden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.GOLDEN_PICKAXE,
+ ToolVariant.GOLDEN, 14.5, 32, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenShovel.java
index 75e6cc9..ab07539 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenShovel.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenShovel.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("golden_shovel")
public class GoldenShovel extends Item {
public GoldenShovel() {
- super("golden_shovel", "Golden shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.GOLDEN_SHOVEL, ToolVariant.GOLDEN, 0.625, 32, false);
+ super("golden_shovel", "Golden shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.GOLDEN_SHOVEL, ToolVariant.GOLDEN,
+ 0.625, 32, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenSword.java
index 3aaff65..c728444 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenSword.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldenSword.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("golden_sword")
public class GoldenSword extends Item {
public GoldenSword() {
- super("golden_sword", "Golden sword", ItemType.SWORD, SpriteLoader.SPRITES.GOLDEN_SWORD, ToolVariant.GOLDEN, 32, false, 2);
+ super("golden_sword", "Golden sword", ItemType.SWORD, SpriteLoader.SPRITES.GOLDEN_SWORD, ToolVariant.GOLDEN, 32,
+ false, 2);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronAxe.java
index 26383b9..b603364 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronAxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronAxe.java
@@ -11,4 +11,4 @@ public class IronAxe extends Item {
public IronAxe() {
super("iron_axe", "Iron axe", ItemType.AXE, SpriteLoader.SPRITES.IRON_AXE, ToolVariant.IRON, 1.5, 250, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronHoe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronHoe.java
index 6ce0f1e..345d6bb 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronHoe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronHoe.java
@@ -11,4 +11,4 @@ public class IronHoe extends Item {
public IronHoe() {
super("iron_hoe", "Iron hoe", ItemType.HOE, SpriteLoader.SPRITES.IRON_HOE, ToolVariant.IRON, 0, 250, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronIngotItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronIngotItem.java
index 5d40a64..5014f91 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronIngotItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronIngotItem.java
@@ -10,4 +10,4 @@ public class IronIngotItem extends Item {
public IronIngotItem() {
super("iron_ingot", "Iron ingot", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.ITEM_IRON_INGOT);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronPickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronPickaxe.java
index 2b83057..6fb1ff4 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronPickaxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronPickaxe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("iron_pickaxe")
public class IronPickaxe extends Item {
public IronPickaxe() {
- super("iron_pickaxe", "Iron pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.IRON_PICKAXE, ToolVariant.IRON, 13.5, 250, false);
+ super("iron_pickaxe", "Iron pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.IRON_PICKAXE, ToolVariant.IRON,
+ 13.5, 250, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronShovel.java
index a33135e..606dd05 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronShovel.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronShovel.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("iron_shovel")
public class IronShovel extends Item {
public IronShovel() {
- super("iron_shovel", "Iron shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.IRON_SHOVEL, ToolVariant.IRON, 0.375, 250, false);
+ super("iron_shovel", "Iron shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.IRON_SHOVEL, ToolVariant.IRON, 0.375,
+ 250, false);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronSword.java
index adfb21d..19c6b12 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronSword.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronSword.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("iron_sword")
public class IronSword extends Item {
public IronSword() {
- super("iron_sword", "Iron sword", ItemType.SWORD, SpriteLoader.SPRITES.IRON_SWORD, ToolVariant.IRON, 250, false, 3);
+ super("iron_sword", "Iron sword", ItemType.SWORD, SpriteLoader.SPRITES.IRON_SWORD, ToolVariant.IRON, 250, false,
+ 3);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
index 4736ad3..01e49b8 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("stone_pickaxe")
public class StonePickaxeItem extends Item {
public StonePickaxeItem() {
- super("stone_pickaxe", "Stone pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.STONE_PICKAXE, ToolVariant.STONE, 12.5, 132, false);
+ super("stone_pickaxe", "Stone pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.STONE_PICKAXE, ToolVariant.STONE,
+ 12.5, 132, false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
index ebb3eff..2a786af 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("stone_shovel")
public class StoneShovelItem extends Item {
public StoneShovelItem() {
- super("stone_shovel", "Stone shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.STONE_SHOVEL, ToolVariant.STONE, 0.5, 132, false);
+ super("stone_shovel", "Stone shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.STONE_SHOVEL, ToolVariant.STONE,
+ 0.5, 132, false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneSword.java
index 5ad7aa3..b45d548 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneSword.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneSword.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("stone_sword")
public class StoneSword extends Item {
public StoneSword() {
- super("stone_sword", "Stone sword", ItemType.SWORD, SpriteLoader.SPRITES.STONE_SWORD, ToolVariant.STONE, 131, false, 3);
+ super("stone_sword", "Stone sword", ItemType.SWORD, SpriteLoader.SPRITES.STONE_SWORD, ToolVariant.STONE, 131,
+ false, 3);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
index 6027a51..c3be839 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("wooden_axe")
public class WoodenAxeItem extends Item {
public WoodenAxeItem() {
- super("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 0.5, 59, false);
+ super("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 0.5, 59,
+ false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenHoe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenHoe.java
index a5a8820..4d094a7 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenHoe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenHoe.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("wooden_hoe")
public class WoodenHoe extends Item {
public WoodenHoe() {
- super("wooden_hoe", "Wooden hoe", ItemType.HOE, SpriteLoader.SPRITES.WOODEN_HOE, ToolVariant.WOODEN, 0, 59, false);
+ super("wooden_hoe", "Wooden hoe", ItemType.HOE, SpriteLoader.SPRITES.WOODEN_HOE, ToolVariant.WOODEN, 0, 59,
+ false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
index 52afa21..5126395 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("wooden_pickaxe")
public class WoodenPickaxeItem extends Item {
public WoodenPickaxeItem() {
- super("wooden_pickaxe", "Wooden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.WOODEN_PICKAXE, ToolVariant.WOODEN, 12, 59, false);
+ super("wooden_pickaxe", "Wooden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.WOODEN_PICKAXE,
+ ToolVariant.WOODEN, 12, 59, false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
index 33e5ee1..6134c40 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("wooden_shovel")
public class WoodenShovelItem extends Item {
public WoodenShovelItem() {
- super("wooden_shovel", "Wooden shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.WOODEN_SHOVEL, ToolVariant.WOODEN, 0.3, 59, false);
+ super("wooden_shovel", "Wooden shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.WOODEN_SHOVEL, ToolVariant.WOODEN,
+ 0.3, 59, false);
}
}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenSword.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenSword.java
index 25b8c79..33593ee 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenSword.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenSword.java
@@ -9,6 +9,7 @@ import cz.jzitnik.game.entities.items.ToolVariant;
@ItemRegistry("wooden_sword")
public class WoodenSword extends Item {
public WoodenSword() {
- super("wooden_sword", "Wooden sword", ItemType.SWORD, SpriteLoader.SPRITES.WOODEN_SWORD, ToolVariant.WOODEN, 59, false, 2);
+ super("wooden_sword", "Wooden sword", ItemType.SWORD, SpriteLoader.SPRITES.WOODEN_SWORD, ToolVariant.WOODEN, 59,
+ false, 2);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/mobs/Pig.java b/src/main/java/cz/jzitnik/game/entities/items/registry/mobs/Pig.java
index b35c7e8..c257736 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/mobs/Pig.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/mobs/Pig.java
@@ -8,7 +8,7 @@ import cz.jzitnik.game.mobs.services.pig.PigData;
// Yes, pig is a block. Cry about it.
@EntityRegistry("pig")
public class Pig extends Block {
- public Pig () {
+ public Pig() {
super("pig", SpriteLoader.SPRITES.PIG);
setMob(true);
setGhost(true);
diff --git a/src/main/java/cz/jzitnik/game/generation/Generation.java b/src/main/java/cz/jzitnik/game/generation/Generation.java
index 5a70b6b..2df0ba4 100644
--- a/src/main/java/cz/jzitnik/game/generation/Generation.java
+++ b/src/main/java/cz/jzitnik/game/generation/Generation.java
@@ -95,7 +95,8 @@ public class Generation {
for (int i = 10; i < 502; i += random.nextInt(20) + 20) {
int treeBase = terrainHeight[i];
- if (treeBase - 3 < 0) continue;
+ if (treeBase - 3 < 0)
+ continue;
for (int j = 0; j < 3; j++) {
if (treeBase - j >= 0) {
@@ -112,7 +113,8 @@ public class Generation {
for (int dx = -size / 2; dx <= size / 2; dx++) {
for (int dy = -size / 2; dy <= size / 2; dy++) {
if (i + dx >= 0 && i + dx < world[0].length && offsetY >= 0) {
- world[offsetY][i + dx].add(new Block("oak_leaves", SpriteLoader.SPRITES.OAK_LEAF, 1, ItemType.SHEARS, new ArrayList<>()));
+ world[offsetY][i + dx].add(new Block("oak_leaves", SpriteLoader.SPRITES.OAK_LEAF, 1,
+ ItemType.SHEARS, new ArrayList<>()));
}
}
}
diff --git a/src/main/java/cz/jzitnik/game/handlers/pickup/PickupHandlerProvider.java b/src/main/java/cz/jzitnik/game/handlers/pickup/PickupHandlerProvider.java
index 77006b7..57bb4b1 100644
--- a/src/main/java/cz/jzitnik/game/handlers/pickup/PickupHandlerProvider.java
+++ b/src/main/java/cz/jzitnik/game/handlers/pickup/PickupHandlerProvider.java
@@ -24,7 +24,8 @@ public class PickupHandlerProvider {
for (Class> clazz : handlerClasses) {
if (CustomPickupHandler.class.isAssignableFrom(clazz)) {
try {
- CustomPickupHandler handlerInstance = (CustomPickupHandler) clazz.getDeclaredConstructor().newInstance();
+ CustomPickupHandler handlerInstance = (CustomPickupHandler) clazz.getDeclaredConstructor()
+ .newInstance();
PickupHandler annotation = clazz.getAnnotation(PickupHandler.class);
String key = annotation.value();
if (!key.contains(",")) {
diff --git a/src/main/java/cz/jzitnik/game/handlers/place/CustomPlaceHandler.java b/src/main/java/cz/jzitnik/game/handlers/place/CustomPlaceHandler.java
index f0c1645..5594b66 100644
--- a/src/main/java/cz/jzitnik/game/handlers/place/CustomPlaceHandler.java
+++ b/src/main/java/cz/jzitnik/game/handlers/place/CustomPlaceHandler.java
@@ -4,5 +4,6 @@ import cz.jzitnik.game.Game;
public interface CustomPlaceHandler {
boolean place(Game game, int x, int y);
+
void mine(Game game, int x, int y);
}
diff --git a/src/main/java/cz/jzitnik/game/handlers/place/PlaceHandler.java b/src/main/java/cz/jzitnik/game/handlers/place/PlaceHandler.java
index 88db7d9..ba3303d 100644
--- a/src/main/java/cz/jzitnik/game/handlers/place/PlaceHandler.java
+++ b/src/main/java/cz/jzitnik/game/handlers/place/PlaceHandler.java
@@ -27,13 +27,16 @@ public class PlaceHandler {
private void registerHandlers() {
Reflections reflections = new Reflections("cz.jzitnik.game.handlers.place.handlers");
- Set> handlerClasses = reflections.getTypesAnnotatedWith(cz.jzitnik.game.annotations.PlaceHandler.class);
+ Set> handlerClasses = reflections
+ .getTypesAnnotatedWith(cz.jzitnik.game.annotations.PlaceHandler.class);
for (Class> clazz : handlerClasses) {
if (CustomPlaceHandler.class.isAssignableFrom(clazz)) {
try {
- CustomPlaceHandler handlerInstance = (CustomPlaceHandler) clazz.getDeclaredConstructor().newInstance();
- cz.jzitnik.game.annotations.PlaceHandler annotation = clazz.getAnnotation(cz.jzitnik.game.annotations.PlaceHandler.class);
+ CustomPlaceHandler handlerInstance = (CustomPlaceHandler) clazz.getDeclaredConstructor()
+ .newInstance();
+ cz.jzitnik.game.annotations.PlaceHandler annotation = clazz
+ .getAnnotation(cz.jzitnik.game.annotations.PlaceHandler.class);
placeHandlerList.put(annotation.value(), handlerInstance);
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/cz/jzitnik/game/handlers/place/handlers/BedPlaceHandler.java b/src/main/java/cz/jzitnik/game/handlers/place/handlers/BedPlaceHandler.java
index 17f1c45..0a6f031 100644
--- a/src/main/java/cz/jzitnik/game/handlers/place/handlers/BedPlaceHandler.java
+++ b/src/main/java/cz/jzitnik/game/handlers/place/handlers/BedPlaceHandler.java
@@ -12,8 +12,8 @@ public class BedPlaceHandler implements CustomPlaceHandler {
@Override
public boolean place(Game game, int x, int y) {
var blocks = game.getWorld()[y][x];
- var blocksLeft = game.getWorld()[y][x-1];
- var blocksRight = game.getWorld()[y][x+1];
+ var blocksLeft = game.getWorld()[y][x - 1];
+ var blocksRight = game.getWorld()[y][x + 1];
var inventory = game.getInventory();
if (!blocksLeft.stream().allMatch(block -> block.getBlockId().equals("air"))) {
@@ -52,12 +52,12 @@ public class BedPlaceHandler implements CustomPlaceHandler {
Block block = blocks.stream().filter(b -> b.getBlockId().equals("bed")).toList().getFirst();
if (block.getSpriteState().get() == Bed.BedState.LEFT) {
- var blocks2 = game.getWorld()[y][x+1];
+ var blocks2 = game.getWorld()[y][x + 1];
blocks2.removeAll(blocks2.stream().filter(i -> !i.getBlockId().equals("air")).toList());
}
if (block.getSpriteState().get() == Bed.BedState.RIGHT) {
- var blocks2 = game.getWorld()[y][x-1];
+ var blocks2 = game.getWorld()[y][x - 1];
blocks2.removeAll(blocks2.stream().filter(i -> !i.getBlockId().equals("air")).toList());
}
diff --git a/src/main/java/cz/jzitnik/game/handlers/place/handlers/BucketPlaceHandler.java b/src/main/java/cz/jzitnik/game/handlers/place/handlers/BucketPlaceHandler.java
index e9fd764..2283ffa 100644
--- a/src/main/java/cz/jzitnik/game/handlers/place/handlers/BucketPlaceHandler.java
+++ b/src/main/java/cz/jzitnik/game/handlers/place/handlers/BucketPlaceHandler.java
@@ -25,7 +25,7 @@ public class BucketPlaceHandler implements CustomPlaceHandler {
var flowingBlock = flowingBlocks.getFirst();
var items = flowingBlock.getDrops();
- for (Item item: items) {
+ for (Item item : items) {
game.getInventory().addItem(item);
}
blocks.remove(flowingBlock);
diff --git a/src/main/java/cz/jzitnik/game/handlers/place/handlers/DoorPlaceHandler.java b/src/main/java/cz/jzitnik/game/handlers/place/handlers/DoorPlaceHandler.java
index 4acf776..d3ddf4d 100644
--- a/src/main/java/cz/jzitnik/game/handlers/place/handlers/DoorPlaceHandler.java
+++ b/src/main/java/cz/jzitnik/game/handlers/place/handlers/DoorPlaceHandler.java
@@ -12,7 +12,7 @@ public class DoorPlaceHandler implements CustomPlaceHandler {
@Override
public boolean place(Game game, int x, int y) {
var blocks = game.getWorld()[y][x];
- var blocksTop = game.getWorld()[y-1][x];
+ var blocksTop = game.getWorld()[y - 1][x];
if (!blocksTop.stream().allMatch(block -> block.getBlockId().equals("air"))) {
return false;
@@ -40,13 +40,15 @@ public class DoorPlaceHandler implements CustomPlaceHandler {
var blocks = game.getWorld()[y][x];
Block block = blocks.stream().filter(b -> b.getBlockId().equals("oak_door")).toList().getFirst();
- if (block.getSpriteState().get() == OakDoor.OakDoorState.BOTTOM || block.getSpriteState().get() == OakDoor.OakDoorState.BOTTOMCLOSED) {
- var blocks2 = game.getWorld()[y-1][x];
+ if (block.getSpriteState().get() == OakDoor.OakDoorState.BOTTOM
+ || block.getSpriteState().get() == OakDoor.OakDoorState.BOTTOMCLOSED) {
+ var blocks2 = game.getWorld()[y - 1][x];
blocks2.removeAll(blocks2.stream().filter(i -> !i.getBlockId().equals("air")).toList());
}
- if (block.getSpriteState().get() == OakDoor.OakDoorState.TOP || block.getSpriteState().get() == OakDoor.OakDoorState.TOPCLOSED) {
- var blocks2 = game.getWorld()[y+1][x];
+ if (block.getSpriteState().get() == OakDoor.OakDoorState.TOP
+ || block.getSpriteState().get() == OakDoor.OakDoorState.TOPCLOSED) {
+ var blocks2 = game.getWorld()[y + 1][x];
blocks2.removeAll(blocks2.stream().filter(i -> !i.getBlockId().equals("air")).toList());
}
diff --git a/src/main/java/cz/jzitnik/game/handlers/rightclick/RightClickHandlerProvider.java b/src/main/java/cz/jzitnik/game/handlers/rightclick/RightClickHandlerProvider.java
index 2fe0f55..b40cfc9 100644
--- a/src/main/java/cz/jzitnik/game/handlers/rightclick/RightClickHandlerProvider.java
+++ b/src/main/java/cz/jzitnik/game/handlers/rightclick/RightClickHandlerProvider.java
@@ -21,7 +21,8 @@ public class RightClickHandlerProvider {
continue;
}
- if (block.getData() != null && block.getData().getClass().isAnnotationPresent(RightClickLogic.class) && block.getData() instanceof RightClickHandler handlerClass) {
+ if (block.getData() != null && block.getData().getClass().isAnnotationPresent(RightClickLogic.class)
+ && block.getData() instanceof RightClickHandler handlerClass) {
handlerClass.onBlockRightClick(x, y, game, screenRenderer);
}
}
diff --git a/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaData.java b/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaData.java
index 615529e..67b97d9 100644
--- a/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaData.java
+++ b/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaData.java
@@ -2,4 +2,5 @@ package cz.jzitnik.game.logic.services.flowing.lava;
import cz.jzitnik.game.logic.services.flowing.FlowingData;
-public class LavaData extends FlowingData {}
+public class LavaData extends FlowingData {
+}
diff --git a/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaLogic.java b/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaLogic.java
index dba4de2..4276e63 100644
--- a/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaLogic.java
+++ b/src/main/java/cz/jzitnik/game/logic/services/flowing/lava/LavaLogic.java
@@ -45,16 +45,18 @@ public class LavaLogic implements CustomLogicInterface {
for (int x = startX; x <= endX; x++) {
var blocks = world[y][x];
- var waterSourceBlocks = blocks.stream().filter(block -> block.getBlockId().equals("lava") && ((LavaData) block.getData()).isSource()).toList();
+ var waterSourceBlocks = blocks.stream()
+ .filter(block -> block.getBlockId().equals("lava") && ((LavaData) block.getData()).isSource())
+ .toList();
if (!waterSourceBlocks.isEmpty()) {
sourceBlocks.add(new WaterBlock(waterSourceBlocks.getFirst(), x, y));
}
- world[y][x].removeAll(blocks.stream().filter(i -> i.getBlockId().equals("lava") && !((LavaData) i.getData()).isSource()).toList());
+ world[y][x].removeAll(blocks.stream()
+ .filter(i -> i.getBlockId().equals("lava") && !((LavaData) i.getData()).isSource()).toList());
}
}
-
for (WaterBlock sourceBlock : sourceBlocks) {
int x = sourceBlock.getX();
int y = sourceBlock.getY();
@@ -66,11 +68,11 @@ public class LavaLogic implements CustomLogicInterface {
}
public void flow(List[][] world, int x, int y, int strength, Set visited) {
- if (y + 1 < world.length && waterCanFlow(world[y+1][x])) {
+ if (y + 1 < world.length && waterCanFlow(world[y + 1][x])) {
Block newWater = ItemBlockSupplier.getBlock("lava");
newWater.setSpriteState(Lava.LavaState.get(5));
((LavaData) newWater.getData()).setSource(false);
- world[y+1][x].add(newWater);
+ world[y + 1][x].add(newWater);
flow(world, x, y + 1, 5, visited);
return;
}
@@ -80,19 +82,19 @@ public class LavaLogic implements CustomLogicInterface {
}
visited.add(new Point(x, y));
- if (x - 1 >= 0 && waterCanFlow(world[y][x-1])) {
+ if (x - 1 >= 0 && waterCanFlow(world[y][x - 1])) {
Block newWater = ItemBlockSupplier.getBlock("lava");
newWater.setSpriteState(Lava.LavaState.get(strength - 1));
((LavaData) newWater.getData()).setSource(false);
- world[y][x-1].add(newWater);
+ world[y][x - 1].add(newWater);
flow(world, x - 1, y, strength - 1, visited);
}
- if (x + 1 < world[y].length && waterCanFlow(world[y][x+1])) {
+ if (x + 1 < world[y].length && waterCanFlow(world[y][x + 1])) {
Block newWater = ItemBlockSupplier.getBlock("lava");
newWater.setSpriteState(Lava.LavaState.get(strength - 1));
((LavaData) newWater.getData()).setSource(false);
- world[y][x+1].add(newWater);
+ world[y][x + 1].add(newWater);
flow(world, x + 1, y, strength - 1, visited);
}
}
@@ -116,8 +118,8 @@ public class LavaLogic implements CustomLogicInterface {
}
}
-
private boolean waterCanFlow(List blocks) {
- return blocks.stream().allMatch(block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob());
+ return blocks.stream().allMatch(
+ block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob());
}
}
diff --git a/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterData.java b/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterData.java
index 4cc782f..5ae35f4 100644
--- a/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterData.java
+++ b/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterData.java
@@ -2,4 +2,5 @@ package cz.jzitnik.game.logic.services.flowing.water;
import cz.jzitnik.game.logic.services.flowing.FlowingData;
-public class WaterData extends FlowingData {}
+public class WaterData extends FlowingData {
+}
diff --git a/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterLogic.java b/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterLogic.java
index 89510a0..eae0d11 100644
--- a/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterLogic.java
+++ b/src/main/java/cz/jzitnik/game/logic/services/flowing/water/WaterLogic.java
@@ -45,16 +45,18 @@ public class WaterLogic implements CustomLogicInterface {
for (int x = startX; x <= endX; x++) {
var blocks = world[y][x];
- var waterSourceBlocks = blocks.stream().filter(block -> block.getBlockId().equals("water") && ((WaterData) block.getData()).isSource()).toList();
+ var waterSourceBlocks = blocks.stream()
+ .filter(block -> block.getBlockId().equals("water") && ((WaterData) block.getData()).isSource())
+ .toList();
if (!waterSourceBlocks.isEmpty()) {
sourceBlocks.add(new WaterBlock(waterSourceBlocks.getFirst(), x, y));
}
- world[y][x].removeAll(blocks.stream().filter(i -> i.getBlockId().equals("water") && !((WaterData) i.getData()).isSource()).toList());
+ world[y][x].removeAll(blocks.stream()
+ .filter(i -> i.getBlockId().equals("water") && !((WaterData) i.getData()).isSource()).toList());
}
}
-
for (WaterBlock sourceBlock : sourceBlocks) {
int x = sourceBlock.getX();
int y = sourceBlock.getY();
@@ -64,11 +66,11 @@ public class WaterLogic implements CustomLogicInterface {
}
public void flow(List[][] world, int x, int y, int strength, Set visited) {
- if (y + 1 < world.length && waterCanFlow(world[y+1][x])) {
+ if (y + 1 < world.length && waterCanFlow(world[y + 1][x])) {
Block newWater = ItemBlockSupplier.getBlock("water");
newWater.setSpriteState(Water.WaterState.get(5));
((WaterData) newWater.getData()).setSource(false);
- world[y+1][x].add(newWater);
+ world[y + 1][x].add(newWater);
flow(world, x, y + 1, 5, visited);
return;
}
@@ -78,25 +80,25 @@ public class WaterLogic implements CustomLogicInterface {
}
visited.add(new Point(x, y));
- if (x - 1 >= 0 && waterCanFlow(world[y][x-1])) {
+ if (x - 1 >= 0 && waterCanFlow(world[y][x - 1])) {
Block newWater = ItemBlockSupplier.getBlock("water");
newWater.setSpriteState(Water.WaterState.get(strength - 1));
((WaterData) newWater.getData()).setSource(false);
- world[y][x-1].add(newWater);
+ world[y][x - 1].add(newWater);
flow(world, x - 1, y, strength - 1, visited);
}
- if (x + 1 < world[y].length && waterCanFlow(world[y][x+1])) {
+ if (x + 1 < world[y].length && waterCanFlow(world[y][x + 1])) {
Block newWater = ItemBlockSupplier.getBlock("water");
newWater.setSpriteState(Water.WaterState.get(strength - 1));
((WaterData) newWater.getData()).setSource(false);
- world[y][x+1].add(newWater);
+ world[y][x + 1].add(newWater);
flow(world, x + 1, y, strength - 1, visited);
}
}
-
private boolean waterCanFlow(List blocks) {
- return blocks.stream().allMatch(block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob());
+ return blocks.stream().allMatch(
+ block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob());
}
}
diff --git a/src/main/java/cz/jzitnik/game/mobs/EntityHurtAnimation.java b/src/main/java/cz/jzitnik/game/mobs/EntityHurtAnimation.java
index 1fdb716..1ef9c81 100644
--- a/src/main/java/cz/jzitnik/game/mobs/EntityHurtAnimation.java
+++ b/src/main/java/cz/jzitnik/game/mobs/EntityHurtAnimation.java
@@ -24,7 +24,8 @@ public class EntityHurtAnimation {
for (Class> clazz : handlerClasses) {
if (EntityHurtAnimationChanger.class.isAssignableFrom(clazz)) {
try {
- EntityHurtAnimationChanger handlerInstance = (EntityHurtAnimationChanger) clazz.getDeclaredConstructor().newInstance();
+ EntityHurtAnimationChanger handlerInstance = (EntityHurtAnimationChanger) clazz
+ .getDeclaredConstructor().newInstance();
EntityHurtAnimationHandler annotation = clazz.getAnnotation(EntityHurtAnimationHandler.class);
handlerList.put(annotation.value(), handlerInstance);
} catch (Exception e) {
diff --git a/src/main/java/cz/jzitnik/game/mobs/EntityKill.java b/src/main/java/cz/jzitnik/game/mobs/EntityKill.java
index 7a664dc..ee22081 100644
--- a/src/main/java/cz/jzitnik/game/mobs/EntityKill.java
+++ b/src/main/java/cz/jzitnik/game/mobs/EntityKill.java
@@ -24,7 +24,8 @@ public class EntityKill {
for (Class> clazz : handlerClasses) {
if (EntityKillInterface.class.isAssignableFrom(clazz)) {
try {
- EntityKillInterface handlerInstance = (EntityKillInterface) clazz.getDeclaredConstructor().newInstance();
+ EntityKillInterface handlerInstance = (EntityKillInterface) clazz.getDeclaredConstructor()
+ .newInstance();
EntityKillHandler annotation = clazz.getAnnotation(EntityKillHandler.class);
handlerList.put(annotation.value(), handlerInstance);
} catch (Exception e) {
diff --git a/src/main/java/cz/jzitnik/game/mobs/EntityLogicProvider.java b/src/main/java/cz/jzitnik/game/mobs/EntityLogicProvider.java
index bde9842..11a8746 100644
--- a/src/main/java/cz/jzitnik/game/mobs/EntityLogicProvider.java
+++ b/src/main/java/cz/jzitnik/game/mobs/EntityLogicProvider.java
@@ -41,7 +41,8 @@ public class EntityLogicProvider {
for (int x = startX; x <= endX; x++) {
int finalX = x;
int finalY = y;
- List blockMobs = game.getWorld()[y][x].stream().filter(Block::isMob).map(mob -> new EntityLogicMobDTO(game, mob, finalX, finalY)).toList();
+ List blockMobs = game.getWorld()[y][x].stream().filter(Block::isMob)
+ .map(mob -> new EntityLogicMobDTO(game, mob, finalX, finalY)).toList();
mobs.addAll(blockMobs);
}
}
diff --git a/src/main/java/cz/jzitnik/game/mobs/EntitySpawnProvider.java b/src/main/java/cz/jzitnik/game/mobs/EntitySpawnProvider.java
index 9474792..481f278 100644
--- a/src/main/java/cz/jzitnik/game/mobs/EntitySpawnProvider.java
+++ b/src/main/java/cz/jzitnik/game/mobs/EntitySpawnProvider.java
@@ -20,7 +20,7 @@ public class EntitySpawnProvider {
int playerX = playerLocation[0];
int playerY = playerLocation[1];
- for (EntitySpawnInterface entitySpawnInterface: spawnList) {
+ for (EntitySpawnInterface entitySpawnInterface : spawnList) {
entitySpawnInterface.spawn(playerX, playerY, game, terminal);
}
diff --git a/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java b/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
index 7cd87f1..3ceae12 100644
--- a/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
+++ b/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
@@ -21,7 +21,8 @@ import static cz.jzitnik.game.sprites.Cow.CowState.*;
@EntityLogic("cow")
@EntityHurtAnimationHandler("cow")
@EntityKillHandler("cow")
-public class CowLogic implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
+public class CowLogic
+ implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
private final Random random = new Random();
@Override
@@ -105,7 +106,8 @@ public class CowLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
@Override
public void spawn(int playerX, int playerY, Game game, Terminal terminal) {
// Cordinates where player can see
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
var world = game.getWorld();
int startX = data[0];
int endX = data[1];
@@ -183,15 +185,15 @@ public class CowLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
public Cow.CowState setHurtAnimation(boolean hurt, Enum current) {
if (hurt) {
return switch (current) {
- case LEFT_HURT,LEFT -> LEFT_HURT;
- case RIGHT_HURT,RIGHT -> RIGHT_HURT;
+ case LEFT_HURT, LEFT -> LEFT_HURT;
+ case RIGHT_HURT, RIGHT -> RIGHT_HURT;
default -> throw new IllegalStateException("Unexpected value: " + current);
};
}
return switch (current) {
- case LEFT_HURT,LEFT -> LEFT;
- case RIGHT_HURT,RIGHT -> RIGHT;
+ case LEFT_HURT, LEFT -> LEFT;
+ case RIGHT_HURT, RIGHT -> RIGHT;
default -> throw new IllegalStateException("Unexpected value: " + current);
};
}
diff --git a/src/main/java/cz/jzitnik/game/mobs/services/pig/PigLogic.java b/src/main/java/cz/jzitnik/game/mobs/services/pig/PigLogic.java
index 61d785c..f282d2c 100644
--- a/src/main/java/cz/jzitnik/game/mobs/services/pig/PigLogic.java
+++ b/src/main/java/cz/jzitnik/game/mobs/services/pig/PigLogic.java
@@ -21,7 +21,8 @@ import static cz.jzitnik.game.sprites.Pig.PigState.*;
@EntityLogic("pig")
@EntityHurtAnimationHandler("pig")
@EntityKillHandler("pig")
-public class PigLogic implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
+public class PigLogic
+ implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
private final Random random = new Random();
@Override
@@ -105,7 +106,8 @@ public class PigLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
@Override
public void spawn(int playerX, int playerY, Game game, Terminal terminal) {
// Cordinates where player can see
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
var world = game.getWorld();
int startX = data[0];
int endX = data[1];
@@ -183,15 +185,15 @@ public class PigLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
public Pig.PigState setHurtAnimation(boolean hurt, Enum current) {
if (hurt) {
return switch (current) {
- case LEFT_HURT,LEFT -> LEFT_HURT;
- case RIGHT_HURT,RIGHT -> RIGHT_HURT;
+ case LEFT_HURT, LEFT -> LEFT_HURT;
+ case RIGHT_HURT, RIGHT -> RIGHT_HURT;
default -> throw new IllegalStateException("Unexpected value: " + current);
};
}
return switch (current) {
- case LEFT_HURT,LEFT -> LEFT;
- case RIGHT_HURT,RIGHT -> RIGHT;
+ case LEFT_HURT, LEFT -> LEFT;
+ case RIGHT_HURT, RIGHT -> RIGHT;
default -> throw new IllegalStateException("Unexpected value: " + current);
};
}
@@ -199,7 +201,7 @@ public class PigLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
@Override
public void killed(Game game, Block mob) {
int amount = random.nextInt(2) + 1;
- InventoryItem inventoryItem = new InventoryItem(amount, ItemBlockSupplier.getItem("mutton"));
+ InventoryItem inventoryItem = new InventoryItem(amount, ItemBlockSupplier.getItem("porkchop"));
game.getInventory().addItem(inventoryItem);
}
}
diff --git a/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepLogic.java b/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepLogic.java
index ae13728..2e95ba3 100644
--- a/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepLogic.java
+++ b/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepLogic.java
@@ -21,7 +21,8 @@ import static cz.jzitnik.game.sprites.Sheep.SheepState.*;
@EntityLogic("sheep")
@EntityHurtAnimationHandler("sheep")
@EntityKillHandler("sheep")
-public class SheepLogic implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
+public class SheepLogic
+ implements EntityLogicInterface, EntitySpawnInterface, EntityHurtAnimationChanger, EntityKillInterface {
private final Random random = new Random();
@Override
@@ -51,7 +52,6 @@ public class SheepLogic implements EntityLogicInterface, EntitySpawnInterface, E
Sheep.SheepState newState = getSheepState(sheep, sheepData, direction);
sheep.setSpriteState(newState);
-
List blocksAhead = world[sheepY][sheepX + direction];
if (!game.isSolid(blocksAhead)) {
world[sheepY][sheepX].remove(sheep);
@@ -95,29 +95,23 @@ public class SheepLogic implements EntityLogicInterface, EntitySpawnInterface, E
private static Sheep.SheepState getSheepState(Block sheep, SheepData sheepData, int direction) {
boolean isHurt = sheep.getSpriteState().get().name().endsWith("_HURT");
Sheep.SheepState newState = switch (sheepData.getVariant()) {
- case WHITE ->
- isHurt ? (direction == 1 ? WHITE_RIGHT_HURT : WHITE_LEFT_HURT)
- : (direction == 1 ? WHITE_RIGHT : WHITE_LEFT);
+ case WHITE -> isHurt ? (direction == 1 ? WHITE_RIGHT_HURT : WHITE_LEFT_HURT)
+ : (direction == 1 ? WHITE_RIGHT : WHITE_LEFT);
- case LIGHT_GRAY ->
- isHurt ? (direction == 1 ? LIGHT_GRAY_RIGHT_HURT : LIGHT_GRAY_LEFT_HURT)
- : (direction == 1 ? LIGHT_GRAY_RIGHT : LIGHT_GRAY_LEFT);
+ case LIGHT_GRAY -> isHurt ? (direction == 1 ? LIGHT_GRAY_RIGHT_HURT : LIGHT_GRAY_LEFT_HURT)
+ : (direction == 1 ? LIGHT_GRAY_RIGHT : LIGHT_GRAY_LEFT);
- case GRAY ->
- isHurt ? (direction == 1 ? GRAY_RIGHT_HURT : GRAY_LEFT_HURT)
- : (direction == 1 ? GRAY_RIGHT : GRAY_LEFT);
+ case GRAY -> isHurt ? (direction == 1 ? GRAY_RIGHT_HURT : GRAY_LEFT_HURT)
+ : (direction == 1 ? GRAY_RIGHT : GRAY_LEFT);
- case BLACK ->
- isHurt ? (direction == 1 ? BLACK_RIGHT_HURT : BLACK_LEFT_HURT)
- : (direction == 1 ? BLACK_RIGHT : BLACK_LEFT);
+ case BLACK -> isHurt ? (direction == 1 ? BLACK_RIGHT_HURT : BLACK_LEFT_HURT)
+ : (direction == 1 ? BLACK_RIGHT : BLACK_LEFT);
- case BROWN ->
- isHurt ? (direction == 1 ? BROWN_RIGHT_HURT : BROWN_LEFT_HURT)
- : (direction == 1 ? BROWN_RIGHT : BROWN_LEFT);
+ case BROWN -> isHurt ? (direction == 1 ? BROWN_RIGHT_HURT : BROWN_LEFT_HURT)
+ : (direction == 1 ? BROWN_RIGHT : BROWN_LEFT);
- case PINK ->
- isHurt ? (direction == 1 ? PINK_RIGHT_HURT : PINK_LEFT_HURT)
- : (direction == 1 ? PINK_RIGHT : PINK_LEFT);
+ case PINK -> isHurt ? (direction == 1 ? PINK_RIGHT_HURT : PINK_LEFT_HURT)
+ : (direction == 1 ? PINK_RIGHT : PINK_LEFT);
};
return newState;
}
@@ -125,7 +119,8 @@ public class SheepLogic implements EntityLogicInterface, EntitySpawnInterface, E
@Override
public void spawn(int playerX, int playerY, Game game, Terminal terminal) {
// Cordinates where player can see
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
var world = game.getWorld();
int startX = data[0];
int endX = data[1];
@@ -246,7 +241,6 @@ public class SheepLogic implements EntityLogicInterface, EntitySpawnInterface, E
}
}
-
@Override
public void killed(Game game, Block mob) {
int amount = random.nextInt(3) + 1;
diff --git a/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepVariant.java b/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepVariant.java
index eefeed0..65dce0c 100644
--- a/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepVariant.java
+++ b/src/main/java/cz/jzitnik/game/mobs/services/sheep/SheepVariant.java
@@ -1,10 +1,5 @@
package cz.jzitnik.game.mobs.services.sheep;
public enum SheepVariant {
- WHITE,
- LIGHT_GRAY,
- GRAY,
- BLACK,
- BROWN,
- PINK
+ WHITE, LIGHT_GRAY, GRAY, BLACK, BROWN, PINK
}
diff --git a/src/main/java/cz/jzitnik/game/smelting/Smelting.java b/src/main/java/cz/jzitnik/game/smelting/Smelting.java
index 2d9441e..ca78171 100644
--- a/src/main/java/cz/jzitnik/game/smelting/Smelting.java
+++ b/src/main/java/cz/jzitnik/game/smelting/Smelting.java
@@ -6,7 +6,6 @@ import cz.jzitnik.game.entities.items.ItemBlockSupplier;
import java.util.HashMap;
import java.util.function.Supplier;
-
public class Smelting {
public static final HashMap> smeltingList = new HashMap<>();
static {
diff --git a/src/main/java/cz/jzitnik/game/sprites/Bed.java b/src/main/java/cz/jzitnik/game/sprites/Bed.java
index 472207b..189fa4c 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Bed.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Bed.java
@@ -7,8 +7,7 @@ import java.util.Optional;
public class Bed extends Sprite {
public enum BedState {
- LEFT,
- RIGHT,
+ LEFT, RIGHT,
}
public String getSprite() {
@@ -16,13 +15,11 @@ public class Bed extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case BedState.LEFT -> "bed/left.ans";
- case BedState.RIGHT -> "bed/right.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case BedState.LEFT -> "bed/left.ans";
+ case BedState.RIGHT -> "bed/right.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Breaking.java b/src/main/java/cz/jzitnik/game/sprites/Breaking.java
index 9fc99ad..63b23e1 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Breaking.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Breaking.java
@@ -8,9 +8,7 @@ import java.util.Optional;
public class Breaking extends Sprite {
public enum BreakingState {
- FIRST,
- SECOND,
- THIRD
+ FIRST, SECOND, THIRD
}
private String fix(String x) {
diff --git a/src/main/java/cz/jzitnik/game/sprites/Cow.java b/src/main/java/cz/jzitnik/game/sprites/Cow.java
index f44b7aa..67148d3 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Cow.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Cow.java
@@ -6,11 +6,8 @@ import cz.jzitnik.tui.Sprite;
import java.util.Optional;
public class Cow extends Sprite {
- public enum CowState{
- LEFT,
- RIGHT,
- LEFT_HURT,
- RIGHT_HURT
+ public enum CowState {
+ LEFT, RIGHT, LEFT_HURT, RIGHT_HURT
}
public String getSprite() {
@@ -18,15 +15,13 @@ public class Cow extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case CowState.LEFT -> "mobs/cow/left.ans";
- case CowState.RIGHT -> "mobs/cow/right.ans";
- case CowState.LEFT_HURT -> "mobs/cow/lefthurt.ans";
- case CowState.RIGHT_HURT -> "mobs/cow/righthurt.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case CowState.LEFT -> "mobs/cow/left.ans";
+ case CowState.RIGHT -> "mobs/cow/right.ans";
+ case CowState.LEFT_HURT -> "mobs/cow/lefthurt.ans";
+ case CowState.RIGHT_HURT -> "mobs/cow/righthurt.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Furnace.java b/src/main/java/cz/jzitnik/game/sprites/Furnace.java
index 11ddc87..79b459b 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Furnace.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Furnace.java
@@ -7,8 +7,7 @@ import java.util.Optional;
public class Furnace extends Sprite {
public enum FurnaceState {
- OFF,
- ON,
+ OFF, ON,
}
public String getSprite() {
@@ -16,13 +15,11 @@ public class Furnace extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case FurnaceState.OFF -> "furnace.ans";
- case FurnaceState.ON -> "furnace2.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case FurnaceState.OFF -> "furnace.ans";
+ case FurnaceState.ON -> "furnace2.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Heart.java b/src/main/java/cz/jzitnik/game/sprites/Heart.java
index d164b8e..f85319e 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Heart.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Heart.java
@@ -7,8 +7,7 @@ import java.util.Optional;
public class Heart extends Sprite {
public enum HeartState {
- OFF,
- ON,
+ OFF, ON,
}
public String getSprite() {
@@ -16,13 +15,11 @@ public class Heart extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case HeartState.OFF -> "gui/heartempty.ans";
- case HeartState.ON -> "gui/heartfull.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case HeartState.OFF -> "gui/heartempty.ans";
+ case HeartState.ON -> "gui/heartfull.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Hunger.java b/src/main/java/cz/jzitnik/game/sprites/Hunger.java
index 3eed0e8..b9f6e7e 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Hunger.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Hunger.java
@@ -7,8 +7,7 @@ import java.util.Optional;
public class Hunger extends Sprite {
public enum HungerState {
- OFF,
- ON,
+ OFF, ON,
}
public String getSprite() {
@@ -16,13 +15,11 @@ public class Hunger extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case HungerState.OFF -> "gui/hungerempty.ans";
- case HungerState.ON -> "gui/hungerfull.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case HungerState.OFF -> "gui/hungerempty.ans";
+ case HungerState.ON -> "gui/hungerfull.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Lava.java b/src/main/java/cz/jzitnik/game/sprites/Lava.java
index da2ed61..614a7a0 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Lava.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Lava.java
@@ -7,11 +7,7 @@ import java.util.Optional;
public class Lava extends Sprite {
public enum LavaState {
- FIRST,
- SECOND,
- THIRD,
- FOURTH,
- FIFTH;
+ FIRST, SECOND, THIRD, FOURTH, FIFTH;
public static LavaState get(int x) {
return switch (x) {
diff --git a/src/main/java/cz/jzitnik/game/sprites/OakDoor.java b/src/main/java/cz/jzitnik/game/sprites/OakDoor.java
index 29c7488..7e36415 100644
--- a/src/main/java/cz/jzitnik/game/sprites/OakDoor.java
+++ b/src/main/java/cz/jzitnik/game/sprites/OakDoor.java
@@ -7,10 +7,7 @@ import java.util.Optional;
public class OakDoor extends Sprite {
public enum OakDoorState {
- TOP,
- BOTTOM,
- TOPCLOSED,
- BOTTOMCLOSED
+ TOP, BOTTOM, TOPCLOSED, BOTTOMCLOSED
}
public String getSprite() {
@@ -18,15 +15,13 @@ public class OakDoor extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case OakDoorState.TOP -> "oak_door/top.ans";
- case OakDoorState.BOTTOM -> "oak_door/bottom.ans";
- case OakDoorState.TOPCLOSED -> "oak_door/topclosed.ans";
- case OakDoorState.BOTTOMCLOSED -> "oak_door/bottomclosed.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case OakDoorState.TOP -> "oak_door/top.ans";
+ case OakDoorState.BOTTOM -> "oak_door/bottom.ans";
+ case OakDoorState.TOPCLOSED -> "oak_door/topclosed.ans";
+ case OakDoorState.BOTTOMCLOSED -> "oak_door/bottomclosed.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Pig.java b/src/main/java/cz/jzitnik/game/sprites/Pig.java
index cf719b5..fbf75cb 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Pig.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Pig.java
@@ -6,11 +6,8 @@ import cz.jzitnik.tui.Sprite;
import java.util.Optional;
public class Pig extends Sprite {
- public enum PigState{
- LEFT,
- RIGHT,
- LEFT_HURT,
- RIGHT_HURT
+ public enum PigState {
+ LEFT, RIGHT, LEFT_HURT, RIGHT_HURT
}
public String getSprite() {
@@ -18,15 +15,13 @@ public class Pig extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case PigState.LEFT -> "mobs/pig/left.ans";
- case PigState.RIGHT -> "mobs/pig/right.ans";
- case PigState.LEFT_HURT -> "mobs/pig/lefthurt.ans";
- case PigState.RIGHT_HURT -> "mobs/pig/righthurt.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case PigState.LEFT -> "mobs/pig/left.ans";
+ case PigState.RIGHT -> "mobs/pig/right.ans";
+ case PigState.LEFT_HURT -> "mobs/pig/lefthurt.ans";
+ case PigState.RIGHT_HURT -> "mobs/pig/righthurt.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Sheep.java b/src/main/java/cz/jzitnik/game/sprites/Sheep.java
index 0a07377..4ee44f2 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Sheep.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Sheep.java
@@ -7,35 +7,17 @@ import java.util.Optional;
public class Sheep extends Sprite {
public enum SheepState {
- WHITE_LEFT,
- WHITE_RIGHT,
- WHITE_LEFT_HURT,
- WHITE_RIGHT_HURT,
+ WHITE_LEFT, WHITE_RIGHT, WHITE_LEFT_HURT, WHITE_RIGHT_HURT,
- LIGHT_GRAY_LEFT,
- LIGHT_GRAY_RIGHT,
- LIGHT_GRAY_LEFT_HURT,
- LIGHT_GRAY_RIGHT_HURT,
+ LIGHT_GRAY_LEFT, LIGHT_GRAY_RIGHT, LIGHT_GRAY_LEFT_HURT, LIGHT_GRAY_RIGHT_HURT,
- GRAY_LEFT,
- GRAY_RIGHT,
- GRAY_LEFT_HURT,
- GRAY_RIGHT_HURT,
+ GRAY_LEFT, GRAY_RIGHT, GRAY_LEFT_HURT, GRAY_RIGHT_HURT,
- BLACK_LEFT,
- BLACK_RIGHT,
- BLACK_LEFT_HURT,
- BLACK_RIGHT_HURT,
+ BLACK_LEFT, BLACK_RIGHT, BLACK_LEFT_HURT, BLACK_RIGHT_HURT,
- BROWN_LEFT,
- BROWN_RIGHT,
- BROWN_LEFT_HURT,
- BROWN_RIGHT_HURT,
+ BROWN_LEFT, BROWN_RIGHT, BROWN_LEFT_HURT, BROWN_RIGHT_HURT,
- PINK_LEFT,
- PINK_RIGHT,
- PINK_LEFT_HURT,
- PINK_RIGHT_HURT,
+ PINK_LEFT, PINK_RIGHT, PINK_LEFT_HURT, PINK_RIGHT_HURT,
}
public String getSprite() {
@@ -43,45 +25,43 @@ public class Sheep extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case SheepState.WHITE_LEFT -> "mobs/sheep/white/left.ans";
- case SheepState.WHITE_RIGHT -> "mobs/sheep/white/right.ans";
- case SheepState.WHITE_LEFT_HURT -> "mobs/sheep/white/lefthurt.ans";
- case SheepState.WHITE_RIGHT_HURT -> "mobs/sheep/white/righthurt.ans";
+ return ResourceLoader.loadResource(switch (e) {
+ case SheepState.WHITE_LEFT -> "mobs/sheep/white/left.ans";
+ case SheepState.WHITE_RIGHT -> "mobs/sheep/white/right.ans";
+ case SheepState.WHITE_LEFT_HURT -> "mobs/sheep/white/lefthurt.ans";
+ case SheepState.WHITE_RIGHT_HURT -> "mobs/sheep/white/righthurt.ans";
- case SheepState.LIGHT_GRAY_LEFT -> "mobs/sheep/light_gray/left.ans";
- case SheepState.LIGHT_GRAY_RIGHT -> "mobs/sheep/light_gray/right.ans";
- case SheepState.LIGHT_GRAY_LEFT_HURT -> "mobs/sheep/light_gray/lefthurt.ans";
- case SheepState.LIGHT_GRAY_RIGHT_HURT -> "mobs/sheep/light_gray/righthurt.ans";
+ case SheepState.LIGHT_GRAY_LEFT -> "mobs/sheep/light_gray/left.ans";
+ case SheepState.LIGHT_GRAY_RIGHT -> "mobs/sheep/light_gray/right.ans";
+ case SheepState.LIGHT_GRAY_LEFT_HURT -> "mobs/sheep/light_gray/lefthurt.ans";
+ case SheepState.LIGHT_GRAY_RIGHT_HURT -> "mobs/sheep/light_gray/righthurt.ans";
- case SheepState.GRAY_LEFT -> "mobs/sheep/gray/left.ans";
- case SheepState.GRAY_RIGHT -> "mobs/sheep/gray/right.ans";
- case SheepState.GRAY_LEFT_HURT -> "mobs/sheep/gray/lefthurt.ans";
- case SheepState.GRAY_RIGHT_HURT -> "mobs/sheep/gray/righthurt.ans";
+ case SheepState.GRAY_LEFT -> "mobs/sheep/gray/left.ans";
+ case SheepState.GRAY_RIGHT -> "mobs/sheep/gray/right.ans";
+ case SheepState.GRAY_LEFT_HURT -> "mobs/sheep/gray/lefthurt.ans";
+ case SheepState.GRAY_RIGHT_HURT -> "mobs/sheep/gray/righthurt.ans";
- case SheepState.BLACK_LEFT -> "mobs/sheep/black/left.ans";
- case SheepState.BLACK_RIGHT -> "mobs/sheep/black/right.ans";
- case SheepState.BLACK_LEFT_HURT -> "mobs/sheep/black/lefthurt.ans";
- case SheepState.BLACK_RIGHT_HURT -> "mobs/sheep/black/righthurt.ans";
+ case SheepState.BLACK_LEFT -> "mobs/sheep/black/left.ans";
+ case SheepState.BLACK_RIGHT -> "mobs/sheep/black/right.ans";
+ case SheepState.BLACK_LEFT_HURT -> "mobs/sheep/black/lefthurt.ans";
+ case SheepState.BLACK_RIGHT_HURT -> "mobs/sheep/black/righthurt.ans";
- case SheepState.BROWN_LEFT -> "mobs/sheep/brown/left.ans";
- case SheepState.BROWN_RIGHT -> "mobs/sheep/brown/right.ans";
- case SheepState.BROWN_LEFT_HURT -> "mobs/sheep/brown/lefthurt.ans";
- case SheepState.BROWN_RIGHT_HURT -> "mobs/sheep/brown/righthurt.ans";
+ case SheepState.BROWN_LEFT -> "mobs/sheep/brown/left.ans";
+ case SheepState.BROWN_RIGHT -> "mobs/sheep/brown/right.ans";
+ case SheepState.BROWN_LEFT_HURT -> "mobs/sheep/brown/lefthurt.ans";
+ case SheepState.BROWN_RIGHT_HURT -> "mobs/sheep/brown/righthurt.ans";
- case SheepState.PINK_LEFT -> "mobs/sheep/pink/left.ans";
- case SheepState.PINK_RIGHT -> "mobs/sheep/pink/right.ans";
- case SheepState.PINK_LEFT_HURT -> "mobs/sheep/pink/lefthurt.ans";
- case SheepState.PINK_RIGHT_HURT -> "mobs/sheep/pink/righthurt.ans";
+ case SheepState.PINK_LEFT -> "mobs/sheep/pink/left.ans";
+ case SheepState.PINK_RIGHT -> "mobs/sheep/pink/right.ans";
+ case SheepState.PINK_LEFT_HURT -> "mobs/sheep/pink/lefthurt.ans";
+ case SheepState.PINK_RIGHT_HURT -> "mobs/sheep/pink/righthurt.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
public Optional> getStates() {
return Optional.of(SheepState.class);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/sprites/Steve.java b/src/main/java/cz/jzitnik/game/sprites/Steve.java
index 0f4dc75..8b936ec 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Steve.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Steve.java
@@ -6,9 +6,8 @@ import cz.jzitnik.tui.Sprite;
import java.util.Optional;
public class Steve extends Sprite {
- public enum SteveState{
- FIRST,
- SECOND,
+ public enum SteveState {
+ FIRST, SECOND,
}
public String getSprite() {
@@ -16,13 +15,11 @@ public class Steve extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case SteveState.FIRST -> "steve1.ans";
- case SteveState.SECOND -> "steve2.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ return ResourceLoader.loadResource(switch (e) {
+ case SteveState.FIRST -> "steve1.ans";
+ case SteveState.SECOND -> "steve2.ans";
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/Water.java b/src/main/java/cz/jzitnik/game/sprites/Water.java
index 5d50179..e6f4785 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Water.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Water.java
@@ -7,11 +7,7 @@ import java.util.Optional;
public class Water extends Sprite {
public enum WaterState {
- FIRST,
- SECOND,
- THIRD,
- FOURTH,
- FIFTH;
+ FIRST, SECOND, THIRD, FOURTH, FIFTH;
public static WaterState get(int x) {
return switch (x) {
diff --git a/src/main/java/cz/jzitnik/game/sprites/Wool.java b/src/main/java/cz/jzitnik/game/sprites/Wool.java
index f4daf36..087704a 100644
--- a/src/main/java/cz/jzitnik/game/sprites/Wool.java
+++ b/src/main/java/cz/jzitnik/game/sprites/Wool.java
@@ -7,12 +7,7 @@ import java.util.Optional;
public class Wool extends Sprite {
public enum WoolState {
- WHITE,
- LIGHT_GRAY,
- GRAY,
- BLACK,
- BROWN,
- PINK,
+ WHITE, LIGHT_GRAY, GRAY, BLACK, BROWN, PINK,
}
public String getSprite() {
@@ -20,18 +15,16 @@ public class Wool extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case WoolState.WHITE -> "white_wool.ans";
- case WoolState.LIGHT_GRAY -> "light_gray_wool.ans";
- case WoolState.GRAY -> "gray_wool.ans";
- case WoolState.BLACK -> "black_wool.ans";
- case WoolState.BROWN -> "brown_wool.ans";
- case WoolState.PINK -> "pink_wool.ans";
+ return ResourceLoader.loadResource(switch (e) {
+ case WoolState.WHITE -> "white_wool.ans";
+ case WoolState.LIGHT_GRAY -> "light_gray_wool.ans";
+ case WoolState.GRAY -> "gray_wool.ans";
+ case WoolState.BLACK -> "black_wool.ans";
+ case WoolState.BROWN -> "brown_wool.ans";
+ case WoolState.PINK -> "pink_wool.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/WoolItem.java b/src/main/java/cz/jzitnik/game/sprites/WoolItem.java
index 503a7eb..677b626 100644
--- a/src/main/java/cz/jzitnik/game/sprites/WoolItem.java
+++ b/src/main/java/cz/jzitnik/game/sprites/WoolItem.java
@@ -7,12 +7,7 @@ import java.util.Optional;
public class WoolItem extends Sprite {
public enum WoolItemState {
- WHITE,
- LIGHT_GRAY,
- GRAY,
- BLACK,
- BROWN,
- PINK,
+ WHITE, LIGHT_GRAY, GRAY, BLACK, BROWN, PINK,
}
public String getSprite() {
@@ -20,18 +15,16 @@ public class WoolItem extends Sprite {
}
public String getSprite(Enum e) {
- return ResourceLoader.loadResource(
- switch (e) {
- case WoolItemState.WHITE -> "items/white_wool.ans";
- case WoolItemState.LIGHT_GRAY -> "items/light_gray_wool.ans";
- case WoolItemState.GRAY -> "items/gray_wool.ans";
- case WoolItemState.BLACK -> "items/black_wool.ans";
- case WoolItemState.BROWN -> "items/brown_wool.ans";
- case WoolItemState.PINK -> "items/pink_wool.ans";
+ return ResourceLoader.loadResource(switch (e) {
+ case WoolItemState.WHITE -> "items/white_wool.ans";
+ case WoolItemState.LIGHT_GRAY -> "items/light_gray_wool.ans";
+ case WoolItemState.GRAY -> "items/gray_wool.ans";
+ case WoolItemState.BLACK -> "items/black_wool.ans";
+ case WoolItemState.BROWN -> "items/brown_wool.ans";
+ case WoolItemState.PINK -> "items/pink_wool.ans";
- default -> throw new IllegalStateException("Unexpected value: " + e);
- }
- );
+ default -> throw new IllegalStateException("Unexpected value: " + e);
+ });
}
@Override
diff --git a/src/main/java/cz/jzitnik/game/sprites/ui/Font.java b/src/main/java/cz/jzitnik/game/sprites/ui/Font.java
index 133ec11..91306dc 100644
--- a/src/main/java/cz/jzitnik/game/sprites/ui/Font.java
+++ b/src/main/java/cz/jzitnik/game/sprites/ui/Font.java
@@ -7,14 +7,10 @@ import java.util.Optional;
public class Font extends Sprite {
public enum FontState {
- A,B,C,D,E,F,G,H,I,J,K,
- L,M,N,O,P,Q,R,S,T,U,V,
- W,X,Y,Z,a,b,c,d,e,f,g,
- h,i,j,k,l,m,n,o,p,q,r,
- s,t,u,v,w,x,y,z
+ A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, a, b, c, d, e, f, g, h, i, j, k,
+ l, m, n, o, p, q, r, s, t, u, v, w, x, y, z
}
-
public String getSprite() {
throw new RuntimeException("Invalid state");
}
diff --git a/src/main/java/cz/jzitnik/game/sprites/ui/Number.java b/src/main/java/cz/jzitnik/game/sprites/ui/Number.java
index a3f13e9..f363184 100644
--- a/src/main/java/cz/jzitnik/game/sprites/ui/Number.java
+++ b/src/main/java/cz/jzitnik/game/sprites/ui/Number.java
@@ -8,16 +8,7 @@ import java.util.Optional;
public class Number extends Sprite {
public enum NumberState {
- ZERO,
- ONE,
- TWO,
- THREE,
- FOUR,
- FIVE,
- SIX,
- SEVEN,
- EIGHT,
- NINE,
+ ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE,
}
public static String fixForHotbar(String str, int place) {
@@ -28,7 +19,8 @@ public class Number extends Sprite {
stringBuilder.append("\033[0m ".repeat(50)).append("\n");
}
for (int i = 0; i < 12; i++) {
- stringBuilder.append("\033[0m ".repeat(50 - 12 * place)).append(parts[i]).append("\033[0m ".repeat(12 * (place-1))).append("\n");
+ stringBuilder.append("\033[0m ".repeat(50 - 12 * place)).append(parts[i])
+ .append("\033[0m ".repeat(12 * (place - 1))).append("\n");
}
stringBuilder.append("\033[0m ".repeat(50)).append("\n");
@@ -37,7 +29,8 @@ public class Number extends Sprite {
private String fix(String x) {
return x;
- //return x.replaceAll("\033\\[38;5;1;48;5;16m", "\033[0m").replaceAll("\033\\[38;5;16;48;5;16m▓", "\033[0m "); // TODO: Fix issue with sprite size decreasing
+ // return x.replaceAll("\033\\[38;5;1;48;5;16m", "\033[0m").replaceAll("\033\\[38;5;16;48;5;16m▓", "\033[0m ");
+ // // TODO: Fix issue with sprite size decreasing
}
public String getSprite() {
diff --git a/src/main/java/cz/jzitnik/game/threads/InputHandlerThread.java b/src/main/java/cz/jzitnik/game/threads/InputHandlerThread.java
index e077c83..d757012 100644
--- a/src/main/java/cz/jzitnik/game/threads/InputHandlerThread.java
+++ b/src/main/java/cz/jzitnik/game/threads/InputHandlerThread.java
@@ -40,14 +40,18 @@ public class InputHandlerThread extends Thread {
MouseEvent mouseEvent = terminal.readMouseEvent();
switch (game.getWindow()) {
case WORLD -> mouseHandler.handle(mouseEvent);
- case INVENTORY -> InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.empty(), Optional.empty());
- case CRAFTING_TABLE -> game.getGameStates().craftingTable.click(mouseEvent, terminal, screenRenderer);
- case CHEST -> ((Chest) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX]
- .stream().filter(i -> i.getBlockId().equals("chest")).toList().getFirst().getData())
- .click(game, mouseEvent, terminal, screenRenderer);
- case FURNACE -> ((Furnace) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX]
- .stream().filter(i -> i.getBlockId().equals("furnace")).toList().getFirst().getData())
- .click(game, mouseEvent, terminal, screenRenderer);
+ case INVENTORY -> InventoryClickHandler.click(mouseEvent, terminal, screenRenderer,
+ game, Optional.empty(), Optional.empty());
+ case CRAFTING_TABLE ->
+ game.getGameStates().craftingTable.click(mouseEvent, terminal, screenRenderer);
+ case CHEST -> ((Chest) game.getWorld()[game.getGameStates().clickY][game
+ .getGameStates().clickX].stream().filter(i -> i.getBlockId().equals("chest"))
+ .toList().getFirst().getData()).click(game, mouseEvent, terminal,
+ screenRenderer);
+ case FURNACE -> ((Furnace) game.getWorld()[game.getGameStates().clickY][game
+ .getGameStates().clickX].stream().filter(i -> i.getBlockId().equals("furnace"))
+ .toList().getFirst().getData()).click(game, mouseEvent, terminal,
+ screenRenderer);
}
}
}
@@ -81,7 +85,8 @@ public class InputHandlerThread extends Thread {
System.out.println("Exiting game...");
isRunning[0] = false;
}
- default -> {}
+ default -> {
+ }
}
}
} catch (IOException e) {
diff --git a/src/main/java/cz/jzitnik/game/ui/CloseHandler.java b/src/main/java/cz/jzitnik/game/ui/CloseHandler.java
index 09ac484..f29560f 100644
--- a/src/main/java/cz/jzitnik/game/ui/CloseHandler.java
+++ b/src/main/java/cz/jzitnik/game/ui/CloseHandler.java
@@ -24,4 +24,4 @@ public class CloseHandler {
func.call(game);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cz/jzitnik/game/ui/CraftingTable.java b/src/main/java/cz/jzitnik/game/ui/CraftingTable.java
index 9ab4577..a5bf74d 100644
--- a/src/main/java/cz/jzitnik/game/ui/CraftingTable.java
+++ b/src/main/java/cz/jzitnik/game/ui/CraftingTable.java
@@ -31,7 +31,8 @@ public class CraftingTable {
}
public void pickup() {
- Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items).map(item -> item == null ? null: item.getItem().getFirst().getId()).toArray(String[]::new));
+ Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items)
+ .map(item -> item == null ? null : item.getItem().getFirst().getId()).toArray(String[]::new));
if (recipe.isPresent()) {
InventoryItem item = recipe.get().getItemSupplier().get();
@@ -60,16 +61,17 @@ public class CraftingTable {
List sprites = game.getInventory().getSprites(items, spriteList, inventory.getSelectedItemInv() - 50);
- Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items).map(item -> item == null ? null: item.getItem().getFirst().getId()).toArray(String[]::new));
+ Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items)
+ .map(item -> item == null ? null : item.getItem().getFirst().getId()).toArray(String[]::new));
Optional craftedItem = recipe.map(craftingRecipe -> craftingRecipe.getItemSupplier().get());
String[] craftedSprite = craftedItem.map(inventoryItem -> SpriteCombiner.combineTwoSprites(
- inventoryItem.getItem().getFirst().getSpriteState().isPresent() ?
- spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite(inventoryItem.getItem().getFirst().getSpriteState().get()) :
- spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite() ,
- Numbers.getNumberSprite(inventoryItem.getAmount())
- ).split("\n")).orElse(null);
+ inventoryItem.getItem().getFirst().getSpriteState().isPresent()
+ ? spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite())
+ .getSprite(inventoryItem.getItem().getFirst().getSpriteState().get())
+ : spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite(),
+ Numbers.getNumberSprite(inventoryItem.getAmount())).split("\n")).orElse(null);
for (int i = 0; i < ROW_AMOUNT; i++) {
for (int j = 0; j < CELL_HEIGHT; j++) {
@@ -90,7 +92,6 @@ public class CraftingTable {
buffer.append("\033[38;5;231;48;5;231m▓".repeat(BORDER_SIZE));
}
-
if (i == 1) {
buffer.append("\033[0m ".repeat(7));
buffer.append("\033[38;5;231;48;5;231m▓".repeat(BORDER_SIZE));
@@ -123,20 +124,25 @@ public class CraftingTable {
int heightPixels = ROW_AMOUNT * (CELL_HEIGHT + 1);
int moveLeft = (terminal.getWidth() / 2) - (widthPixels / 2);
- if (x > moveLeft + widthPixels + 7 && x < moveLeft + widthPixels + 7 + CELL_WIDTH + BORDER_SIZE * 2 && y > 26 && y < 52 && mouseEvent.getType() == MouseEvent.Type.Pressed && mouseEvent.getButton() == MouseEvent.Button.Button1) {
+ if (x > moveLeft + widthPixels + 7 && x < moveLeft + widthPixels + 7 + CELL_WIDTH + BORDER_SIZE * 2 && y > 26
+ && y < 52 && mouseEvent.getType() == MouseEvent.Type.Pressed
+ && mouseEvent.getButton() == MouseEvent.Button.Button1) {
pickup();
screenRenderer.render(game);
return;
}
- if (x > moveLeft && x <= moveLeft + widthPixels && y > 0 && y < heightPixels && mouseEvent.getType() == MouseEvent.Type.Pressed) {
- if (mouseEvent.getType() != MouseEvent.Type.Pressed) return;
+ if (x > moveLeft && x <= moveLeft + widthPixels && y > 0 && y < heightPixels
+ && mouseEvent.getType() == MouseEvent.Type.Pressed) {
+ if (mouseEvent.getType() != MouseEvent.Type.Pressed)
+ return;
int blockX = (x - moveLeft) / 52;
int blockY = y / 26;
- InventoryClickHandler.handleItemClick(mouseEvent, game.getInventory(), items, blockY * COLUMN_AMOUNT + blockX, 50, Optional.of(items));
+ InventoryClickHandler.handleItemClick(mouseEvent, game.getInventory(), items,
+ blockY * COLUMN_AMOUNT + blockX, 50, Optional.of(items));
screenRenderer.render(game);
@@ -144,7 +150,8 @@ public class CraftingTable {
}
// TODO: Why I need to add 20 here. Like wtf
- InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20), Optional.of(items));
+ InventoryClickHandler.click(mouseEvent, terminal, screenRenderer, game, Optional.of(size + 20),
+ Optional.of(items));
}
public void exit() {
diff --git a/src/main/java/cz/jzitnik/game/ui/Healthbar.java b/src/main/java/cz/jzitnik/game/ui/Healthbar.java
index 177a208..2f1e3fc 100644
--- a/src/main/java/cz/jzitnik/game/ui/Healthbar.java
+++ b/src/main/java/cz/jzitnik/game/ui/Healthbar.java
@@ -18,10 +18,13 @@ public class Healthbar {
int moveLeft = Math.max(0, INVENTORY_SIZE_PX - (heartSize * 2));
String[] spriteOn = spriteList.getSprite(SpriteLoader.SPRITES.HEART).getSprite(Heart.HeartState.ON).split("\n");
- String[] spriteOff = spriteList.getSprite(SpriteLoader.SPRITES.HEART).getSprite(Heart.HeartState.OFF).split("\n");
+ String[] spriteOff = spriteList.getSprite(SpriteLoader.SPRITES.HEART).getSprite(Heart.HeartState.OFF)
+ .split("\n");
- String[] hungerSpriteOn = spriteList.getSprite(SpriteLoader.SPRITES.HUNGER).getSprite(Hunger.HungerState.ON).split("\n");
- String[] hungerSpriteOff = spriteList.getSprite(SpriteLoader.SPRITES.HUNGER).getSprite(Hunger.HungerState.OFF).split("\n");
+ String[] hungerSpriteOn = spriteList.getSprite(SpriteLoader.SPRITES.HUNGER).getSprite(Hunger.HungerState.ON)
+ .split("\n");
+ String[] hungerSpriteOff = spriteList.getSprite(SpriteLoader.SPRITES.HUNGER).getSprite(Hunger.HungerState.OFF)
+ .split("\n");
for (int i = 0; i < 9; i++) {
buffer.append(" ".repeat(startLeft));
diff --git a/src/main/java/cz/jzitnik/game/ui/Inventory.java b/src/main/java/cz/jzitnik/game/ui/Inventory.java
index 0a89a1e..7679c43 100644
--- a/src/main/java/cz/jzitnik/game/ui/Inventory.java
+++ b/src/main/java/cz/jzitnik/game/ui/Inventory.java
@@ -21,7 +21,7 @@ public class Inventory {
private final InventoryItem[] items = new InventoryItem[20];
private final InventoryItem[] hotbar = new InventoryItem[9];
- private final SmallCraftingTable smallCraftingTable = new SmallCraftingTable( this);
+ private final SmallCraftingTable smallCraftingTable = new SmallCraftingTable(this);
@Setter
private int itemInhHandIndex = 0;
@@ -84,7 +84,6 @@ public class Inventory {
}
}
-
public void addItem(Item item) {
if (!item.isStackable()) {
placeItem(item);
@@ -101,7 +100,8 @@ public class Inventory {
// Try to stack in inventory
for (InventoryItem inventoryItem : items) {
- if (inventoryItem != null && inventoryItem.getItem().getFirst().equals(item) && inventoryItem.getAmount() < item.getStackAmount()) {
+ if (inventoryItem != null && inventoryItem.getItem().getFirst().equals(item)
+ && inventoryItem.getAmount() < item.getStackAmount()) {
inventoryItem.add(item);
return;
}
@@ -111,7 +111,6 @@ public class Inventory {
placeItem(item);
}
-
private String getHotbarBackground() {
StringBuilder sprite = new StringBuilder();
for (int i = 0; i < 25; i++) {
@@ -150,7 +149,8 @@ public class Inventory {
}
}
- public void renderFull(StringBuilder buffer, Terminal terminal, SpriteList spriteList, boolean includeCrafting, Optional moveTopCustom) {
+ public void renderFull(StringBuilder buffer, Terminal terminal, SpriteList spriteList, boolean includeCrafting,
+ Optional moveTopCustom) {
int widthPixels = COLUMN_AMOUNT * (50 + 4) + 2;
int heightPixels = ROW_AMOUNT * (25 + 1);
@@ -229,21 +229,26 @@ public class Inventory {
}
if (i == selectedItem) {
- sprites.add(SpriteCombiner.combineTwoSprites(getHotbarBackground(), SpriteCombiner.combineTwoSprites(
- item.getItem().getFirst().getSpriteState().isPresent() ?
- spriteList.getSprite(item.getItem().getFirst().getSprite()).getSprite(item.getItem().getFirst().getSpriteState().get()) :
- spriteList.getSprite(item.getItem().getFirst().getSprite()).getSprite(),
- Numbers.getNumberSprite(item.getAmount())
- )));
+ sprites.add(
+ SpriteCombiner
+ .combineTwoSprites(getHotbarBackground(),
+ SpriteCombiner.combineTwoSprites(
+ item.getItem().getFirst().getSpriteState().isPresent()
+ ? spriteList.getSprite(item.getItem().getFirst().getSprite())
+ .getSprite(item.getItem().getFirst().getSpriteState()
+ .get())
+ : spriteList.getSprite(item.getItem().getFirst().getSprite())
+ .getSprite(),
+ Numbers.getNumberSprite(item.getAmount()))));
continue;
}
sprites.add(SpriteCombiner.combineTwoSprites(
- item.getItem().getFirst().getSpriteState().isPresent() ?
- spriteList.getSprite(item.getItem().getFirst().getSprite()).getSprite(item.getItem().getFirst().getSpriteState().get()) :
- spriteList.getSprite(item.getItem().getFirst().getSprite()).getSprite(),
- Numbers.getNumberSprite(item.getAmount())
- ));
+ item.getItem().getFirst().getSpriteState().isPresent()
+ ? spriteList.getSprite(item.getItem().getFirst().getSprite())
+ .getSprite(item.getItem().getFirst().getSpriteState().get())
+ : spriteList.getSprite(item.getItem().getFirst().getSprite()).getSprite(),
+ Numbers.getNumberSprite(item.getAmount())));
}
return sprites;
@@ -373,7 +378,8 @@ public class Inventory {
InventoryItem fromItem = fromSlot.getObj()[fromSlot.getIndex()];
InventoryItem toItem = toSlot.getObj()[toSlot.getIndex()];
- if (fromItem == null || !fromItem.getItem().getFirst().equals(toItem.getItem().getFirst()) || toItem.getAmount() >= fromItem.getItem().getFirst().getStackAmount()) {
+ if (fromItem == null || !fromItem.getItem().getFirst().equals(toItem.getItem().getFirst())
+ || toItem.getAmount() >= fromItem.getItem().getFirst().getStackAmount()) {
return; // Can't merge
}
diff --git a/src/main/java/cz/jzitnik/game/ui/InventoryClickHandler.java b/src/main/java/cz/jzitnik/game/ui/InventoryClickHandler.java
index 2bca08b..b4c8fbe 100644
--- a/src/main/java/cz/jzitnik/game/ui/InventoryClickHandler.java
+++ b/src/main/java/cz/jzitnik/game/ui/InventoryClickHandler.java
@@ -11,8 +11,10 @@ import java.util.Optional;
import static cz.jzitnik.game.ui.Inventory.*;
public class InventoryClickHandler {
- public static void click(MouseEvent mouseEvent, Terminal terminal, ScreenRenderer screenRenderer, Game game, Optional moveTopCustom, Optional i) {
- if (mouseEvent.getType() != MouseEvent.Type.Pressed) return;
+ public static void click(MouseEvent mouseEvent, Terminal terminal, ScreenRenderer screenRenderer, Game game,
+ Optional moveTopCustom, Optional i) {
+ if (mouseEvent.getType() != MouseEvent.Type.Pressed)
+ return;
var inventory = game.getInventory();
int x = mouseEvent.getX();
@@ -21,8 +23,10 @@ public class InventoryClickHandler {
int moveLeft = calculateMoveLeft(terminal);
int moveTop = moveTopCustom.orElseGet(() -> calculateMoveTop(terminal));
- if (handleCraftingTableClick(mouseEvent, x, y, inventory, screenRenderer, game, moveLeft, moveTop, i)) return;
- if (handleHotbarClick(mouseEvent, x, y, inventory, screenRenderer, game, terminal, moveTop, i)) return;
+ if (handleCraftingTableClick(mouseEvent, x, y, inventory, screenRenderer, game, moveLeft, moveTop, i))
+ return;
+ if (handleHotbarClick(mouseEvent, x, y, inventory, screenRenderer, game, terminal, moveTop, i))
+ return;
handleInventoryClick(mouseEvent, x, y, inventory, screenRenderer, game, moveLeft, moveTop, i);
}
@@ -34,11 +38,13 @@ public class InventoryClickHandler {
return Math.max(0, (terminal.getHeight() / 2) - ((ROW_AMOUNT * (25 + 1)) / 2));
}
- private static boolean handleCraftingTableClick(MouseEvent mouseEvent, int x, int y, Inventory inventory, ScreenRenderer screenRenderer, Game game, int moveLeft, int moveTop, Optional i) {
+ private static boolean handleCraftingTableClick(MouseEvent mouseEvent, int x, int y, Inventory inventory,
+ ScreenRenderer screenRenderer, Game game, int moveLeft, int moveTop, Optional i) {
int startLeftCrafting = moveLeft + (COLUMN_AMOUNT * (50 + 4) + 2) + 20;
int startTopCrafting = moveTop + 26;
- if (x < startLeftCrafting || y < startTopCrafting || x > startLeftCrafting + 166 || y > startTopCrafting + 51) return false;
+ if (x < startLeftCrafting || y < startTopCrafting || x > startLeftCrafting + 166 || y > startTopCrafting + 51)
+ return false;
int craftX = x - startLeftCrafting;
int craftY = y - startTopCrafting;
@@ -61,11 +67,14 @@ public class InventoryClickHandler {
return true;
}
- private static boolean handleHotbarClick(MouseEvent mouseEvent, int x, int y, Inventory inventory, ScreenRenderer screenRenderer, Game game, Terminal terminal, int moveTop, Optional i) {
+ private static boolean handleHotbarClick(MouseEvent mouseEvent, int x, int y, Inventory inventory,
+ ScreenRenderer screenRenderer, Game game, Terminal terminal, int moveTop, Optional i) {
int startLeftHotbar = (terminal.getWidth() / 2) - (INVENTORY_SIZE_PX / 2) + 2;
int startTopHotbar = moveTop + (ROW_AMOUNT * (25 + 1)) + 10;
- if (x < startLeftHotbar || y < startTopHotbar || x > startLeftHotbar + INVENTORY_SIZE_PX - 2 || y > startTopHotbar + 26) return false;
+ if (x < startLeftHotbar || y < startTopHotbar || x > startLeftHotbar + INVENTORY_SIZE_PX - 2
+ || y > startTopHotbar + 26)
+ return false;
int index = (x - startLeftHotbar) / 52;
handleItemClick(mouseEvent, inventory, inventory.getHotbar(), index, 20, i);
@@ -73,21 +82,24 @@ public class InventoryClickHandler {
return true;
}
- private static void handleInventoryClick(MouseEvent mouseEvent, int x, int y, Inventory inventory, ScreenRenderer screenRenderer, Game game, int moveLeft, int moveTop, Optional i) {
+ private static void handleInventoryClick(MouseEvent mouseEvent, int x, int y, Inventory inventory,
+ ScreenRenderer screenRenderer, Game game, int moveLeft, int moveTop, Optional i) {
int fx = x - moveLeft;
int fy = y - moveTop;
int widthPixels = COLUMN_AMOUNT * (50 + 4) + 2;
int heightPixels = ROW_AMOUNT * (25 + 1);
- if (fx < 0 || fx > widthPixels - 3 || fy < 0 || fy > heightPixels - 1) return;
+ if (fx < 0 || fx > widthPixels - 3 || fy < 0 || fy > heightPixels - 1)
+ return;
int blockIndex = (fy / 26) * COLUMN_AMOUNT + (fx / 54);
handleItemClick(mouseEvent, inventory, inventory.getItems(), blockIndex, 0, i);
screenRenderer.render(game);
}
- public static void handleItemClick(MouseEvent mouseEvent, Inventory inventory, Object[] items, int index, int offset, Optional i) {
+ public static void handleItemClick(MouseEvent mouseEvent, Inventory inventory, Object[] items, int index,
+ int offset, Optional i) {
int actualIndex = index + offset;
if (inventory.getSelectedItemInv() == actualIndex) {
diff --git a/src/main/java/cz/jzitnik/game/ui/SmallCraftingTable.java b/src/main/java/cz/jzitnik/game/ui/SmallCraftingTable.java
index 62597dc..adca6c6 100644
--- a/src/main/java/cz/jzitnik/game/ui/SmallCraftingTable.java
+++ b/src/main/java/cz/jzitnik/game/ui/SmallCraftingTable.java
@@ -21,7 +21,8 @@ public class SmallCraftingTable {
private InventoryItem[] items = new InventoryItem[4];
public void pickup() {
- Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items).map(item -> item == null ? null: item.getItem().getFirst().getId()).toArray(String[]::new));
+ Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items)
+ .map(item -> item == null ? null : item.getItem().getFirst().getId()).toArray(String[]::new));
if (recipe.isPresent()) {
InventoryItem item = recipe.get().getItemSupplier().get();
@@ -47,16 +48,17 @@ public class SmallCraftingTable {
List sprites = inventory.getSprites(items, spriteList, inventory.getSelectedItemInv() - 29);
- Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items).map(item -> item == null ? null: item.getItem().getFirst().getId()).toArray(String[]::new));
+ Optional recipe = CraftingRecipeList.getRecipe(Arrays.stream(items)
+ .map(item -> item == null ? null : item.getItem().getFirst().getId()).toArray(String[]::new));
Optional craftedItem = recipe.map(craftingRecipe -> craftingRecipe.getItemSupplier().get());
String[] craftedSprite = craftedItem.map(inventoryItem -> SpriteCombiner.combineTwoSprites(
- inventoryItem.getItem().getFirst().getSpriteState().isPresent() ?
- spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite(inventoryItem.getItem().getFirst().getSpriteState().get()) :
- spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite() ,
- Numbers.getNumberSprite(inventoryItem.getAmount())
- ).split("\n")).orElse(null);
+ inventoryItem.getItem().getFirst().getSpriteState().isPresent()
+ ? spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite())
+ .getSprite(inventoryItem.getItem().getFirst().getSpriteState().get())
+ : spriteList.getSprite(inventoryItem.getItem().getFirst().getSprite()).getSprite(),
+ Numbers.getNumberSprite(inventoryItem.getAmount())).split("\n")).orElse(null);
int counter = 0;
for (int i = 0; i < ROW_AMOUNT; i++) {
@@ -77,7 +79,7 @@ public class SmallCraftingTable {
buf.append("\033[38;5;231;48;5;231m▓".repeat(2));
}
- if (i == 0 && j > 10 || i == 1 && j < 12) {
+ if (i == 0 && j > 10 || i == 1 && j < 12) {
buf.append("\033[0m").append(" ".repeat(7));
if (i == 0 && j - 11 == 0 || i == 1 && j == 11) {
buf.append("\033[38;5;231;48;5;231m▓".repeat(54));
diff --git a/src/main/java/cz/jzitnik/game/ui/Window.java b/src/main/java/cz/jzitnik/game/ui/Window.java
index c896843..c7c527e 100644
--- a/src/main/java/cz/jzitnik/game/ui/Window.java
+++ b/src/main/java/cz/jzitnik/game/ui/Window.java
@@ -1,9 +1,5 @@
package cz.jzitnik.game.ui;
public enum Window {
- WORLD,
- INVENTORY,
- CRAFTING_TABLE,
- CHEST,
- FURNACE
+ WORLD, INVENTORY, CRAFTING_TABLE, CHEST, FURNACE
}
diff --git a/src/main/java/cz/jzitnik/tui/MouseHandler.java b/src/main/java/cz/jzitnik/tui/MouseHandler.java
index ef5fce1..6cba2a8 100644
--- a/src/main/java/cz/jzitnik/tui/MouseHandler.java
+++ b/src/main/java/cz/jzitnik/tui/MouseHandler.java
@@ -46,18 +46,20 @@ public class MouseHandler {
int mouseY = mouseEvent.getY();
int[] cords = game.getPlayerCords();
- if (cords == null) return;
+ if (cords == null)
+ return;
int playerX = cords[0];
int playerY = cords[1];
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
int startX = data[0];
int startY = data[2];
- int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
- int blockY = startY + (mouseY / 25); // 25 lines high per sprite
+ int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
+ int blockY = startY + (mouseY / 25); // 25 lines high per sprite
if (game.isHitable(blockX, blockY, terminal)) {
game.hit(screenRenderer, blockX, blockY);
@@ -74,18 +76,20 @@ public class MouseHandler {
int mouseY = mouseEvent.getY();
int[] cords = game.getPlayerCords();
- if (cords == null) return;
+ if (cords == null)
+ return;
int playerX = cords[0];
int playerY = cords[1];
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
int startX = data[0];
int startY = data[2];
- int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
- int blockY = startY + (mouseY / 25); // 25 lines high per sprite
+ int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
+ int blockY = startY + (mouseY / 25); // 25 lines high per sprite
game.build(blockX, blockY, screenRenderer);
}
@@ -99,18 +103,20 @@ public class MouseHandler {
int mouseY = mouseEvent.getY();
int[] cords = game.getPlayerCords();
- if (cords == null) return;
+ if (cords == null)
+ return;
int playerX = cords[0];
int playerY = cords[1];
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(), terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminal.getHeight(),
+ terminal.getWidth(), game.getWorld()[0].length, game.getWorld().length);
int startX = data[0];
int startY = data[2];
- int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
- int blockY = startY + (mouseY / 25); // 25 lines high per sprite
+ int blockX = startX + (mouseX / 50); // 50 chars wide per sprite
+ int blockY = startY + (mouseY / 25); // 25 lines high per sprite
if (blockY == playerX && blockY == playerY) {
return;
@@ -121,7 +127,9 @@ public class MouseHandler {
list.add(blockX);
list.add(blockY);
- if (screenRenderer.getSelectedBlock().isPresent() && screenRenderer.getSelectedBlock().get().get(0).equals(blockX) && screenRenderer.getSelectedBlock().get().get(1).equals(blockY)) {
+ if (screenRenderer.getSelectedBlock().isPresent()
+ && screenRenderer.getSelectedBlock().get().get(0).equals(blockX)
+ && screenRenderer.getSelectedBlock().get().get(1).equals(blockY)) {
return;
}
diff --git a/src/main/java/cz/jzitnik/tui/ResourceLoader.java b/src/main/java/cz/jzitnik/tui/ResourceLoader.java
index ddfe8c0..9ff199d 100644
--- a/src/main/java/cz/jzitnik/tui/ResourceLoader.java
+++ b/src/main/java/cz/jzitnik/tui/ResourceLoader.java
@@ -6,7 +6,8 @@ import java.nio.charset.StandardCharsets;
public class ResourceLoader {
public static String loadResource(String fileName) {
- try (InputStream inputStream = ResourceLoader.class.getClassLoader().getResourceAsStream("textures/"+fileName)) {
+ try (InputStream inputStream = ResourceLoader.class.getClassLoader()
+ .getResourceAsStream("textures/" + fileName)) {
if (inputStream == null) {
// If the file is not found, return null
return null;
diff --git a/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java b/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java
index 446976a..ff01083 100644
--- a/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java
+++ b/src/main/java/cz/jzitnik/tui/ScreenMovingCalculationProvider.java
@@ -19,6 +19,6 @@ public class ScreenMovingCalculationProvider {
int startY = Math.max(0, y - viewUpRadius);
int endY = Math.min(worldY, y + viewDownRadius + 1);
- return new int[] {startX, endX, startY, endY};
+ return new int[] { startX, endX, startY, endY };
}
}
diff --git a/src/main/java/cz/jzitnik/tui/ScreenRenderer.java b/src/main/java/cz/jzitnik/tui/ScreenRenderer.java
index 733d2ef..ce71c73 100644
--- a/src/main/java/cz/jzitnik/tui/ScreenRenderer.java
+++ b/src/main/java/cz/jzitnik/tui/ScreenRenderer.java
@@ -31,8 +31,9 @@ public class ScreenRenderer {
private int[] getPlayerCords(List[][] world) {
for (int i = 0; i < world.length; i++) {
for (int j = 0; j < world[i].length; j++) {
- if (world[i][j].stream().anyMatch(x -> x.getBlockId().equals("steve") && x.getSpriteState().isPresent() && x.getSpriteState().get() == Steve.SteveState.SECOND)) {
- return new int[]{j, i};
+ if (world[i][j].stream().anyMatch(x -> x.getBlockId().equals("steve") && x.getSpriteState().isPresent()
+ && x.getSpriteState().get() == Steve.SteveState.SECOND)) {
+ return new int[] { j, i };
}
}
}
@@ -47,13 +48,18 @@ public class ScreenRenderer {
switch (game.getWindow()) {
case INVENTORY -> game.getInventory().renderFull(main, terminal, spriteList, true, Optional.empty());
case CRAFTING_TABLE -> game.getGameStates().craftingTable.render(main, terminal, spriteList);
- case CHEST -> ((Chest) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX].stream().filter(i -> i.getBlockId().equals("chest")).toList().getFirst().getData()).render(game, main, terminal, spriteList);
- case FURNACE -> ((Furnace) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX].stream().filter(i -> i.getBlockId().equals("furnace")).toList().getFirst().getData()).render(game, main, terminal, spriteList);
+ case CHEST -> ((Chest) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX].stream()
+ .filter(i -> i.getBlockId().equals("chest")).toList().getFirst().getData()).render(game, main,
+ terminal, spriteList);
+ case FURNACE -> ((Furnace) game.getWorld()[game.getGameStates().clickY][game.getGameStates().clickX]
+ .stream().filter(i -> i.getBlockId().equals("furnace")).toList().getFirst().getData()).render(game,
+ main, terminal, spriteList);
case WORLD -> {
// World
int[] cords = getPlayerCords(world);
- if (cords == null) return;
+ if (cords == null)
+ return;
int playerX = cords[0];
int playerY = cords[1];
@@ -61,7 +67,8 @@ public class ScreenRenderer {
int terminalWidth = terminal.getWidth();
int terminalHeight = terminal.getHeight();
- int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminalHeight, terminalWidth, world[0].length, world.length);
+ int[] data = ScreenMovingCalculationProvider.calculate(playerX, playerY, terminalHeight, terminalWidth,
+ world[0].length, world.length);
// Calculate visible area boundaries
int startX = data[0];
@@ -89,14 +96,14 @@ public class ScreenRenderer {
for (int x = startX; x < endX; x++) {
List blocks = world[y][x];
List sprites = new ArrayList<>(blocks.stream()
- .map(block ->
- block.getSpriteState().isEmpty() ?
- spriteList.getSprite(block.getSprite()).getSprite() :
- spriteList.getSprite(block.getSprite()).getSprite(block.getSpriteState().get())
- ).toList()
- );
+ .map(block -> block.getSpriteState().isEmpty()
+ ? spriteList.getSprite(block.getSprite()).getSprite()
+ : spriteList.getSprite(block.getSprite())
+ .getSprite(block.getSpriteState().get()))
+ .toList());
- if (selectedBlock.isPresent() && selectedBlock.get().get(0) == x && selectedBlock.get().get(1) == y) {
+ if (selectedBlock.isPresent() && selectedBlock.get().get(0) == x
+ && selectedBlock.get().get(1) == y) {
StringBuilder stringBuilder = getStringBuilder();
sprites.add(stringBuilder.toString());
diff --git a/src/main/java/cz/jzitnik/tui/Sprite.java b/src/main/java/cz/jzitnik/tui/Sprite.java
index 5fb0981..bdf2182 100644
--- a/src/main/java/cz/jzitnik/tui/Sprite.java
+++ b/src/main/java/cz/jzitnik/tui/Sprite.java
@@ -4,6 +4,8 @@ import java.util.Optional;
public abstract class Sprite> {
public abstract String getSprite();
+
public abstract String getSprite(E key);
+
public abstract Optional> getStates();
}
diff --git a/src/main/java/cz/jzitnik/tui/utils/Numbers.java b/src/main/java/cz/jzitnik/tui/utils/Numbers.java
index d6f2222..63361ce 100644
--- a/src/main/java/cz/jzitnik/tui/utils/Numbers.java
+++ b/src/main/java/cz/jzitnik/tui/utils/Numbers.java
@@ -46,6 +46,7 @@ public class Numbers {
Number.NumberState numberState1 = getNumberState(firstDigit);
Number.NumberState numberState2 = getNumberState(secondDigit);
- return SpriteCombiner.combineTwoSprites(Number.fixForHotbar(nm.getSprite(numberState1), 2), Number.fixForHotbar(nm.getSprite(numberState2), 1));
+ return SpriteCombiner.combineTwoSprites(Number.fixForHotbar(nm.getSprite(numberState1), 2),
+ Number.fixForHotbar(nm.getSprite(numberState2), 1));
}
}
diff --git a/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java b/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java
index 108e488..13b02ef 100644
--- a/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java
+++ b/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java
@@ -15,7 +15,6 @@ public class SpriteCombiner {
return combinedSprite;
}
-
public static String combineTwoSprites(String sprite1, String sprite2) {
String[] rows1 = sprite1.split("\n");
String[] rows2 = sprite2.split("\n");
@@ -37,12 +36,14 @@ public class SpriteCombiner {
while (cursor1 < row1.length() && cursor2 < row2.length()) {
String color1 = extractColorCode(row1, cursor1);
int pixelIndex1 = cursor1 + color1.length();
- if (pixelIndex1 >= row1.length()) break; // Avoid out-of-bounds
+ if (pixelIndex1 >= row1.length())
+ break; // Avoid out-of-bounds
char pixel1 = row1.charAt(pixelIndex1);
String color2 = extractColorCode(row2, cursor2);
int pixelIndex2 = cursor2 + color2.length();
- if (pixelIndex2 >= row2.length()) break; // Avoid out-of-bounds
+ if (pixelIndex2 >= row2.length())
+ break; // Avoid out-of-bounds
char pixel2 = row2.charAt(pixelIndex2);
if (color2.equals("\033[0m") && pixel2 == ' ' || color2.equals("\033[49m") && pixel2 == ' ') {
diff --git a/src/main/resources/config/checkstyle/checkstyle.xml b/src/main/resources/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..2ffc78b
--- /dev/null
+++ b/src/main/resources/config/checkstyle/checkstyle.xml
@@ -0,0 +1,427 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/java/cz/jzitnik/game/SpriteLoaderTest.java b/src/test/java/cz/jzitnik/game/SpriteLoaderTest.java
index 87a4201..39f1daa 100644
--- a/src/test/java/cz/jzitnik/game/SpriteLoaderTest.java
+++ b/src/test/java/cz/jzitnik/game/SpriteLoaderTest.java
@@ -20,13 +20,13 @@ public class SpriteLoaderTest {
void testAllResourcesArePresent() {
for (SpriteLoader.SPRITES spriteEnum : SpriteLoader.SPRITES_MAP.keySet()) {
Sprite sprite = SpriteLoader.SPRITES_MAP.get(spriteEnum);
- assertNotNull(sprite.getSprite(),
- "getSprite() couldn't find file for: " + spriteEnum);
+ assertNotNull(sprite.getSprite(), "getSprite() couldn't find file for: " + spriteEnum);
if (sprite.getStates().isPresent()) {
- for (Enum state : ((Class) SpriteLoader.SPRITES_MAP.get(spriteEnum).getStates().get()).getEnumConstants()) {
+ for (Enum state : ((Class) SpriteLoader.SPRITES_MAP.get(spriteEnum).getStates().get())
+ .getEnumConstants()) {
assertNotNull(SpriteLoader.SPRITES_MAP.get(spriteEnum).getSprite(state),
- "getSprite("+state+") couldn't find file for: " + spriteEnum);
+ "getSprite(" + state + ") couldn't find file for: " + spriteEnum);
}
}
diff --git a/src/test/java/cz/jzitnik/game/crafting/CraftingRecipeListTest.java b/src/test/java/cz/jzitnik/game/crafting/CraftingRecipeListTest.java
index 0f9f805..07e5cc8 100644
--- a/src/test/java/cz/jzitnik/game/crafting/CraftingRecipeListTest.java
+++ b/src/test/java/cz/jzitnik/game/crafting/CraftingRecipeListTest.java
@@ -16,15 +16,17 @@ class CraftingRecipeListTest {
if (!craftingRecipe.isUsingRegex()) {
for (String[] arr : craftingRecipe.getRecipe()) {
for (String item : arr) {
- if (item == null ) {
+ if (item == null) {
continue;
}
- assertDoesNotThrow(() -> ItemBlockSupplier.getItem(item), "Item " + item + " does not exist but is present as source in crafting recipe list.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getItem(item),
+ "Item " + item + " does not exist but is present as source in crafting recipe list.");
}
}
}
- assertDoesNotThrow(craftingRecipe.getItemSupplier()::get, "Output item does not exist for recipe: " + Arrays.deepToString(craftingRecipe.getRecipe()) + ".");
+ assertDoesNotThrow(craftingRecipe.getItemSupplier()::get,
+ "Output item does not exist for recipe: " + Arrays.deepToString(craftingRecipe.getRecipe()) + ".");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/cz/jzitnik/game/mobs/EntityHurtAnimationTest.java b/src/test/java/cz/jzitnik/game/mobs/EntityHurtAnimationTest.java
index 705d297..1cc7276 100644
--- a/src/test/java/cz/jzitnik/game/mobs/EntityHurtAnimationTest.java
+++ b/src/test/java/cz/jzitnik/game/mobs/EntityHurtAnimationTest.java
@@ -12,7 +12,8 @@ class EntityHurtAnimationTest {
void allEntitiesExists() {
EntityHurtAnimation entityHurtAnimation = new EntityHurtAnimation();
for (String entity : entityHurtAnimation.handlerList.keySet()) {
- assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity), "Entity " + entity + " does not exist but has hurt animation implemented.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity),
+ "Entity " + entity + " does not exist but has hurt animation implemented.");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/cz/jzitnik/game/mobs/EntityKillTest.java b/src/test/java/cz/jzitnik/game/mobs/EntityKillTest.java
index 233b2d4..2ceaf95 100644
--- a/src/test/java/cz/jzitnik/game/mobs/EntityKillTest.java
+++ b/src/test/java/cz/jzitnik/game/mobs/EntityKillTest.java
@@ -12,7 +12,8 @@ class EntityKillTest {
void allEntitiesExists() {
EntityKill entityKill = new EntityKill();
for (String entity : entityKill.handlerList.keySet()) {
- assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity), "Entity " + entity + " does not exist but has a kill implemented.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity),
+ "Entity " + entity + " does not exist but has a kill implemented.");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/cz/jzitnik/game/mobs/EntityLogicProviderTest.java b/src/test/java/cz/jzitnik/game/mobs/EntityLogicProviderTest.java
index c2cad2b..e45cdaf 100644
--- a/src/test/java/cz/jzitnik/game/mobs/EntityLogicProviderTest.java
+++ b/src/test/java/cz/jzitnik/game/mobs/EntityLogicProviderTest.java
@@ -11,7 +11,8 @@ class EntityLogicProviderTest {
void allEntitiesExists() {
EntityLogicProvider entityLogicProvider = new EntityLogicProvider();
for (String entity : entityLogicProvider.logicList.keySet()) {
- assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity), "Entity " + entity + " does not exist but has a logic implemented.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getEntity(entity),
+ "Entity " + entity + " does not exist but has a logic implemented.");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/cz/jzitnik/game/smelting/SmeltingTest.java b/src/test/java/cz/jzitnik/game/smelting/SmeltingTest.java
index 115f2e6..c1f4e1b 100644
--- a/src/test/java/cz/jzitnik/game/smelting/SmeltingTest.java
+++ b/src/test/java/cz/jzitnik/game/smelting/SmeltingTest.java
@@ -14,15 +14,17 @@ public class SmeltingTest {
@DisplayName("Verity that all items in Smelting are actual items")
void testAllItems() {
for (String item : Smelting.smeltingList.keySet()) {
- assertDoesNotThrow(() -> ItemBlockSupplier.getItem(item), "Item " + item + "does not exist but is present as source in Smelting.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getItem(item),
+ "Item " + item + "does not exist but is present as source in Smelting.");
}
- for (Supplier- supplier: Smelting.smeltingList.values()) {
+ for (Supplier
- supplier : Smelting.smeltingList.values()) {
assertDoesNotThrow(supplier::get, "Item does not exist but is present as result in Smelting.");
}
for (String fuel : Smelting.fuelList.keySet()) {
- assertDoesNotThrow(() -> ItemBlockSupplier.getItem(fuel), "Item " + fuel + " does not exist but is present as fuel in Smelting.");
+ assertDoesNotThrow(() -> ItemBlockSupplier.getItem(fuel),
+ "Item " + fuel + " does not exist but is present as fuel in Smelting.");
}
}
-}
\ No newline at end of file
+}