Merge remote-tracking branch 'origin/1.21.1-1.1' into 1.21.1-1.1

Author: darksonic300

gradle.properties

@@ -17,7 +17,7 @@ loader_version_range=[4,)
 mod_id=deep_aether
 mod_group=io.github.razordevs.deep_aether
 mod_name=Deep Aether
-mod_version=1.1.4
+mod_version=1.1.5
 mod_license=Assets: All Rights Reserved; Code: GPL-3.0
 mod_url=https://modrinth.com/mod/deep-aether
 mod_update=https://github.com/RazorDevs/Deep-Aether/raw/1.21.1-1.1/update.json

src/generated/resources/data/deep_aether/advancement/recipes/decorations/ambrosium_tiki_torch.json

@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_ambrosium_torch": {
+    "has_ambrosium_shard": {
       "conditions": {
         "items": [
           {
-            "items": "aether:ambrosium_torch"
+            "items": "aether:ambrosium_shard"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_ambrosium_torch"
+      "has_ambrosium_shard"
     ]
   ],
   "rewards": {

src/generated/resources/data/deep_aether/recipe/ambrosium_tiki_torch.json

@@ -3,19 +3,19 @@
   "category": "misc",
   "key": {
     "A": {
-      "item": "aether:ambrosium_torch"
+      "item": "aether:ambrosium_shard"
     },
     "B": {
-      "item": "aether:holystone_slab"
+      "item": "aether:skyroot_stick"
     },
     "C": {
-      "item": "aether:skyroot_stick"
+      "item": "deep_aether:cloudbloom_bouquet"
     }
   },
   "pattern": [
-    "A",
-    "B",
-    "C"
+    " CA",
+    " BC",
+    "B  "
   ],
   "result": {
     "count": 1,

src/main/java/io/github/razordevs/deep_aether/DeepAether.java

@@ -103,7 +103,7 @@ public class DeepAether {
 	public static final Logger LOGGER = LogUtils.getLogger();
 
 	public static final String MODID = "deep_aether";
-	public static final String MOD_VERSION = "1.1.4";
+	public static final String MOD_VERSION = "1.1.5";
 
 	// We lost hope on LC's side. Code removed and will be reintroduced in future versions if needed.
 	public static final String LOST_AETHER_CONTENT = "lost_aether_content";

src/main/java/io/github/razordevs/deep_aether/datagen/DARecipeData.java

@@ -21,7 +21,15 @@
 import io.github.razordevs.deep_aether.recipe.GoldenSwetBallRecipe;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
-import net.minecraft.data.recipes.*;
+import net.minecraft.data.recipes.RecipeBuilder;
+import net.minecraft.data.recipes.RecipeCategory;
+import net.minecraft.data.recipes.RecipeOutput;
+import net.minecraft.data.recipes.ShapedRecipeBuilder;
+import net.minecraft.data.recipes.ShapelessRecipeBuilder;
+import net.minecraft.data.recipes.SimpleCookingRecipeBuilder;
+import net.minecraft.data.recipes.SingleItemRecipeBuilder;
+import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
+import net.minecraft.data.recipes.SpecialRecipeBuilder;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.effect.MobEffectInstance;
@@ -438,13 +446,13 @@ protected void buildRecipes(RecipeOutput consumer) {
                 .save(consumer, name("skyjade_lantern_from_skyjade_nuggets"));
 
         ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.AMBROSIUM_TIKI_TORCH.get())
-                .define('A', AetherBlocks.AMBROSIUM_TORCH.get())
-                .define('B', AetherBlocks.HOLYSTONE_SLAB.get())
-                .define('C', AetherItems.SKYROOT_STICK.get())
-                .pattern("A")
-                .pattern("B")
-                .pattern("C")
-                .unlockedBy(getHasName(AetherBlocks.AMBROSIUM_TORCH.get()), has(AetherBlocks.AMBROSIUM_TORCH.get()))
+                .define('A', AetherItems.AMBROSIUM_SHARD.get())
+                .define('B', AetherItems.SKYROOT_STICK.get())
+                .define('C', DAItems.CLOUDBLOOM_BOUQUET.get())
+                .pattern(" CA")
+                .pattern(" BC")
+                .pattern("B  ")
+                .unlockedBy(getHasName(AetherItems.AMBROSIUM_SHARD.get()), has(AetherItems.AMBROSIUM_SHARD.get()))
                 .save(consumer, name("ambrosium_tiki_torch"));
 
         ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.SKYJADE_CHAIN.get())

src/main/resources/assets/deep_aether/lang/en_us.json

@@ -131,6 +131,7 @@
   "upgrade.deep_aether.stratus_upgrade": "Stratus Upgrade",
   "upgrade.deep_aether.stormforged_upgrade": "Stormforged Upgrade",
 
+  "block.deep_aether.ambrosium_tiki_torch": "Ambrosium Tiki Torch",
   "block.deep_aether.aerglow_blossom_block": "Aerglow Blossom Block",
   "block.deep_aether.aerglow_grass_block": "Aerglow Grass Block",
   "block.deep_aether.aerglow_grass_path": "Aerglow Grass Path",
@@ -471,6 +472,7 @@
   "item.deep_aether.yagroot_chest_boat": "Yagroot Boat with Chest",
   "item.deep_aether.squall_plate": "Squall Plate",
   "item.deep_aether.stormforged_smithing_template": "Smithing Template",
+  "lore.block.deep_aether.ambrosium_tiki_torch": "Look, a tiki torch! Taller, better, and more fashionable than an old torch.",
   "lore.block.deep_aether.aerglow_blossom_block": "Crafted from Aerglow Blossoms. Can be used for decoration or as a light source.",
   "lore.block.deep_aether.aerglow_grass_block": "This is a variant of the typical Aether Grass Block, but it's more of a blue-ish color.",
   "lore.block.deep_aether.aerglow_grass_path": "This block is the result of using a shovel on an Aerglow Grass Block.",
@@ -650,7 +652,7 @@
   "lore.block.deep_aether.skyjade_block": "A block of compacted Skyjade Gemstones. They can power beacons, and just have a sleek look to them.",
   "lore.block.deep_aether.skyjade_lantern": "A cozy lantern with materials native of the Aether. A stronger light source and more enjoyable than those old torches, so might as well use these.",
   "lore.block.deep_aether.skyjade_ore": "A rare ore that drops Skyjade Gemstones when broken with Iron-grade tools or better.",
-  "lore.block.deep_aether.skyjade_ring": "Looks like chains can be made out of Skyjade Nuggets now! A nice addition for your builds, especially paired with its lantern!",
+  "lore.block.deep_aether.skyjade_chain": "Looks like chains can be made out of Skyjade Nuggets now! A nice addition for your builds, especially paired with its lantern!",
   "lore.block.deep_aether.sterling_aercloud": "This Aercloud is found way up high where it's hard to reach. When stepped on, lightning turns it into a Cold Aercloud. Can be enchanted in an altar to become a §cC§6h§er§ao§bm§9a§dt§ci§6c §eA§ae§br§9c§dl§co§6u§ed.",
   "lore.block.deep_aether.stratus_block": "Compressed stratus that is crafted from Stratus Ingots. Can be used for decoration.",
   "lore.block.deep_aether.stratus_debris": "One of Aether's most valuable resources. It can rarely be found inside of clouds in small patches.",

update.json

@@ -3,6 +3,6 @@
   "promos": {
     "1.19.2-recommended": "1.19.2-1.0.4",
     "1.20.1-recommended": "1.20.1-1.1.7",
-    "1.21.1-recommended": "1.21.1-1.1.4"
+    "1.21.1-recommended": "1.21.1-1.1.5"
   }
 }