Merge pull request #1077 from eccentricdevotion

Add wardrobe and cloister rooms

Author: eccentricdevotion

.github/workflows/gradle.yml

@@ -9,7 +9,7 @@ on:
     branches: [ "master" ]
 
 env:
-  VERSION: '6.3.9'
+  VERSION: '6.3.10'
   RELEASE_TAG: '1.21.11'
 
 jobs:

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 group = "me.eccentric_nz"
 val buildNumber = "-b${System.getenv("BUILD_NUMBER") ?: (System.getenv("SHORT_SHA") ?: ".local")}"
-version = "6.3.9${buildNumber}"
+version = "6.3.10${buildNumber}"
 
 repositories {
     mavenCentral()

src/main/java/me/eccentric_nz/TARDIS/ARS/TARDISARS.java

@@ -38,6 +38,7 @@ public enum TARDISARS implements ARS {
     BEDROOM("GLOWSTONE", "Bedroom", 1, RoomVariant.BEDROOM.getKey()),
     BIRDCAGE("YELLOW_GLAZED_TERRACOTTA", "Bird Cage", 1, RoomVariant.BIRDCAGE.getKey()),
     CHEMISTRY("BLAST_FURNACE", "Chemistry Lab", 1, RoomVariant.CHEMISTRY.getKey()),
+    CLOISTER("PALE_MOSS_BLOCK", "Cloister", 1, RoomVariant.CLOISTER.getKey()),
     EMPTY("GLASS", "Empty", 1, RoomVariant.EMPTY.getKey()),
     EYE("SHROOMLIGHT", "Eye of Harmony", 1, RoomVariant.EYE.getKey()),
     FARM("DIRT", "Mob Farm", 1, RoomVariant.FARM.getKey()),
@@ -76,6 +77,7 @@ public enum TARDISARS implements ARS {
     TRENZALORE("BRICKS", "Trenzalore", 1, RoomVariant.TRENZALORE.getKey()),
     VAULT("DISPENSER", "Storage Vault", 1, RoomVariant.VAULT.getKey()),
     VILLAGE("OAK_LOG", "Village", 1, RoomVariant.VILLAGE.getKey()),
+    WARDROBE("BIRCH_LOG", "Wardrobe", 1, RoomVariant.WARDROBE.getKey()),
     WOOD("OAK_PLANKS", "Wood Secondary Console", 1, RoomVariant.WOOD.getKey()),
     WORKSHOP("RED_NETHER_BRICKS", "Workshop", 1, RoomVariant.WORKSHOP.getKey()),
     ZERO("GRASS_BLOCK", "Zero Room", 0, null, false),

src/main/java/me/eccentric_nz/TARDIS/blueprints/BlueprintRoom.java

@@ -40,6 +40,7 @@ public enum BlueprintRoom {
     BEDROOM("tardis.room.bedroom"),
     BIRDCAGE("tardis.room.birdcage", BlueprintFeature.FARM),
     CHEMISTRY("tardis.room.chemistry"),
+    CLOISTER("tardis.room.cloister"),
     EMPTY("tardis.room.empty"),
     EYE("tardis.room.eye"),
     FARM("tardis.room.farm", BlueprintFeature.FARM),
@@ -76,6 +77,7 @@ public enum BlueprintRoom {
     TRENZALORE("tardis.room.trenzalore"),
     VAULT("tardis.room.vault", BlueprintFeature.VAULT),
     VILLAGE("tardis.room.village", BlueprintFeature.FARM),
+    WARDROBE("tardis.room.wardrobe"),
     WOOD("tardis.room.wood"),
     WORKSHOP("tardis.room.workshop"),
     ZERO("tardis.room.zero");

src/main/java/me/eccentric_nz/TARDIS/commands/TARDISRoomCommands.java

@@ -70,7 +70,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                             return false;
                         }
                         rooms.forEach((r) -> {
-                            if (plugin.getRoomsConfig().getBoolean("rooms." + name + ".enabled")) {
+                            if (plugin.getRoomsConfig().getBoolean("rooms." + r + ".enabled")) {
                                 HashMap<String, Integer> blockIDs = plugin.getBuildKeeper().getRoomBlockCounts().get(r);
                                 String file = plugin.getDataFolder() + File.separator + r + "_block_list.txt";
                                 int cost = 0;
@@ -85,7 +85,18 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                                                 cost += value;
                                             }
                                         }
-                                        bw.write("Actual room cost: " + Math.round(cost / 2.0F));
+                                        int artron_cost = Math.round(cost / 2.0F);
+                                        float tmp_cost = artron_cost / 10.0f;
+                                        int config_cost = (((int) tmp_cost) / 25) * 25;
+//                                        int offset = plugin.getRoomsConfig().getInt("rooms." + r + ".offset");
+//                                        String material = plugin.getRoomsConfig().getString("rooms." + r + ".seed");
+//                                        plugin.debug("| " + r + " | " + config_cost + " | " + offset + " | " + material + " |");
+//                                        plugin.debug("| " + TARDISStringUtils.capitalise(r) + " | " + artron_cost + " | " + config_cost + " |");
+//                                        plugin.debug("integerOptions.put(\"rooms." + r + ".cost\", " + config_cost + ");");
+//                                        plugin.debug("integerOptions.put(\"rooms." + r + ".offset\", " + offset + ");");
+                                        bw.write("Actual room cost: " + artron_cost);
+                                        bw.newLine();
+                                        bw.write("Config room cost: " + config_cost);
                                         bw.newLine();
                                     }
                                 } catch (IOException e) {

src/main/java/me/eccentric_nz/TARDIS/custommodels/keys/RoomVariant.java

@@ -32,6 +32,7 @@ public enum RoomVariant {
     BEDROOM(new NamespacedKey(TARDIS.plugin, "button_bedroom")),
     BIRDCAGE(new NamespacedKey(TARDIS.plugin, "button_birdcage")),
     CHEMISTRY(new NamespacedKey(TARDIS.plugin, "button_chemistry")),
+    CLOISTER(new NamespacedKey(TARDIS.plugin, "button_cloister")),
     EMPTY(new NamespacedKey(TARDIS.plugin, "button_empty")),
     EYE(new NamespacedKey(TARDIS.plugin, "button_eye")),
     FARM(new NamespacedKey(TARDIS.plugin, "button_farm")),
@@ -72,6 +73,7 @@ public enum RoomVariant {
     TRENZALORE(new NamespacedKey(TARDIS.plugin, "button_trenzalore")),
     VAULT(new NamespacedKey(TARDIS.plugin, "button_vault")),
     VILLAGE(new NamespacedKey(TARDIS.plugin, "button_village")),
+    WARDROBE(new NamespacedKey(TARDIS.plugin, "button_wardrobe")),
     WOOD(new NamespacedKey(TARDIS.plugin, "button_wood")),
     WORKSHOP(new NamespacedKey(TARDIS.plugin, "button_workshop")),
     ZERO(new NamespacedKey(TARDIS.plugin, "button_zero_room"));

src/main/java/me/eccentric_nz/TARDIS/enumeration/Room.java

@@ -32,6 +32,7 @@ public enum Room {
     BEDROOM,
     BIRDCAGE,
     CHEMISTRY,
+    CLOISTER,
     EMPTY,
     EYE,
     FARM,
@@ -70,6 +71,7 @@ public enum Room {
     TRENZALORE,
     VAULT,
     VILLAGE,
+    WARDROBE,
     WOOD,
     WORKSHOP,
     ZERO