Skip to content
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

improv: Make Aerclouds appear hollow from the inside like Powder Snow #1914

Merged
merged 1 commit into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/CREDITS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ kodadacod
MehVahdJukaar
- Updated the support for extinguishing Copper Lanterns.

muzikbike
- Contribution of the reference JSON for an improved Aercloud block model.

saintselect
- Integration for JEI.
- Converting entity audio files from stereo to mono.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-09-14T15:32:59.2589219 Block States: aether
// 1.20.1 2023-12-28T13:12:49.1020551 Block States: aether
79cb0c0ea34a92e86b03080a209cb60f268cb31e assets/aether/blockstates/aerogel.json
28f7eea22b621bda459b2328c2252cdebe0bcdb9 assets/aether/blockstates/aerogel_slab.json
0866f96b2339b894ff4c8a01aebb3d87103eb0fb assets/aether/blockstates/aether_dirt.json
Expand Down Expand Up @@ -155,7 +155,7 @@ c9ee3079927210752a06c78fb00a5da3d228a350 assets/aether/models/block/angelic_ston
6921c1d3caa4786cf8504f4cb2ae063f3362c151 assets/aether/models/block/angelic_wall_side_tall.json
c584a0d8198fd08da792503fcca5623a25f08ba5 assets/aether/models/block/berry_bush.json
a8ce803f9e72a62d2e7c59ec5d23fa75b0f7889e assets/aether/models/block/berry_bush_stem.json
605382a9392d1636d19c3ebe1f640b663110dbfb assets/aether/models/block/blue_aercloud.json
8702b373b7a175c62f1c5b3d856e6fd4d39ddb66 assets/aether/models/block/blue_aercloud.json
bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/aether/models/block/boss_doorway_angelic_stone.json
bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/aether/models/block/boss_doorway_carved_stone.json
bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f assets/aether/models/block/boss_doorway_hellfire_stone.json
Expand All @@ -172,7 +172,7 @@ c2c5086795b04f6d158af259750cc1a85e6fe04b assets/aether/models/block/carved_stair
dfc749ceeb9480f9cf91269b62071f8a69d7c298 assets/aether/models/block/carved_wall_side.json
f2317c75a65087c81cb32b5e5511568c2735f990 assets/aether/models/block/carved_wall_side_tall.json
8809529b2459734217c5f0026d1cf79666883114 assets/aether/models/block/chest_mimic.json
31309113b3df0cac6a8e07c115ee53cb8e73222d assets/aether/models/block/cold_aercloud.json
0bdee2b795d0855ca4c28c95e41743a4ac0751a5 assets/aether/models/block/cold_aercloud.json
f0d518c6ae894a2c987f874dc52d3f8dc0c705f7 assets/aether/models/block/crystal_fruit_leaves.json
e2b9267e726a993fdba4c57a391474833c8aff7e assets/aether/models/block/crystal_leaves.json
988e61139bada4be5bc1aab97245dce13f6dde5e assets/aether/models/block/decorated_holiday_leaves.json
Expand All @@ -183,7 +183,7 @@ e2b9267e726a993fdba4c57a391474833c8aff7e assets/aether/models/block/crystal_leav
d1288ec1504807b14f72a5e21d2f189eb86a4f00 assets/aether/models/block/frosted_ice_1.json
c66fd7d21578ea4fbf909db367d79c07c350b342 assets/aether/models/block/frosted_ice_2.json
ace58f92785f40479571659c4757bb66df7aa9ee assets/aether/models/block/frosted_ice_3.json
09a3f0e2a0a6ddbc3f6a1b6a6323d7244f06469d assets/aether/models/block/golden_aercloud.json
f1884c66dd2aa6818cd7465525325f0dee1fa21a assets/aether/models/block/golden_aercloud.json
4bd9c1b9bb7f9f78afb0778d3dce398349df8fba assets/aether/models/block/golden_oak_leaves.json
80b8780dd999e814af92f35dcddb32b59cc2806b assets/aether/models/block/golden_oak_log.json
597ee6261d41733e26600dafb8511d9de6245c44 assets/aether/models/block/golden_oak_log_horizontal.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-09-15T16:24:50.5106891 Item Models: aether
// 1.20.1 2023-12-28T13:54:27.7148063 Item Models: aether
88dbeab79e0017737773db746d2e719a21fdb198 assets/aether/models/item/aechor_petal.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/aechor_plant_spawn_egg.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/aerbunny_spawn_egg.json
Expand All @@ -25,7 +25,7 @@ a630d72b1012009b69e12a5a1b35d6371881f8a9 assets/aether/models/item/angelic_stone
8227f8d61fa4717a1f4deb6fc64e24124dfc1964 assets/aether/models/item/berry_bush.json
eaf63dcd7099fe4b22dfaa28a6462569c3724301 assets/aether/models/item/berry_bush_stem.json
844560cd220fc6dd90531a06ccb1ffbbd28fe829 assets/aether/models/item/black_moa_egg.json
6afe7fbeb93dcffb95f9f18b3c93e22f5b5f5a18 assets/aether/models/item/blue_aercloud.json
605382a9392d1636d19c3ebe1f640b663110dbfb assets/aether/models/item/blue_aercloud.json
63e54b386c191c896934d8c06a5d6ff99c1e1d74 assets/aether/models/item/blue_berry.json
cf7b2783076dfa52685c372f30df78d633653b41 assets/aether/models/item/blue_cape.json
4d812d49b42f1fb99f8e373c92ce07b0e8c1451d assets/aether/models/item/blue_gummy_swet.json
Expand Down Expand Up @@ -59,7 +59,7 @@ f6273c16d45e7b320cc2655bc8c81d8080fa9fa6 assets/aether/models/item/chainmail_glo
f6caba399494a58683561699d72ad1cc86e3d339 assets/aether/models/item/chest_mimic.json
79f0613371e2d8e68ab695fb9f334c5b06cb954a assets/aether/models/item/cloud_staff.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/cockatrice_spawn_egg.json
2b7a1e4d8e05d23d78854d56d79b3a7103ea2c0c assets/aether/models/item/cold_aercloud.json
31309113b3df0cac6a8e07c115ee53cb8e73222d assets/aether/models/item/cold_aercloud.json
3b8dbc53f1985ed325ddd6ee7db7d70a387de3da assets/aether/models/item/cold_parachute.json
0beb43548545a5e15fd4af0be78dc90f79e41338 assets/aether/models/item/crystal_fruit_leaves.json
0e642b18a2ed4529fc9a160debaeefcdf291161a assets/aether/models/item/crystal_leaves.json
Expand All @@ -86,7 +86,7 @@ cd27f7843c9b7e54752cd3b916134f4aac68cf7c assets/aether/models/item/enchanted_dar
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/flying_cow_spawn_egg.json
151f7ec0ce71d11b3ea7b859d28dda255c1d0905 assets/aether/models/item/freezer.json
9c9c68308a2abf2d42bad14f9f59f3aa27899f7d assets/aether/models/item/gingerbread_man.json
e6a93fe6cd2541c5fd1bbcbed023c627bfa2ac12 assets/aether/models/item/golden_aercloud.json
09a3f0e2a0a6ddbc3f6a1b6a6323d7244f06469d assets/aether/models/item/golden_aercloud.json
61b39d971288685756130274b0f1e6f39cccde3c assets/aether/models/item/golden_amber.json
b3c7bef4591ceccc542961dc9aba4010396bed2e assets/aether/models/item/golden_dart.json
655b04d4e13dcc55f2eae32fcdad4463b0c4ae1a assets/aether/models/item/golden_dart_shooter.json
Expand Down
186 changes: 184 additions & 2 deletions src/generated/resources/assets/aether/models/block/blue_aercloud.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,189 @@
{
"parent": "minecraft:block/cube_all",
"parent": "minecraft:block/block",
"elements": [
{
"faces": {
"down": {
"cullface": "up",
"texture": "#up_inside",
"uv": [
0.0,
16.0,
16.0,
0.0
]
},
"up": {
"cullface": "up",
"texture": "#up_outside"
}
},
"from": [
0,
15.998,
0
],
"to": [
16,
16,
16
]
},
{
"faces": {
"down": {
"cullface": "down",
"texture": "#down_outside"
},
"up": {
"cullface": "down",
"texture": "#down_inside",
"uv": [
0.0,
16.0,
16.0,
0.0
]
}
},
"from": [
0,
0,
0
],
"to": [
16,
0.002,
16
]
},
{
"faces": {
"north": {
"cullface": "north",
"texture": "#north_outside"
},
"south": {
"cullface": "north",
"texture": "#north_inside",
"uv": [
16.0,
0.0,
0.0,
16.0
]
}
},
"from": [
0,
0,
0
],
"to": [
16,
16,
0.002
]
},
{
"faces": {
"north": {
"cullface": "south",
"texture": "#south_inside",
"uv": [
16.0,
0.0,
0.0,
16.0
]
},
"south": {
"cullface": "south",
"texture": "#south_outside"
}
},
"from": [
0,
0,
15.998
],
"to": [
16,
16,
16
]
},
{
"faces": {
"east": {
"cullface": "west",
"texture": "#west_inside",
"uv": [
16.0,
0.0,
0.0,
16.0
]
},
"west": {
"cullface": "west",
"texture": "#west_outside"
}
},
"from": [
0,
0,
0
],
"to": [
0.002,
16,
16
]
},
{
"faces": {
"east": {
"cullface": "east",
"texture": "#east_outside"
},
"west": {
"cullface": "east",
"texture": "#east_inside",
"uv": [
16.0,
0.0,
0.0,
16.0
]
}
},
"from": [
15.998,
0,
0
],
"to": [
16,
16,
16
]
}
],
"render_type": "minecraft:translucent",
"textures": {
"all": "aether:block/natural/blue_aercloud"
"down_inside": "aether:block/natural/blue_aercloud",
"down_outside": "aether:block/natural/blue_aercloud",
"east_inside": "aether:block/natural/blue_aercloud",
"east_outside": "aether:block/natural/blue_aercloud",
"north_inside": "aether:block/natural/blue_aercloud",
"north_outside": "aether:block/natural/blue_aercloud",
"particle": "aether:block/natural/blue_aercloud",
"south_inside": "aether:block/natural/blue_aercloud",
"south_outside": "aether:block/natural/blue_aercloud",
"up_inside": "aether:block/natural/blue_aercloud",
"up_outside": "aether:block/natural/blue_aercloud",
"west_inside": "aether:block/natural/blue_aercloud",
"west_outside": "aether:block/natural/blue_aercloud"
}
}
Loading