-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #119 from AnonymousHacker1279/1.21.1-dev
Update master branch with 1.21.1-dev changes
- Loading branch information
Showing
22 changed files
with
355 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,11 @@ | ||
| This minor update fixes a few bugs and tweaks some features. | ||
| This minor update fixes a bug and adds some new items to loot tables. | ||
|
|
||
| ### Feature Changes / Additions | ||
|
|
||
| - Soldier-type XP drops are now based on factors including local difficulty, worn armor, and armor/weapon enchantments | ||
| - Increase XP drops for berserk Wandering Warriors | ||
| - Add Skygazer enchantment caps for Density (5), Wind Burst (10), and Breach (4). | ||
| - Add more loot table options for Azul Keystone Fragments to generate in | ||
| - Add some IW items to the loot tables for trial chamber vaults | ||
| - Add a second recipe for the Bottle of Wine that uses glow berries | ||
|
|
||
| ### Bugfixes | ||
|
|
||
| - Fix soldier-type entities not dropping XP at all | ||
| - Fix various parity issues between custom arrow entities and vanilla arrows (for example, fixing the Flame enchantment | ||
| on Aurora and Dragon's Breath bows) | ||
| - Fix Azul Keystone Fragments being unable to generate in any loot tables |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...ent/recipes/immersiveweapons/barrel_tap/bottle_of_wine_fermenting_from_sweet_berries.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "barrel_tap": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": "immersiveweapons:barrel_tap" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "immersiveweapons:bottle_of_wine_fermenting_from_sweet_berries" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "barrel_tap" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "immersiveweapons:bottle_of_wine_fermenting_from_sweet_berries" | ||
| ] | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/immersiveweapons/loot_modifiers/agility_bracelet.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "type": "immersiveweapons:simple_chest", | ||
| "allow_treasure": false, | ||
| "conditions": [ | ||
| { | ||
| "condition": "neoforge:loot_table_id", | ||
| "loot_table_id": "minecraft:chests/trial_chambers/reward" | ||
| } | ||
| ], | ||
| "item": { | ||
| "count": 1, | ||
| "id": "immersiveweapons:agility_bracelet" | ||
| }, | ||
| "max_enchant_levels": 0, | ||
| "max_quantity": 1, | ||
| "min_quantity": 1, | ||
| "roll_chance": 0.1 | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/immersiveweapons/loot_modifiers/azul_keystone.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "type": "immersiveweapons:simple_chest", | ||
| "allow_treasure": false, | ||
| "conditions": [ | ||
| { | ||
| "condition": "neoforge:loot_table_id", | ||
| "loot_table_id": "minecraft:chests/trial_chambers/reward_ominous" | ||
| } | ||
| ], | ||
| "item": { | ||
| "count": 1, | ||
| "id": "immersiveweapons:azul_keystone" | ||
| }, | ||
| "max_enchant_levels": 0, | ||
| "max_quantity": 1, | ||
| "min_quantity": 1, | ||
| "roll_chance": 0.2 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/immersiveweapons/loot_modifiers/cobalt_arrow.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "type": "immersiveweapons:simple_chest", | ||
| "allow_treasure": false, | ||
| "conditions": [ | ||
| { | ||
| "condition": "neoforge:loot_table_id", | ||
| "loot_table_id": "minecraft:chests/trial_chambers/reward" | ||
| } | ||
| ], | ||
| "item": { | ||
| "count": 1, | ||
| "id": "immersiveweapons:cobalt_arrow" | ||
| }, | ||
| "max_enchant_levels": 0, | ||
| "max_quantity": 4, | ||
| "min_quantity": 2, | ||
| "roll_chance": 0.2 | ||
| } |
Oops, something went wrong.