MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge and fix

Browse source
This commit is contained in:
paulevsGitch 2020-11-08 15:07:19 +03:00
parent b91c85529d
commit ce9f4add97
548 changed files with 17517 additions and 16862 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/resources/assets/betterend/materialmaps/block/aurora_crystal.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:glow_all"
}
{
"defaultMaterial": "betterend:glow_all"
}

6
src/main/resources/assets/betterend/materialmaps/block/blue_vine_fur.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:waving_wall_glow_all"
}
{
"defaultMaterial": "betterend:waving_wall_glow_all"
}

6
src/main/resources/assets/betterend/materialmaps/block/blue_vine_lantern.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:glow_all"
}
{
"defaultMaterial": "betterend:glow_all"
}

6
src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:noao"
}
{
"defaultMaterial": "betterend:noao"
}

26
src/main/resources/assets/betterend/materialmaps/block/creeping_moss.json
View file

@ -1,14 +1,14 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/creeping_moss_spores",
"material": "betterend:wave_glow_50_half"
},
{
"sprite": "betterend:block/creeping_moss_leaves",
"material": "betterend:waving_floor"
}
]
}
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/creeping_moss_spores",
"material": "betterend:wave_glow_50_half"
},
{
"sprite": "betterend:block/creeping_moss_leaves",
"material": "betterend:waving_floor"
}
]
}
}

6
src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:waving_wall_glow_inc"
}
{
"defaultMaterial": "betterend:waving_wall_glow_inc"
}

26
src/main/resources/assets/betterend/materialmaps/block/dense_vine.json
View file

@ -1,14 +1,14 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/dense_vine_bottom",
"material": "betterend:wave_glow_50_half"
},
{
"sprite": "betterend:block/dense_vine",
"material": "betterend:waving"
}
]
}
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/dense_vine_bottom",
"material": "betterend:wave_glow_50_half"
},
{
"sprite": "betterend:block/dense_vine",
"material": "betterend:waving"
}
]
}
}

26
src/main/resources/assets/betterend/materialmaps/block/end_lily.json
View file

@ -1,14 +1,14 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/end_lily_flower",
"material": "betterend:glow_inc"
},
{
"sprite": "betterend:block/end_lily_flower_small",
"material": "betterend:glow_inc"
}
]
}
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/end_lily_flower",
"material": "betterend:glow_inc"
},
{
"sprite": "betterend:block/end_lily_flower_small",
"material": "betterend:glow_inc"
}
]
}
}

10
src/main/resources/assets/betterend/materialmaps/block/flavolite_lantern.json Normal file
View file

@ -0,0 +1,10 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/aurora_crystal",
"material": "betterend:glow_all"
}
]
}
}

10
src/main/resources/assets/betterend/materialmaps/block/lantern_end_stone.json Normal file
View file

@ -0,0 +1,10 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/aurora_crystal",
"material": "betterend:glow_all"
}
]
}
}

6
src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_fur.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:waving_wall_inverted_glow_all"
}
{
"defaultMaterial": "betterend:waving_wall_inverted_glow_all"
}

6
src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_hymenophore.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:glow_all"
}
{
"defaultMaterial": "betterend:glow_all"
}

6
src/main/resources/assets/betterend/materialmaps/block/mossy_glowshroom_sapling.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:waving_floor_glow_50_blue"
}
{
"defaultMaterial": "betterend:waving_floor_glow_50_blue"
}

6
src/main/resources/assets/betterend/materialmaps/block/tail_moss.json
View file

@ -1,3 +1,3 @@
{
"defaultMaterial": "betterend:waving_wall"
}
{
"defaultMaterial": "betterend:waving_wall"
}

42
src/main/resources/assets/betterend/materialmaps/block/umbrella_moss.json
View file

@ -1,22 +1,22 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/umbrella_moss_sporophyte",
"material": "betterend:wave_glow_all"
},
{
"sprite": "betterend:block/umbrella_moss_small",
"material": "betterend:waving_floor"
},
{
"sprite": "betterend:block/umbrella_moss_up",
"material": "betterend:waving_floor"
},
{
"sprite": "betterend:block/umbrella_moss_end",
"material": "betterend:waving_floor"
}
]
}
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/umbrella_moss_sporophyte",
"material": "betterend:wave_glow_all"
},
{
"sprite": "betterend:block/umbrella_moss_small",
"material": "betterend:waving_floor"
},
{
"sprite": "betterend:block/umbrella_moss_up",
"material": "betterend:waving_floor"
},
{
"sprite": "betterend:block/umbrella_moss_end",
"material": "betterend:waving_floor"
}
]
}
}

42
src/main/resources/assets/betterend/materialmaps/block/umbrella_moss_tall.json
View file

@ -1,22 +1,22 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/umbrella_moss_sporophyte",
"material": "betterend:wave_glow_all"
},
{
"sprite": "betterend:block/umbrella_moss_up",
"material": "betterend:waving"
},
{
"sprite": "betterend:block/umbrella_moss_end",
"material": "betterend:waving"
},
{
"sprite": "betterend:block/umbrella_moss_bottom",
"material": "betterend:waving_floor"
}
]
}
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/umbrella_moss_sporophyte",
"material": "betterend:wave_glow_all"
},
{
"sprite": "betterend:block/umbrella_moss_up",
"material": "betterend:waving"
},
{
"sprite": "betterend:block/umbrella_moss_end",
"material": "betterend:waving"
},
{
"sprite": "betterend:block/umbrella_moss_bottom",
"material": "betterend:waving_floor"
}
]
}
}

10
src/main/resources/assets/betterend/materialmaps/block/violecite_lantern.json Normal file
View file

@ -0,0 +1,10 @@
{
"defaultMap": {
"spriteMap": [
{
"sprite": "betterend:block/aurora_crystal",
"material": "betterend:glow_all"
}
]
}
}

4
src/main/resources/assets/betterend/materialmaps/particle/glowing_sphere.json
View file

@ -1,3 +1,3 @@
{
"material": "canvas:emissive_no_diffuse"
{
"material": "canvas:emissive_no_diffuse"
}

4
src/main/resources/assets/betterend/materialmaps/particle/portal_sphere.json
View file

@ -1,3 +1,3 @@
{
"material": "canvas:emissive_no_diffuse"
{
"material": "canvas:emissive_no_diffuse"
}