Skip to content

Commit 4ba817d

Browse files
Add a couple more missed condensables
1 parent b92e406 commit 4ba817d

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

src/main/java/me/eccentric_nz/TARDIS/TARDISBuilderInstanceKeeper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ private static HashMap<String, String> initBlockConversion() {
146146
for (Material pot : Tag.FLOWER_POTS.getValues()) {
147147
conversions.put(pot.toString(), pot.toString().replace("POTTED_", ""));
148148
}
149+
conversions.put("POTTED_FLOWERING_AZALEA_BUSH", "FLOWERING_AZALEA_LEAVES");
149150
// all wall signs
150151
for (Material sign : Tag.WALL_SIGNS.getValues()) {
151152
conversions.put(sign.toString(), sign.toString().replace("_WALL", ""));

src/main/java/me/eccentric_nz/TARDIS/artron/ArtronCondensables.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@ public void makeCondensables() {
726726
condensables.put("PRISMARINE_BRICKS", 72);
727727
condensables.put("PRISMARINE_CRYSTALS", 16);
728728
condensables.put("PRISMARINE_SHARD", 8);
729+
condensables.put("PRISMARINE_SLAB", 16);
729730
condensables.put("PRISMARINE_STAIRS", 48);
730731
condensables.put("PRISMARINE_WALL", 32);
731732
condensables.put("PUFFERFISH", 5);

src/main/java/me/eccentric_nz/TARDIS/commands/dev/lists/ConsoleCostLister.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ public void actualArtron() {
6262
for (Map.Entry<String, HashMap<String, Integer>> c : consoleBlockCounts.entrySet()) {
6363
int cost = 0;
6464
for (Map.Entry<String, Integer> entry : c.getValue().entrySet()) {
65-
if (plugin.getCondensables().containsKey(entry.getKey())) {
66-
int value = entry.getValue() * plugin.getCondensables().get(entry.getKey());
65+
String bid = entry.getKey();
66+
if (plugin.getBuildKeeper().getBlockConversion().containsKey(bid)) {
67+
bid = plugin.getBuildKeeper().getBlockConversion().get(bid);
68+
}
69+
if (plugin.getCondensables().containsKey(bid)) {
70+
int value = entry.getValue() * plugin.getCondensables().get(bid);
6771
cost += value;
6872
} else {
6973
plugin.debug("Not in condensables: " + entry.getKey());

src/main/java/me/eccentric_nz/TARDIS/files/CondensablesConfigUpdater.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,7 @@ public void checkCondensables() {
822822
plugin.getCondensablesConfig().set("DEEPSLATE_NETHER_QUARTZ_ORE", 15);
823823
plugin.getCondensablesConfig().set("DEEPSLATE_REDSTONE_ORE", 32);
824824
plugin.getCondensablesConfig().set("PRISMARINE_BRICK_SLAB", 36);
825+
plugin.getCondensablesConfig().set("PRISMARINE_SLAB", 16);
825826
plugin.getCondensablesConfig().set("PRISMARINE_STAIRS", 48);
826827
plugin.getCondensablesConfig().set("PRISMARINE_WALL", 32);
827828
plugin.getCondensablesConfig().set("QUARTZ_BRICKS", 60);

src/main/resources/condensables.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ PRISMARINE_BRICK_SLAB: 36
905905
PRISMARINE_BRICKS: 72
906906
PRISMARINE_CRYSTALS: 16
907907
PRISMARINE_SHARD: 8
908+
PRISMARINE_SLAB: 16
908909
PRISMARINE_STAIRS: 48
909910
PRISMARINE_WALL: 32
910911
PRIZE_POTTERY_SHERD: 20

0 commit comments

Comments
 (0)