Skip to content

Commit 25060e0

Browse files
WaterpickerWaterpicker
committed
Correct Hearthflame error caused by me thinking the mask was spelled wrong.
1 parent d494fdc commit 25060e0

10 files changed

Lines changed: 99 additions & 102 deletions

File tree

‎common/src/main/generated/resources/assets/generations_core/lang/en_us.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@
20132013
"item.generations_core.health_candy_xl": "Health Candy Xl",
20142014
"item.generations_core.health_candy_xl.desc": "Not currently implemented",
20152015
"item.generations_core.heart_scale": "Heart Scale",
2016-
"item.generations_core.heartflame_mask": "Heartflame Mask",
2016+
"item.generations_core.hearthflame_mask": "Hearthflame Mask",
20172017
"item.generations_core.heat_badge": "Heat Badge",
20182018
"item.generations_core.heracronite": "Heracronite",
20192019
"item.generations_core.hi_tech_earbuds": "Hi Tech Earbuds",

‎common/src/main/generated/resources/assets/generations_core/models/item/heartflame_mask.json‎

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

‎common/src/main/generated/resources/assets/generations_core/models/item/hearthflame_mask.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "generations_core:item/held_items/hearthflame_mask"
5+
}
6+
}

‎common/src/main/generated/resources/data/generations_core/tags/items/held_items.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"generations_core:fairy_feather",
138138
"generations_core:teal_mask",
139139
"generations_core:wellspring_mask",
140-
"generations_core:heartflame_mask",
140+
"generations_core:hearthflame_mask",
141141
"generations_core:cornerstone_mask",
142142
"generations_core:red_orb",
143143
"generations_core:blue_orb"

‎common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -56,101 +56,101 @@
5656
"generations_core:cursed_carved_pumpkin",
5757
"generations_core:scarecrow",
5858
"generations_core:box",
59-
"generations_core:lime_couch_arm_left",
60-
"generations_core:cyan_couch_arm_left",
61-
"generations_core:magenta_couch_arm_left",
59+
"generations_core:gray_couch_arm_left",
60+
"generations_core:orange_couch_arm_left",
61+
"generations_core:light_gray_couch_arm_left",
6262
"generations_core:blue_couch_arm_left",
63+
"generations_core:yellow_couch_arm_left",
64+
"generations_core:green_couch_arm_left",
6365
"generations_core:light_blue_couch_arm_left",
66+
"generations_core:magenta_couch_arm_left",
67+
"generations_core:brown_couch_arm_left",
6468
"generations_core:red_couch_arm_left",
65-
"generations_core:black_couch_arm_left",
66-
"generations_core:light_gray_couch_arm_left",
67-
"generations_core:white_couch_arm_left",
68-
"generations_core:green_couch_arm_left",
69+
"generations_core:lime_couch_arm_left",
6970
"generations_core:pink_couch_arm_left",
70-
"generations_core:orange_couch_arm_left",
71-
"generations_core:gray_couch_arm_left",
72-
"generations_core:yellow_couch_arm_left",
7371
"generations_core:purple_couch_arm_left",
74-
"generations_core:brown_couch_arm_left",
75-
"generations_core:lime_couch_arm_right",
76-
"generations_core:cyan_couch_arm_right",
77-
"generations_core:magenta_couch_arm_right",
72+
"generations_core:cyan_couch_arm_left",
73+
"generations_core:black_couch_arm_left",
74+
"generations_core:white_couch_arm_left",
75+
"generations_core:gray_couch_arm_right",
76+
"generations_core:orange_couch_arm_right",
77+
"generations_core:light_gray_couch_arm_right",
7878
"generations_core:blue_couch_arm_right",
79+
"generations_core:yellow_couch_arm_right",
80+
"generations_core:green_couch_arm_right",
7981
"generations_core:light_blue_couch_arm_right",
82+
"generations_core:magenta_couch_arm_right",
83+
"generations_core:brown_couch_arm_right",
8084
"generations_core:red_couch_arm_right",
81-
"generations_core:black_couch_arm_right",
82-
"generations_core:light_gray_couch_arm_right",
83-
"generations_core:white_couch_arm_right",
84-
"generations_core:green_couch_arm_right",
85+
"generations_core:lime_couch_arm_right",
8586
"generations_core:pink_couch_arm_right",
86-
"generations_core:orange_couch_arm_right",
87-
"generations_core:gray_couch_arm_right",
88-
"generations_core:yellow_couch_arm_right",
8987
"generations_core:purple_couch_arm_right",
90-
"generations_core:brown_couch_arm_right",
91-
"generations_core:lime_couch_corner_left",
92-
"generations_core:cyan_couch_corner_left",
93-
"generations_core:magenta_couch_corner_left",
88+
"generations_core:cyan_couch_arm_right",
89+
"generations_core:black_couch_arm_right",
90+
"generations_core:white_couch_arm_right",
91+
"generations_core:gray_couch_corner_left",
92+
"generations_core:orange_couch_corner_left",
93+
"generations_core:light_gray_couch_corner_left",
9494
"generations_core:blue_couch_corner_left",
95+
"generations_core:yellow_couch_corner_left",
96+
"generations_core:green_couch_corner_left",
9597
"generations_core:light_blue_couch_corner_left",
98+
"generations_core:magenta_couch_corner_left",
99+
"generations_core:brown_couch_corner_left",
96100
"generations_core:red_couch_corner_left",
97-
"generations_core:black_couch_corner_left",
98-
"generations_core:light_gray_couch_corner_left",
99-
"generations_core:white_couch_corner_left",
100-
"generations_core:green_couch_corner_left",
101+
"generations_core:lime_couch_corner_left",
101102
"generations_core:pink_couch_corner_left",
102-
"generations_core:orange_couch_corner_left",
103-
"generations_core:gray_couch_corner_left",
104-
"generations_core:yellow_couch_corner_left",
105103
"generations_core:purple_couch_corner_left",
106-
"generations_core:brown_couch_corner_left",
107-
"generations_core:lime_couch_corner_right",
108-
"generations_core:cyan_couch_corner_right",
109-
"generations_core:magenta_couch_corner_right",
104+
"generations_core:cyan_couch_corner_left",
105+
"generations_core:black_couch_corner_left",
106+
"generations_core:white_couch_corner_left",
107+
"generations_core:gray_couch_corner_right",
108+
"generations_core:orange_couch_corner_right",
109+
"generations_core:light_gray_couch_corner_right",
110110
"generations_core:blue_couch_corner_right",
111+
"generations_core:yellow_couch_corner_right",
112+
"generations_core:green_couch_corner_right",
111113
"generations_core:light_blue_couch_corner_right",
114+
"generations_core:magenta_couch_corner_right",
115+
"generations_core:brown_couch_corner_right",
112116
"generations_core:red_couch_corner_right",
113-
"generations_core:black_couch_corner_right",
114-
"generations_core:light_gray_couch_corner_right",
115-
"generations_core:white_couch_corner_right",
116-
"generations_core:green_couch_corner_right",
117+
"generations_core:lime_couch_corner_right",
117118
"generations_core:pink_couch_corner_right",
118-
"generations_core:orange_couch_corner_right",
119-
"generations_core:gray_couch_corner_right",
120-
"generations_core:yellow_couch_corner_right",
121119
"generations_core:purple_couch_corner_right",
122-
"generations_core:brown_couch_corner_right",
123-
"generations_core:lime_couch_middle",
124-
"generations_core:cyan_couch_middle",
125-
"generations_core:magenta_couch_middle",
120+
"generations_core:cyan_couch_corner_right",
121+
"generations_core:black_couch_corner_right",
122+
"generations_core:white_couch_corner_right",
123+
"generations_core:gray_couch_middle",
124+
"generations_core:orange_couch_middle",
125+
"generations_core:light_gray_couch_middle",
126126
"generations_core:blue_couch_middle",
127+
"generations_core:yellow_couch_middle",
128+
"generations_core:green_couch_middle",
127129
"generations_core:light_blue_couch_middle",
130+
"generations_core:magenta_couch_middle",
131+
"generations_core:brown_couch_middle",
128132
"generations_core:red_couch_middle",
129-
"generations_core:black_couch_middle",
130-
"generations_core:light_gray_couch_middle",
131-
"generations_core:white_couch_middle",
132-
"generations_core:green_couch_middle",
133+
"generations_core:lime_couch_middle",
133134
"generations_core:pink_couch_middle",
134-
"generations_core:orange_couch_middle",
135-
"generations_core:gray_couch_middle",
136-
"generations_core:yellow_couch_middle",
137135
"generations_core:purple_couch_middle",
138-
"generations_core:brown_couch_middle",
139-
"generations_core:lime_couch_ottoman",
140-
"generations_core:cyan_couch_ottoman",
141-
"generations_core:magenta_couch_ottoman",
136+
"generations_core:cyan_couch_middle",
137+
"generations_core:black_couch_middle",
138+
"generations_core:white_couch_middle",
139+
"generations_core:gray_couch_ottoman",
140+
"generations_core:orange_couch_ottoman",
141+
"generations_core:light_gray_couch_ottoman",
142142
"generations_core:blue_couch_ottoman",
143+
"generations_core:yellow_couch_ottoman",
144+
"generations_core:green_couch_ottoman",
143145
"generations_core:light_blue_couch_ottoman",
146+
"generations_core:magenta_couch_ottoman",
147+
"generations_core:brown_couch_ottoman",
144148
"generations_core:red_couch_ottoman",
145-
"generations_core:black_couch_ottoman",
146-
"generations_core:light_gray_couch_ottoman",
147-
"generations_core:white_couch_ottoman",
148-
"generations_core:green_couch_ottoman",
149+
"generations_core:lime_couch_ottoman",
149150
"generations_core:pink_couch_ottoman",
150-
"generations_core:orange_couch_ottoman",
151-
"generations_core:gray_couch_ottoman",
152-
"generations_core:yellow_couch_ottoman",
153151
"generations_core:purple_couch_ottoman",
154-
"generations_core:brown_couch_ottoman"
152+
"generations_core:cyan_couch_ottoman",
153+
"generations_core:black_couch_ottoman",
154+
"generations_core:white_couch_ottoman"
155155
]
156156
}

‎common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -804,38 +804,38 @@
804804
"generations_core:pink_elevator",
805805
"generations_core:desk",
806806
"generations_core:fridge",
807-
"generations_core:lime_street_lamp",
808-
"generations_core:cyan_street_lamp",
809-
"generations_core:magenta_street_lamp",
807+
"generations_core:gray_street_lamp",
808+
"generations_core:orange_street_lamp",
809+
"generations_core:light_gray_street_lamp",
810810
"generations_core:blue_street_lamp",
811+
"generations_core:yellow_street_lamp",
812+
"generations_core:green_street_lamp",
811813
"generations_core:light_blue_street_lamp",
814+
"generations_core:magenta_street_lamp",
815+
"generations_core:brown_street_lamp",
812816
"generations_core:red_street_lamp",
813-
"generations_core:black_street_lamp",
814-
"generations_core:light_gray_street_lamp",
815-
"generations_core:white_street_lamp",
816-
"generations_core:green_street_lamp",
817+
"generations_core:lime_street_lamp",
817818
"generations_core:pink_street_lamp",
818-
"generations_core:orange_street_lamp",
819-
"generations_core:gray_street_lamp",
820-
"generations_core:yellow_street_lamp",
821819
"generations_core:purple_street_lamp",
822-
"generations_core:brown_street_lamp",
823-
"generations_core:lime_pc",
824-
"generations_core:cyan_pc",
825-
"generations_core:magenta_pc",
820+
"generations_core:cyan_street_lamp",
821+
"generations_core:black_street_lamp",
822+
"generations_core:white_street_lamp",
823+
"generations_core:gray_pc",
824+
"generations_core:orange_pc",
825+
"generations_core:light_gray_pc",
826826
"generations_core:blue_pc",
827+
"generations_core:yellow_pc",
828+
"generations_core:green_pc",
827829
"generations_core:light_blue_pc",
830+
"generations_core:magenta_pc",
831+
"generations_core:brown_pc",
828832
"generations_core:red_pc",
829-
"generations_core:black_pc",
830-
"generations_core:light_gray_pc",
831-
"generations_core:white_pc",
832-
"generations_core:green_pc",
833+
"generations_core:lime_pc",
833834
"generations_core:pink_pc",
834-
"generations_core:orange_pc",
835-
"generations_core:gray_pc",
836-
"generations_core:yellow_pc",
837835
"generations_core:purple_pc",
838-
"generations_core:brown_pc",
836+
"generations_core:cyan_pc",
837+
"generations_core:black_pc",
838+
"generations_core:white_pc",
839839
"generations_core:empty_ball_display",
840840
"generations_core:poke_ball_display",
841841
"generations_core:great_ball_display",

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ object GenerationsItems {
754754

755755
@JvmField val TEAL_MASK = registerHeldItem("teal_mask") { properties -> createFormChangingItem(properties, "ogerpon_mask", "teal") }
756756
@JvmField val WELLSPRING_MASK = registerHeldItem("wellspring_mask") { properties -> createFormChangingItem(properties, "ogerpon_mask", "wellspring") }
757-
@JvmField val HEARTFLAME_MASK = registerHeldItem("heartflame_mask") { properties -> createFormChangingItem(properties, "ogerpon_mask", "heartflame") }
757+
@JvmField val HEARTHFLAME_MASK = registerHeldItem("hearthflame_mask") { properties -> createFormChangingItem(properties, "ogerpon_mask", "hearthflame") }
758758
@JvmField val CORNERSTONE_MASK = registerHeldItem("cornerstone_mask") { properties -> createFormChangingItem(properties, "ogerpon_mask", "cornerstone") }
759759

760760
/**

common/src/main/resources/assets/generations_core/textures/item/held_items/heartflame_mask.png renamed to common/src/main/resources/assets/generations_core/textures/item/held_items/hearthflame_mask.png

File renamed without changes.

‎common/src/main/resources/data/generations_core/species_features/ogerpon_mask.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"choices": [
66
"teal",
77
"wellspring",
8-
"heartflame",
8+
"hearthflame",
99
"cornerstone"
1010
],
1111
"isAspect": true,

‎forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/items/ItemDatagen.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package generations.gg.generations.core.generationscore.forge.datagen.generators.items;
22

3-
import dev.architectury.registry.registries.RegistrySupplier;
43
import generations.gg.generations.core.generationscore.common.GenerationsCore;
5-
import generations.gg.generations.core.generationscore.common.world.GenerationsPokeBalls;
64
import generations.gg.generations.core.generationscore.common.world.item.*;
75
import generations.gg.generations.core.generationscore.common.world.item.curry.CurryType;
86
import generations.gg.generations.core.generationscore.common.world.level.block.*;
@@ -18,7 +16,6 @@
1816

1917
import java.util.Objects;
2018
import java.util.function.BiConsumer;
21-
import java.util.function.Consumer;
2219

2320
public class ItemDatagen extends ItemModelProvider {
2421

@@ -260,7 +257,7 @@ protected void registerModels() {
260257
createHeldItem(GenerationsItems.FAIRY_FEATHER.get());
261258

262259
createHeldItem(GenerationsItems.TEAL_MASK.get());
263-
createHeldItem(GenerationsItems.HEARTFLAME_MASK.get());
260+
createHeldItem(GenerationsItems.HEARTHFLAME_MASK.get());
264261
createHeldItem(GenerationsItems.WELLSPRING_MASK.get());
265262
createHeldItem(GenerationsItems.CORNERSTONE_MASK.get());
266263

0 commit comments

Comments
 (0)