-
-
Notifications
You must be signed in to change notification settings - Fork 68
Horsemanship #1138
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
TheThanathor
wants to merge
26
commits into
Gamemode4Dev:update-26.1
Choose a base branch
from
TheThanathor:horsemanship
base: update-26.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Horsemanship #1138
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
583e4b3
update old module to 1.21.5
TheThanathor 8f30a9f
add swimming with rider
TheThanathor 17dead4
fix horse breeding, add varying scales
TheThanathor 3713f87
update horse training mechanics
TheThanathor d9a2d20
add more sounds and particles
TheThanathor 2eaa554
swap carrot to standard foods
TheThanathor a3010bf
update and simplify Horsemanship
TheThanathor 3295814
update headers and reorganize folders
TheThanathor fac65b4
update horse flight
TheThanathor 2f20a9b
quick wing period fix
TheThanathor e93277f
runcow's horse improvements
TheThanathor 35e936c
add horse wing texture (WIP)
TheThanathor 5fda619
fix the wings!
TheThanathor 7bffc08
oops missing tag
TheThanathor ba28233
add advancement, image and website note
TheThanathor 6eca354
update to 1.21.11
TheThanathor 16c1923
add translations
TheThanathor 3c43455
technically RP is not required rn
TheThanathor 1ff263d
Backport mob_griefing gamerule
misode 9d48c0e
update Horsemanship
TheThanathor 5d9a239
update guidebook trigger
TheThanathor a7cde9e
fix horse jumping
TheThanathor 856ada2
fix attribuite names
TheThanathor 12fd25b
fix guidebook trigger, remove plugin change
TheThanathor b093a2c
resolve bloo's comments
TheThanathor 53f188d
fix last missing attribute
TheThanathor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,10 @@ | ||
| # Horsemanship<!--$headerTitle--><!--$pmc:delete--> | ||
|
|
||
| Level up your Horses as you use them! Adds level-ups, additional foods and more!<!--$pmc:headerSize--> | ||
|
|
||
| <img src="images/horsemanship.png" alt="Horse in flight" height="350"/> <!--$localAssetToURL--> <!--$modrinth:replaceWithVideo--> <!--$pmc:delete--> | ||
|
|
||
| ### Features | ||
| - Horses will grow stronger with use, while keeping breeding mechanics. | ||
| - New item crafted with Horse Armor and Elytra to allow your horse to fly! | ||
| - Allow horses to graze grass and add a variety of new food items you can feed them. |
9 changes: 9 additions & 0 deletions
9
gm4_horsemanship/assets/gm4_horsemanship/equipment/wings.json
This file contains hidden or 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,9 @@ | ||
| { | ||
| "layers": { | ||
| "horse_body": [ | ||
| { | ||
| "texture": "gm4_horsemanship:wings" | ||
| } | ||
| ] | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
gm4_horsemanship/assets/gm4_horsemanship/items/horse_winged.json
This file contains hidden or 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,6 @@ | ||
| { | ||
| "model": { | ||
| "type": "minecraft:model", | ||
| "model": "gm4_horsemanship:item/horse_winged" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
gm4_horsemanship/assets/gm4_horsemanship/items/horse_wings.json
This file contains hidden or 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,6 @@ | ||
| { | ||
| "model": { | ||
| "type": "minecraft:model", | ||
| "model": "gm4_horsemanship:item/horse_wings" | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
gm4_horsemanship/assets/gm4_horsemanship/models/item/horse_winged.json
This file contains hidden or 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,53 @@ | ||
| { | ||
| "format_version": "1.21.6", | ||
| "textures": { | ||
| "0": "gm4_horsemanship:item/horse_winged", | ||
| "particle": "gm4_horsemanship:item/horse_winged" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [2.40317, -5.58211, 8], | ||
| "to": [18.40317, 10.41789, 8], | ||
| "rotation": {"angle": 22.5, "axis": "z", "origin": [3, 3, 8]}, | ||
| "faces": { | ||
| "north": {"uv": [16, 16, 0, 0], "texture": "#0"}, | ||
| "east": {"uv": [0, 0, 0, 16], "texture": "#missing"}, | ||
| "south": {"uv": [0, 16, 16, 0], "texture": "#0"}, | ||
| "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, | ||
| "up": {"uv": [16, 0, 0, 0], "texture": "#missing"}, | ||
| "down": {"uv": [16, 0, 0, 0], "texture": "#missing"} | ||
| } | ||
| } | ||
| ], | ||
| "display": { | ||
| "thirdperson_righthand": { | ||
| "translation": [0, 3, 1], | ||
| "scale": [0.55, 0.55, 0.55] | ||
| }, | ||
| "thirdperson_lefthand": { | ||
| "translation": [0, 3, 1], | ||
| "scale": [0.55, 0.55, 0.55] | ||
| }, | ||
| "firstperson_righthand": { | ||
| "rotation": [0, -90, 25], | ||
| "translation": [1.13, 3.2, 1.13], | ||
| "scale": [0.68, 0.68, 0.68] | ||
| }, | ||
| "firstperson_lefthand": { | ||
| "rotation": [0, -90, 25], | ||
| "translation": [1.13, 3.2, 1.13], | ||
| "scale": [0.68, 0.68, 0.68] | ||
| }, | ||
| "ground": { | ||
| "translation": [0, 2, 0], | ||
| "scale": [0.5, 0.5, 0.5] | ||
| }, | ||
| "head": { | ||
| "rotation": [0, -180, 0], | ||
| "translation": [0, 13, 7] | ||
| }, | ||
| "fixed": { | ||
| "rotation": [0, -180, 0] | ||
| } | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
gm4_horsemanship/assets/gm4_horsemanship/models/item/horse_wings.json
This file contains hidden or 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,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "gm4_horsemanship:item/horse_wings" | ||
| } | ||
| } |
Binary file added
BIN
+615 Bytes
...emanship/assets/gm4_horsemanship/textures/entity/equipment/horse_body/wings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+534 Bytes
gm4_horsemanship/assets/gm4_horsemanship/textures/item/horse_winged.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+347 Bytes
gm4_horsemanship/assets/gm4_horsemanship/textures/item/horse_wings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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,7 @@ | ||
| model_data: | ||
| - item: elytra | ||
| reference: item/horse_wings | ||
| template: custom | ||
| - item: feather | ||
| reference: item/horse_winged | ||
| template: custom |
This file contains hidden or 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,8 @@ | ||
| key,en_us | ||
| gm4.horsemanship.item.horse_wings,Pegasuit | ||
| advancement.gm4.horsemanship.horse_takes_flight.title,When Horses Fly! | ||
| advancement.gm4.horsemanship.horse_takes_flight.description,Craft a %s and take to the skies! | ||
| text.gm4.guidebook.module_desc.horsemanship,Form a bond with your horses | ||
| text.gm4.guidebook.horsemanship.description,"Horses can level up, indicated by their amount of hearts. Horses start at 5 hearts and will gain 1 for every level, up to a total of 20.\n\nWearing Frost Walker will also apply to any Horse you ride." | ||
| text.gm4.guidebook.horsemanship.description_2,A pegasuit allows your Horse to fly by looking up or down while riding. | ||
| text.gm4.guidebook.horsemanship.description_3,Horses can be fed the following food items:\n- Baked Potato\n- Beetroot\n- Bread\n- Chorus Fruit\n- Dried Kelp\n- Glow Berries\n- Melon Slice\n- Short Grass\n- Sweet Berries |
This file contains hidden or 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 @@ | ||
| id: gm4_horsemanship | ||
| name: Horsemanship | ||
| version: 1.0.X | ||
|
|
||
| resource_pack: | ||
| load: . | ||
| data_pack: | ||
| load: . | ||
|
|
||
| pipeline: | ||
| - gm4.plugins.extend.module | ||
| - gm4.plugins.include.lib_forceload | ||
|
|
||
| meta: | ||
| gm4: | ||
| versioning: | ||
| required: | ||
| lib_forceload: 1.1.0 | ||
| schedule_loops: | ||
| - main | ||
| - tick | ||
| website: | ||
| description: Form a bond with your horses | ||
| recommended: [] | ||
| notes: | ||
| - Usage of the Gamemode 4 Resource Pack is highly recommended. | ||
| video: null | ||
| wiki: https://wiki.gm4.co/wiki/Horsemanship | ||
| credits: | ||
| Creator: | ||
| - Thanathor | ||
32 changes: 32 additions & 0 deletions
32
gm4_horsemanship/data/gm4/advancement/horse_takes_flight.json
This file contains hidden or 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 @@ | ||
| { | ||
| "display": { | ||
| "icon": { | ||
| "id": "minecraft:elytra", | ||
| "components": { | ||
| "minecraft:custom_model_data": "item/horse_wings" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same issue here |
||
| } | ||
| }, | ||
| "title": { | ||
| "translate": "advancement.gm4.horsemanship.horse_takes_flight.title", | ||
| "fallback": "When Horses Fly!" | ||
| }, | ||
| "description": { | ||
| "translate": "advancement.gm4.horsemanship.horse_takes_flight.description", | ||
| "fallback": "Craft a %s and take to the skies!", | ||
| "color": "gray", | ||
| "with": [ | ||
| { | ||
| "translate": "gm4.horsemanship.item.horse_wings", | ||
| "fallback": "Pegasuit" | ||
| } | ||
| ] | ||
| }, | ||
| "frame": "task" | ||
| }, | ||
| "parent": "gm4:root", | ||
| "criteria": { | ||
| "full_set": { | ||
| "trigger": "minecraft:impossible" | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.