-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated hammer tooltip + other misc changes
- Added info about prop locking to the hammer tooltip - Added/modified a few advancements - Fixed the namespace of the gravity api data folder
- Loading branch information
1 parent
422c4e5
commit 2c59b4d
Showing
9 changed files
with
152 additions
and
51 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
13 changes: 13 additions & 0 deletions
13
src/main/resources/data/gravity_api/tags/entity_types/forbidden_entities.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,13 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "portalcubed:portal", | ||
| "portalcubed:energy_pellet", | ||
| "portalcubed:excursion_funnel", | ||
| "portalcubed:repulsion_gel_blob", | ||
| "portalcubed:propulsion_gel_blob", | ||
| "portalcubed:conversion_gel_blob", | ||
| "portalcubed:adhesion_gel_blob", | ||
| "portalcubed:reflection_gel_blob" | ||
| ] | ||
| } |
6 changes: 0 additions & 6 deletions
6
src/main/resources/data/gravitychanger/tags/entity_types/forbidden_entities.json
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
src/main/resources/data/portalcubed/advancements/achievements/crowbar.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,31 @@ | ||
| { | ||
| "display": { | ||
| "icon": { | ||
| "item": "portalcubed:crowbar" | ||
| }, | ||
| "title": { | ||
| "translate": "advancement.portalcubed.crowbar.title" | ||
| }, | ||
| "description": { | ||
| "translate": "advancement.portalcubed.crowbar.description" | ||
| }, | ||
| "show_toast": true, | ||
| "announce_to_chat": false, | ||
| "hidden": false | ||
| }, | ||
| "parent": "portalcubed:achievements/hammer_time", | ||
| "criteria": { | ||
| "requirement": { | ||
| "trigger": "minecraft:inventory_changed", | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "portalcubed:crowbar" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -29,8 +29,7 @@ | |
| { | ||
| "enchantment": "minecraft:feather_falling", | ||
| "levels": { | ||
| "min": 1, | ||
| "max": 4 | ||
| "min": 1 | ||
| } | ||
| } | ||
| ] | ||
|
|
||
45 changes: 45 additions & 0 deletions
45
src/main/resources/data/portalcubed/advancements/achievements/fizzler.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,45 @@ | ||
| { | ||
| "display": { | ||
| "icon": { | ||
| "item": "portalcubed:fizzler_emitter" | ||
| }, | ||
| "title": { | ||
| "translate": "advancement.portalcubed.fizzler.title" | ||
| }, | ||
| "description": { | ||
| "translate": "advancement.portalcubed.fizzler.description" | ||
| }, | ||
| "frame": "task", | ||
| "show_toast": true, | ||
| "announce_to_chat": false, | ||
| "hidden": false | ||
| }, | ||
| "parent": "portalcubed:achievements/auto_portal", | ||
| "criteria": { | ||
| "p1": { | ||
| "trigger": "minecraft:enter_block", | ||
| "conditions": { | ||
| "block": "portalcubed:fizzler" | ||
| } | ||
| }, | ||
| "p2": { | ||
| "trigger": "minecraft:enter_block", | ||
| "conditions": { | ||
| "block": "portalcubed:portal_1_fizzler" | ||
| } | ||
| }, | ||
| "oa": { | ||
| "trigger": "minecraft:enter_block", | ||
| "conditions": { | ||
| "block": "portalcubed:old_aperture_fizzler" | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "p1", | ||
| "p2", | ||
| "oa" | ||
| ] | ||
| ] | ||
| } |
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