Skip to content

Commit 272c3a9

Browse files
wrincewindwrincewind
authored
Merge pull request #2112
1.20 dungeon fix
2 parents 8491169 + 6c119f7 commit 272c3a9

34 files changed

+201
-73
lines changed

src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1_assorted.json renamed to src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json

File renamed without changes.

src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1_stairs.json renamed to src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,206 +1,206 @@
11
{
22
"variants": {
33
"facing=east,half=bottom,shape=inner_left": {
4-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
4+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
55
"uvlock": true,
66
"y": 270
77
},
88
"facing=east,half=bottom,shape=inner_right": {
9-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner"
9+
"model": "bloodmagic:block/dungeon_brick_stairs_inner"
1010
},
1111
"facing=east,half=bottom,shape=outer_left": {
12-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
12+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
1313
"uvlock": true,
1414
"y": 270
1515
},
1616
"facing=east,half=bottom,shape=outer_right": {
17-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer"
17+
"model": "bloodmagic:block/dungeon_brick_stairs_outer"
1818
},
1919
"facing=east,half=bottom,shape=straight": {
20-
"model": "bloodmagic:block/dungeon_brick1_stairs"
20+
"model": "bloodmagic:block/dungeon_brick_stairs"
2121
},
2222
"facing=east,half=top,shape=inner_left": {
23-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
23+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
2424
"uvlock": true,
2525
"x": 180
2626
},
2727
"facing=east,half=top,shape=inner_right": {
28-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
28+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
2929
"uvlock": true,
3030
"x": 180,
3131
"y": 90
3232
},
3333
"facing=east,half=top,shape=outer_left": {
34-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
34+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
3535
"uvlock": true,
3636
"x": 180
3737
},
3838
"facing=east,half=top,shape=outer_right": {
39-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
39+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
4040
"uvlock": true,
4141
"x": 180,
4242
"y": 90
4343
},
4444
"facing=east,half=top,shape=straight": {
45-
"model": "bloodmagic:block/dungeon_brick1_stairs",
45+
"model": "bloodmagic:block/dungeon_brick_stairs",
4646
"uvlock": true,
4747
"x": 180
4848
},
4949
"facing=north,half=bottom,shape=inner_left": {
50-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
50+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
5151
"uvlock": true,
5252
"y": 180
5353
},
5454
"facing=north,half=bottom,shape=inner_right": {
55-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
55+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
5656
"uvlock": true,
5757
"y": 270
5858
},
5959
"facing=north,half=bottom,shape=outer_left": {
60-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
60+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
6161
"uvlock": true,
6262
"y": 180
6363
},
6464
"facing=north,half=bottom,shape=outer_right": {
65-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
65+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
6666
"uvlock": true,
6767
"y": 270
6868
},
6969
"facing=north,half=bottom,shape=straight": {
70-
"model": "bloodmagic:block/dungeon_brick1_stairs",
70+
"model": "bloodmagic:block/dungeon_brick_stairs",
7171
"uvlock": true,
7272
"y": 270
7373
},
7474
"facing=north,half=top,shape=inner_left": {
75-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
75+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
7676
"uvlock": true,
7777
"x": 180,
7878
"y": 270
7979
},
8080
"facing=north,half=top,shape=inner_right": {
81-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
81+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
8282
"uvlock": true,
8383
"x": 180
8484
},
8585
"facing=north,half=top,shape=outer_left": {
86-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
86+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
8787
"uvlock": true,
8888
"x": 180,
8989
"y": 270
9090
},
9191
"facing=north,half=top,shape=outer_right": {
92-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
92+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
9393
"uvlock": true,
9494
"x": 180
9595
},
9696
"facing=north,half=top,shape=straight": {
97-
"model": "bloodmagic:block/dungeon_brick1_stairs",
97+
"model": "bloodmagic:block/dungeon_brick_stairs",
9898
"uvlock": true,
9999
"x": 180,
100100
"y": 270
101101
},
102102
"facing=south,half=bottom,shape=inner_left": {
103-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner"
103+
"model": "bloodmagic:block/dungeon_brick_stairs_inner"
104104
},
105105
"facing=south,half=bottom,shape=inner_right": {
106-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
106+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
107107
"uvlock": true,
108108
"y": 90
109109
},
110110
"facing=south,half=bottom,shape=outer_left": {
111-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer"
111+
"model": "bloodmagic:block/dungeon_brick_stairs_outer"
112112
},
113113
"facing=south,half=bottom,shape=outer_right": {
114-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
114+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
115115
"uvlock": true,
116116
"y": 90
117117
},
118118
"facing=south,half=bottom,shape=straight": {
119-
"model": "bloodmagic:block/dungeon_brick1_stairs",
119+
"model": "bloodmagic:block/dungeon_brick_stairs",
120120
"uvlock": true,
121121
"y": 90
122122
},
123123
"facing=south,half=top,shape=inner_left": {
124-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
124+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
125125
"uvlock": true,
126126
"x": 180,
127127
"y": 90
128128
},
129129
"facing=south,half=top,shape=inner_right": {
130-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
130+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
131131
"uvlock": true,
132132
"x": 180,
133133
"y": 180
134134
},
135135
"facing=south,half=top,shape=outer_left": {
136-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
136+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
137137
"uvlock": true,
138138
"x": 180,
139139
"y": 90
140140
},
141141
"facing=south,half=top,shape=outer_right": {
142-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
142+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
143143
"uvlock": true,
144144
"x": 180,
145145
"y": 180
146146
},
147147
"facing=south,half=top,shape=straight": {
148-
"model": "bloodmagic:block/dungeon_brick1_stairs",
148+
"model": "bloodmagic:block/dungeon_brick_stairs",
149149
"uvlock": true,
150150
"x": 180,
151151
"y": 90
152152
},
153153
"facing=west,half=bottom,shape=inner_left": {
154-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
154+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
155155
"uvlock": true,
156156
"y": 90
157157
},
158158
"facing=west,half=bottom,shape=inner_right": {
159-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
159+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
160160
"uvlock": true,
161161
"y": 180
162162
},
163163
"facing=west,half=bottom,shape=outer_left": {
164-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
164+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
165165
"uvlock": true,
166166
"y": 90
167167
},
168168
"facing=west,half=bottom,shape=outer_right": {
169-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
169+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
170170
"uvlock": true,
171171
"y": 180
172172
},
173173
"facing=west,half=bottom,shape=straight": {
174-
"model": "bloodmagic:block/dungeon_brick1_stairs",
174+
"model": "bloodmagic:block/dungeon_brick_stairs",
175175
"uvlock": true,
176176
"y": 180
177177
},
178178
"facing=west,half=top,shape=inner_left": {
179-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
179+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
180180
"uvlock": true,
181181
"x": 180,
182182
"y": 180
183183
},
184184
"facing=west,half=top,shape=inner_right": {
185-
"model": "bloodmagic:block/dungeon_brick1_stairs_inner",
185+
"model": "bloodmagic:block/dungeon_brick_stairs_inner",
186186
"uvlock": true,
187187
"x": 180,
188188
"y": 270
189189
},
190190
"facing=west,half=top,shape=outer_left": {
191-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
191+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
192192
"uvlock": true,
193193
"x": 180,
194194
"y": 180
195195
},
196196
"facing=west,half=top,shape=outer_right": {
197-
"model": "bloodmagic:block/dungeon_brick1_stairs_outer",
197+
"model": "bloodmagic:block/dungeon_brick_stairs_outer",
198198
"uvlock": true,
199199
"x": 180,
200200
"y": 270
201201
},
202202
"facing=west,half=top,shape=straight": {
203-
"model": "bloodmagic:block/dungeon_brick1_stairs",
203+
"model": "bloodmagic:block/dungeon_brick_stairs",
204204
"uvlock": true,
205205
"x": 180,
206206
"y": 180

‎src/generated/resources/assets/bloodmagic/lang/en_us.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"block.bloodmagic.dislocationrune2": "Reinforced Displacement Rune",
3939
"block.bloodmagic.dungeon_alternator": "Demon Alternator",
4040
"block.bloodmagic.dungeon_brick1": "Demon Bricks",
41-
"block.bloodmagic.dungeon_brick1_assorted": "Assorted Demon Bricks",
4241
"block.bloodmagic.dungeon_brick1_c": "Corrosive Demon Bricks",
4342
"block.bloodmagic.dungeon_brick1_d": "Destructive Demon Bricks",
4443
"block.bloodmagic.dungeon_brick1_gate": "Demon Brick Gate",
@@ -52,7 +51,6 @@
5251
"block.bloodmagic.dungeon_brick1_slab_d": "Destructive Demon Brick Slab",
5352
"block.bloodmagic.dungeon_brick1_slab_s": "Steadfast Demon Brick Slab",
5453
"block.bloodmagic.dungeon_brick1_slab_v": "Vengeful Demon Brick Slab",
55-
"block.bloodmagic.dungeon_brick1_stairs": "Demon Brick Stairs",
5654
"block.bloodmagic.dungeon_brick1_stairs_c": "Corrosive Demon Brick Stairs",
5755
"block.bloodmagic.dungeon_brick1_stairs_d": "Destructive Demon Brick Stairs",
5856
"block.bloodmagic.dungeon_brick1_stairs_s": "Steadfast Demon Brick Stairs",
@@ -73,6 +71,8 @@
7371
"block.bloodmagic.dungeon_brick3_d": "Destructive Long Demon Bricks",
7472
"block.bloodmagic.dungeon_brick3_s": "Steadfast Long Demon Bricks",
7573
"block.bloodmagic.dungeon_brick3_v": "Vengeful Long Demon Bricks",
74+
"block.bloodmagic.dungeon_brick_assorted": "Assorted Demon Bricks",
75+
"block.bloodmagic.dungeon_brick_stairs": "Demon Brick Stairs",
7676
"block.bloodmagic.dungeon_controller": "Dungeon Master",
7777
"block.bloodmagic.dungeon_cracked_brick1": "Glowing Cracked Brick",
7878
"block.bloodmagic.dungeon_emitter": "Demon Emitter",
@@ -229,6 +229,8 @@
229229
"bloodmagic.keybind.cycle_holding_pos": "Cycle Sigil (+)",
230230
"bloodmagic.keybind.open_holding": "Open Sigil of Holding",
231231
"chat.bloodmagic.diviner.blockedBuild": "Unable to replace block at %d, %d, %d.",
232+
"chat.bloodmagic.dungeon.controller_fix": "Dimensional Threading Reforked (and potentially some other similar mods) prevent the dungeon from generating like normal.\nAt this moment we dont really know how to actually fix this so instead we had you trigger the generation again by trying to leave like you just did.\nIt *should* be fixed now meaning the locks should generate rooms now.\nIf this message is triggered from this same dungeon again it did NOT work and you might want to report this to us on the Blood Magic discord.\nBest of luck to you",
233+
"chat.bloodmagic.dungeon.position_fix": "Exit position has been set to %s in %s",
232234
"chat.bloodmagic.living_upgrade_level_increase": "%s has leveled up to %d!",
233235
"chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!",
234236
"chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...",

src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1_stairs.json renamed to src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json

File renamed without changes.

src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1_stairs_inner.json renamed to src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json

File renamed without changes.

src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1_stairs_outer.json renamed to src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json

File renamed without changes.

‎src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1_stairs.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1_assorted.json renamed to src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json

File renamed without changes.

src/generated/resources/data/bloodmagic/advancements/recipes/building_blocks/dungeon_brick1_stairs.json renamed to src/generated/resources/data/bloodmagic/advancements/recipes/building_blocks/dungeon_brick_stairs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"has_the_recipe": {
1717
"conditions": {
18-
"recipe": "bloodmagic:dungeon_brick1_stairs"
18+
"recipe": "bloodmagic:dungeon_brick_stairs"
1919
},
2020
"trigger": "minecraft:recipe_unlocked"
2121
}
@@ -28,7 +28,7 @@
2828
],
2929
"rewards": {
3030
"recipes": [
31-
"bloodmagic:dungeon_brick1_stairs"
31+
"bloodmagic:dungeon_brick_stairs"
3232
]
3333
},
3434
"sends_telemetry_event": false

src/generated/resources/data/bloodmagic/advancements/recipes/decorations/dungeon_brick1_stairs_from_dungeon_raw_stonecutting.json renamed to src/generated/resources/data/bloodmagic/advancements/recipes/decorations/dungeon_brick_stairs_from_dungeon_raw_stonecutting.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": "bloodmagic:dungeon_brick1_stairs_from_dungeon_raw_stonecutting"
16+
"recipe": "bloodmagic:dungeon_brick_stairs_from_dungeon_raw_stonecutting"
1717
},
1818
"trigger": "minecraft:recipe_unlocked"
1919
}
@@ -26,7 +26,7 @@
2626
],
2727
"rewards": {
2828
"recipes": [
29-
"bloodmagic:dungeon_brick1_stairs_from_dungeon_raw_stonecutting"
29+
"bloodmagic:dungeon_brick_stairs_from_dungeon_raw_stonecutting"
3030
]
3131
},
3232
"sends_telemetry_event": false

0 commit comments

Comments
 (0)