Commit 53ccbb7
Fix Enchanter scroll quests for the 1.20.1 quest schema (#11727)
The 5 Enchanter scroll quests added in #11650 use the 1.21.1 quest JSON
format (item as an ItemStack object {id,count}, potion data via item
components). On 1.20.1 the delivery and item-reward parsers expect a
string item id plus a separate "qty" int (and SNBT "nbt" for potions),
so each quest failed to load with a NullPointerException on the missing
"qty" field ("Skipping quest ... due to parsing error").
Convert the delivery objectives and item rewards to the 1.20.1 format:
- "item": {"id":X,"count":N} -> "item": "X", "qty": N
- luck potion components -> "nbt": "{Potion:\"minecraft:luck\"}"
Dialogue, triggers, and happiness rewards are unchanged.
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 69feca2 commit 53ccbb7
5 files changed
Lines changed: 57 additions & 122 deletions
File tree
- src/main/resources/data/minecolonies/colony/quests/general
Lines changed: 8 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
| 56 | + | |
| 57 | + | |
60 | 58 | | |
61 | 59 | | |
62 | 60 | | |
| |||
110 | 108 | | |
111 | 109 | | |
112 | 110 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
| 111 | + | |
| 112 | + | |
117 | 113 | | |
118 | 114 | | |
119 | 115 | | |
120 | 116 | | |
121 | 117 | | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
| 118 | + | |
| 119 | + | |
126 | 120 | | |
127 | 121 | | |
128 | 122 | | |
129 | 123 | | |
130 | 124 | | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 125 | + | |
| 126 | + | |
135 | 127 | | |
136 | 128 | | |
137 | 129 | | |
| |||
Lines changed: 11 additions & 30 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
73 | | - | |
74 | | - | |
| 72 | + | |
| 73 | + | |
75 | 74 | | |
76 | 75 | | |
77 | 76 | | |
| |||
111 | 110 | | |
112 | 111 | | |
113 | 112 | | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
123 | 116 | | |
124 | 117 | | |
125 | 118 | | |
126 | 119 | | |
127 | 120 | | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
137 | 124 | | |
138 | 125 | | |
139 | 126 | | |
140 | 127 | | |
141 | 128 | | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
151 | 132 | | |
152 | 133 | | |
153 | 134 | | |
| |||
Lines changed: 8 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
| 75 | + | |
| 76 | + | |
79 | 77 | | |
80 | 78 | | |
81 | 79 | | |
82 | 80 | | |
83 | 81 | | |
84 | 82 | | |
85 | 83 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
| 84 | + | |
| 85 | + | |
90 | 86 | | |
91 | 87 | | |
92 | 88 | | |
| |||
140 | 136 | | |
141 | 137 | | |
142 | 138 | | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
| 139 | + | |
| 140 | + | |
147 | 141 | | |
148 | 142 | | |
149 | 143 | | |
150 | 144 | | |
151 | 145 | | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
| 146 | + | |
| 147 | + | |
156 | 148 | | |
157 | 149 | | |
158 | 150 | | |
| |||
Lines changed: 16 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 65 | + | |
| 66 | + | |
69 | 67 | | |
70 | 68 | | |
71 | 69 | | |
72 | 70 | | |
73 | 71 | | |
74 | 72 | | |
75 | 73 | | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
| 74 | + | |
| 75 | + | |
80 | 76 | | |
81 | 77 | | |
82 | 78 | | |
83 | 79 | | |
84 | 80 | | |
85 | 81 | | |
86 | 82 | | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 83 | + | |
| 84 | + | |
91 | 85 | | |
92 | 86 | | |
93 | 87 | | |
94 | 88 | | |
95 | 89 | | |
96 | 90 | | |
97 | 91 | | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
| 92 | + | |
| 93 | + | |
102 | 94 | | |
103 | 95 | | |
104 | 96 | | |
| |||
152 | 144 | | |
153 | 145 | | |
154 | 146 | | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
| 147 | + | |
| 148 | + | |
159 | 149 | | |
160 | 150 | | |
161 | 151 | | |
162 | 152 | | |
163 | 153 | | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
| 154 | + | |
| 155 | + | |
168 | 156 | | |
169 | 157 | | |
170 | 158 | | |
171 | 159 | | |
172 | 160 | | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
| 161 | + | |
| 162 | + | |
177 | 163 | | |
178 | 164 | | |
179 | 165 | | |
180 | 166 | | |
181 | 167 | | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
| 168 | + | |
| 169 | + | |
186 | 170 | | |
187 | 171 | | |
188 | 172 | | |
| |||
Lines changed: 14 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
| 75 | + | |
| 76 | + | |
79 | 77 | | |
80 | 78 | | |
81 | 79 | | |
82 | 80 | | |
83 | 81 | | |
84 | 82 | | |
85 | 83 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
| 84 | + | |
| 85 | + | |
90 | 86 | | |
91 | 87 | | |
92 | 88 | | |
93 | 89 | | |
94 | 90 | | |
95 | 91 | | |
96 | 92 | | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
| 93 | + | |
| 94 | + | |
101 | 95 | | |
102 | 96 | | |
103 | 97 | | |
| |||
201 | 195 | | |
202 | 196 | | |
203 | 197 | | |
204 | | - | |
205 | | - | |
206 | | - | |
207 | | - | |
| 198 | + | |
| 199 | + | |
208 | 200 | | |
209 | 201 | | |
210 | 202 | | |
211 | 203 | | |
212 | 204 | | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
| 205 | + | |
| 206 | + | |
217 | 207 | | |
218 | 208 | | |
219 | 209 | | |
220 | 210 | | |
221 | 211 | | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
| 212 | + | |
| 213 | + | |
226 | 214 | | |
227 | 215 | | |
228 | 216 | | |
229 | 217 | | |
230 | 218 | | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
| 219 | + | |
| 220 | + | |
235 | 221 | | |
236 | 222 | | |
237 | 223 | | |
| |||
0 commit comments