Merge pull request #18 from DroidDude/1.21

0.4.1

ChangeLog.txt

@@ -1,10 +1,3 @@
-Beta 1.21-0.4.0
+Beta 1.21-0.4.1
 
-- Updated to Forge 51.0.33
-- Added Block of Magic Alloy
-- Added Smithing Template Wings Upgrade
-- Added Temple Structure
-- Removed Wings Crafting Recipe
-- Code Optimizations
-- Minor Bugfixes
-- Magic Nugget texture rotated for better differentiation
+- Bug fixes

README.md

@@ -1,5 +1,5 @@
 
-Flight Potion Beta 1.21-0.4.0
+Flight Potion Beta 1.21-0.4.1
 =======
 
 A Minecraft mod, that adds some features related to flight.
@@ -73,16 +73,9 @@ Custom Advancement Trigger FlightTrigger
 
 Change Logs:
 ============
-Beta 1.21-0.4.0
-
-- Updated to Forge 51.0.33
-- Added Block of Magic Alloy
-- Added Smithing Template Wings Upgrade
-- Added Temple Structure
-- Removed Wings Crafting Recipe
-- Code Optimizations
-- Minor Bugfixes
-- Magic Nugget texture rotated for better differentiation
+Beta 1.21-0.4.1
+
+- Bug fixes
 
 Licence:
 ============

gradle.properties

@@ -48,7 +48,7 @@ mod_name=Flight Potion
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT License
 # The mod version. See https://semver.org/
-mod_version=1.21-0.4.0
+mod_version=1.21-0.4.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/github/droiddude/fltpot/creativetab/CreativeTab.java

@@ -65,6 +65,12 @@ public static void buildContents(BuildCreativeModeTabContentsEvent event) {
 
         }
 
+        if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) {
+
+            event.getEntries().putAfter(Items.NETHERITE_BLOCK.getDefaultInstance(), Items.MAGIC_ALLOY_BLOCK.get().getDefaultInstance(), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);
+
+        }
+
         if (event.getTabKey() == CreativeModeTabs.INGREDIENTS) {
 
             event.getEntries().putAfter(Items.GOLD_NUGGET.getDefaultInstance(), Items.MAGIC_NUGGET.get().getDefaultInstance(), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS);

src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_block.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "fltpot:magic_ingot_from_block"
+    ]
+  },
+  "criteria": {
+    "has_magic_nugget": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "fltpot:magic_alloy_block"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "fltpot:magic_ingot_from_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_magic_nugget",
+      "has_the_recipe"
+    ]
+  ]
+}

src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot.json → src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_nuggets.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "fltpot:magic_ingot"
+      "fltpot:magic_ingot_from_nuggets"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "fltpot:magic_ingot"
+        "recipe": "fltpot:magic_ingot_from_nuggets"
       }
     }
   },

src/main/resources/data/fltpot/worldgen/template_pool/temple/start_pool.json

@@ -5,7 +5,7 @@
       "element": {
         "element_type": "minecraft:single_pool_element",
         "location": "fltpot:temple",
-        "processors": "fltpot:temple_processor",
+        "processors": "minecraft:empty",
         "projection": "rigid"
       },
       "weight": 1