Update to Minecraft 1.21.1 (#81)

* Update gradle build files * Update to accommodate API changes * Update items tiers with material changes * Update item tiers and images with new items * Add tuff variants to item data * Bump version number
Extremelyd1 · Sep 14, 2024 · ee635a0 · ee635a0
1 parent 49ebb45
commit ee635a0
Show file tree

Hide file tree

Showing 16 changed files with 208 additions and 63 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,22 +1,16 @@
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
 plugins {
     `java-library`
-    id("io.papermc.paperweight.userdev") version "1.5.5"
-}
-
-repositories {
-    maven {
-        url = uri("https://papermc.io/repo/repository/maven-public/")
-    }
+    id("io.papermc.paperweight.userdev") version "1.7.2"
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
 }
 
 tasks {
@@ -26,5 +20,5 @@ tasks {
 }
 
 group = "com.extremelyd1"
-version = "1.10.0"
+version = "1.11.0"
 description = "MinecraftBingo"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
+#Sat Sep 14 09:26:01 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/item_data/a_tier.txt b/item_data/a_tier.txt
@@ -54,6 +54,7 @@ BLAZE_POWDER
 BLAZE_ROD
 BLUE_CANDLE
 BLUE_ORCHID
+BREEZE_ROD
 BREWING_STAND
 BROWN_BED
 BROWN_CANDLE
@@ -87,11 +88,13 @@ CHERRY_STAIRS
 CHERRY_TRAPDOOR
 CHISELED_POLISHED_BLACKSTONE
 CHISELED_RED_SANDSTONE
+CHISELED_TUFF
 COBWEB
 COCOA_BEANS
 COD_BUCKET
 COOKED_RABBIT
 COOKIE
+COPPER_BULB
 CRACKED_POLISHED_BLACKSTONE_BRICKS
 CRIMSON_BUTTON
 CRIMSON_DOOR
@@ -157,7 +160,12 @@ ENCHANTING_TABLE
 ENDER_CHEST
 END_CRYSTAL
 EXPERIENCE_BOTTLE
+EXPOSED_CHISELED_COPPER
 EXPOSED_COPPER
+EXPOSED_COPPER_BULB
+EXPOSED_COPPER_DOOR
+EXPOSED_COPPER_GRATE
+EXPOSED_COPPER_TRAPDOOR
 EXPOSED_CUT_COPPER
 EXPOSED_CUT_COPPER_SLAB
 EXPOSED_CUT_COPPER_STAIRS
@@ -170,7 +178,7 @@ GLISTERING_MELON_SLICE
 GLOW_BERRIES
 GLOW_LICHEN
 GOLDEN_HORSE_ARMOR
-GRASS
+SHORT_GRASS
 GRAY_CANDLE
 GREEN_BED
 GREEN_CANDLE
@@ -258,6 +266,8 @@ NETHERITE_SCRAP
 NETHER_SPROUTS
 NETHER_WART
 NETHER_WART_BLOCK
+OMINOUS_BOTTLE
+OMINOUS_TRIAL_KEY
 ORANGE_CANDLE
 ORANGE_TULIP
 PINK_CANDLE
@@ -275,6 +285,10 @@ POLISHED_BLACKSTONE_BUTTON
 POLISHED_BLACKSTONE_SLAB
 POLISHED_BLACKSTONE_STAIRS
 POLISHED_BLACKSTONE_WALL
+POLISHED_TUFF
+POLISHED_TUFF_SLAB
+POLISHED_TUFF_STAIRS
+POLISHED_TUFF_WALL
 POTATO
 POWDER_SNOW_BUCKET
 PRISMARINE
@@ -349,6 +363,13 @@ TINTED_GLASS
 TIPPED_ARROW
 TROPICAL_FISH_BUCKET
 TUFF
+TUFF_BRICKS
+TUFF_BRICK_SLAB
+TUFF_BRICK_STAIRS
+TUFF_BRICK_WALL
+TUFF_SLAB
+TUFF_STAIRS
+TUFF_WALL
 TWISTING_VINES
 VINE
 WARPED_BUTTON
@@ -366,8 +387,27 @@ WARPED_STAIRS
 WARPED_STEM
 WARPED_TRAPDOOR
 WARPED_WART_BLOCK
+WAXED_CHISELED_COPPER
+WAXED_COPPER_BLOCK
+WAXED_COPPER_BULB
+WAXED_COPPER_DOOR
+WAXED_COPPER_GRATE
+WAXED_COPPER_TRAPDOOR
+WAXED_CUT_COPPER
+WAXED_CUT_COPPER_SLAB
+WAXED_CUT_COPPER_STAIRS
+WAXED_EXPOSED_CHISELED_COPPER
+WAXED_EXPOSED_COPPER
+WAXED_EXPOSED_COPPER_BULB
+WAXED_EXPOSED_COPPER_DOOR
+WAXED_EXPOSED_COPPER_GRATE
+WAXED_EXPOSED_COPPER_TRAPDOOR
+WAXED_EXPOSED_CUT_COPPER
+WAXED_EXPOSED_CUT_COPPER_SLAB
+WAXED_EXPOSED_CUT_COPPER_STAIRS
 WEEPING_VINES
 WET_SPONGE
 WHITE_CANDLE
 WHITE_TULIP
+WIND_CHARGE
 YELLOW_CANDLE
diff --git a/item_data/b_tier.txt b/item_data/b_tier.txt
@@ -1,5 +1,6 @@
 ACTIVATOR_RAIL
 ANVIL
+ARMADILLO_SCUTE
 AZURE_BLUET
 BIRCH_HANGING_SIGN
 BIRCH_LEAVES
@@ -19,14 +20,19 @@ CAKE
 CAULDRON
 CHAIN
 CHEST_MINECART
+CHISELED_COPPER
 CHISELED_NETHER_BRICKS
 CHISELED_QUARTZ_BLOCK
 CLOCK
 COMPARATOR
 COMPASS
 COPPER_BLOCK
+COPPER_DOOR
+COPPER_GRATE
+COPPER_TRAPDOOR
 COPPER_INGOT
 CORNFLOWER
+CRAFTER
 CRACKED_NETHER_BRICKS
 CROSSBOW
 CUT_COPPER
@@ -42,6 +48,7 @@ EGG
 ENDER_EYE
 FIRE_CHARGE
 FLINT_AND_STEEL
+FLOW_POTTERY_SHERD
 FLOWER_BANNER_PATTERN
 FURNACE_MINECART
 GLOWSTONE
@@ -62,6 +69,7 @@ GOLDEN_SWORD
 GOLD_BLOCK
 GOLD_INGOT
 GOLD_NUGGET
+GUSTER_POTTERY_SHERD
 HOPPER
 HOPPER_MINECART
 IRON_AXE
@@ -148,6 +156,7 @@ REDSTONE_TORCH
 RED_MUSHROOM
 REPEATER
 ROSE_BUSH
+SCRAPE_POTTERY_SHERD
 SHEARS
 SHIELD
 SHROOMLIGHT
@@ -163,5 +172,7 @@ SUSPICIOUS_STEW
 TARGET
 TNT_MINECART
 TRAPPED_CHEST
+TRIAL_KEY
 TRIPWIRE_HOOK
-WATER_BUCKET
+WATER_BUCKET
+WOLF_ARMOR
diff --git a/item_data/blacklist.txt b/item_data/blacklist.txt
@@ -13,17 +13,21 @@ DRAGON_EGG
 DRAGON_HEAD
 ELYTRA
 END_ROD
-GLOBE_BANNER_PATTERN
+FLOW_BANNER_PATTERN
 GRAY_SHULKER_BOX
 GREEN_SHULKER_BOX
+GUSTER_BANNER_PATTERN
 LIGHT_BLUE_SHULKER_BOX
 LIGHT_GRAY_SHULKER_BOX
 LIME_SHULKER_BOX
 MAGENTA_SHULKER_BOX
 MOJANG_BANNER_PATTERN
 MUSIC_DISC_5
+MUSIC_DISC_CREATOR
+MUSIC_DISC_CREATOR_MUSIC_BOX
 MUSIC_DISC_OTHERSIDE
 MUSIC_DISC_PIGSTEP
+MUSIC_DISC_PRECIPICE
 NETHERITE_AXE
 NETHERITE_BLOCK
 NETHERITE_BOOTS
@@ -37,9 +41,14 @@ NETHERITE_SWORD
 NETHER_STAR
 ORANGE_SHULKER_BOX
 OXIDIZED_COPPER
+OXIDIZED_COPPER_BULB
+OXIDIZED_COPPER_DOOR
+OXIDIZED_COPPER_GRATE
+OXIDIZED_COPPER_TRAPDOOR
 OXIDIZED_CUT_COPPER
 OXIDIZED_CUT_COPPER_SLAB
 OXIDIZED_CUT_COPPER_STAIRS
+PIGLIN_BANNER_PATTERN
 PIGLIN_HEAD
 PINK_SHULKER_BOX
 PITCHER_PLANT
@@ -60,10 +69,41 @@ TORCHFLOWER
 TORCHFLOWER_SEEDS
 TURTLE_HELMET
 WARD_ARMOR_TRIM_SMITHING_TEMPLATE
-WAXED_OXIDIZED_COPPER
+WAXED_CHISELED_COPPER
+WAXED_EXPOSED_CHISELED_COPPER
+WAXED_WEATHERED_CHISELED_COPPER
+WAXED_OXIDIZED_CHISELED_COPPER
+WAXED_COPPER_DOOR
+WAXED_EXPOSED_COPPER_DOOR
+WAXED_WEATHERED_COPPER_DOOR
+WAXED_OXIDIZED_COPPER_DOOR
+WAXED_COPPER_GRATE
+WAXED_EXPOSED_COPPER_GRATE
+WAXED_WEATHERED_COPPER_GRATE
+WAXED_OXIDIZED_COPPER_GRATE
+WAXED_COPPER_TRAPDOOR
+WAXED_EXPOSED_COPPER_TRAPDOOR
+WAXED_WEATHERED_COPPER_TRAPDOOR
+WAXED_OXIDIZED_COPPER_TRAPDOOR
+WAXED_CUT_COPPER
+WAXED_EXPOSED_CUT_COPPER
+WAXED_WEATHERED_CUT_COPPER
 WAXED_OXIDIZED_CUT_COPPER
-WAXED_OXIDIZED_CUT_COPPER_SLAB
+WAXED_CUT_COPPER_STAIRS
+WAXED_EXPOSED_CUT_COPPER_STAIRS
+WAXED_WEATHERED_CUT_COPPER_STAIRS
 WAXED_OXIDIZED_CUT_COPPER_STAIRS
+WAXED_CUT_COPPER_SLAB
+WAXED_EXPOSED_CUT_COPPER_SLAB
+WAXED_WEATHERED_CUT_COPPER_SLAB
+WAXED_OXIDIZED_CUT_COPPER_SLAB
+WAXED_EXPOSED_COPPER
+WAXED_WEATHERED_COPPER
+WAXED_OXIDIZED_COPPER
+WAXED_COPPER_BULB
+WAXED_EXPOSED_COPPER_BULB
+WAXED_WEATHERED_COPPER_BULB
+WAXED_OXIDIZED_COPPER_BULB
 WHITE_SHULKER_BOX
 WITHER_ROSE
 YELLOW_SHULKER_BOX

diff --git a/item_data/groups.txt b/item_data/groups.txt
@@ -24,7 +24,7 @@ GRANITE|POLISHED_GRANITE|GRANITE_WALL|POLISHED_GRANITE_STAIRS|GRANITE_STAIRS|POL
 DIORITE|POLISHED_DIORITE|DIORITE_WALL|POLISHED_DIORITE_STAIRS|DIORITE_STAIRS|POLISHED_DIORITE_SLAB|DIORITE_SLAB
 ANDESITE|POLISHED_ANDESITE|ANDESITE_WALL|ANDESITE_STAIRS|POLISHED_ANDESITE_STAIRS|ANDESITE_SLAB|POLISHED_ANDESITE_SLAB
 DEEPSLATE|COBBLED_DEEPSLATE|POLISHED_DEEPSLATE|DEEPSLATE_BRICKS|CRACKED_DEEPSLATE_BRICKS|DEEPSLATE_TILES|CRACKED_DEEPSLATE_TILES|CHISELED_DEEPSLATE|REINFORCED_DEEPSLATE|COBBLED_DEEPSLATE_WALL|POLISHED_DEEPSLATE_WALL|DEEPSLATE_BRICK_WALL|DEEPSLATE_TILE_WALL|COBBLED_DEEPSLATE_STAIRS|POLISHED_DEEPSLATE_STAIRS|DEEPSLATE_BRICK_STAIRS|DEEPSLATE_TILE_STAIRS|COBBLED_DEEPSLATE_SLAB|POLISHED_DEEPSLATE_SLAB|DEEPSLATE_BRICK_SLAB|DEEPSLATE_TILE_SLAB
-AMETHYST_SHARD|CALCITE|TUFF|AMETHYST_BLOCK|SPYGLASS|SMALL_AMETHYST_BUD|MEDIUM_AMETHYST_BUD|LARGE_AMETHYST_BUD|AMETHYST_CLUSTER|TINTED_GLASS
+AMETHYST_SHARD|CALCITE|TUFF|TUFF_SLAB|TUFF_STAIRS|TUFF_WALL|CHISELED_TUFF|POLISHED_TUFF|POLISHED_TUFF_SLAB|POLISHED_TUFF_STAIRS|POLISHED_TUFF_WALL|TUFF_BRICKS|TUFF_BRICK_SLAB|TUFF_BRICK_STAIRS|TUFF_BRICK_WALL|CHISELED_TUFF_BRICKS|AMETHYST_BLOCK|SPYGLASS|SMALL_AMETHYST_BUD|MEDIUM_AMETHYST_BUD|LARGE_AMETHYST_BUD|AMETHYST_CLUSTER|TINTED_GLASS
 DRIPSTONE_BLOCK|POINTED_DRIPSTONE
 PRISMARINE|PRISMARINE_SHARD|PRISMARINE_CRYSTALS|PRISMARINE_SLAB|PRISMARINE_BRICK_SLAB|DARK_PRISMARINE_SLAB|PRISMARINE_WALL|PRISMARINE_BRICKS|DARK_PRISMARINE|PRISMARINE_STAIRS|PRISMARINE_BRICK_STAIRS|DARK_PRISMARINE_STAIRS|SEA_LANTERN
 NETHERRACK|NETHER_BRICK_SLAB|NETHER_BRICKS|CRACKED_NETHER_BRICKS|CHISELED_NETHER_BRICKS|NETHER_BRICK_FENCE|NETHER_BRICK_STAIRS|NETHER_BRICK_WALL|NETHER_BRICK
@@ -39,7 +39,7 @@ END_STONE|END_STONE_BRICKS|END_STONE_BRICK_WALL|END_STONE_BRICK_STAIRS|END_STONE
 CHORUS_FRUIT|POPPED_CHORUS_FRUIT|PURPUR_SLAB|CHORUS_FLOWER|PURPUR_BLOCK|PURPUR_PILLAR|PURPUR_STAIRS
 COAL|COAL_BLOCK|TORCH
 RAW_IRON|IRON_INGOT|RAW_IRON_BLOCK|IRON_BLOCK|IRON_BARS|CHAIN|ANVIL|HOPPER|TRIPWIRE_HOOK|TRAPPED_CHEST|IRON_DOOR|IRON_TRAPDOOR|FLINT_AND_STEEL|IRON_SWORD|IRON_SHOVEL|IRON_PICKAXE|IRON_AXE|IRON_HOE|IRON_HELMET|IRON_CHESTPLATE|IRON_LEGGINGS|IRON_BOOTS|BUCKET|SHEARS|CAULDRON|SHIELD|IRON_NUGGET|BLAST_FURNACE|SMITHING_TABLE|STONECUTTER|LANTERN
-RAW_COPPER|COPPER_INGOT|RAW_COPPER_BLOCK|COPPER_BLOCK|EXPOSED_COPPER|WEATHERED_COPPER|OXIDIZED_COPPER|CUT_COPPER|EXPOSED_CUT_COPPER|WEATHERED_CUT_COPPER|OXIDIZED_CUT_COPPER|CUT_COPPER_STAIRS|EXPOSED_CUT_COPPER_STAIRS|WEATHERED_CUT_COPPER_STAIRS|OXIDIZED_CUT_COPPER_STAIRS|CUT_COPPER_SLAB|EXPOSED_CUT_COPPER_SLAB|WEATHERED_CUT_COPPER_SLAB|OXIDIZED_CUT_COPPER_SLAB|LIGHTNING_ROD
+RAW_COPPER|COPPER_INGOT|RAW_COPPER_BLOCK|COPPER_BLOCK|EXPOSED_COPPER|WEATHERED_COPPER|OXIDIZED_COPPER|CUT_COPPER|EXPOSED_CUT_COPPER|WEATHERED_CUT_COPPER|OXIDIZED_CUT_COPPER|CUT_COPPER_STAIRS|EXPOSED_CUT_COPPER_STAIRS|WEATHERED_CUT_COPPER_STAIRS|OXIDIZED_CUT_COPPER_STAIRS|CUT_COPPER_SLAB|EXPOSED_CUT_COPPER_SLAB|WEATHERED_CUT_COPPER_SLAB|OXIDIZED_CUT_COPPER_SLAB|LIGHTNING_ROD|CHISELED_COPPER|EXPOSED_CHISELED_COPPER|WEATHERED_CHISELED_COPPER|OXIDIZED_CHISELED_COPPER|WAXED_CHISELED_COPPER|WAXED_EXPOSED_CHISELED_COPPER|WAXED_WEATHERED_CHISELED_COPPER|WAXED_OXIDIZED_CHISELED_COPPER|COPPER_DOOR|EXPOSED_COPPER_DOOR|WEATHERED_COPPER_DOOR|OXIDIZED_COPPER_DOOR|WAXED_COPPER_DOOR|WAXED_EXPOSED_COPPER_DOOR|WAXED_WEATHERED_COPPER_DOOR|WAXED_OXIDIZED_COPPER_DOOR|COPPER_GRATE|EXPOSED_COPPER_GRATE|WEATHERED_COPPER_GRATE|OXIDIZED_COPPER_GRATE|WAXED_COPPER_GRATE|WAXED_EXPOSED_COPPER_GRATE|WAXED_WEATHERED_COPPER_GRATE|WAXED_OXIDIZED_COPPER_GRATE|COPPER_TRAPDOOR|EXPOSED_COPPER_TRAPDOOR|WEATHERED_COPPER_TRAPDOOR|OXIDIZED_COPPER_TRAPDOOR|WAXED_COPPER_TRAPDOOR|WAXED_EXPOSED_COPPER_TRAPDOOR|WAXED_WEATHERED_COPPER_TRAPDOOR|WAXED_OXIDIZED_COPPER_TRAPDOOR|WAXED_CUT_COPPER|WAXED_EXPOSED_CUT_COPPER|WAXED_WEATHERED_CUT_COPPER|WAXED_OXIDIZED_CUT_COPPER|WAXED_CUT_COPPER_STAIRS|WAXED_EXPOSED_CUT_COPPER_STAIRS|WAXED_WEATHERED_CUT_COPPER_STAIRS|WAXED_OXIDIZED_CUT_COPPER_STAIRS|WAXED_CUT_COPPER_SLAB|WAXED_EXPOSED_CUT_COPPER_SLAB|WAXED_WEATHERED_CUT_COPPER_SLAB|WAXED_OXIDIZED_CUT_COPPER_SLAB|WAXED_COPPER_BLOCK|WAXED_EXPOSED_COPPER|WAXED_WEATHERED_COPPER|WAXED_OXIDIZED_COPPER
 RAW_GOLD|GOLD_INGOT|RAW_GOLD_BLOCK|GOLD_BLOCK|GOLDEN_SWORD|GOLDEN_SHOVEL|GOLDEN_PICKAXE|GOLDEN_AXE|GOLDEN_HOE|GOLDEN_HELMET|GOLDEN_CHESTPLATE|GOLDEN_LEGGINGS|GOLDEN_BOOTS|CLOCK|GOLD_NUGGET
 REDSTONE|REDSTONE_TORCH|REDSTONE_BLOCK|REPEATER|PISTON|DROPPER|DISPENSER|NOTE_BLOCK|COMPASS
 DIAMOND|DIAMOND_BLOCK|DIAMOND_SWORD|DIAMOND_SHOVEL|DIAMOND_PICKAXE|DIAMOND_AXE|DIAMOND_HOE|DIAMOND_HELMET|DIAMOND_CHESTPLATE|DIAMOND_LEGGINGS|DIAMOND_BOOTS|JUKEBOX
@@ -51,7 +51,7 @@ CHICKEN|COOKED_CHICKEN
 MUTTON|COOKED_MUTTON
 RABBIT|COOKED_RABBIT|RABBIT_STEW|RABBIT_FOOT|RABBIT_HIDE
 COD|SALMON|TROPICAL_FISH|PUFFERFISH|COOKED_COD|COOKED_SALMON
-TURTLE_EGG|TURTLE_HELMET|SCUTE
+TURTLE_EGG|TURTLE_HELMET|TURTLE_SCUTE
 SNIFFER_EGG|TORCHFLOWER_SEEDS|PITCHER_POD|TORCHFLOWER|PITCHER_PLANT
 GOAT_HORN
 EGG|CAKE
@@ -80,7 +80,7 @@ BROWN_MUSHROOM|RED_MUSHROOM|MUSHROOM_STEW|SUSPICIOUS_STEW
 BROWN_MUSHROOM_BLOCK|RED_MUSHROOM_BLOCK|MUSHROOM_STEM
 SUGAR_CANE|PAPER|BOOK|SUGAR|WRITABLE_BOOK|WRITTEN_BOOK|ENCHANTED_BOOK|CARTOGRAPHY_TABLE
 AZALEA_LEAVES|FLOWERING_AZALEA_LEAVES|AZALEA|FLOWERING_AZALEA|SPORE_BLOSSOM|MOSS_BLOCK|BIG_DRIPLEAF|SMALL_DRIPLEAF|HANGING_ROOTS|ROOTED_DIRT
-GRASS|FERN|DEAD_BUSH|SEAGRASS|TALL_GRASS|LARGE_FERN|VINE|GLOW_LICHEN
+SHORT_GRASS|FERN|DEAD_BUSH|SEAGRASS|TALL_GRASS|LARGE_FERN|VINE|GLOW_LICHEN
 KELP|DRIED_KELP|DRIED_KELP_BLOCK
 CRIMSON_FUNGUS|WARPED_FUNGUS|CRIMSON_ROOTS|WARPED_ROOTS|NETHER_SPROUTS|WEEPING_VINES|TWISTING_VINES
 LILY_PAD
@@ -123,7 +123,14 @@ ECHO_SHARD|RECOVERY_COMPASS
 TRIDENT
 CRYING_OBSIDIAN|RESPAWN_ANCHOR
 DEAD_TUBE_CORAL_BLOCK|DEAD_BRAIN_CORAL_BLOCK|DEAD_BUBBLE_CORAL_BLOCK|DEAD_FIRE_CORAL_BLOCK|DEAD_HORN_CORAL_BLOCK|TUBE_CORAL_BLOCK|BRAIN_CORAL_BLOCK|BUBBLE_CORAL_BLOCK|FIRE_CORAL_BLOCK|HORN_CORAL_BLOCK|TUBE_CORAL|BRAIN_CORAL|BUBBLE_CORAL|FIRE_CORAL|HORN_CORAL|DEAD_BRAIN_CORAL|DEAD_BUBBLE_CORAL|DEAD_FIRE_CORAL|DEAD_HORN_CORAL|DEAD_TUBE_CORAL|TUBE_CORAL_FAN|BRAIN_CORAL_FAN|BUBBLE_CORAL_FAN|FIRE_CORAL_FAN|HORN_CORAL_FAN|DEAD_TUBE_CORAL_FAN|DEAD_BRAIN_CORAL_FAN|DEAD_BUBBLE_CORAL_FAN|DEAD_FIRE_CORAL_FAN|DEAD_HORN_CORAL_FAN
-MUSIC_DISC_13|MUSIC_DISC_CAT|MUSIC_DISC_BLOCKS|MUSIC_DISC_CHIRP|MUSIC_DISC_FAR|MUSIC_DISC_MALL|MUSIC_DISC_MELLOHI|MUSIC_DISC_STAL|MUSIC_DISC_STRAD|MUSIC_DISC_WARD|MUSIC_DISC_11|MUSIC_DISC_WAIT|MUSIC_DISC_OTHERSIDE|MUSIC_DISC_RELIC|MUSIC_DISC_5|MUSIC_DISC_PIGSTEP|DISC_FRAGMENT_5|
-FLOWER_BANNER_PATTERN
-BRUSH|ANGLER_POTTERY_SHERD|ARCHER_POTTERY_SHERD|ARMS_UP_POTTERY_SHERD|BLADE_POTTERY_SHERD|BREWER_POTTERY_SHERD|BURN_POTTERY_SHERD|DANGER_POTTERY_SHERD|EXPLORER_POTTERY_SHERD|FRIEND_POTTERY_SHERD|HEART_POTTERY_SHERD|HEARTBREAK_POTTERY_SHERD|HOWL_POTTERY_SHERD|MINER_POTTERY_SHERD|MOURNER_POTTERY_SHERD|PLENTY_POTTERY_SHERD|PRIZE_POTTERY_SHERD|SHEAF_POTTERY_SHERD|SHELTER_POTTERY_SHERD|SKULL_POTTERY_SHERD|SNORT_POTTERY_SHERD
-NETHERITE_UPGRADE_SMITHING_TEMPLATE|SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE|DUNE_ARMOR_TRIM_SMITHING_TEMPLATE|COAST_ARMOR_TRIM_SMITHING_TEMPLATE|WILD_ARMOR_TRIM_SMITHING_TEMPLATE|WARD_ARMOR_TRIM_SMITHING_TEMPLATE|EYE_ARMOR_TRIM_SMITHING_TEMPLATE|VEX_ARMOR_TRIM_SMITHING_TEMPLATE|TIDE_ARMOR_TRIM_SMITHING_TEMPLATE|SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE|RIB_ARMOR_TRIM_SMITHING_TEMPLATE|SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE|WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE|SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE|SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE|RAISER_ARMOR_TRIM_SMITHING_TEMPLATE|HOST_ARMOR_TRIM_SMITHING_TEMPLATE
+MUSIC_DISC_13|MUSIC_DISC_CAT|MUSIC_DISC_BLOCKS|MUSIC_DISC_CHIRP|MUSIC_DISC_FAR|MUSIC_DISC_MALL|MUSIC_DISC_MELLOHI|MUSIC_DISC_STAL|MUSIC_DISC_STRAD|MUSIC_DISC_WARD|MUSIC_DISC_11|MUSIC_DISC_WAIT|MUSIC_DISC_OTHERSIDE|MUSIC_DISC_RELIC|MUSIC_DISC_5|MUSIC_DISC_PIGSTEP|DISC_FRAGMENT_5|MUSIC_DISC_PRECIPICE|MUSIC_DISC_CREATOR|MUSIC_DISC_CREATOR_MUSIC_BOX
+FLOWER_BANNER_PATTERN|CREEPER_BANNER_PATTERN|SKULL_BANNER_PATTERN|MOJANG_BANNER_PATTERN|GLOBE_BANNER_PATTERN|PIGLIN_BANNER_PATTERN|FLOW_BANNER_PATTERN|GUSTER_BANNER_PATTERN
+BRUSH|ANGLER_POTTERY_SHERD|ARCHER_POTTERY_SHERD|ARMS_UP_POTTERY_SHERD|BLADE_POTTERY_SHERD|BREWER_POTTERY_SHERD|BURN_POTTERY_SHERD|DANGER_POTTERY_SHERD|EXPLORER_POTTERY_SHERD|FRIEND_POTTERY_SHERD|HEART_POTTERY_SHERD|HEARTBREAK_POTTERY_SHERD|HOWL_POTTERY_SHERD|MINER_POTTERY_SHERD|MOURNER_POTTERY_SHERD|PLENTY_POTTERY_SHERD|PRIZE_POTTERY_SHERD|SHEAF_POTTERY_SHERD|SHELTER_POTTERY_SHERD|SKULL_POTTERY_SHERD|SNORT_POTTERY_SHERD|FLOW_POTTERY_SHERD|GUSTER_POTTERY_SHERD|SCRAPE_POTTERY_SHERD
+NETHERITE_UPGRADE_SMITHING_TEMPLATE|SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE|DUNE_ARMOR_TRIM_SMITHING_TEMPLATE|COAST_ARMOR_TRIM_SMITHING_TEMPLATE|WILD_ARMOR_TRIM_SMITHING_TEMPLATE|WARD_ARMOR_TRIM_SMITHING_TEMPLATE|EYE_ARMOR_TRIM_SMITHING_TEMPLATE|VEX_ARMOR_TRIM_SMITHING_TEMPLATE|TIDE_ARMOR_TRIM_SMITHING_TEMPLATE|SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE|RIB_ARMOR_TRIM_SMITHING_TEMPLATE|SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE|WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE|SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE|SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE|RAISER_ARMOR_TRIM_SMITHING_TEMPLATE|HOST_ARMOR_TRIM_SMITHING_TEMPLATE|BOLT_ARMOR_TRIM_SMITHING_TEMPLATE|FLOW_ARMOR_TRIM_SMITHING_TEMPLATE
+ARMADILLO_SCUTE|WOLF_ARMOR
+COPPER_BULB|EXPOSED_COPPER_BULB|WEATHERED_COPPER_BULB|OXIDIZED_COPPER_BULB|WAXED_COPPER_BULB|WAXED_EXPOSED_COPPER_BULB|WAXED_WEATHERED_COPPER_BULB|WAXED_OXIDIZED_COPPER_BULB
+CRAFTER
+HEAVY_CORE|MACE
+BREEZE_ROD|WIND_CHARGE
+OMINOUS_BOTTLE
+TRIAL_KEY|OMINOUS_TRIAL_KEY
diff --git a/item_data/images/images.zip b/item_data/images/images.zip