From f6ae34006a2c91076b5afb0e2ac147ff78d02300 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Fri, 5 Apr 2024 22:51:43 -0500 Subject: [PATCH] Moved HeadType to core. --- .../epicspawners/api/utils/HeadType.java | 105 ------------------ .../epicspawners/api/utils/HeadUtils.java | 1 + .../epicspawners/gui/EditorOverviewGui.java | 2 +- pom.xml | 2 +- 4 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadType.java diff --git a/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadType.java b/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadType.java deleted file mode 100644 index 236ec55..0000000 --- a/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadType.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.craftaro.epicspawners.api.utils; - -public enum HeadType { - BAT("978862a56119227aaad4b7c246c8b2256db985db0951f55b0a1f8616c191f"), - BLAZE("b78ef2e4cf2c41a2d14bfde9caff10219f5b1bf5b35a49eb51c6467882cb5f0"), - CHICKEN("1638469a599ceef7207537603248a9ab11ff591fd378bea4735b346a7fae893"), - COW("5d6c6eda942f7f5f71c3161c7306f4aed307d82895f9d2b07ab4525718edc5"), - CREEPER("295ef836389af993158aba27ff37b6567185f7a721ca90fdfeb937a7cb5747"), - CAVE_SPIDER("eccc4a32d45d74e8b14ef1ffd55cd5f381a06d4999081d52eaea12e13293e209"), - DONKEY("9ffca9f0859834da81af524c2865fa3186b5bf58bd1c4e3742837c4fd6853887"), - ELDER_GUARDIAN("dbb9491b7a1768e3291959796232eb6f61b9c39aa2f81e13d287a3ab5d16dec"), - ENDERMAN("7a59bb0a7a32965b3d90d8eafa899d1835f424509eadd4e6b709ada50b9cf"), - ENDERMITE("e8c6cb8ceaad5a2ad5cc9a67bce6d5bdbf5cbb7e312955ccf9f162509355b1"), - ENDER_DRAGON("74ecc040785e54663e855ef0486da72154d69bb4b7424b7381ccf95b095a"), - EVOKER("d954135dc82213978db478778ae1213591b93d228d36dd54f1ea1da48e7cba6"), - GHAST("8b6a72138d69fbbd2fea3fa251cabd87152e4f1c97e5f986bf685571db3cc0"), - GIANT("56fc854bb84cf4b7697297973e02b79bc10698460b51a639c60e5e417734e11"), - GUARDIAN("932c24524c82ab3b3e57c2052c533f13dd8c0beb8bdd06369bb2554da86c123"), - HORSE("61902898308730c4747299cb5a5da9c25838b1d059fe46fc36896fee662729"), - HUSK("6ae3a5bfcaa943d126988ed17ce8e4a7fb4231b05a5c5c947e5cc9752a199962"), - ILLUSIONER("c269a9dabe4f9fd6b4d74b7cd9c7ee6b24d87549b5acabbeb36cd756cc373"), - IRON_GOLEM("e13f34227283796bc017244cb46557d64bd562fa9dab0e12af5d23ad699cf697"), - LLAMA("6bc438fc1fbbaea2289aabecedd3fdf269ddc979bf8b5c6a8fc4bb8dcd4e1fe"), - MAGMA_CUBE("38957d5023c937c4c41aa2412d43410bda23cf79a9f6ab36b76fef2d7c429"), - MULE("46dcda265e57e4f51b145aacbf5b59bdc6099ffd3cce0a661b2c0065d80930d8"), - MUSHROOM_COW("d0bc61b9757a7b83e03cd2507a2157913c2cf016e7c096a4d6cf1fe1b8db"), - OCELOT("d03a2e37418e0cffaa2b513910c5282b9bb06c35a1d47039a5cc51b234a542f3"), - OMNI("afe097f7f7a6568884198b562cb58cfb84a3936fbf72828954aaa1f58cba32"), - PARROT("fd7cca30a1dc2fb25d3b7fb16318330ac79742d97deeeabe5393fb8a2cb878"), - PIG("621668ef7cb79dd9c22ce3d1f3f4cb6e2559893b6df4a469514e667c16aa4"), - PIG_ZOMBIE("74e9c6e98582ffd8ff8feb3322cd1849c43fb16b158abb11ca7b42eda7743eb"), - POLAR_BEAR("d46d23f04846369fa2a3702c10f759101af7bfe8419966429533cd81a11d2b"), - RABBIT("dc7a317ec5c1ed7788f89e7f1a6af3d2eeb92d1e9879c05343c57f9d863de130"), - SHEEP("f31f9ccc6b3e32ecf13b8a11ac29cd33d18c95fc73db8a66c5d657ccb8be70"), - SHULKER("1433a4b73273a64c8ab2830b0fff777a61a488c92f60f83bfb3e421f428a44"), - SILVERFISH("453a6aedbc9e4a22266cd70d2d4a2850a7e4b5864fbcbddf952b748fbabdb2"), - SKELETON("2e5be6a3c0159d2c1f3b1e4e1d8384b6f7ebac993d58b10b9f8989c78a232"), - SKELETON_HORSE("39be68887f5cf8c8044ebcdc5e768a172b2ef3e99545acd75b5ff74a263a"), - SLIME("16ad20fc2d579be250d3db659c832da2b478a73a698b7ea10d18c9162e4d9b5"), - SNOWMAN("a528df1653962e4e995dfd064a72b2cbff9b7197912880143f941a37db46c"), - SPIDER("cd541541daaff50896cd258bdbdd4cf80c3ba816735726078bfe393927e57f1"), - SQUID("01433be242366af126da434b8735df1eb5b3cb2cede39145974e9c483607bac"), - STRAY("96e58aeeaf75e9695813aeaabd3973c83d5ff8c285fe6b944550bc41b953"), - VEX("6dc4b59be077f7f2f6b488666afb85e45d96cc57b57934ae11ba9734bb4811"), - VILLAGER("126ec1ca185b47aad39f931db8b0a8500ded86a127a204886ed4b3783ad1775c"), - VINDICATOR("7a5b31aeab7f728cd7e90f81e2ffad4cd198c1907574f57be2b7c42f49ddd"), - WITCH("2e139130d7efd41fbad53735f64f8aff265bd7c54977189c02babbec4b0d07b"), - WITHER("cdf74e323ed41436965f5c57ddf2815d5332fe999e68fbb9d6cf5c8bd4139f"), - WITHER_SKELETON("233b41fa79cd53a230e2db942863843183a70404533bbc01fab744769bcb"), - WOLF("e95cbb4f75ea87617f2f713c6d49dac3209ba1bd4b9369654b1459ea15317"), - ZOMBIE("56fc854bb84cf4b7697297973e02b79bc10698460b51a639c60e5e417734e11"), - ZOMBIE_HORSE("d898e3eacff9949a9de9777ddfada8a7f62a4102de47b54db35f9f843e1ce4"), - ZOMBIE_VILLAGER("1a207a2b872fe8dd22ce5e27fc3263622621635efd8ea6abbdf317f99c5843"), - TURTLE("8df85c60a2e6061a5b4100e224422d19373badae2c0a1ca13e4d94897f7cbcf3"), - PHANTOM("fc060c4c1565f337a1b399ccf247cf300d3c3843efaaa610e5d894a79d9957fe"), - DOLPHIN("546fd34b06c61f68e94f357f38e62d334e339edf2b930d26951971921bbb5268"), - PUFFERFISH("13bc144030373790ca5a03bf111ca4127d31729bf0788d1e05a019206e62da92"), - SALMON("c1102e3a82c44ad4180e5be1cedda386158f5b8b20a52a8bd941104f7b695b9f"), - COD("a5eef52a468f681fab6a56bf5cc9986c1868ff0795d115c6ab0009d8faf972a4"), - TROPICAL_FISH("b80f5955825e822eff416182925c7d650a7e0947ec9f855a75450e03175e8338"), - DROWNED("71f2469f9b4bd92aa6a8ba3415f1ab76fd746041400062dc40fe13b646c0cc5d"), - DROPPED_ITEM("452fe4ce1f1d53a12ed443eeba7297e81da581e0c7a39954d9d7bba7de59c46"), - WANDERING_TRADER("4e8882cb316875e867b8d90c197f3ab57ff809fe8dd4a88368354afada48cdb4"), - PANDA("3cddc208575aadfdc47c1c707f8230b4775f70cec7531a9a355774f59e6bffa7"), - CAT("ff1b549341ad53b2bcd851b224ec56dbadb54887eaa0f771ba8eb39f58cf1d59"), - FOX("add8cd97dc3b34402b6d5e12f991ebaef246254c931803eb8dcb45fa4b4fba53"), - PILLAGER("63550f89aea88665804c2fd1b6682930c23233184fdc060991305718ed660597"), - RAVAGER("d91a9d864e36fbec19b584bcb71292530755b10c4e60784fec92b51f8189363c"), - TRADER_LLAMA("6bc438fc1fbbaea2289aabecedd3fdf269ddc979bf8b5c6a8fc4bb8dcd4e1fe"), - BEE("5162dd0b9f65b58a1e70f81d8e03e8ff6c53e4e985bdbe0186558d8a69a81189"), - PIGLIN("8ed4c6c5e8ba2c3ab05cb47258a4fe95bd3b92ba0a68db6d6e961d830baa0179"), - HOGLIN("6c8c7fb74e69885f294ca6652553dd5938dac1164f652d4843abe0e891453da4"), - STRIDER("16a9186a317e31e77b85a625f9d0b1cf1809f9d46a4aa153e639b60d30743fcf"), - ZOMBIFIED_PIGLIN("f05e06b1d1357a3574268a5189615983ceffc185993047da47ac947f3b7507f3"), - ZOGLIN("f05e06b1d1357a3574268a5189615983ceffc185993047da47ac947f3b7507f3"), - PIGLIN_BRUTE("7543ec4797511285efeb76d909d124dcecb255e048c7d65ae66b6ee2bae152e7"), - AXOLOTL("fd792cd16e006d6e3e6303186d0498ea189e0c59389296a8e612a6db67af22cf"), - GLOW_SQUID("72356ab9fc794c4b3e494aa26238a4156a1f2ec8571b198d5687a42b7f5581f1"), - GOAT("5cc9fd5d95bbd035e2f6dc91e34670d67f89151b6d45ab106424e26101b94814"), - ALLAY("df5de940bfe499c59ee8dac9f9c3919e7535eff3a9acb16f4842bf290f4c679f"), - FROG("2ca4a8e494582c62aaa2c92474b16d69cd63baa3d3f50a4b631d6559ca0f33f5"), - TADPOLE("b23ebf26b7a441e10a86fb5c2a5f3b519258a5c5dddd6a1a75549f517332815b"), - WARDEN("bc9c84349742164a22971ee54516fff91d868da72cdcce62069db128c42154b2"), - CAMEL("3642c9f71131b5df4a8c21c8c6f10684f22abafb8cd68a1d55ac4bf263a53a31"), - SNIFFER("87ad920a66e38cc3426a5bff084667e8772116915e298098567c139f222e2c42"), - BREEZE("80843a94f925b5598924ff9b52b7999c8d29d1b790ad487dd54e27956e540d20"); - - private final String urlHash; - - HeadType(String urlHash) { - this.urlHash = urlHash; - } - - /** - * @deprecated Use {@link #getUrlHash()} instead. - */ - @Deprecated - public String getUrl() { - return this.urlHash; - } - - public String getUrlHash() { - return this.urlHash; - } -} diff --git a/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadUtils.java b/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadUtils.java index 05bbd45..ef53c48 100644 --- a/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadUtils.java +++ b/EpicSpawners-API/src/main/java/com/craftaro/epicspawners/api/utils/HeadUtils.java @@ -1,5 +1,6 @@ package com.craftaro.epicspawners.api.utils; +import com.craftaro.core.utils.HeadType; import com.craftaro.third_party.com.cryptomorin.xseries.SkullUtils; import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.epicspawners.api.spawners.spawner.SpawnerData; diff --git a/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/EditorOverviewGui.java b/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/EditorOverviewGui.java index 329e3f8..8e29454 100644 --- a/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/EditorOverviewGui.java +++ b/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/EditorOverviewGui.java @@ -4,12 +4,12 @@ import com.craftaro.core.gui.AnvilGui; import com.craftaro.core.gui.Gui; import com.craftaro.core.gui.GuiUtils; import com.craftaro.core.input.ChatPrompt; +import com.craftaro.core.utils.HeadType; import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.utils.TextUtils; import com.craftaro.epicspawners.EpicSpawners; import com.craftaro.epicspawners.api.spawners.spawner.SpawnerData; import com.craftaro.epicspawners.api.spawners.spawner.SpawnerTier; -import com.craftaro.epicspawners.api.utils.HeadType; import com.craftaro.epicspawners.api.utils.HeadUtils; import com.craftaro.epicspawners.settings.Settings; import org.bukkit.entity.Player; diff --git a/pom.xml b/pom.xml index 5ae5917..f151c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://craftaro.com/marketplace/product/13 - 3.0.0-SNAPSHOT + 3.0.5-SNAPSHOT 8 1.8