Skip to content

Commit 3ca16d2

Browse files
TunefulTurnipTunefulTurnip
committed
feat: Beyond Parity compat
closes #267
1 parent d28c4b3 commit 3ca16d2

File tree

189 files changed

+615
-441
lines changed

Some content is hidden

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

189 files changed

+615
-441
lines changed

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ dependencies {
102102
implementation("mezz.jei:jei-${project.mc_version}-neoforge:${project.jei_version}")
103103

104104

105-
compileOnly "curse.maven:aether-protect-your-moa-1016303:6040716"
105+
implementation "curse.maven:aether-protect-your-moa-1016303:6040716"
106+
implementation "com.aetherteam.beyondparity:aether_beyond_parity:${project.aether_beyond_parity_version}"
106107
implementation "curse.maven:aether-emissivity-916028:6392126"
107108
implementation "curse.maven:aether-treasure-reforging-1016302:6040710"
108109
}
@@ -112,6 +113,7 @@ repositories {
112113
maven { url = "https://packages.aether-mod.net/Emissivity" }
113114
maven { url = "https://packages.aether-mod.net/Treasure-Reforging" }
114115
maven { url = "https://packages.aether-mod.net/Protect-Your-Moa" }
116+
maven { url = "https://packages.aether-mod.net/Beyond-Parity" }
115117
maven { url = "https://maven.theillusivec4.top/" }
116118
maven { url = 'https://maven.minecraftforge.net/' }
117119
maven { url = "https://maven.wispforest.io" }

‎gradle.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ mod_authors=RazorDevs
2727
mod_description=Deep Aether is an unofficial addon for the Aether Mod which aims to add extra content to the Aether Dimension in a similar fashion to the 1.16 Nether Expansion update.\nExtra content includes new blocks, items, plants, biomes, trees, mobs, and more!\nCreated by RazorDevs!
2828

2929
# Dependencies
30-
aether_version=1.21.1-1.5.8-neoforge
31-
nitrogen_version=1.21.1-1.1.22-neoforge
30+
aether_version=1.21.1-1.5.10-neoforge
31+
nitrogen_version=1.21.1-1.1.25-neoforge
3232
cumulus_version=1.21.1-2.0.2-neoforge
3333
accessories_version=1.1.0-beta.16
3434
cloth_config_version=15.0.140
@@ -38,4 +38,5 @@ aeroblender_version=1.21.1-1.0.0-neoforge
3838
terrablender_version=1.21.1-4.1.0.3
3939

4040
# Optional Dependencies
41-
jei_version=19.21.0.246
41+
jei_version=19.25.0.323
42+
aether_beyond_parity_version=1.21.1-1.0.0-neoforge

‎src/generated/resources/data/aether/tags/block/aerclouds.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"values": [
33
"deep_aether:chromatic_aercloud",
44
"deep_aether:sterling_aercloud",
5-
"deep_aether:aercloud_grass_block",
65
"deep_aether:aersmog",
76
"deep_aether:rain_aercloud"
87
]

‎src/generated/resources/data/aether/tags/block/trapped_dungeon_blocks.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"values": [
33
"deep_aether:trapped_nimbus_stone",
4-
"deep_aether:trapped_skyroot_planks",
54
"deep_aether:trapped_light_nimbus_stone",
65
"deep_aether:trapped_nimbus_pillar",
7-
"deep_aether:trapped_light_nimbus_pillar"
6+
"deep_aether:trapped_light_nimbus_pillar",
7+
"deep_aether:trapped_skyroot_planks"
88
]
99
}

‎src/generated/resources/data/aether/tags/block/treated_as_aether_block.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
"deep_aether:roseroot_wood",
1414
"deep_aether:roseroot_log",
1515
"deep_aether:rotten_roseroot_log",
16-
"deep_aether:roseroot_wall",
1716
"deep_aether:stripped_roseroot_wood",
1817
"deep_aether:stripped_roseroot_log",
19-
"deep_aether:stripped_roseroot_wall",
2018
"deep_aether:roseroot_planks",
2119
"deep_aether:roseroot_stairs",
2220
"deep_aether:roseroot_slab",
@@ -40,10 +38,8 @@
4038
"deep_aether:lightcap_mushroom_block",
4139
"deep_aether:yagroot_wood",
4240
"deep_aether:yagroot_log",
43-
"deep_aether:yagroot_wall",
4441
"deep_aether:stripped_yagroot_wood",
4542
"deep_aether:stripped_yagroot_log",
46-
"deep_aether:stripped_yagroot_wall",
4743
"deep_aether:yagroot_planks",
4844
"deep_aether:yagroot_stairs",
4945
"deep_aether:yagroot_slab",
@@ -64,10 +60,8 @@
6460
"deep_aether:yagroot_wall_hanging_sign",
6561
"deep_aether:cruderoot_wood",
6662
"deep_aether:cruderoot_log",
67-
"deep_aether:cruderoot_wall",
6863
"deep_aether:stripped_cruderoot_wood",
6964
"deep_aether:stripped_cruderoot_log",
70-
"deep_aether:stripped_cruderoot_wall",
7165
"deep_aether:cruderoot_planks",
7266
"deep_aether:cruderoot_stairs",
7367
"deep_aether:cruderoot_slab",
@@ -85,10 +79,8 @@
8579
"deep_aether:cruderoot_wall_hanging_sign",
8680
"deep_aether:conberry_wood",
8781
"deep_aether:conberry_log",
88-
"deep_aether:conberry_wall",
8982
"deep_aether:stripped_conberry_wood",
9083
"deep_aether:stripped_conberry_log",
91-
"deep_aether:stripped_conberry_wall",
9284
"deep_aether:conberry_planks",
9385
"deep_aether:conberry_stairs",
9486
"deep_aether:conberry_slab",
@@ -106,10 +98,8 @@
10698
"deep_aether:conberry_wall_hanging_sign",
10799
"deep_aether:sunroot_wood",
108100
"deep_aether:sunroot_log",
109-
"deep_aether:sunroot_wall",
110101
"deep_aether:stripped_sunroot_wood",
111102
"deep_aether:stripped_sunroot_log",
112-
"deep_aether:stripped_sunroot_wall",
113103
"deep_aether:sunroot_planks",
114104
"deep_aether:sunroot_stairs",
115105
"deep_aether:sunroot_slab",
@@ -284,6 +274,16 @@
284274
"deep_aether:stripped_conberry_log_wall",
285275
"deep_aether:sunroot_log_wall",
286276
"deep_aether:stripped_sunroot_log_wall",
277+
"deep_aether:roseroot_wall",
278+
"deep_aether:stripped_roseroot_wall",
279+
"deep_aether:cruderoot_wall",
280+
"deep_aether:stripped_cruderoot_wall",
281+
"deep_aether:yagroot_wall",
282+
"deep_aether:stripped_yagroot_wall",
283+
"deep_aether:conberry_wall",
284+
"deep_aether:stripped_conberry_wall",
285+
"deep_aether:sunroot_wall",
286+
"deep_aether:stripped_sunroot_wall",
287287
"deep_aether:squall_block",
288288
"deep_aether:aercloud_root_carpet",
289289
"deep_aether:tall_alien_plant",

‎src/generated/resources/data/aether/tags/item/aerclouds.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"values": [
33
"deep_aether:chromatic_aercloud",
44
"deep_aether:sterling_aercloud",
5-
"deep_aether:aercloud_grass_block",
65
"deep_aether:aersmog",
76
"deep_aether:rain_aercloud"
87
]

‎src/generated/resources/data/aether/tags/item/treated_as_aether_item.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@
126126
"deep_aether:roseroot_wood",
127127
"deep_aether:roseroot_log",
128128
"deep_aether:rotten_roseroot_log",
129-
"deep_aether:roseroot_wall",
130129
"deep_aether:stripped_roseroot_wood",
131130
"deep_aether:stripped_roseroot_log",
132-
"deep_aether:stripped_roseroot_wall",
133131
"deep_aether:roseroot_planks",
134132
"deep_aether:roseroot_stairs",
135133
"deep_aether:roseroot_slab",
@@ -149,10 +147,8 @@
149147
"deep_aether:lightcap_mushroom_block",
150148
"deep_aether:yagroot_wood",
151149
"deep_aether:yagroot_log",
152-
"deep_aether:yagroot_wall",
153150
"deep_aether:stripped_yagroot_wood",
154151
"deep_aether:stripped_yagroot_log",
155-
"deep_aether:stripped_yagroot_wall",
156152
"deep_aether:yagroot_planks",
157153
"deep_aether:yagroot_stairs",
158154
"deep_aether:yagroot_slab",
@@ -169,10 +165,8 @@
169165
"deep_aether:yagroot_vine",
170166
"deep_aether:cruderoot_wood",
171167
"deep_aether:cruderoot_log",
172-
"deep_aether:cruderoot_wall",
173168
"deep_aether:stripped_cruderoot_wood",
174169
"deep_aether:stripped_cruderoot_log",
175-
"deep_aether:stripped_cruderoot_wall",
176170
"deep_aether:cruderoot_planks",
177171
"deep_aether:cruderoot_stairs",
178172
"deep_aether:cruderoot_slab",
@@ -186,10 +180,8 @@
186180
"deep_aether:cruderoot_sapling",
187181
"deep_aether:conberry_wood",
188182
"deep_aether:conberry_log",
189-
"deep_aether:conberry_wall",
190183
"deep_aether:stripped_conberry_wood",
191184
"deep_aether:stripped_conberry_log",
192-
"deep_aether:stripped_conberry_wall",
193185
"deep_aether:conberry_planks",
194186
"deep_aether:conberry_stairs",
195187
"deep_aether:conberry_slab",
@@ -203,10 +195,8 @@
203195
"deep_aether:conberry_sapling",
204196
"deep_aether:sunroot_wood",
205197
"deep_aether:sunroot_log",
206-
"deep_aether:sunroot_wall",
207198
"deep_aether:stripped_sunroot_wood",
208199
"deep_aether:stripped_sunroot_log",
209-
"deep_aether:stripped_sunroot_wall",
210200
"deep_aether:sunroot_planks",
211201
"deep_aether:sunroot_stairs",
212202
"deep_aether:sunroot_slab",
@@ -352,6 +342,16 @@
352342
"deep_aether:stripped_conberry_log_wall",
353343
"deep_aether:sunroot_log_wall",
354344
"deep_aether:stripped_sunroot_log_wall",
345+
"deep_aether:roseroot_wall",
346+
"deep_aether:stripped_roseroot_wall",
347+
"deep_aether:cruderoot_wall",
348+
"deep_aether:stripped_cruderoot_wall",
349+
"deep_aether:yagroot_wall",
350+
"deep_aether:stripped_yagroot_wall",
351+
"deep_aether:conberry_wall",
352+
"deep_aether:stripped_conberry_wall",
353+
"deep_aether:sunroot_wall",
354+
"deep_aether:stripped_sunroot_wall",
355355
"deep_aether:squall_block",
356356
"deep_aether:aercloud_root_carpet",
357357
"deep_aether:tall_alien_plant",

‎src/generated/resources/data/aether_beyond_parity/tags/block/log_walls.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"values": [
3+
"deep_aether:roseroot_wall",
4+
"deep_aether:stripped_roseroot_wall",
5+
"deep_aether:yagroot_wall",
6+
"deep_aether:stripped_yagroot_wall",
7+
"deep_aether:cruderoot_wall",
8+
"deep_aether:stripped_cruderoot_wall",
9+
"deep_aether:conberry_wall",
10+
"deep_aether:stripped_conberry_wall",
11+
"deep_aether:sunroot_wall",
12+
"deep_aether:stripped_sunroot_wall",
13+
"deep_aether:roseroot_log_wall",
14+
"deep_aether:stripped_roseroot_log_wall",
15+
"deep_aether:yagroot_log_wall",
16+
"deep_aether:stripped_yagroot_log_wall",
17+
"deep_aether:cruderoot_log_wall",
18+
"deep_aether:stripped_cruderoot_log_wall",
19+
"deep_aether:conberry_log_wall",
20+
"deep_aether:stripped_conberry_log_wall",
21+
"deep_aether:sunroot_log_wall",
22+
"deep_aether:stripped_sunroot_log_wall"
23+
]
24+
}

‎src/generated/resources/data/aether_beyond_parity/tags/item/log_walls.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"values": [
3+
"deep_aether:roseroot_wall",
4+
"deep_aether:stripped_roseroot_wall",
5+
"deep_aether:yagroot_wall",
6+
"deep_aether:stripped_yagroot_wall",
7+
"deep_aether:cruderoot_wall",
8+
"deep_aether:stripped_cruderoot_wall",
9+
"deep_aether:conberry_wall",
10+
"deep_aether:stripped_conberry_wall",
11+
"deep_aether:sunroot_wall",
12+
"deep_aether:stripped_sunroot_wall",
13+
"deep_aether:roseroot_log_wall",
14+
"deep_aether:stripped_roseroot_log_wall",
15+
"deep_aether:yagroot_log_wall",
16+
"deep_aether:stripped_yagroot_log_wall",
17+
"deep_aether:cruderoot_log_wall",
18+
"deep_aether:stripped_cruderoot_log_wall",
19+
"deep_aether:conberry_log_wall",
20+
"deep_aether:stripped_conberry_log_wall",
21+
"deep_aether:sunroot_log_wall",
22+
"deep_aether:stripped_sunroot_log_wall"
23+
]
24+
}

src/generated/resources/data/deep_aether/advancement/recipes/decorations/conberry_wall.json renamed to src/generated/resources/data/deep_aether/advancement/recipes/decorations/conberry_log_wall.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"has_the_recipe": {
1515
"conditions": {
16-
"recipe": "deep_aether:conberry_wall"
16+
"recipe": "deep_aether:conberry_log_wall"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"deep_aether:conberry_wall"
29+
"deep_aether:conberry_log_wall"
3030
]
3131
}
3232
}

0 commit comments

Comments
 (0)