Update to 1.20.4

BluebirdYT · Feb 3, 2024 · 560d26e · 560d26e
1 parent e277ae7
commit 560d26e
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Collect unique items to expand the border!
   with the overworld), but the end doesn't have a border, just
   so that obtaining an elytra and outer end island items is
   possible
-- As of 1.19.2, there are 1,051 total obtainable items in
+- As of 1.20.4, there are 1,147 total obtainable items in
   survival, and collecting any other item (such as bedrock
   or command blocks) will not count towards the progression and
   will not expand the border.
@@ -51,8 +51,9 @@ Collect unique items to expand the border!
 
 - The plugin runs on Bukkit, meaning any fork of Bukkit should
   work, including Spigot and Paper
-- The game only works on 1.19 and above, as it uses all the new
-  items added in 1.19.
+- The game is intended to be played on 1.20.4. It will probably 
+  not work below 1.20.3, and I can't guarantee it will work on 
+  future versions until I update it.
 - The game can be played with any number of players, but it is
   recommended to play with 2-4 players. The more players there
   are, the easier the game will get.

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <outputFile>C:\Users\SimonDMC\Desktop\Spigot\plugins\BorderHoarder.jar</outputFile>
+                            <outputFile>C:\Users\simon\OneDrive\Desktop\spigot\plugins\BorderHoarder.jar</outputFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -70,7 +70,8 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.2-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/simondmc/borderhoarder/game/ItemDictionary.java b/src/main/java/com/simondmc/borderhoarder/game/ItemDictionary.java
@@ -170,7 +170,7 @@ public static void populateDict() {
         list.put(Material.CHISELED_SANDSTONE, "Chiseled Sandstone");
         list.put(Material.CUT_SANDSTONE, "Cut Sandstone");
         list.put(Material.COBWEB, "Cobweb");
-        list.put(Material.GRASS, "Grass");
+        list.put(Material.SHORT_GRASS, "Grass");
         list.put(Material.FERN, "Fern");
         list.put(Material.AZALEA, "Azalea");
         list.put(Material.FLOWERING_AZALEA, "Flowering Azalea");
@@ -1063,5 +1063,102 @@ public static void populateDict() {
         list.put(Material.VERDANT_FROGLIGHT, "Verdant Froglight");
         list.put(Material.PEARLESCENT_FROGLIGHT, "Pearlescent Froglight");
         list.put(Material.ECHO_SHARD, "Echo Shard");
+        list.put(Material.PINK_PETALS, "Pink Petals");
+        list.put(Material.CHERRY_SAPLING, "Cherry Sapling");
+        list.put(Material.CHERRY_LEAVES, "Cherry Leaves");
+        list.put(Material.CHERRY_LOG, "Cherry Log");
+        list.put(Material.CHERRY_WOOD, "Cherry Wood");
+        list.put(Material.STRIPPED_CHERRY_LOG, "Stripped Cherry Log");
+        list.put(Material.STRIPPED_CHERRY_WOOD, "Stripped Cherry Wood");
+        list.put(Material.CHERRY_PLANKS, "Cherry Planks");
+        list.put(Material.CHERRY_STAIRS, "Cherry Stairs");
+        list.put(Material.CHERRY_SLAB, "Cherry Slab");
+        list.put(Material.CHERRY_FENCE, "Cherry Fence");
+        list.put(Material.CHERRY_FENCE_GATE, "Cherry Fence Gate");
+        list.put(Material.CHERRY_DOOR, "Cherry Door");
+        list.put(Material.CHERRY_TRAPDOOR, "Cherry Trapdoor");
+        list.put(Material.CHERRY_PRESSURE_PLATE, "Cherry Pressure Plate");
+        list.put(Material.CHERRY_BUTTON, "Cherry Button");
+        list.put(Material.CHERRY_SIGN, "Cherry Sign");
+        list.put(Material.CHERRY_HANGING_SIGN, "Cherry Hanging Sign");
+        list.put(Material.CHERRY_BOAT, "Cherry Boat");
+        list.put(Material.CHERRY_CHEST_BOAT, "Cherry Boat with Chest");
+        list.put(Material.BAMBOO_BLOCK, "Block of Bamboo");
+        list.put(Material.STRIPPED_BAMBOO_BLOCK, "Block of Stripped Bamboo");
+        list.put(Material.BAMBOO_PLANKS, "Bamboo Planks");
+        list.put(Material.BAMBOO_MOSAIC, "Bamboo Mosaic");
+        list.put(Material.BAMBOO_STAIRS, "Bamboo Stairs");
+        list.put(Material.BAMBOO_MOSAIC_STAIRS, "Bamboo Mosaic Stairs");
+        list.put(Material.BAMBOO_SLAB, "Bamboo Slab");
+        list.put(Material.BAMBOO_MOSAIC_SLAB, "Bamboo Mosaic Slab");
+        list.put(Material.BAMBOO_FENCE, "Bamboo Fence");
+        list.put(Material.BAMBOO_FENCE_GATE, "Bamboo Fence Gate");
+        list.put(Material.BAMBOO_DOOR, "Bamboo Door");
+        list.put(Material.BAMBOO_TRAPDOOR, "Bamboo Trapdoor");
+        list.put(Material.BAMBOO_PRESSURE_PLATE, "Bamboo Pressure Plate");
+        list.put(Material.BAMBOO_BUTTON, "Bamboo Button");
+        list.put(Material.BAMBOO_SIGN, "Bamboo Sign");
+        list.put(Material.BAMBOO_HANGING_SIGN, "Bamboo Hanging Sign");
+        list.put(Material.BAMBOO_RAFT, "Bamboo Raft");
+        list.put(Material.BAMBOO_CHEST_RAFT, "Bamboo Raft with Chest");
+        list.put(Material.OAK_HANGING_SIGN, "Oak Hanging Sign");
+        list.put(Material.SPRUCE_HANGING_SIGN, "Spruce Hanging Sign");
+        list.put(Material.BIRCH_HANGING_SIGN, "Birch Hanging Sign");
+        list.put(Material.JUNGLE_HANGING_SIGN, "Jungle Hanging Sign");
+        list.put(Material.ACACIA_HANGING_SIGN, "Acacia Hanging Sign");
+        list.put(Material.DARK_OAK_HANGING_SIGN, "Dark Oak Hanging Sign");
+        list.put(Material.MANGROVE_HANGING_SIGN, "Mangrove Hanging Sign");
+        list.put(Material.CRIMSON_HANGING_SIGN, "Crimson Hanging Sign");
+        list.put(Material.WARPED_HANGING_SIGN, "Warped Hanging Sign");
+        list.put(Material.CHISELED_BOOKSHELF, "Chiseled Bookshelf");
+        list.put(Material.PIGLIN_HEAD, "Piglin Head");
+        list.put(Material.SNIFFER_EGG, "Sniffer Egg");
+        list.put(Material.TORCHFLOWER_SEEDS, "Torchflower Seeds");
+        list.put(Material.TORCHFLOWER, "Torchflower");
+        list.put(Material.PITCHER_POD, "Pitcher Pod");
+        list.put(Material.PITCHER_PLANT, "Pitcher Plant");
+        list.put(Material.CALIBRATED_SCULK_SENSOR, "Calibrated Sculk Sensor");
+        list.put(Material.BRUSH, "Brush");
+        list.put(Material.SUSPICIOUS_SAND, "Suspicious Sand");
+        list.put(Material.SUSPICIOUS_GRAVEL, "Suspicious Gravel");
+        list.put(Material.DECORATED_POT, "Decorated Pot");
+        list.put(Material.ANGLER_POTTERY_SHERD, "Angler Pottery Sherd");
+        list.put(Material.ARCHER_POTTERY_SHERD, "Archer Pottery Sherd");
+        list.put(Material.ARMS_UP_POTTERY_SHERD, "Arms Up Pottery Sherd");
+        list.put(Material.BLADE_POTTERY_SHERD, "Blade Pottery Sherd");
+        list.put(Material.BREWER_POTTERY_SHERD, "Brewer Pottery Sherd");
+        list.put(Material.BURN_POTTERY_SHERD, "Burn Pottery Sherd");
+        list.put(Material.DANGER_POTTERY_SHERD, "Danger Pottery Sherd");
+        list.put(Material.EXPLORER_POTTERY_SHERD, "Explorer Pottery Sherd");
+        list.put(Material.FRIEND_POTTERY_SHERD, "Friend Pottery Sherd");
+        list.put(Material.HEART_POTTERY_SHERD, "Heart Pottery Sherd");
+        list.put(Material.HEARTBREAK_POTTERY_SHERD, "Heartbreak Pottery Sherd");
+        list.put(Material.HOWL_POTTERY_SHERD, "Howl Pottery Sherd");
+        list.put(Material.MINER_POTTERY_SHERD, "Miner Pottery Sherd");
+        list.put(Material.MOURNER_POTTERY_SHERD, "Mourner Pottery Sherd");
+        list.put(Material.PLENTY_POTTERY_SHERD, "Plenty Pottery Sherd");
+        list.put(Material.PRIZE_POTTERY_SHERD, "Prize Pottery Sherd");
+        list.put(Material.SHEAF_POTTERY_SHERD, "Sheaf Pottery Sherd");
+        list.put(Material.SHELTER_POTTERY_SHERD, "Shelter Pottery Sherd");
+        list.put(Material.SKULL_POTTERY_SHERD, "Skull Pottery Sherd");
+        list.put(Material.SNORT_POTTERY_SHERD, "Snort Pottery Sherd");
+        list.put(Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.VEX_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.WILD_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.HOST_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.WARD_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.RIB_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.EYE_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, "Smithing Template");
+        list.put(Material.MUSIC_DISC_RELIC, "Music Disc");
     }
 }
diff --git a/src/main/java/com/simondmc/borderhoarder/game/PlayerListener.java b/src/main/java/com/simondmc/borderhoarder/game/PlayerListener.java
@@ -95,7 +95,7 @@ public void respawn(PlayerRespawnEvent e) {
     public void breakBlock(BlockBreakEvent e) {
         if (!GameData.getBoolean("dropped-first-seed") &&
                 e.getBlock().getWorld().getName().equals(BorderWorldCreator.worldName) &&
-                e.getBlock().getType().equals(Material.GRASS)) {
+                e.getBlock().getType().equals(Material.SHORT_GRASS)) {
             e.setDropItems(false);
             e.getBlock().getWorld().dropItemNaturally(e.getBlock().getLocation(), new ItemStack(Material.WHEAT_SEEDS));
             GameData.set("dropped-first-seed", true);