Add More Cosmetics, Cleanup StarMaterial

gmitch215 · Dec 22, 2023 · 0b87ebe · 0b87ebe
1 parent b73fd2a
commit 0b87ebe
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 15 deletions.
diff --git a/abstraction/src/main/java/me/gamercoder215/starcosmetics/util/StarMaterial.java b/abstraction/src/main/java/me/gamercoder215/starcosmetics/util/StarMaterial.java
@@ -20,33 +20,25 @@ public enum StarMaterial {
     PLAYER_HEAD(3, "skull_item"),
 
     OAK_LOG("log"),
-
     ACACIA_LOG("log_2"),
-
     JUNGLE_LOG(3, "log"),
 
     END_STONE("ender_stone"),
 
     COMMAND_BLOCK("command"),
-
     CHAIN_COMMAND_BLOCK("command_chain"),
-
     REPEATING_COMMAND_BLOCK("command_repeating"),
 
     GRASS_BLOCK("grass"),
 
     CRAFTING_TABLE("workbench"),
 
     BLACK_STAINED_GLASS_PANE(15, "stained_glass_pane"),
-
     RED_STAINED_GLASS_PANE(14, "stained_glass_pane"),
-
     LIME_STAINED_GLASS_PANE(5, "stained_glass_pane"),
 
     LIME_WOOL(5, "wool"),
-
     RED_WOOL(14, "wool"),
-
     WHITE_WOOL(0, "wool"),
 
     LIGHT_BLUE_WOOL(3, "wool"),
@@ -93,18 +85,13 @@ public enum StarMaterial {
 
     LIGHT_BLUE_TERRACOTTA(3, "stained_clay"),
 
-    PORKCHOP("pork"),
-
     RED_SAND(1, "sand"),
 
     NETHER_QUARTZ_ORE("quartz_ore"),
 
     OAK_LEAVES("leaves"),
-
     OAK_BUTTON("wooden_button"),
-
     OAK_FENCE("fence"),
-
     OAK_FENCE_GATE("fence_gate"),
 
     SPAWNER("mob_spawner"),
@@ -134,6 +121,12 @@ public enum StarMaterial {
     RED_BANNER(14, "banner"),
     BLACK_BANNER(15, "banner"),
 
+    CHICKEN("raw_chicken"),
+    BEEF("raw_beef"),
+    PORKCHOP("pork"),
+
+    NETHER_WART("nether_warts"),
+
     ;
 
     @VisibleForTesting

diff --git a/...src/main/java/me/gamercoder215/starcosmetics/wrapper/cosmetics/CosmeticSelections1_9.java b/...src/main/java/me/gamercoder215/starcosmetics/wrapper/cosmetics/CosmeticSelections1_9.java
@@ -293,6 +293,8 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
             // Large Rings
             .add(new ParticleSelection("sand", BaseShape.LARGE_RING, Material.SAND,
                     fromMined(80, Material.SAND), COMMON))
+            .add(new ParticleSelection("bucket", BaseShape.LARGE_RING, Material.BUCKET,
+                    fromCrafted(12, Material.BUCKET), COMMON))
 
             .add(new ParticleSelection("note", BaseShape.LARGE_RING, Particle.NOTE,
                     fromCrafted(200, Material.NOTE_BLOCK), RARE))
@@ -312,13 +314,35 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
 
             .add(new ParticleSelection("quartz_block", BaseShape.SMALL_TRIANGLE, Material.QUARTZ_BLOCK,
                     fromCrafted(75, Material.QUARTZ_BLOCK), OCCASIONAL))
+            .add(new ParticleSelection("chicken", BaseShape.SMALL_TRIANGLE, StarMaterial.CHICKEN.find(),
+                    fromKilled(100, EntityType.CHICKEN), OCCASIONAL))
+            .add(new ParticleSelection("mutton", BaseShape.SMALL_TRIANGLE, Material.MUTTON,
+                    fromKilled(100, EntityType.SHEEP), OCCASIONAL))
+            .add(new ParticleSelection("rabbit", BaseShape.SMALL_TRIANGLE, Material.RABBIT,
+                    fromKilled(100, EntityType.RABBIT), OCCASIONAL))
+            .add(new ParticleSelection("beef", BaseShape.SMALL_TRIANGLE, StarMaterial.BEEF.find(),
+                    fromKilled(100, EntityType.COW), OCCASIONAL))
+
+            .add(new ParticleSelection("iron_block", BaseShape.SMALL_TRIANGLE, Material.IRON_BLOCK,
+                    fromCrafted(170, Material.IRON_BLOCK), RARE))
 
             // Medium Triangles
             .add(new ParticleSelection("water", BaseShape.MEDIUM_TRIANGLE, Particle.WATER_SPLASH,
                     fromCrafted(85, Material.WATER_BUCKET), OCCASIONAL))
 
             .add(new ParticleSelection("endstone", BaseShape.MEDIUM_TRIANGLE, StarMaterial.END_STONE.find(),
                     fromMined(310, StarMaterial.END_STONE.find()), UNCOMMON))
+            .add(new ParticleSelection("cooked_chicken", BaseShape.MEDIUM_TRIANGLE, Material.COOKED_CHICKEN,
+                    fromKilled(250, EntityType.CHICKEN), UNCOMMON))
+            .add(new ParticleSelection("cooked_mutton", BaseShape.MEDIUM_TRIANGLE, Material.COOKED_MUTTON,
+                    fromKilled(250, EntityType.SHEEP), UNCOMMON))
+            .add(new ParticleSelection("cooked_rabbit", BaseShape.MEDIUM_TRIANGLE, Material.COOKED_RABBIT,
+                    fromKilled(250, EntityType.RABBIT), UNCOMMON))
+            .add(new ParticleSelection("cooked_beef", BaseShape.MEDIUM_TRIANGLE, Material.COOKED_BEEF,
+                    fromKilled(250, EntityType.COW), UNCOMMON))
+
+            .add(new ParticleSelection("gold_block", BaseShape.MEDIUM_TRIANGLE, Material.GOLD_BLOCK,
+                    fromCrafted(170, Material.GOLD_BLOCK), EPIC))
 
             // Large Triangles
             .add(new ParticleSelection("gravel", BaseShape.LARGE_TRIANGLE, Material.GRAVEL,
@@ -327,13 +351,21 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
             .add(new ParticleSelection("anvil", BaseShape.LARGE_TRIANGLE, Material.ANVIL,
                     fromCrafted(160, Material.ANVIL), RARE))
 
+            .add(new ParticleSelection("diamond_block", BaseShape.LARGE_TRIANGLE, Material.DIAMOND_BLOCK,
+                    fromCrafted(170, Material.DIAMOND_BLOCK), LEGENDARY))
+
             // Large Detailed Triangles
             .add(new ParticleSelection("seeds", BaseShape.LARGE_DETAILED_TRIANGLE, StarMaterial.WHEAT_SEEDS.find(),
                     fromMined(100, Material.HAY_BLOCK), UNCOMMON))
+            .add(new ParticleSelection("book", BaseShape.LARGE_DETAILED_TRIANGLE, Material.BOOK,
+                    fromCrafted(25, Material.BOOK), UNCOMMON))
 
             .add(new ParticleSelection("string", BaseShape.LARGE_DETAILED_TRIANGLE, Material.STRING,
                     fromMined(350, StarMaterial.COBWEB.find()), RARE))
 
+            .add(new ParticleSelection("emerald_block", BaseShape.LARGE_DETAILED_TRIANGLE, Material.EMERALD_BLOCK,
+                    fromCrafted(170, Material.EMERALD_BLOCK), LEGENDARY))
+
             // Small Squares
             .add(new ParticleSelection("cobblestone", BaseShape.SMALL_SQUARE, Material.COBBLESTONE,
                     fromMined(25, Material.COBBLESTONE), COMMON))
@@ -350,6 +382,9 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
             .add(new ParticleSelection("redstone", BaseShape.LARGE_SQUARE, Material.REDSTONE,
                     fromCrafted(400, Material.REDSTONE_BLOCK), EPIC))
 
+            .add(new ParticleSelection("redstone_block", BaseShape.LARGE_SQUARE, Material.REDSTONE_BLOCK,
+                    fromCrafted(170, Material.REDSTONE_BLOCK), LEGENDARY))
+
             .add(new ParticleSelection("barrier", BaseShape.LARGE_SQUARE, Particle.BARRIER,
                     fromBlocksMined(10000000), SPECIAL))
 
@@ -359,15 +394,27 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
             .add(new ParticleSelection("chorus", BaseShape.PENTAGON, Material.CHORUS_FRUIT,
                     fromMined(1400, StarMaterial.END_STONE.find()), RARE))
 
+            .add(new ParticleSelection("glass", BaseShape.PENTAGON, "fancy_block:glass",
+                    fromMined(1855, Material.SAND), EPIC))
+
             // Detailed Pentagons
+            .add(new ParticleSelection("nether_wart", BaseShape.DETAILED_PENTAGON, StarMaterial.NETHER_WART.find(),
+                    fromMined(410, Material.SOUL_SAND), RARE))
+
             .add(new ParticleSelection("crit_magic", BaseShape.DETAILED_PENTAGON, Particle.CRIT_MAGIC,
                     fromStatistic(Statistic.MOB_KILLS, 17500), LEGENDARY))
 
             // Octagons
             .add(new ParticleSelection("dragon_breath", BaseShape.OCTAGON, Particle.DRAGON_BREATH,
                     fromKilled(25, EntityType.ENDER_DRAGON), MYTHICAL))
 
+            .add(new ParticleSelection("bedrock", BaseShape.OCTAGON, Material.BEDROCK,
+                    fromMined(2000000, Material.OBSIDIAN), ULTRA))
+
             // Detailed Octagons
+            .add(new ParticleSelection("blaze", BaseShape.DETAILED_OCTAGON, Material.BLAZE_ROD,
+                    fromKilled(360, EntityType.BLAZE), RARE))
+
             .add(new ParticleSelection("end_portal_frame", BaseShape.DETAILED_OCTAGON, StarMaterial.END_PORTAL_FRAME.find(),
                     fromKilled(75000, EntityType.ENDERMITE), MYTHICAL))
 
@@ -376,8 +423,6 @@ final class CosmeticSelections1_9 implements CosmeticSelections {
             .add(new ParticleSelection("structure_block", BaseShape.DETAILED_OCTAGON, Material.STRUCTURE_BLOCK,
                     fromBlocksMined(3500000), ULTRA))
 
-            // Detailed Octagons
-
             // Combinations
             .add(new ParticleSelection("snowball", BaseShape.SQUARE_RING, Particle.SNOWBALL,
                     fromKilled(85, EntityType.SNOWMAN), UNCOMMON))