Skip to content

Commit

Permalink
Merge pull request #58 from Alathra/sherman
Browse files Browse the repository at this point in the history 
feat: fishing salmon changes
  • Loading branch information
@ShermansWorld
ShermansWorld authored Jul 28, 2024
2 parents 2d1135d + af7c375 commit dab8c8c
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 242 deletions.
242 changes: 31 additions & 211 deletions assets/minecraft/models/item/cod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,215 +4,35 @@
"layer0": "minecraft:item/cod"
},
"overrides": [
{
"predicate": {
"custom_model_data": 2800
},
"model": "item/extras/shark_meat"
},
{
"predicate": {
"custom_model_data": 2801
},
"model": "item/extras/calamari"
},
{
"predicate": {
"custom_model_data": 2802
},
"model": "item/extras/whale_blubber"
},
{
"predicate": {
"custom_model_data": 47000
},
"model": "item/fishing/cod/atlantic_mackerel"
},
{
"predicate": {
"custom_model_data": 47001
},
"model": "item/fishing/cod/bluefish"
},
{
"predicate": {
"custom_model_data": 70001
},
"model": "fish:item/cod/1"
},
{
"predicate": {
"custom_model_data": 70002
},
"model": "fish:item/cod/2"
},
{
"predicate": {
"custom_model_data": 70003
},
"model": "fish:item/cod/3"
},
{
"predicate": {
"custom_model_data": 70004
},
"model": "fish:item/cod/4"
},
{
"predicate": {
"custom_model_data": 70005
},
"model": "fish:item/cod/5"
},
{
"predicate": {
"custom_model_data": 70101
},
"model": "fish:item/cod/21"
},
{
"predicate": {
"custom_model_data": 70102
},
"model": "fish:item/cod/22"
},
{
"predicate": {
"custom_model_data": 70103
},
"model": "fish:item/cod/23"
},
{
"predicate": {
"custom_model_data": 70104
},
"model": "fish:item/cod/24"
},
{
"predicate": {
"custom_model_data": 70105
},
"model": "fish:item/cod/25"
},
{
"predicate": {
"custom_model_data": 70201
},
"model": "fish:item/cod/26"
},
{
"predicate": {
"custom_model_data": 70202
},
"model": "fish:item/cod/27"
},
{
"predicate": {
"custom_model_data": 70203
},
"model": "fish:item/cod/28"
},
{
"predicate": {
"custom_model_data": 70204
},
"model": "fish:item/cod/29"
},
{
"predicate": {
"custom_model_data": 70205
},
"model": "fish:item/cod/30"
},
{
"predicate": {
"custom_model_data": 75001
},
"model": "fish:item/cod/6"
},
{
"predicate": {
"custom_model_data": 75002
},
"model": "fish:item/cod/7"
},
{
"predicate": {
"custom_model_data": 75003
},
"model": "fish:item/cod/8"
},
{
"predicate": {
"custom_model_data": 75004
},
"model": "fish:item/cod/9"
},
{
"predicate": {
"custom_model_data": 75005
},
"model": "fish:item/cod/10"
},
{
"predicate": {
"custom_model_data": 76001
},
"model": "fish:item/cod/11"
},
{
"predicate": {
"custom_model_data": 76002
},
"model": "fish:item/cod/12"
},
{
"predicate": {
"custom_model_data": 76003
},
"model": "fish:item/cod/13"
},
{
"predicate": {
"custom_model_data": 76004
},
"model": "fish:item/cod/14"
},
{
"predicate": {
"custom_model_data": 76005
},
"model": "fish:item/cod/15"
},
{
"predicate": {
"custom_model_data": 76011
},
"model": "fish:item/cod/16"
},
{
"predicate": {
"custom_model_data": 76012
},
"model": "fish:item/cod/17"
},
{
"predicate": {
"custom_model_data": 76013
},
"model": "fish:item/cod/18"
},
{
"predicate": {
"custom_model_data": 76014
},
"model": "fish:item/cod/19"
},
{
"predicate": {
"custom_model_data": 76015
},
"model": "fish:item/cod/20"
}
{ "predicate": { "custom_model_data": 70001}, "model": "fish:item/cod/1" },
{ "predicate": { "custom_model_data": 70002}, "model": "fish:item/cod/2" },
{ "predicate": { "custom_model_data": 70003}, "model": "fish:item/cod/3" },
{ "predicate": { "custom_model_data": 70004}, "model": "fish:item/cod/4" },
{ "predicate": { "custom_model_data": 70005}, "model": "fish:item/cod/5" },
{ "predicate": { "custom_model_data": 70101}, "model": "fish:item/cod/21" },
{ "predicate": { "custom_model_data": 70102}, "model": "fish:item/cod/22" },
{ "predicate": { "custom_model_data": 70103}, "model": "fish:item/cod/23" },
{ "predicate": { "custom_model_data": 70104}, "model": "fish:item/cod/24" },
{ "predicate": { "custom_model_data": 70105}, "model": "fish:item/cod/25" },
{ "predicate": { "custom_model_data": 70201}, "model": "fish:item/cod/26" },
{ "predicate": { "custom_model_data": 70202}, "model": "fish:item/cod/27" },
{ "predicate": { "custom_model_data": 70203}, "model": "fish:item/cod/28" },
{ "predicate": { "custom_model_data": 70204}, "model": "fish:item/cod/29" },
{ "predicate": { "custom_model_data": 70205}, "model": "fish:item/cod/30" },
{ "predicate": { "custom_model_data": 75001}, "model": "fish:item/cod/6" },
{ "predicate": { "custom_model_data": 75002}, "model": "fish:item/cod/7" },
{ "predicate": { "custom_model_data": 75003}, "model": "fish:item/cod/8" },
{ "predicate": { "custom_model_data": 75004}, "model": "fish:item/cod/9" },
{ "predicate": { "custom_model_data": 75005}, "model": "fish:item/cod/10" },
{ "predicate": { "custom_model_data": 76001}, "model": "fish:item/cod/11" },
{ "predicate": { "custom_model_data": 76002}, "model": "fish:item/cod/12" },
{ "predicate": { "custom_model_data": 76003}, "model": "fish:item/cod/13" },
{ "predicate": { "custom_model_data": 76004}, "model": "fish:item/cod/14" },
{ "predicate": { "custom_model_data": 76005}, "model": "fish:item/cod/15" },
{ "predicate": { "custom_model_data": 76011}, "model": "fish:item/cod/16" },
{ "predicate": { "custom_model_data": 76012}, "model": "fish:item/cod/17" },
{ "predicate": { "custom_model_data": 76013}, "model": "fish:item/cod/18" },
{ "predicate": { "custom_model_data": 76014}, "model": "fish:item/cod/19" },
{ "predicate": { "custom_model_data": 76015}, "model": "fish:item/cod/20" }
]
}
}
50 changes: 19 additions & 31 deletions assets/minecraft/models/item/salmon.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "minecraft:item/salmon"
},
"overrides": [
{
"predicate": {
"custom_model_data": 47000
},
"model": "item/fishing/salmon/bluegill"
},
{
"predicate": {
"custom_model_data": 47001
},
"model": "item/fishing/salmon/common_carp"
},
{
"predicate": {
"custom_model_data": 47002
},
"model": "item/fishing/salmon/channel_catfish"
},
{
"predicate": {
"custom_model_data": 47003
},
"model": "item/fishing/salmon/striped_bass"
}
]
}
"parent": "item/handheld",
"textures": {
"layer0": "minecraft:item/salmon"
},
"overrides": [
{ "predicate": { "custom_model_data": 70004}, "model": "fish:item/cod/4" },
{ "predicate": { "custom_model_data": 70005}, "model": "fish:item/cod/5" },
{ "predicate": { "custom_model_data": 70104}, "model": "fish:item/cod/24" },
{ "predicate": { "custom_model_data": 70105}, "model": "fish:item/cod/25" },
{ "predicate": { "custom_model_data": 70204}, "model": "fish:item/cod/29" },
{ "predicate": { "custom_model_data": 70205}, "model": "fish:item/cod/30" },
{ "predicate": { "custom_model_data": 75004}, "model": "fish:item/cod/9" },
{ "predicate": { "custom_model_data": 75005}, "model": "fish:item/cod/10" },
{ "predicate": { "custom_model_data": 76004}, "model": "fish:item/cod/14" },
{ "predicate": { "custom_model_data": 76005}, "model": "fish:item/cod/15" },
{ "predicate": { "custom_model_data": 76014}, "model": "fish:item/cod/19" },
{ "predicate": { "custom_model_data": 76015}, "model": "fish:item/cod/20" }
]
}

0 comments on commit dab8c8c

Please sign in to comment.