From 47a284c1713f28ead50fed3fad9ec52f67fe52e8 Mon Sep 17 00:00:00 2001
From: JojoFR1 <JojoFR1@users.noreply.github.com>
Date: Mon, 17 Jun 2024 13:20:27 +0200
Subject: [PATCH] Added env blocks + some bundle changes

---
 src/aeyama/content/AeyamaBlocks.java | 36 ++++++++++++++++++++++++++++
 src/aeyama/content/AeyamaItems.java  |  2 +-
 src/assets/bundles/bundle.properties | 28 ++++++++++++----------
 3 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 src/aeyama/content/AeyamaBlocks.java

diff --git a/src/aeyama/content/AeyamaBlocks.java b/src/aeyama/content/AeyamaBlocks.java
new file mode 100644
index 0000000..4ae6562
--- /dev/null
+++ b/src/aeyama/content/AeyamaBlocks.java
@@ -0,0 +1,36 @@
+package aeyama.content;
+
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
+
+public class AeyamaBlocks {
+    public static Block
+    stoneSlateFloor, stoneGraniteFloor, stoneLimestoneFloor, stoneSandstoneFloor,
+    stoneMarbleFloor,
+
+    woodTreeWall;
+
+    public static void load() {
+        //#region Environment
+        stoneSlateFloor = new Floor("floor-stone-slate") {{
+            itemDrop = AeyamaItems.stone;
+        }};
+        stoneGraniteFloor = new Floor("floor-stone-granite") {{
+            itemDrop = AeyamaItems.stone;
+        }};
+        stoneLimestoneFloor = new Floor("floor-stone-limestone") {{
+            itemDrop = AeyamaItems.stone;
+        }};
+        stoneSandstoneFloor = new Floor("floor-stone-sandstone") {{
+            itemDrop = AeyamaItems.stone;
+        }};
+        stoneMarbleFloor = new Floor("floor-stone-marble") {{
+            itemDrop = AeyamaItems.stone;
+        }};
+
+        woodTreeWall = new StaticWall("wall-wood-tree") {{
+            itemDrop = AeyamaItems.wood;
+        }};
+        //#endregion
+    }
+}
diff --git a/src/aeyama/content/AeyamaItems.java b/src/aeyama/content/AeyamaItems.java
index 93ccd50..2042fe4 100644
--- a/src/aeyama/content/AeyamaItems.java
+++ b/src/aeyama/content/AeyamaItems.java
@@ -18,7 +18,7 @@ public static void load() {
         stone = new Item("stone", Color.valueOf("#e0b28d")) {{
 
         }};
-        //#endregion Resources
+        //#endregion
 
         aeyamaItems.addAll(wood, stone);
     }
diff --git a/src/assets/bundles/bundle.properties b/src/assets/bundles/bundle.properties
index 400dbfc..b668ba6 100644
--- a/src/assets/bundles/bundle.properties
+++ b/src/assets/bundles/bundle.properties
@@ -40,20 +40,24 @@ aeyama.displayName-simple = Aeyama
 #=#=# Units #=#=# 
 
 #=#=# Blocks #=#=# 
-block.aeyama-wood.name = Tree
-block.aeyama-wood.description = Carbon-based plant with great properties as building material, available in very large quantities.
-block.aeyama-stone-a.name = Slate
-block.aeyama-stone-a.description = Dark and brittle stone type.
-block.aeyama-stone-b.name = Granite
-block.aeyama-stone-b.description = Hhard and strong red-ish colored stone type.
-block.aeyama-stone-c.name = Limestone
-block.aeyama-stone-c.description = Not the strongest stone, but available in large quantities.
-block.aeyama-stone-d.name = Sandstone
-block.aeyama-stone-d.description = Orange tinted stone type made out of compressed sand.
-block.aeyama-stone-e.name = Marble
-block.aeyama-stone-e.description = Beautifull stone type.
+# Are description really needed for env block?
+block.aeyama-floor-stone-slate.name = Slate
+block.aeyama-floor-stone-slate.description = Dark and brittle stone type.
+block.aeyama-floor-stone-granite.name = Granite
+block.aeyama-floor-stone-granite.description = Hhard and strong red-ish colored stone type.
+block.aeyama-floor-stone-limestone.name = Limestone
+block.aeyama-floor-stone-limestone.description = Not the strongest stone, but available in large quantities.
+block.aeyama-floor-stone-sandstone.name = Sandstone
+block.aeyama-floor-stone-sandstone.description = Orange tinted stone type made out of compressed sand.
+block.aeyama-floor-stone-marble.name = Marble
+block.aeyama-floor-stone-marble.description = Beautifull stone type.
+
+block.aeyama-wall-wood-tree.name = Tree
+block.aeyama-wall-wood-tree.description = Carbon-based plant with great properties as building material, available in very large quantities.
+
 
 #=#=# Items #=#=# 
+# Why naming wood Lumber? Lumber is a transformed product no?
 item.aeyama-wood.name = Lumber
 item.aeyama-wood.description = A very basic but useful building resource.
 item.aeyama-stone.name = Stone Brick