-
-
Notifications
You must be signed in to change notification settings - Fork 64
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
16
commits into
Gamemode4Dev:master
Choose a base branch
from
TheThanathor:horsemanship
base: master
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 11 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
1db708c
update old module to 1.21.5
TheThanathor 394b636
add swimming with rider
TheThanathor 8ee5bd7
fix horse breeding, add varying scales
TheThanathor 3a0d1de
update horse training mechanics
TheThanathor b012a43
Merge remote-tracking branch 'upstream/master' into horsemanship
TheThanathor 384d026
add more sounds and particles
TheThanathor 0a193b8
swap carrot to standard foods
TheThanathor 893b9a8
Merge remote-tracking branch 'upstream/master' into horsemanship
TheThanathor 3d70fe5
update and simplify Horsemanship
TheThanathor 5c1b68e
update headers and reorganize folders
TheThanathor df4ca6f
update horse flight
TheThanathor e5e3162
quick wing period fix
TheThanathor 7dbc611
runcow's horse improvements
TheThanathor a6dc52e
add horse wing texture (WIP)
TheThanathor 2d2c06c
fix the wings!
TheThanathor a9a8cbc
oops missing tag
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # Shapeless Portals<!--$headerTitle--><!--$pmc:delete--> | ||
|
|
||
| TODO!<!--$pmc:headerSize--> | ||
|
|
||
| <img src="images/shapeless_portals.png" alt="There is 1 portal among us" height="350"/> <!--$localAssetToURL--> <!--$modrinth:replaceWithVideo--> <!--$pmc:delete--> | ||
|
|
||
| ### Features | ||
| - Light portals of any shape with Flint and Steel or Fire Charges. | ||
| - Portals can use Crying Obsidian. | ||
Binary file added
BIN
+397 Bytes
gm4_horsemanship/assets/gm4_horsemanship/textures/item/glider_wing.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,4 @@ | ||
| model_data: | ||
| - item: feather | ||
| reference: item/glider_wing | ||
| template: generated |
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,2 @@ | ||
| key,en_us | ||
| gm4.horsemanship.item.horse_wings,Horse Wings | ||
TheThanathor marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
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,28 @@ | ||
| id: gm4_horsemanship | ||
| name: Horsemanship | ||
| version: 1.0.X | ||
|
|
||
| data_pack: | ||
| load: . | ||
|
|
||
TheThanathor marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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: [] | ||
| video: null | ||
| wiki: https://wiki.gm4.co/wiki/Horsemanship | ||
| credits: | ||
| Creator: | ||
| - Thanathor | ||
187 changes: 187 additions & 0 deletions
187
gm4_horsemanship/data/gm4_horsemanship/advancement/feed_horse.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,187 @@ | ||
| { | ||
| "criteria": { | ||
| "apple": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
TheThanathor marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| "item": { | ||
| "items": [ | ||
| "minecraft:apple" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "golden_apple": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:golden_apple" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "carrot": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:carrot" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "enchanted_golden_apple": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:enchanted_golden_apple" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "golden_carrot": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:golden_carrot" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "sugar": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:sugar" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "wheat": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:wheat" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "hay_block": { | ||
| "trigger": "minecraft:player_interacted_with_entity", | ||
| "conditions": { | ||
| "player": [], | ||
| "item": { | ||
| "items": [ | ||
| "minecraft:hay_block" | ||
| ] | ||
| }, | ||
| "entity": [ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "type": "#gm4_horsemanship:trainable", | ||
| "nbt": "{Tags:[\"gm4_horse\"]}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "apple", | ||
| "golden_apple", | ||
| "carrot", | ||
| "enchanted_golden_apple", | ||
| "golden_carrot", | ||
| "sugar", | ||
| "wheat", | ||
| "hay_block" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "function": "gm4_horsemanship:horse_processing/food/feed_original_food" | ||
| } | ||
| } | ||
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.