Skip to content

Commit 78843f0

Browse files
PssbleTrnglePssbleTrngle
authored
Merge pull request #47 from Xaidee/feature/gargoyle
2 parents 6a150b6 + 3303c76 commit 78843f0

File tree

94 files changed

+1223
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1223
-684
lines changed

‎.github/workflows/test.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Test
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches: ["[0-9]+.[0-9]+.x"]
6+
pull_request:
7+
types: [opened, synchronize]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
packages: write
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- uses: actions/setup-java@v4
19+
with:
20+
java-version: 17
21+
distribution: temurin
22+
23+
- name: Validate Gradle wrapper
24+
uses: gradle/wrapper-validation-action@v3
25+
26+
- name: Build and upload
27+
uses: gradle/gradle-build-action@v3
28+
with:
29+
arguments: build
30+
env:
31+
CI: true

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ dependencies {
9797
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
9898

9999
// Compatibilities
100-
runtimeOnly(fg.deobf("maven.modrinth:create:${create_version}"))
100+
implementation(fg.deobf("maven.modrinth:create:${create_version}"))
101101

102102
// For dev testing
103103
runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))

‎gradlew

100644100755
File mode changed.

‎src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

+2-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-13T15:46:13.8380616 oreganized Block States
1+
// 1.20.1 2024-07-22T22:02:00.7111198 oreganized Block States
22
d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
33
05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
44
5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json
@@ -12,7 +12,7 @@ c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crys
1212
8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json
1313
91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json
1414
f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json
15-
cbe8408434e5460981f1854d6fabbdce38756720 assets/oreganized/blockstates/exposer.json
15+
c1e90c9548de4808e0903a7e18f9ff83ca476d28 assets/oreganized/blockstates/gargoyle.json
1616
7098288ccd6ba925fb22bad6197a39f177bd82bf assets/oreganized/blockstates/glance.json
1717
83ceb01a7bc2cfa83cfeed35e236e23013033016 assets/oreganized/blockstates/glance_bricks.json
1818
5382067f2b58b89788f38327e94e1a196cf01482 assets/oreganized/blockstates/glance_brick_slab.json
@@ -186,30 +186,6 @@ e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_cry
186186
5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json
187187
50b31e901f9c3d7db1fde987cfd547999e37cf67 assets/oreganized/models/block/dimmer_lead_bulb.json
188188
70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json
189-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_down.json
190-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_east.json
191-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_north.json
192-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_south.json
193-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_up.json
194-
bb5902e9e6bb0fd0e6aa019914e532fb91da7522 assets/oreganized/models/block/exposer_level_0_west.json
195-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_down.json
196-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_east.json
197-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_north.json
198-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_south.json
199-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_up.json
200-
6cfef845ee5a0f9486f26ca52d7783a2900a28f8 assets/oreganized/models/block/exposer_level_1_west.json
201-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_down.json
202-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_east.json
203-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_north.json
204-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_south.json
205-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_up.json
206-
ab7d5942c80778ee1f5261777e196d2e02387432 assets/oreganized/models/block/exposer_level_2_west.json
207-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_down.json
208-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_east.json
209-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_north.json
210-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_south.json
211-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_up.json
212-
9ef373ac64cf0b3b1de11433fe224824d532ef22 assets/oreganized/models/block/exposer_level_3_west.json
213189
9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json
214190
c16aa840c01875b0a5c1655ba1bd0bdd55cefe35 assets/oreganized/models/block/glance_bricks.json
215191
de9c306cb47beaa419a6155f46f93488fba9277e assets/oreganized/models/block/glance_brick_slab.json

‎src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-13T15:46:13.8471695 oreganized Item Models
1+
// 1.20.1 2024-07-22T22:07:33.4666831 oreganized Item Models
22
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
33
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
44
8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -66,7 +66,7 @@ f3871ff234873195dd47e570e62f802f7f67c889 assets/oreganized/models/item/electrum_
6666
ba6dafcb3b21faf4eb7886b812f205e91e59a49d assets/oreganized/models/item/electrum_shovel.json
6767
05cacc76a2e9820c58a78e8456d69278e41ce32f assets/oreganized/models/item/electrum_sword.json
6868
35a59e558e3caa534b1d2e155dea97863ed6bd56 assets/oreganized/models/item/electrum_upgrade_smithing_template.json
69-
1eeae5d92f8a92dc5ea2c30f17913213fb30af80 assets/oreganized/models/item/exposer.json
69+
90794871c3e583844d22b86e27ef20d936d60715 assets/oreganized/models/item/gargoyle.json
7070
5d88c542b8ca2e9e8768e2624f1b560ef793d32c assets/oreganized/models/item/glance.json
7171
fb4d349a3ebe34df2254a4748e6e051d29730cae assets/oreganized/models/item/glance_bricks.json
7272
c907552eecc918e0bc5f5bd7a457004fd6940136 assets/oreganized/models/item/glance_brick_slab.json

‎src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-13T15:46:13.848169 Oreganized Block Tags
1+
// 1.20.1 2024-07-22T22:02:00.7201533 Oreganized Block Tags
22
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
33
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
44
d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -19,7 +19,7 @@ bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/s
1919
503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/blocks/doors.json
2020
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json
2121
f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json
22-
a4f374350d2bc24131c46217f4f8810ba08c33e6 data/minecraft/tags/blocks/mineable/pickaxe.json
22+
5a2cdeb6fd6f03e5f1980e2b6fb22e4e4d9b4dd0 data/minecraft/tags/blocks/mineable/pickaxe.json
2323
84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json
2424
bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json
2525
dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json

‎src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2024-02-29T16:37:03.2403501 Sound Definitions
2-
47254237d13fdbae0fc8e5a730e2c1370f1a0156 assets/oreganized/sounds.json
1+
// 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions
2+
1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json

‎src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-04-01T14:10:27.7094146 Oreganized Item Tags
1+
// 1.20.1 2024-07-24T21:36:25.8657027 Oreganized Item Tags
22
d8d286ea76e30a635512bc93d68815770003ff41 data/forge/tags/items/buckets/molten_lead.json
33
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json
44
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/items/glass_panes.json
@@ -37,6 +37,7 @@ bd1440ab62499b2be9d2d4050f2d30cbb306b34f data/minecraft/tags/items/trimmable_arm
3737
a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json
3838
81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/items/crystal_glass.json
3939
f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/items/crystal_glass_panes.json
40+
bf2ad799074f5c44acee490bdf3d3ae81d56997b data/oreganized/tags/items/gargoyle_snack.json
4041
f7810c755845dc955112f7b0cedf68260ad693cc data/oreganized/tags/items/lead_source.json
4142
376b7c9ff449a4b98cb7b1f65b47d658c4e39428 data/oreganized/tags/items/lighter_than_lead.json
4243
3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/items/stone_types/glance.json

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-13T15:46:13.8440615 Recipes
1+
// 1.20.1 2024-07-22T22:02:00.7171536 Recipes
22
c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
33
ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
44
40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
@@ -130,7 +130,7 @@ bacd4047275f3c40df06a276e36804b6f9bf155e data/oreganized/advancements/recipes/mi
130130
e5e53c7d6b2173a1f6dec77caf21771f41f97edc data/oreganized/advancements/recipes/misc/smelt_raw_lead.json
131131
2f4e1f1ac23c86a7a60e1d860af14dc24e0ca4fd data/oreganized/advancements/recipes/misc/smelt_raw_silver.json
132132
69c401795ef31b870e886764e132efa99277d42a data/oreganized/advancements/recipes/misc/smelt_silver_ore.json
133-
c19af50e9c1559e697f6def652c5317c8e625081 data/oreganized/advancements/recipes/redstone/exposer.json
133+
1c41aefb7db7e46e4e73cbb28fdbc35925f8da11 data/oreganized/advancements/recipes/redstone/gargoyle.json
134134
515ce7c277e9172bf0c68c6bddc09d08de2b0c12 data/oreganized/advancements/recipes/redstone/lead_bars.json
135135
fea94b2bd9d8d2a9ef8e130ad2eb404691da858d data/oreganized/advancements/recipes/redstone/lead_door.json
136136
716ef31e308f24d22ef6dae98e96fe9b16169e9b data/oreganized/advancements/recipes/redstone/lead_trapdoor.json
@@ -169,7 +169,7 @@ db731a127ba3046ceee5ae0e2f6e86d5d01504b2 data/oreganized/recipes/electrum_pickax
169169
facfd8f07459c400bb70163f4867e70d66652787 data/oreganized/recipes/electrum_shovel.json
170170
cf15ffd760d39ce405ab20a1a677b1798ae80437 data/oreganized/recipes/electrum_sword.json
171171
4a09ce0c226b618b61938286b85395b81ecb3efb data/oreganized/recipes/electrum_upgrade_smithing_template.json
172-
d63a328623247dabc486f8e49964fb84ffec0c5e data/oreganized/recipes/exposer.json
172+
1fe4c5cc425db61412f873704d046425f07198e0 data/oreganized/recipes/gargoyle.json
173173
586044ef7239f771d4055bcf9e0acba184edcb49 data/oreganized/recipes/glance.json
174174
6b6c7d006b274224fdd9b469859e18aaf20040ff data/oreganized/recipes/glance_bricks.json
175175
cd75a9311f1b63a61fb34547c17607b26dd7d911 data/oreganized/recipes/glance_brick_slab.json

‎src/generated/resources/assets/oreganized/blockstates/exposer.json

-188
This file was deleted.

‎src/generated/resources/assets/oreganized/blockstates/gargoyle.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"variants": {
3+
"attachment=floor,facing=east": {
4+
"model": "oreganized:block/gargoyle",
5+
"y": 270
6+
},
7+
"attachment=floor,facing=north": {
8+
"model": "oreganized:block/gargoyle",
9+
"y": 180
10+
},
11+
"attachment=floor,facing=south": {
12+
"model": "oreganized:block/gargoyle"
13+
},
14+
"attachment=floor,facing=west": {
15+
"model": "oreganized:block/gargoyle",
16+
"y": 90
17+
},
18+
"attachment=wall,facing=east": {
19+
"model": "oreganized:block/gargoyle_side",
20+
"y": 270
21+
},
22+
"attachment=wall,facing=north": {
23+
"model": "oreganized:block/gargoyle_side",
24+
"y": 180
25+
},
26+
"attachment=wall,facing=south": {
27+
"model": "oreganized:block/gargoyle_side"
28+
},
29+
"attachment=wall,facing=west": {
30+
"model": "oreganized:block/gargoyle_side",
31+
"y": 90
32+
}
33+
}
34+
}

0 commit comments

Comments
 (0)