diff --git a/ChangeLog.txt b/ChangeLog.txt index acc8e36..fdd0fb9 100644 --- a/ChangeLog.txt +++ b/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 \ No newline at end of file +- Bug fixes \ No newline at end of file diff --git a/README.md b/README.md index af92777..5550d9c 100644 --- a/README.md +++ b/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: ============ diff --git a/gradle.properties b/gradle.properties index 9faf852..7e1b1a7 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/com/github/droiddude/fltpot/creativetab/CreativeTab.java b/src/main/java/com/github/droiddude/fltpot/creativetab/CreativeTab.java index e4569e4..26843e5 100644 --- a/src/main/java/com/github/droiddude/fltpot/creativetab/CreativeTab.java +++ b/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); diff --git a/src/main/resources/assets/fltpot/textures/block/magic_alloy_block1.png b/src/main/resources/assets/fltpot/textures/block/magic_alloy_block1.png deleted file mode 100644 index 7144e73..0000000 Binary files a/src/main/resources/assets/fltpot/textures/block/magic_alloy_block1.png and /dev/null differ diff --git a/src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_block.json b/src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_block.json new file mode 100644 index 0000000..ba4ceaf --- /dev/null +++ b/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" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot.json b/src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_nuggets.json similarity index 85% rename from src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot.json rename to src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot_from_nuggets.json index 7825ed9..1c7051b 100644 --- a/src/main/resources/data/fltpot/advancement/recipes/misc/magic_ingot.json +++ b/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" } } }, diff --git a/src/main/resources/data/fltpot/worldgen/processor_list/temple_processor.json b/src/main/resources/data/fltpot/worldgen/processor_list/temple_processor.json deleted file mode 100644 index 53425c6..0000000 --- a/src/main/resources/data/fltpot/worldgen/processor_list/temple_processor.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ - { - "location_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:structure_void", - "probability": 0.1 - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:chest", - "Properties": { - "facing": "north" - } - }, - "output_nbt": { - "LootTable": "fltpot:chests/temple_chest" - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:structure_void", - "probability": 0.9 - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:spawner" - }, - "output_nbt": { - "SpawnData": { - "id": "minecraft:vex" - }, - "Delay": 20, - "MinSpawnDelay": 200, - "MaxSpawnDelay": 800, - "SpawnCount": 4, - "MaxNearbyEntities": 6, - "RequiredPlayerRange": 16, - "SpawnRange": 4 - } - } - ] - } - ] -} diff --git a/src/main/resources/data/fltpot/worldgen/template_pool/temple/start_pool.json b/src/main/resources/data/fltpot/worldgen/template_pool/temple/start_pool.json index 3725f5f..22776ce 100644 --- a/src/main/resources/data/fltpot/worldgen/template_pool/temple/start_pool.json +++ b/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