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

Sepulcher #59

Merged
merged 10 commits into from
Oct 25, 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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
version=3.1.0
version=3.2.0
group=galena
mod_name=Oreganized
mod_author=Xaidee as part of Team Galena
Expand Down
177 changes: 159 additions & 18 deletions src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// 1.20.1 2024-10-14T22:19:49.9810347 oreganized Item Models
// 1.20.1 2024-10-22T21:24:48.3830539 oreganized Item Models
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json
8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json
fce6f4a24293b0fe701a564eb127f4efb3145c35 assets/oreganized/models/item/blue_vigil_candle.json
b7158c4246d64e83d23470e470f46e2afc0999b1 assets/oreganized/models/item/bone_pile.json
ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json
cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json
5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json
Expand Down Expand Up @@ -140,6 +141,7 @@ b7e86f5c2d080a57b173bb058c8d3300297d30b3 assets/oreganized/models/item/purple_vi
1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json
d7caf3f0da6c4c0b8f979e58178c609462b78d72 assets/oreganized/models/item/red_vigil_candle.json
4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json
99a55278df5e10175dfe984338a6d6163e2cea24 assets/oreganized/models/item/sepulcher.json
2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json
0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json
c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_block.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-10-17T22:46:04.3663948 Oreganized Block Tags
// 1.20.1 2024-10-24T15:33:23.489208 Oreganized Block Tags
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
Expand All @@ -21,7 +21,7 @@ b85964d677734db0ac4bbc66f550f073ed0cb5e1 data/minecraft/tags/blocks/candles.json
0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json
abb8283f25d49e1094364bfc91028dd0f3af9ad6 data/minecraft/tags/blocks/mineable/pickaxe.json
c67b7a8b928eab9314c1bf55632789b63a0c62f0 data/minecraft/tags/blocks/mineable/pickaxe.json
84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json
bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json
dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json
Expand All @@ -34,9 +34,10 @@ a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json
81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json
f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json
6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json
b8aa17690b27ed9cdef06ded577fc79991acf1c4 data/oreganized/tags/blocks/heat_source.json
eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json
0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json
cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json
06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json
3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json
cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json
d83fef2771b28de02bd241459bd9e94b38482fe9 data/oreganized/tags/blocks/vigil_candles.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions
1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json
// 1.20.1 2024-10-24T14:51:12.3697524 Sound Definitions
f0ce8a86a30c0f36dd7616ac727c2eea030ff058 assets/oreganized/sounds.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
// 1.20.1 2024-10-14T22:19:49.9779525 Recipes
// 1.20.1 2024-10-22T23:35:54.703495 Recipes
c1dfd749997c4b830ca484062a948878ea0d34f3 data/minecraft/advancements/recipes/building_blocks/bone.json
a8cdf899ebdba8cace47683d027002ed7064ce5a data/minecraft/recipes/bone.json
c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
3c820d9940640deff4179f3b02cc6218a88cd4f9 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json
2aeea7fd0c06b38a4e6f75cafc7b605c776cb386 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json
40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
3afa8ff228b9bef52253d0f816bd8e324730ce50 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json
7010475a07b130d021b53d46647f8ef59a172c48 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json
0f05a751905eb5ce929fafdc1e799b6d5b5711c7 data/oreganized/advancements/recipes/building_blocks/bone_pile.json
a54c0b8196d1a5179a9b51cb260df9d0c4c26d4e data/oreganized/advancements/recipes/building_blocks/brown_crystal_glass_pane.json
ad566c9bc4c74028180df5929a3cb34323345d5b data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json
dab087994daf9d6948e3eec6e875738de6156414 data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json
Expand Down Expand Up @@ -120,6 +123,7 @@ d67b8fff946ef56ae53ba4718e5556f277799309 data/oreganized/advancements/recipes/de
0b1087608b38dcbdd8e77f856cd9fb469df1e358 data/oreganized/advancements/recipes/decorations/pink_crystal_glass.json
09b30e2267c1e9b9c804283a4e5927f909506768 data/oreganized/advancements/recipes/decorations/purple_crystal_glass.json
31db1a4b63de5199b3389872a24d8cbb463a98a2 data/oreganized/advancements/recipes/decorations/red_crystal_glass.json
2611d52bb502fe3a9cc32972727352f8c8ea2bef data/oreganized/advancements/recipes/decorations/sepulcher.json
dbe2cf69f8eb30cff15328377c83ace6be8cb4a3 data/oreganized/advancements/recipes/decorations/waxed_black_concrete_powder.json
4a16c51ac08111b39ddac755d86f12c9f28c9119 data/oreganized/advancements/recipes/decorations/waxed_blue_concrete_powder.json
6b1858a1aee11d96bc6f5c7b4ced8dc5a3c6313e data/oreganized/advancements/recipes/decorations/waxed_brown_concrete_powder.json
Expand Down Expand Up @@ -190,6 +194,7 @@ e44ee55f7ab6df42caecd2dde0963666975e06ef data/oreganized/recipes/blast_raw_silve
87854bacdbf7862b5c7fed3a7c295f87fc7eecf6 data/oreganized/recipes/blue_crystal_glass_pane.json
3ad5f5c16840d814d86e97743db4b7ac78534ffb data/oreganized/recipes/blue_vigil_candle.json
800273eeda90c6c19ff17b15746d3da029577235 data/oreganized/recipes/blue_vigil_candle_dyeing.json
f35f1d5302c5bc10652c4f7b90d707442b490955 data/oreganized/recipes/bone_pile.json
509c4b4713fb5d506d4c2ec7da3c63212e0f13ba data/oreganized/recipes/brown_crystal_glass.json
c261b93b8e4cbe7c710f1165c1a554e8f29fb243 data/oreganized/recipes/brown_crystal_glass_pane.json
034d662b493d46058caf53a01d9f703bb4475f42 data/oreganized/recipes/brown_vigil_candle.json
Expand Down Expand Up @@ -292,6 +297,7 @@ f143419602a22f529db20cea44e5e370e8e4d868 data/oreganized/recipes/red_crystal_gla
7b1ea45d203fa88ba577b2289c7bd7cd8f7bc88a data/oreganized/recipes/red_vigil_candle.json
50b836078acf7b537c8a231ab6b9635261a2e4e5 data/oreganized/recipes/red_vigil_candle_dyeing.json
06ea07eed909dbcff647ac8724355430c1817e0e data/oreganized/recipes/scribe.json
d864df7f745ee19a4a400abfad7c508d0637fd30 data/oreganized/recipes/sepulcher.json
194a5e4bfb1acbb98161ddeb6c0af5b21917e508 data/oreganized/recipes/shrapnel_bomb.json
cedc682018d184f9f9f384afe3b157e6cbfff4b1 data/oreganized/recipes/shrapnel_bomb_minecart.json
07595b3d623aafa3ef700093ec0449ebafa1ed27 data/oreganized/recipes/silver_block.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
// 1.20.1 2023-08-24T20:32:13.551458979 Oreganized Entity Type Tags
// 1.20.1 2024-10-22T23:12:34.5305377 Oreganized Entity Type Tags
a35af8d4e9c9c8d45cb7e2335ce6bacc00d45a8d data/oreganized/tags/entity_types/fills_sepulcher.json
29671cfa11d074462c259806e9d60468451e3cdb data/oreganized/tags/entity_types/lighter_than_lead.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,52 @@
{
"variants": {
"candles=1,hanging=false": {
"candles=1,hanging=false,lit=false": {
"model": "oreganized:block/black_vigil_candle_single"
},
"candles=1,hanging=true": {
"candles=1,hanging=false,lit=true": {
"model": "oreganized:block/black_vigil_candle_single_lit"
},
"candles=1,hanging=true,lit=false": {
"model": "oreganized:block/black_vigil_candle_single_ceiling"
},
"candles=2,hanging=false": {
"candles=1,hanging=true,lit=true": {
"model": "oreganized:block/black_vigil_candle_single_ceiling_lit"
},
"candles=2,hanging=false,lit=false": {
"model": "oreganized:block/black_vigil_candle_double"
},
"candles=2,hanging=true": {
"candles=2,hanging=false,lit=true": {
"model": "oreganized:block/black_vigil_candle_double_lit"
},
"candles=2,hanging=true,lit=false": {
"model": "oreganized:block/black_vigil_candle_double_ceiling"
},
"candles=3,hanging=false": {
"candles=2,hanging=true,lit=true": {
"model": "oreganized:block/black_vigil_candle_double_ceiling_lit"
},
"candles=3,hanging=false,lit=false": {
"model": "oreganized:block/black_vigil_candle_triple"
},
"candles=3,hanging=true": {
"candles=3,hanging=false,lit=true": {
"model": "oreganized:block/black_vigil_candle_triple_lit"
},
"candles=3,hanging=true,lit=false": {
"model": "oreganized:block/black_vigil_candle_triple_ceiling"
},
"candles=4,hanging=false": {
"candles=3,hanging=true,lit=true": {
"model": "oreganized:block/black_vigil_candle_triple_ceiling_lit"
},
"candles=4,hanging=false,lit=false": {
"model": "oreganized:block/black_vigil_candle_quadruple"
},
"candles=4,hanging=true": {
"candles=4,hanging=false,lit=true": {
"model": "oreganized:block/black_vigil_candle_quadruple_lit"
},
"candles=4,hanging=true,lit=false": {
"model": "oreganized:block/black_vigil_candle_quadruple_ceiling"
},
"candles=4,hanging=true,lit=true": {
"model": "oreganized:block/black_vigil_candle_quadruple_ceiling_lit"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,52 @@
{
"variants": {
"candles=1,hanging=false": {
"candles=1,hanging=false,lit=false": {
"model": "oreganized:block/blue_vigil_candle_single"
},
"candles=1,hanging=true": {
"candles=1,hanging=false,lit=true": {
"model": "oreganized:block/blue_vigil_candle_single_lit"
},
"candles=1,hanging=true,lit=false": {
"model": "oreganized:block/blue_vigil_candle_single_ceiling"
},
"candles=2,hanging=false": {
"candles=1,hanging=true,lit=true": {
"model": "oreganized:block/blue_vigil_candle_single_ceiling_lit"
},
"candles=2,hanging=false,lit=false": {
"model": "oreganized:block/blue_vigil_candle_double"
},
"candles=2,hanging=true": {
"candles=2,hanging=false,lit=true": {
"model": "oreganized:block/blue_vigil_candle_double_lit"
},
"candles=2,hanging=true,lit=false": {
"model": "oreganized:block/blue_vigil_candle_double_ceiling"
},
"candles=3,hanging=false": {
"candles=2,hanging=true,lit=true": {
"model": "oreganized:block/blue_vigil_candle_double_ceiling_lit"
},
"candles=3,hanging=false,lit=false": {
"model": "oreganized:block/blue_vigil_candle_triple"
},
"candles=3,hanging=true": {
"candles=3,hanging=false,lit=true": {
"model": "oreganized:block/blue_vigil_candle_triple_lit"
},
"candles=3,hanging=true,lit=false": {
"model": "oreganized:block/blue_vigil_candle_triple_ceiling"
},
"candles=4,hanging=false": {
"candles=3,hanging=true,lit=true": {
"model": "oreganized:block/blue_vigil_candle_triple_ceiling_lit"
},
"candles=4,hanging=false,lit=false": {
"model": "oreganized:block/blue_vigil_candle_quadruple"
},
"candles=4,hanging=true": {
"candles=4,hanging=false,lit=true": {
"model": "oreganized:block/blue_vigil_candle_quadruple_lit"
},
"candles=4,hanging=true,lit=false": {
"model": "oreganized:block/blue_vigil_candle_quadruple_ceiling"
},
"candles=4,hanging=true,lit=true": {
"model": "oreganized:block/blue_vigil_candle_quadruple_ceiling_lit"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "oreganized:block/bone_pile"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,52 @@
{
"variants": {
"candles=1,hanging=false": {
"candles=1,hanging=false,lit=false": {
"model": "oreganized:block/brown_vigil_candle_single"
},
"candles=1,hanging=true": {
"candles=1,hanging=false,lit=true": {
"model": "oreganized:block/brown_vigil_candle_single_lit"
},
"candles=1,hanging=true,lit=false": {
"model": "oreganized:block/brown_vigil_candle_single_ceiling"
},
"candles=2,hanging=false": {
"candles=1,hanging=true,lit=true": {
"model": "oreganized:block/brown_vigil_candle_single_ceiling_lit"
},
"candles=2,hanging=false,lit=false": {
"model": "oreganized:block/brown_vigil_candle_double"
},
"candles=2,hanging=true": {
"candles=2,hanging=false,lit=true": {
"model": "oreganized:block/brown_vigil_candle_double_lit"
},
"candles=2,hanging=true,lit=false": {
"model": "oreganized:block/brown_vigil_candle_double_ceiling"
},
"candles=3,hanging=false": {
"candles=2,hanging=true,lit=true": {
"model": "oreganized:block/brown_vigil_candle_double_ceiling_lit"
},
"candles=3,hanging=false,lit=false": {
"model": "oreganized:block/brown_vigil_candle_triple"
},
"candles=3,hanging=true": {
"candles=3,hanging=false,lit=true": {
"model": "oreganized:block/brown_vigil_candle_triple_lit"
},
"candles=3,hanging=true,lit=false": {
"model": "oreganized:block/brown_vigil_candle_triple_ceiling"
},
"candles=4,hanging=false": {
"candles=3,hanging=true,lit=true": {
"model": "oreganized:block/brown_vigil_candle_triple_ceiling_lit"
},
"candles=4,hanging=false,lit=false": {
"model": "oreganized:block/brown_vigil_candle_quadruple"
},
"candles=4,hanging=true": {
"candles=4,hanging=false,lit=true": {
"model": "oreganized:block/brown_vigil_candle_quadruple_lit"
},
"candles=4,hanging=true,lit=false": {
"model": "oreganized:block/brown_vigil_candle_quadruple_ceiling"
},
"candles=4,hanging=true,lit=true": {
"model": "oreganized:block/brown_vigil_candle_quadruple_ceiling_lit"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,52 @@
{
"variants": {
"candles=1,hanging=false": {
"candles=1,hanging=false,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_single"
},
"candles=1,hanging=true": {
"candles=1,hanging=false,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_single_lit"
},
"candles=1,hanging=true,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_single_ceiling"
},
"candles=2,hanging=false": {
"candles=1,hanging=true,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_single_ceiling_lit"
},
"candles=2,hanging=false,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_double"
},
"candles=2,hanging=true": {
"candles=2,hanging=false,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_double_lit"
},
"candles=2,hanging=true,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_double_ceiling"
},
"candles=3,hanging=false": {
"candles=2,hanging=true,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_double_ceiling_lit"
},
"candles=3,hanging=false,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_triple"
},
"candles=3,hanging=true": {
"candles=3,hanging=false,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_triple_lit"
},
"candles=3,hanging=true,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_triple_ceiling"
},
"candles=4,hanging=false": {
"candles=3,hanging=true,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_triple_ceiling_lit"
},
"candles=4,hanging=false,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_quadruple"
},
"candles=4,hanging=true": {
"candles=4,hanging=false,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_quadruple_lit"
},
"candles=4,hanging=true,lit=false": {
"model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling"
},
"candles=4,hanging=true,lit=true": {
"model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling_lit"
}
}
}
Loading
Loading