feat: Water breaks grass

src/main/java/cz/jzitnik/Main.java

@@ -48,7 +48,7 @@ public class Main {
                     e.printStackTrace();
                 }
 
-                if ( game.getWindow() == Window.WORLD) {
+                if (game.getWindow() == Window.WORLD) {
                     screenRenderer.render(game);
                 }
 

src/main/java/cz/jzitnik/game/annotations/BreakableByWater.java

@@ -0,0 +1,11 @@
+package cz.jzitnik.game.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BreakableByWater {
+}

src/main/java/cz/jzitnik/game/entities/Player.java

@@ -32,7 +32,19 @@ public class Player implements Serializable {
 
     public void fell() {
         int damage = Math.max(fallDistance - 3, 0);
-        health = Math.max(0, health - damage);
+        dealDamage(damage);
         fallDistance = 0;
     }
+
+    public synchronized void dealDamage(int amount) {
+        health = Math.max(0, health - amount);
+
+        if (health == 0) {
+            // TODO: Implement dead
+        }
+    }
+
+    public synchronized void dealDamage() {
+        dealDamage(1);
+    }
 }

src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GrassBushBlock.java

@@ -3,11 +3,13 @@ package cz.jzitnik.game.entities.items.registry.blocks;
 import cz.jzitnik.game.SpriteLoader;
 import cz.jzitnik.game.annotations.BlockDropPercentage;
 import cz.jzitnik.game.annotations.BlockRegistry;
+import cz.jzitnik.game.annotations.BreakableByWater;
 import cz.jzitnik.game.annotations.CustomDrop;
 import cz.jzitnik.game.annotations.PlaceOnSolid;
 import cz.jzitnik.game.entities.Block;
 
 @PlaceOnSolid
+@BreakableByWater
 @CustomDrop(tool = "shears", drops = "grass_bush")
 @BlockDropPercentage(13)
 @BlockRegistry(value = "grass_bush", drops = "wheat_seeds")

src/main/java/cz/jzitnik/game/generation/Generation.java

@@ -34,7 +34,8 @@ public class Generation {
         world[terrainHeight[256] - 1][256].add(steveBlock2);
         world[terrainHeight[256] - 2][256].add(steveBlock);
 
-        game.getInventory().addItem(ItemBlockSupplier.getItem("shears"));
+        game.getInventory().addItem(ItemBlockSupplier.getItem("water_bucket"));
+        game.getInventory().addItem(ItemBlockSupplier.getItem("lava_bucket"));
     }
 
     private static void initializeWorld(List<Block>[][] world) {

src/main/java/cz/jzitnik/game/logic/services/flowing/FlowingLogic.java

@@ -1,6 +1,7 @@
 package cz.jzitnik.game.logic.services.flowing;
 
 import cz.jzitnik.game.Game;
+import cz.jzitnik.game.annotations.BreakableByWater;
 import cz.jzitnik.game.annotations.CustomLogic;
 import cz.jzitnik.game.entities.Block;
 import cz.jzitnik.game.entities.items.ItemBlockSupplier;
@@ -67,6 +68,14 @@ public class FlowingLogic implements CustomLogicInterface {
 
     private void flow(List<Block>[][] world, int x, int y, int strength, Set<Point> visited, String liquidId) {
         if (y + 1 < world.length && canFlowInto(world[y + 1][x])) {
+            var blocks = world[y + 1][x];
+            List<Block> remove = new ArrayList<>();
+            for (Block block : blocks) {
+                if (block.getClass().isAnnotationPresent(BreakableByWater.class)) {
+                    remove.add(block);
+                }
+            }
+            blocks.removeAll(remove);
             Block newLiquid = ItemBlockSupplier.getBlock(liquidId);
             newLiquid.setSpriteState(Water.WaterState.get(5));
             ((FlowingData) newLiquid.getData()).setSource(false);
@@ -94,16 +103,14 @@ public class FlowingLogic implements CustomLogicInterface {
     }
 
     private void transformOrFlow(List<Block>[][] world, int newX, int newY, int strength, Set<Point> visited, String liquidId) {
-        var targetBlocks = world[newY][newX];
-        boolean hasWater = targetBlocks.stream().anyMatch(b -> b.getBlockId().equals("water"));
-        boolean hasLava = targetBlocks.stream().anyMatch(b -> b.getBlockId().equals("lava"));
-
-        if (liquidId.equals("water") && hasLava) {
-            return;
+        var blocks = world[newY][newX];
+        List<Block> remove = new ArrayList<>();
+        for (Block block : blocks) {
+            if (block.getClass().isAnnotationPresent(BreakableByWater.class)) {
+                remove.add(block);
             }
-        if (liquidId.equals("lava") && hasWater) {
-            return;
         }
+        blocks.removeAll(remove);
 
         Block newLiquid = ItemBlockSupplier.getBlock(liquidId);
         newLiquid.setSpriteState(Water.WaterState.get(strength - 1));
@@ -114,6 +121,6 @@ public class FlowingLogic implements CustomLogicInterface {
 
     private boolean canFlowInto(List<Block> blocks) {
         return blocks.stream().allMatch(
-                block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob() || block.isFlowing());
+                block -> block.getBlockId().equals("steve") || block.getBlockId().equals("air") || block.isMob() || block.isFlowing() || block.getClass().isAnnotationPresent(BreakableByWater.class));
     }
 }

src/main/java/cz/jzitnik/game/logic/services/suffocating/Suffocating.java

@@ -0,0 +1,23 @@
+package cz.jzitnik.game.logic.services.suffocating;
+
+import cz.jzitnik.game.Game;
+import cz.jzitnik.game.annotations.CustomLogic;
+import cz.jzitnik.game.logic.CustomLogicInterface;
+
+@CustomLogic
+public class Suffocating implements CustomLogicInterface {
+    @Override
+    public void nextIteration(Game game) {
+        var world = game.getWorld();
+        int[] data = game.getPlayerCords();
+        int x = data[0];
+        int y = data[1];
+
+        var blocks = world[y - 1][x];
+
+        if (blocks.stream().anyMatch(i -> !i.isGhost())) {
+            // Deal damage when solid block
+            game.getPlayer().dealDamage();
+        }
+    }
+}

src/main/java/cz/jzitnik/game/threads/list/NoHungerThread.java

@@ -15,7 +15,7 @@ public class NoHungerThread extends Thread {
             try {
                 Thread.sleep(3000);
                 if (player.getHunger() == 0) {
-                    player.setHealth(player.getHealth() - 1);
+                    player.dealDamage();
                 }
             } catch (InterruptedException e) {
                 break;