Add axolotl taters (#127)

NucleoidMC · Apr 17, 2023 · a2e619e · a2e619e
1 parent 6cf1f09
commit a2e619e
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 2 deletions.
diff --git a/src/main/java/xyz/nucleoid/extras/lobby/NEBlocks.java b/src/main/java/xyz/nucleoid/extras/lobby/NEBlocks.java
@@ -386,6 +386,12 @@ public class NEBlocks {
     public static final Block PACKED_MUD_TATER = createTaterBlock(Blocks.DIRT, "ewogICJ0aW1lc3RhbXAiIDogMTY0NzQ1NDgwOTk3NiwKICAicHJvZmlsZUlkIiA6ICI5MThhMDI5NTU5ZGQ0Y2U2YjE2ZjdhNWQ1M2VmYjQxMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJCZWV2ZWxvcGVyIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzY3YTU5MTEwNjFjOTQ5N2MxZTg4OGFhYmU5NzM3MGQ0ZDAwZjkwMGNhNzk4Y2IxYWM4Y2Y0MWZlN2JiNDE1MzIiCiAgICB9CiAgfQp9");
     public static final Block STRIPPED_MANGROVE_LOG_TATER = createTaterBlock(Blocks.STRIPPED_CRIMSON_STEM, "ewogICJ0aW1lc3RhbXAiIDogMTY0NzQ1MDg2MjQ5NSwKICAicHJvZmlsZUlkIiA6ICJhYzM2YmVkZGQxNGQ0YjVmYmQyYzc5OThlMWMwOTg3ZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJtYWlzYWthIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2MwM2QwZTc3NDJmYTY2NTA2YjU3MzljOThkMGNmMjk0MTE0NjM2MDg4NzdmYTY2N2NlMjljN2I4NTc5M2QxOGEiCiAgICB9CiAgfQp9");
 
+    public static final Block LUCY_AXOLOTL_TATER = createTaterBlock(ParticleTypes.HEART, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzIxYTgyNGRjZmE4ZDc1MDNmMDA4ZjU5ZDdlNDg3NGE1OGJhNmY2MzUxNzUwNzIwYzc4YTU1ZWIyNDIxMWZiNiJ9fX0=");
+    public static final Block WILD_AXOLOTL_TATER = createTaterBlock(ParticleTypes.HEART, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODYxYTc2MDc5ODdlMDc1MWUxMGMzZDgxOTc3NWI1OGM0NWRiYTI5MTFiZDUyMjJjYTgxMTFhODQwMTI0OGQ1NiJ9fX0=");
+    public static final Block GOLD_AXOLOTL_TATER = createTaterBlock(ParticleTypes.HEART, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWU4ZGZmMWNmNGYxZTc2Yzc2OTkzYWI5MzE2ZWY3OTA0YjIyOWMzN2I4Y2JkMTg3NmNjYjhjOWJjYmQzNjUwMiJ9fX0=");
+    public static final Block CYAN_AXOLOTL_TATER = createTaterBlock(ParticleTypes.HEART, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWQ2MWJlNDQ0YjM2MDE4NGNjMzlmYWVjZmFjODQ5MzU5YmE1Njg0M2UxNDY5YTNjNDY4N2YwMDRiOWE3YWU2NSJ9fX0=");
+    public static final Block BLUE_AXOLOTL_TATER = createTaterBlock(ParticleTypes.HEART, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTU2OTFkNDJiY2JlOGJmYTU5NzA3MzkwZTUyZWU3Y2ZjYjJjNzZmZDM5N2IwNzEwYzU2NmQ4MDQ5Zjc0NWFmOCJ9fX0=");
+
     public static final Block BRONZE_CAPSULE_TATER = createCapsuleTaterBlock(Vec3d.unpackRgb(0x764D22).toVector3f(), 90, "ewogICJ0aW1lc3RhbXAiIDogMTY1OTk5MjU0MTQ1MiwKICAicHJvZmlsZUlkIiA6ICIzYWJkYjI5ZDI2MTU0YTAxOWEzZWQ3OGRlMzI4OWUxNCIsCiAgInByb2ZpbGVOYW1lIiA6ICJFcmljSHViZXIiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzM5MTgyMjUwNGQ3OTQ5MTE4NmQ0MmI1YWI2ZmRkOTYxNWJmYzE4ODYzMjRiZTVmNWI2MTNkY2IwMzMxOTY3NyIKICAgIH0KICB9Cn0");
     public static final Block SILVER_CAPSULE_TATER = createCapsuleTaterBlock(Vec3d.unpackRgb(0xBFBFBF).toVector3f(), 9, "ewogICJ0aW1lc3RhbXAiIDogMTY1OTk5MjUwMjk3MCwKICAicHJvZmlsZUlkIiA6ICJlN2IxNmI2MzM2OGM0ODIzYmUxZDcxOTg5ODE5YWI3NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTb3VyY2VXcml0ZXJzIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FmZGNlM2VhMTM5OWRkMGI3MzhmYWFlY2Y4OWNjNWJkY2YxNzliOGRjNGYzZDc5NjRjOGNkNDVjODkyNTdmZDEiCiAgICB9CiAgfQp9");
     public static final Block GOLD_CAPSULE_TATER = createCapsuleTaterBlock(Vec3d.unpackRgb(0xF1A00E).toVector3f(), 1, "ewogICJ0aW1lc3RhbXAiIDogMTY1OTk5MjUyMjQyMSwKICAicHJvZmlsZUlkIiA6ICI0MjEwNTYxMWQxZjM0NzAyOTQ4NjE3OTYzMDY3NjY2NCIsCiAgInByb2ZpbGVOYW1lIiA6ICJUcmlraXRyYWthdGVsYXp6IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2RiNTM4ODgzNDU3OGNjYjkwNmU5N2QzZTU0YWViMzNlZGNjMTJkODIxZjA4MWI3ZWIwNDgzMGNiZDI2MGFkODEiCiAgICB9CiAgfQp9");
@@ -775,6 +781,12 @@ public static void register() {
         register("packed_mud_tater", PACKED_MUD_TATER);
         register("stripped_mangrove_log_tater", STRIPPED_MANGROVE_LOG_TATER);
 
+        register("lucy_axolotl_tater", LUCY_AXOLOTL_TATER);
+        register("wild_axolotl_tater", WILD_AXOLOTL_TATER);
+        register("gold_axolotl_tater", GOLD_AXOLOTL_TATER);
+        register("cyan_axolotl_tater", CYAN_AXOLOTL_TATER);
+        register("blue_axolotl_tater", BLUE_AXOLOTL_TATER);
+
         register("bronze_capsule_tater", BRONZE_CAPSULE_TATER);
         register("silver_capsule_tater", SILVER_CAPSULE_TATER);
         register("gold_capsule_tater", GOLD_CAPSULE_TATER);

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/NEItems.java b/src/main/java/xyz/nucleoid/extras/lobby/NEItems.java
@@ -327,6 +327,11 @@ public class NEItems {
             entries.add(NEItems.MUD_TATER);
             entries.add(NEItems.PACKED_MUD_TATER);
             entries.add(NEItems.STRIPPED_MANGROVE_LOG_TATER);
+            entries.add(NEItems.LUCY_AXOLOTL_TATER);
+            entries.add(NEItems.WILD_AXOLOTL_TATER);
+            entries.add(NEItems.GOLD_AXOLOTL_TATER);
+            entries.add(NEItems.CYAN_AXOLOTL_TATER);
+            entries.add(NEItems.BLUE_AXOLOTL_TATER);
             entries.add(NEItems.BRONZE_CAPSULE_TATER);
             entries.add(NEItems.SILVER_CAPSULE_TATER);
             entries.add(NEItems.GOLD_CAPSULE_TATER);
@@ -647,6 +652,12 @@ public class NEItems {
     public static final Item PACKED_MUD_TATER = createHead(NEBlocks.PACKED_MUD_TATER);
     public static final Item STRIPPED_MANGROVE_LOG_TATER = createHead(NEBlocks.STRIPPED_MANGROVE_LOG_TATER);
 
+    public static final Item LUCY_AXOLOTL_TATER = createHead(NEBlocks.LUCY_AXOLOTL_TATER);
+    public static final Item WILD_AXOLOTL_TATER = createHead(NEBlocks.WILD_AXOLOTL_TATER);
+    public static final Item GOLD_AXOLOTL_TATER = createHead(NEBlocks.GOLD_AXOLOTL_TATER);
+    public static final Item CYAN_AXOLOTL_TATER = createHead(NEBlocks.CYAN_AXOLOTL_TATER);
+    public static final Item BLUE_AXOLOTL_TATER = createHead(NEBlocks.BLUE_AXOLOTL_TATER);
+
     public static final Item BRONZE_CAPSULE_TATER = createHead(NEBlocks.BRONZE_CAPSULE_TATER);
     public static final Item SILVER_CAPSULE_TATER = createHead(NEBlocks.SILVER_CAPSULE_TATER);
     public static final Item GOLD_CAPSULE_TATER = createHead(NEBlocks.GOLD_CAPSULE_TATER);
@@ -975,6 +986,12 @@ public static void register() {
         register("packed_mud_tater", PACKED_MUD_TATER);
         register("stripped_mangrove_log_tater", STRIPPED_MANGROVE_LOG_TATER);
 
+        register("lucy_axolotl_tater", LUCY_AXOLOTL_TATER);
+        register("wild_axolotl_tater", WILD_AXOLOTL_TATER);
+        register("gold_axolotl_tater", GOLD_AXOLOTL_TATER);
+        register("cyan_axolotl_tater", CYAN_AXOLOTL_TATER);
+        register("blue_axolotl_tater", BLUE_AXOLOTL_TATER);
+
         register("bronze_capsule_tater", BRONZE_CAPSULE_TATER);
         register("silver_capsule_tater", SILVER_CAPSULE_TATER);
         register("gold_capsule_tater", GOLD_CAPSULE_TATER);

diff --git a/src/main/resources/data/nucleoid_extras/advancements/taters/axolotl_taters.json b/src/main/resources/data/nucleoid_extras/advancements/taters/axolotl_taters.json
@@ -0,0 +1,50 @@
+{
+  "parent": "nucleoid_extras:taters/copper_taters",
+  "display": {
+    "icon": {
+      "item": "nucleoid_extras:lucy_axolotl_tater"
+    },
+    "title": {
+      "translate": "advancements.nucleoid_extras.axolotl_taters.title"
+    },
+    "description": {
+      "translate": "advancements.nucleoid_extras.axolotl_taters.description"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "criteria": {
+    "get_lucy_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:lucy_axolotl_tater"
+      }
+    },
+    "get_wild_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:wild_axolotl_tater"
+      }
+    },
+    "get_gold_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:gold_axolotl_tater"
+      }
+    },
+    "get_cyan_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:cyan_axolotl_tater"
+      }
+    },
+    "get_blue_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:blue_axolotl_tater"
+      }
+    }
+  }
+}
diff --git a/src/main/resources/data/nucleoid_extras/advancements/taters/caves_and_cliffs_taters.json b/src/main/resources/data/nucleoid_extras/advancements/taters/caves_and_cliffs_taters.json
@@ -1,5 +1,5 @@
 {
-  "parent": "nucleoid_extras:taters/copper_taters",
+  "parent": "nucleoid_extras:taters/axolotl_taters",
   "display": {
     "icon": {
       "item": "nucleoid_extras:azalea_tater"
@@ -117,6 +117,36 @@
       "conditions": {
         "tater": "nucleoid_extras:raw_iron_tater"
       }
+    },
+    "get_lucy_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:lucy_axolotl_tater"
+      }
+    },
+    "get_wild_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:wild_axolotl_tater"
+      }
+    },
+    "get_gold_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:gold_axolotl_tater"
+      }
+    },
+    "get_cyan_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:cyan_axolotl_tater"
+      }
+    },
+    "get_blue_axolotl_tater": {
+      "trigger": "nucleoid_extras:tater_collected",
+      "conditions": {
+        "tater": "nucleoid_extras:blue_axolotl_tater"
+      }
     }
   }
-}
+}
diff --git a/src/main/resources/data/nucleoid_extras/lang/en_us.json b/src/main/resources/data/nucleoid_extras/lang/en_us.json
@@ -315,6 +315,11 @@
   "block.nucleoid_extras.mud_tater": "Mud Tater",
   "block.nucleoid_extras.packed_mud_tater": "Packed Mud Tater",
   "block.nucleoid_extras.stripped_mangrove_log_tater": "Stripped Mangrove Log Tater",
+  "block.nucleoid_extras.lucy_axolotl_tater": "Leucistic Axolotl Tater",
+  "block.nucleoid_extras.wild_axolotl_tater": "Brown Axolotl Tater",
+  "block.nucleoid_extras.gold_axolotl_tater": "Gold Axolotl Tater",
+  "block.nucleoid_extras.cyan_axolotl_tater": "Cyan Axolotl Tater",
+  "block.nucleoid_extras.blue_axolotl_tater": "Blue Axolotl Tater",
   "block.nucleoid_extras.bronze_capsule_tater": "Bronze Capsule Tater",
   "block.nucleoid_extras.silver_capsule_tater": "Silver Capsule Tater",
   "block.nucleoid_extras.gold_capsule_tater": "Golden Capsule Tater",
@@ -404,6 +409,8 @@
   "advancements.nucleoid_extras.raw_taters.description": "Collect all Raw Ore Taters in your Tater Box.",
   "advancements.nucleoid_extras.ice_taters.title": "Frozen Potatoes",
   "advancements.nucleoid_extras.ice_taters.description": "Collect all Ice Taters in your Tater Box.",
+  "advancements.nucleoid_extras.axolotl_taters.title": "A-xo-LOT of Taters",
+  "advancements.nucleoid_extras.axolotl_taters.description": "Collect all Axolotl Taters in your Tater Box.",
 
   "advancements.nucleoid_extras.pre_classic_taters.title": "Prehistoric Taters",
   "advancements.nucleoid_extras.pre_classic_taters.description": "Collect all Minecraft Pre-Classic Taters in your Tater Box.",