Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
26e7728
feat: prayer candle
Builderdog841 May 17, 2026
911ce64
feat: some prayer candle json files
Builderdog841 May 20, 2026
5888e4a
feat: Guardian Pew
Builderdog841 May 21, 2026
11c785c
feat: Guardian Pew
Builderdog841 May 21, 2026
75e0384
improv: add lit state and particles to prayer candle
bconlon1 May 22, 2026
216a64a
feat: guardian donation box
Builderdog841 May 22, 2026
5c13e20
refactor: improve hitbox for prayer candle block
bconlon1 May 22, 2026
d6df8a4
improv: better guardian pew block hitbox
bconlon1 May 22, 2026
5286760
improv: better guardian donation box hitbox
bconlon1 May 22, 2026
970a7c0
improv: removed unused imports
Builderdog841 May 23, 2026
9860454
Merge remote-tracking branch 'origin/26.1.2-alpha.4' into feat/builde…
Builderdog841 May 23, 2026
043349e
improv: seat functionality for guardian pews
bconlon1 May 24, 2026
c626cae
Merge branch 'feat/builderdog/prayer-candle' of https://github.com/Th…
bconlon1 May 24, 2026
c9b73c0
improv: guardian donation box cleanup
bconlon1 May 24, 2026
fc19de6
feat: Abandoned Bag
Builderdog841 May 24, 2026
67fa01e
Merge branch '26.1.2-alpha.4' into feat/builderdog/prayer-candle
bconlon1 Jun 3, 2026
01ff92c
feat: sage chest
bconlon1 Jun 3, 2026
2066fcf
fix: fixed a sage chest rendering issue
Builderdog841 Jun 7, 2026
af21aed
feat: basic fungal cache implementation
Builderdog841 Jun 8, 2026
27eade1
Merge branch '26.1.2-alpha.4' into feat/builderdog/prayer-candle
bconlon1 Jun 9, 2026
966176f
fix: fungal cache animation
bconlon1 Jun 9, 2026
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "aether_ii:block/abandoned_bag"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "aether_ii:block/fungal_cache"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "aether_ii:block/guardian_donation_box",
"y": 90
},
"facing=north": {
"model": "aether_ii:block/guardian_donation_box"
},
"facing=south": {
"model": "aether_ii:block/guardian_donation_box",
"y": 180
},
"facing=west": {
"model": "aether_ii:block/guardian_donation_box",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "aether_ii:block/guardian_pew",
"y": 90
},
"facing=north": {
"model": "aether_ii:block/guardian_pew"
},
"facing=south": {
"model": "aether_ii:block/guardian_pew",
"y": 180
},
"facing=west": {
"model": "aether_ii:block/guardian_pew",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "aether_ii:block/prayer_candle",
"y": 90
},
"facing=north": {
"model": "aether_ii:block/prayer_candle"
},
"facing=south": {
"model": "aether_ii:block/prayer_candle",
"y": 180
},
"facing=west": {
"model": "aether_ii:block/prayer_candle",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "aether_ii:block/sage_chest"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"model": {
"type": "minecraft:special",
"base": "aether_ii:item/abandoned_bag",
"model": {
"type": "aether_ii:abandoned_bag"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"model": {
"type": "minecraft:special",
"base": "aether_ii:item/fungal_cache",
"model": {
"type": "aether_ii:fungal_cache"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "aether_ii:block/guardian_donation_box"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "aether_ii:block/guardian_pew"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "aether_ii:block/prayer_candle"
}
}
10 changes: 10 additions & 0 deletions src/generated/resources/assets/aether_ii/items/sage_chest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"model": {
"type": "minecraft:special",
"base": "aether_ii:item/sage_chest",
"model": {
"type": "aether_ii:sage_chest",
"texture": "aether_ii:sage_chest"
}
}
}
11 changes: 11 additions & 0 deletions src/generated/resources/assets/aether_ii/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@
"aether_ii.configuration.section.aether.ii.server.toml": "Server Settings",
"aether_ii.configuration.section.aether.ii.server.toml.title": "The Aether II Server Configuration",
"aether_ii.configuration.title": "The Aether II Configuration",
"aether_ii.container.abandoned_bag": "Abandoned Bag",
"aether_ii.container.animal_stash": "Animal Stash",
"aether_ii.container.fungal_cache": "Fungal Cache",
"aether_ii.container.sage_chest": "Sage Chest",
"aether_ii.container.sentry_crate": "Sentry Crate",
"aether_ii.guidebook_bestiary.description.entity.aether_ii.aechor_plant": "“Hazardous plants that grow across The Aether's Holy Isles.\n\nAechor plants suck up a vast amount of nutrients and minerals from their surrounding territory, making them a precious food source for many animals in the Holy Isles. To defend themselves from potential predators, they developed toxic barbs that can be projected outward at targets they sense near their roots. While individually these barbs aren't very harmful, their toxins can build up and cause some negative effects if untreated.\n\nThe petals of aechor plants are a favorite food of baby moas, offering enough nutrients to help them grow into strong flight-ready adults.”",
"aether_ii.guidebook_bestiary.description.entity.aether_ii.aerbunny": "“Friendly creatures that roam The Aether's Holy Isles.\n\nThey are deeply social creatures that enjoy the company of other species, including the people of The Aether and human visitors. an aerbunny's coat has a condensed layer of aercloud nestled beneath their fur, which allows them to float gently through the air.\n\nFeeding an aerbunny its favorite fruit allows it to be tamed. This allows them to be held, granting their natural gliding abilities to someone travelling The Aether.”",
Expand Down Expand Up @@ -308,6 +311,7 @@
"biome.aether_ii.turquoise_forest": "Turquoise Forest",
"biome.aether_ii.verdant_woods": "Verdant Woods",
"biome.aether_ii.violet_highwoods": "Violet Highwoods",
"block.aether_ii.abandoned_bag": "Abandoned Bag",
"block.aether_ii.aechor_cutting": "Aechor Cutting",
"block.aether_ii.aether_bush": "Aether Bush",
"block.aether_ii.aether_dirt": "Aether Dirt",
Expand Down Expand Up @@ -457,6 +461,7 @@
"block.aether_ii.fragile_arctic_ice": "Fragile Arctic Ice",
"block.aether_ii.frosted_arctic_ice": "Frosted Arctic Ice",
"block.aether_ii.frosted_ice": "Frosted Ice",
"block.aether_ii.fungal_cache": "Fungal Cache",
"block.aether_ii.gel_block": "Gel Block",
"block.aether_ii.glint_block": "Block of Glint",
"block.aether_ii.glint_ore": "Glint Ore",
Expand Down Expand Up @@ -509,9 +514,11 @@
"block.aether_ii.green_skyroot_bed": "Green Skyroot Bed",
"block.aether_ii.gridded_quicksoil_glass": "Gridded Quicksoil Glass",
"block.aether_ii.gridded_quicksoil_glass_pane": "Gridded Quicksoil Glass Pane",
"block.aether_ii.guardian_donation_box": "Guardian Donation Box",
"block.aether_ii.guardian_lamp": "Guardian Lamp",
"block.aether_ii.guardian_log": "Guardian Log",
"block.aether_ii.guardian_log_slab": "Guardian Log Slab",
"block.aether_ii.guardian_pew": "Guardian Pew",
"block.aether_ii.guardian_roots": "Guardian Roots",
"block.aether_ii.guardian_trunk": "Guardian Trunk",
"block.aether_ii.guardian_wood": "Guardian Wood",
Expand Down Expand Up @@ -696,6 +703,7 @@
"block.aether_ii.potted_tarabloom": "Potted Tarabloom",
"block.aether_ii.potted_wisproot_sapling": "Potted Wisproot Sapling",
"block.aether_ii.potted_wisptop_sapling": "Potted Wisptop Sapling",
"block.aether_ii.prayer_candle": "Prayer Candle",
"block.aether_ii.purple_aercloud": "Purple Aercloud",
"block.aether_ii.purple_arilum_lantern": "Purple Arilum Lantern",
"block.aether_ii.purple_cloudwool": "Purple Cloudwool",
Expand All @@ -721,6 +729,7 @@
"block.aether_ii.rustic_curved_arkenium_bars": "Rustic Curved Arkenium Bars",
"block.aether_ii.rustic_floral_arkenium_bars": "Rustic Floral Arkenium Bars",
"block.aether_ii.rustic_patterned_arkenium_bars": "Rustic Patterned Arkenium Bars",
"block.aether_ii.sage_chest": "Sage Chest",
"block.aether_ii.satival_shoot": "Satival Shoot",
"block.aether_ii.scatterglass": "Scatterglass",
"block.aether_ii.scatterglass_pane": "Scatterglass Pane",
Expand Down Expand Up @@ -1506,6 +1515,8 @@
"subtitles.aether_ii.block.bush.rustle": "Bush rustles",
"subtitles.aether_ii.block.gel.slide": "Sliding down a gel block",
"subtitles.aether_ii.block.ground_trap.trigger": "Trap activates",
"subtitles.aether_ii.block.guardian_donation_box.insert": "Guardian Donation Box fills",
"subtitles.aether_ii.block.guardian_donation_box.insert_fail": "Guardian Donation Box wobbles",
"subtitles.aether_ii.block.hestveil.ignite": "Hestveil ignites",
"subtitles.aether_ii.block.holystone_furnace.fire_crackle": "Holystone Furnace crackles",
"subtitles.aether_ii.block.holystone_smoker.smoke": "Holystone Smoker smokes",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"particle": "aether_ii:block/light_blue_cloudwool"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"particle": "aether_ii:block/rotshroom_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "aether_ii:block/template_guardian_donation_box",
"textures": {
"particle": "aether_ii:block/guardian_log",
"texture": "aether_ii:block/guardian_donation_box"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "aether_ii:block/template_guardian_pew",
"textures": {
"particle": "aether_ii:block/guardian_log",
"texture": "aether_ii:block/guardian_pew"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "aether_ii:block/template_prayer_candle",
"textures": {
"particle": "aether_ii:block/guardian_log",
"texture": "aether_ii:block/prayer_candle"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"particle": "aether_ii:block/guardian_log"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "aether_ii:item/template_abandoned_bag",
"textures": {
"particle": "aether_ii:block/light_blue_cloudwool"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "aether_ii:item/template_fungal_cache",
"textures": {
"particle": "aether_ii:block/rotshroom_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/template_chest",
"textures": {
"particle": "aether_ii:block/guardian_log"
}
}
46 changes: 46 additions & 0 deletions src/generated/resources/assets/aether_ii/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,52 @@
],
"subtitle": "subtitles.aether_ii.block.ground_trap.trigger"
},
"block.guardian_donation_box.inser_fail": {
"sounds": [
{
"name": "block/decorated_pot/insert_fail1",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert_fail2",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert_fail3",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert_fail4",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert_fail5",
"volume": 0.9
}
],
"subtitle": "subtitles.aether_ii.block.guardian_donation_box.insert_fail"
},
"block.guardian_donation_box.insert": {
"sounds": [
{
"name": "block/decorated_pot/insert1",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert2",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert3",
"volume": 0.9
},
{
"name": "block/decorated_pot/insert4",
"volume": 0.9
}
],
"subtitle": "subtitles.aether_ii.block.guardian_donation_box.insert"
},
"block.hestveil.ignite": {
"sounds": [
"mob/ghast/fireball4"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "aether_ii:abandoned_bag"
}
],
"rolls": 1.0
}
],
"random_sequence": "aether_ii:blocks/abandoned_bag"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "aether_ii:fungal_cache"
}
],
"rolls": 1.0
}
],
"random_sequence": "aether_ii:blocks/fungal_cache"
}
Loading