Skip to content

Commit f439c9b

Browse files
eccentricdevotioneccentricdevotion
committed
More 1.21.10 updates
1 parent abb069c commit f439c9b

File tree

10 files changed

+240
-15
lines changed

10 files changed

+240
-15
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212

1313
group = "me.eccentric_nz"
1414
val buildNumber = "-b${System.getenv("BUILD_NUMBER") ?: (System.getenv("SHORT_SHA") ?: ".local")}"
15-
version = "6.2.3${buildNumber}"
15+
version = "6.2.4${buildNumber}"
1616

1717
repositories {
1818
mavenCentral()

‎src/main/java/me/eccentric_nz/TARDIS/artron/TARDISCondensables.java‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void makeCondensables() {
171171
condensables.put("CARTOGRAPHY_TABLE", 28);
172172
condensables.put("CARVED_PUMPKIN", 50);
173173
condensables.put("CAULDRON", 154);
174-
condensables.put("CHAIN", 1);
174+
condensables.put("IRON_CHAIN", 28);
175175
condensables.put("CHARCOAL", 15);
176176
condensables.put("CHEST", 4);
177177
condensables.put("CHEST_MINECART", 30);
@@ -1017,7 +1017,7 @@ public void makeCondensables() {
10171017
condensables.put("HANGING_ROOTS", 2);
10181018
condensables.put("LIGHT_BLUE_CANDLE", 35);
10191019
condensables.put("LIGHT_GRAY_CANDLE", 35);
1020-
condensables.put("LIGHTNING_ROD", 2);
1020+
condensables.put("LIGHTNING_ROD", 60);
10211021
condensables.put("LIME_CANDLE", 35);
10221022
condensables.put("MAGENTA_CANDLE", 35);
10231023
condensables.put("MOSS_BLOCK", 16);
@@ -1268,6 +1268,62 @@ public void makeCondensables() {
12681268
condensables.put("SHORT_DRY_GRASS", 2);
12691269
condensables.put("TALL_DRY_GRASS", 2);
12701270
condensables.put("WILDFLOWERS", 2);
1271+
// 1.21.10
1272+
condensables.put("COPPER_CHAIN", 24);
1273+
condensables.put("EXPOSED_COPPER_CHAIN", 24);
1274+
condensables.put("WEATHERED_COPPER_CHAIN", 24);
1275+
condensables.put("OXIDIZED_COPPER_CHAIN", 24);
1276+
condensables.put("WAXED_COPPER_CHAIN", 24);
1277+
condensables.put("WAXED_EXPOSED_COPPER_CHAIN", 24);
1278+
condensables.put("WAXED_WEATHERED_COPPER_CHAIN", 24);
1279+
condensables.put("WAXED_OXIDIZED_COPPER_CHAIN", 24);
1280+
condensables.put("ACACIA_SHELF", 2);
1281+
condensables.put("BAMBOO_SHELF", 2);
1282+
condensables.put("BIRCH_SHELF", 2);
1283+
condensables.put("CHERRY_SHELF", 2);
1284+
condensables.put("CRIMSON_SHELF", 2);
1285+
condensables.put("DARK_OAK_SHELF", 2);
1286+
condensables.put("JUNGLE_SHELF", 2);
1287+
condensables.put("MANGROVE_SHELF", 2);
1288+
condensables.put("OAK_SHELF", 2);
1289+
condensables.put("PALE_OAK_SHELF", 2);
1290+
condensables.put("SPRUCE_SHELF", 2);
1291+
condensables.put("WARPED_SHELF", 2);
1292+
condensables.put("COPPER_TORCH", 4);
1293+
condensables.put("COPPER_BARS", 10);
1294+
condensables.put("EXPOSED_COPPER_BARS", 10);
1295+
condensables.put("WEATHERED_COPPER_BARS", 10);
1296+
condensables.put("OXIDIZED_COPPER_BARS", 10);
1297+
condensables.put("WAXED_COPPER_BARS", 10);
1298+
condensables.put("WAXED_EXPOSED_COPPER_BARS", 10);
1299+
condensables.put("WAXED_WEATHERED_COPPER_BARS", 10);
1300+
condensables.put("WAXED_OXIDIZED_COPPER_BARS", 10);
1301+
condensables.put("EXPOSED_LIGHTNING_ROD", 60);
1302+
condensables.put("WEATHERED_LIGHTNING_ROD", 60);
1303+
condensables.put("OXIDIZED_LIGHTNING_ROD", 60);
1304+
condensables.put("WAXED_LIGHTNING_ROD", 60);
1305+
condensables.put("WAXED_EXPOSED_LIGHTNING_ROD", 60);
1306+
condensables.put("WAXED_WEATHERED_LIGHTNING_ROD", 60);
1307+
condensables.put("WAXED_OXIDIZED_LIGHTNING_ROD", 60);
1308+
condensables.put("COPPER_SWORD", 42);
1309+
condensables.put("COPPER_SHOVEL", 24);
1310+
condensables.put("COPPER_PICKAXE", 64);
1311+
condensables.put("COPPER_AXE", 64);
1312+
condensables.put("COPPER_HOE", 44);
1313+
condensables.put("COPPER_HELMET", 100);
1314+
condensables.put("COPPER_CHESTPLATE", 160);
1315+
condensables.put("COPPER_LEGGINGS", 140);
1316+
condensables.put("COPPER_BOOTS", 80);
1317+
condensables.put("COPPER_HORSE_ARMOR", 120);
1318+
condensables.put("COPPER_NUGGET", 2);
1319+
condensables.put("COPPER_LANTERN", 20);
1320+
condensables.put("EXPOSED_COPPER_LANTERN", 20);
1321+
condensables.put("WEATHERED_COPPER_LANTERN", 20);
1322+
condensables.put("OXIDIZED_COPPER_LANTERN", 20);
1323+
condensables.put("WAXED_COPPER_LANTERN", 20);
1324+
condensables.put("WAXED_EXPOSED_COPPER_LANTERN", 20);
1325+
condensables.put("WAXED_WEATHERED_COPPER_LANTERN", 20);
1326+
condensables.put("WAXED_OXIDIZED_COPPER_LANTERN", 20);
12711327
} else {
12721328
Set<String> items = plugin.getCondensablesConfig().getKeys(false);
12731329
items.forEach((item) -> condensables.put(item, plugin.getCondensablesConfig().getInt(item)));

‎src/main/java/me/eccentric_nz/TARDIS/files/TARDISBlocksUpdater.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void checkBlocksConfig() {
116116
under.add("BLACKSTONE_WALL");
117117
under.add("BRICK_WALL");
118118
under.add("CAMPFIRE");
119-
under.add("CHAIN");
119+
under.add("IRON_CHAIN");
120120
under.add("CRIMSON_BUTTON");
121121
under.add("CRIMSON_DOOR");
122122
under.add("CRIMSON_FENCE");

‎src/main/java/me/eccentric_nz/TARDIS/files/TARDISCondensablesUpdater.java‎

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void checkCondensables() {
153153
list.put("BLACKSTONE_SLAB", 1);
154154
list.put("BLACKSTONE_STAIRS", 1);
155155
list.put("BLACKSTONE_WALL", 1);
156-
list.put("CHAIN", 1);
156+
list.put("IRON_CHAIN", 1);
157157
list.put("CHISELED_NETHER_BRICKS", 1);
158158
list.put("CHISELED_POLISHED_BLACKSTONE", 1);
159159
list.put("CRACKED_NETHER_BRICKS", 1);
@@ -716,6 +716,68 @@ public void checkCondensables() {
716716
plugin.getCondensablesConfig().set("WILDFLOWERS", 2);
717717
i++;
718718
}
719+
// 1.21.10
720+
if (!plugin.getCondensablesConfig().contains("COPPER_CHAIN")) {
721+
plugin.getCondensablesConfig().set("CHAIN", null);
722+
plugin.getCondensablesConfig().set("IRON_CHAIN", 28);
723+
plugin.getCondensablesConfig().set("COPPER_CHAIN", 24);
724+
plugin.getCondensablesConfig().set("EXPOSED_COPPER_CHAIN", 24);
725+
plugin.getCondensablesConfig().set("WEATHERED_COPPER_CHAIN", 24);
726+
plugin.getCondensablesConfig().set("OXIDIZED_COPPER_CHAIN", 24);
727+
plugin.getCondensablesConfig().set("WAXED_COPPER_CHAIN", 24);
728+
plugin.getCondensablesConfig().set("WAXED_EXPOSED_COPPER_CHAIN", 24);
729+
plugin.getCondensablesConfig().set("WAXED_WEATHERED_COPPER_CHAIN", 24);
730+
plugin.getCondensablesConfig().set("WAXED_OXIDIZED_COPPER_CHAIN", 24);
731+
plugin.getCondensablesConfig().set("ACACIA_SHELF", 2);
732+
plugin.getCondensablesConfig().set("BAMBOO_SHELF", 2);
733+
plugin.getCondensablesConfig().set("BIRCH_SHELF", 2);
734+
plugin.getCondensablesConfig().set("CHERRY_SHELF", 2);
735+
plugin.getCondensablesConfig().set("CRIMSON_SHELF", 2);
736+
plugin.getCondensablesConfig().set("DARK_OAK_SHELF", 2);
737+
plugin.getCondensablesConfig().set("JUNGLE_SHELF", 2);
738+
plugin.getCondensablesConfig().set("MANGROVE_SHELF", 2);
739+
plugin.getCondensablesConfig().set("OAK_SHELF", 2);
740+
plugin.getCondensablesConfig().set("PALE_OAK_SHELF", 2);
741+
plugin.getCondensablesConfig().set("SPRUCE_SHELF", 2);
742+
plugin.getCondensablesConfig().set("WARPED_SHELF", 2);
743+
plugin.getCondensablesConfig().set("COPPER_TORCH", 4);
744+
plugin.getCondensablesConfig().set("COPPER_BARS", 10);
745+
plugin.getCondensablesConfig().set("EXPOSED_COPPER_BARS", 10);
746+
plugin.getCondensablesConfig().set("WEATHERED_COPPER_BARS", 10);
747+
plugin.getCondensablesConfig().set("OXIDIZED_COPPER_BARS", 10);
748+
plugin.getCondensablesConfig().set("WAXED_COPPER_BARS", 10);
749+
plugin.getCondensablesConfig().set("WAXED_EXPOSED_COPPER_BARS", 10);
750+
plugin.getCondensablesConfig().set("WAXED_WEATHERED_COPPER_BARS", 10);
751+
plugin.getCondensablesConfig().set("WAXED_OXIDIZED_COPPER_BARS", 10);
752+
plugin.getCondensablesConfig().set("EXPOSED_LIGHTNING_ROD", 60);
753+
plugin.getCondensablesConfig().set("WEATHERED_LIGHTNING_ROD", 60);
754+
plugin.getCondensablesConfig().set("OXIDIZED_LIGHTNING_ROD", 60);
755+
plugin.getCondensablesConfig().set("WAXED_LIGHTNING_ROD", 60);
756+
plugin.getCondensablesConfig().set("WAXED_EXPOSED_LIGHTNING_ROD", 60);
757+
plugin.getCondensablesConfig().set("WAXED_WEATHERED_LIGHTNING_ROD", 60);
758+
plugin.getCondensablesConfig().set("WAXED_OXIDIZED_LIGHTNING_ROD", 60);
759+
plugin.getCondensablesConfig().set("LIGHTNING_ROD", 60);
760+
plugin.getCondensablesConfig().set("COPPER_SWORD", 42);
761+
plugin.getCondensablesConfig().set("COPPER_SHOVEL", 24);
762+
plugin.getCondensablesConfig().set("COPPER_PICKAXE", 64);
763+
plugin.getCondensablesConfig().set("COPPER_AXE", 64);
764+
plugin.getCondensablesConfig().set("COPPER_HOE", 44);
765+
plugin.getCondensablesConfig().set("COPPER_HELMET", 100);
766+
plugin.getCondensablesConfig().set("COPPER_CHESTPLATE", 160);
767+
plugin.getCondensablesConfig().set("COPPER_LEGGINGS", 140);
768+
plugin.getCondensablesConfig().set("COPPER_BOOTS", 80);
769+
plugin.getCondensablesConfig().set("COPPER_HORSE_ARMOR", 120);
770+
plugin.getCondensablesConfig().set("COPPER_NUGGET", 2);
771+
plugin.getCondensablesConfig().set("COPPER_LANTERN", 20);
772+
plugin.getCondensablesConfig().set("EXPOSED_COPPER_LANTERN", 20);
773+
plugin.getCondensablesConfig().set("WEATHERED_COPPER_LANTERN", 20);
774+
plugin.getCondensablesConfig().set("OXIDIZED_COPPER_LANTERN", 20);
775+
plugin.getCondensablesConfig().set("WAXED_COPPER_LANTERN", 20);
776+
plugin.getCondensablesConfig().set("WAXED_EXPOSED_COPPER_LANTERN", 20);
777+
plugin.getCondensablesConfig().set("WAXED_WEATHERED_COPPER_LANTERN", 20);
778+
plugin.getCondensablesConfig().set("WAXED_OXIDIZED_COPPER_LANTERN", 20);
779+
i++;
780+
}
719781
if (i > 0) {
720782
try {
721783
String listPath = plugin.getDataFolder() + File.separator + "condensables.yml";

0 commit comments

Comments
 (0)