Skip to content

Commit 8ea920a

Browse files
[fix] Fix advancement trigger condition
[fix] Remove redundant stats [fix] Fix stats typo [fix] Add Advancement Background
1 parent 4264826 commit 8ea920a

File tree

8 files changed

+27
-49
lines changed

8 files changed

+27
-49
lines changed

src/generated/resources/assets/create_enchantment_industry/lang/en_ud.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"advancement.create_enchantment_industry.gone_with_the_foil.desc": "ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW ɐ ʎq pǝʇuɐɥɔuǝsıp ǝq ɯǝʇı pǝʇuɐɥɔuǝ uɐ ɥɔʇɐM",
2626
"advancement.create_enchantment_industry.great_publisher": "ɹǝɥsıןqnԀ ʇɐǝɹ⅁",
2727
"advancement.create_enchantment_industry.great_publisher.desc": "sǝɯıʇ 000'Ɩ sʇuıɹd ɹǝʇuıɹԀ",
28-
"advancement.create_enchantment_industry.grind_to_polish": "HSIꞀOԀ‾O⟘‾ᗡNIᴚ",
28+
"advancement.create_enchantment_industry.grind_to_polish": "ɥsıןoԀ o⟘ puıɹ",
2929
"advancement.create_enchantment_industry.grind_to_polish.desc": "ǝuo ɹǝʇʇǝq uǝʇʇob ǝʌ,I ¿ɹǝdɐdpuɐS",
3030
"advancement.create_enchantment_industry.lightning_catalysis": "sısʎןɐʇɐƆ buıuʇɥbıꞀ",
3131
"advancement.create_enchantment_industry.lightning_catalysis.desc": "ǝɔuǝıɹǝdxƎ ɹǝdnS uıɐʇqO",
@@ -176,11 +176,9 @@
176176
"item.create_enchantment_industry.super_enchanting_template": "ǝʇɐןdɯǝ⟘ buıʇuɐɥɔuƎ ɹǝdnS",
177177
"item.create_enchantment_industry.super_experience_nugget": "ǝɔuǝıɹǝdxƎ ɹǝdnS ɟo ʇǝbbnN",
178178
"itemGroup.create_enchantment_industry.base": "ʎɹʇsnpuI ʇuǝɯʇuɐɥɔuƎ :ǝʇɐǝɹƆ",
179-
"stat.create_enchantment_industry.enchant": "ǝbɐs∩ ɹǝʇuɐɥɔuƎ ǝzɐןᗺ",
180-
"stat.create_enchantment_industry.enchanting_template_applied": "ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW ʎq pǝɔnpoɹԀ ǝɔuǝıɹǝdxƎ",
181-
"stat.create_enchantment_industry.enchanting_template_enchanted": "ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW ʎq pǝɔnpoɹԀ ǝɔuǝıɹǝdxƎ",
182-
"stat.create_enchantment_industry.forge": "ǝbɐs∩ ɹǝbɹoℲ ǝzɐןᗺ",
183-
"stat.create_enchantment_industry.mechanical_grindstone_experience": "ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW ʎq pǝɔnpoɹԀ ǝɔuǝıɹǝdxƎ",
184-
"stat.create_enchantment_industry.print": "ǝbɐs∩ ɹǝʇuıɹԀ",
185-
"stat.create_enchantment_industry.super_enchant": ")ɹǝbɹoℲ ǝzɐןᗺ & ɹǝʇuɐɥɔuƎ ǝzɐןᗺ ǝpnןɔuı( ǝɯı⟘ ʇuɐɥɔuƎ ɹǝdnS"
179+
"stat.create_enchantment_industry.enchant": "pǝs∩ ɹǝʇuɐɥɔuƎ ǝzɐןᗺ",
180+
"stat.create_enchantment_industry.forge": "pǝs∩ ɹǝbɹoℲ ǝzɐןᗺ",
181+
"stat.create_enchantment_industry.mechanical_grindstone_experience": ")ǝuoʇspuıɹ⅁ ןɐɔıuɐɥɔǝW ʎq( pǝɔnpoɹԀ ǝɔuǝıɹǝdxƎ",
182+
"stat.create_enchantment_industry.print": "pǝs∩ ɹǝʇuıɹԀ",
183+
"stat.create_enchantment_industry.super_enchant": "ʇuɐɥɔuƎ-ɹǝdnS"
186184
}

src/generated/resources/assets/create_enchantment_industry/lang/en_us.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"advancement.create_enchantment_industry.gone_with_the_foil.desc": "Watch an enchanted item be disenchanted by a Mechanical Grindstone",
2626
"advancement.create_enchantment_industry.great_publisher": "Great Publisher",
2727
"advancement.create_enchantment_industry.great_publisher.desc": "Printer prints 1,000 times",
28-
"advancement.create_enchantment_industry.grind_to_polish": "GRIND_TO_POLISH",
28+
"advancement.create_enchantment_industry.grind_to_polish": "Grind To Polish",
2929
"advancement.create_enchantment_industry.grind_to_polish.desc": "Sandpaper? I've gotten better one",
3030
"advancement.create_enchantment_industry.lightning_catalysis": "Lightning Catalysis",
3131
"advancement.create_enchantment_industry.lightning_catalysis.desc": "Obtain Super Experience",
@@ -176,11 +176,9 @@
176176
"item.create_enchantment_industry.super_enchanting_template": "Super Enchanting Template",
177177
"item.create_enchantment_industry.super_experience_nugget": "Nugget of Super Experience",
178178
"itemGroup.create_enchantment_industry.base": "Create: Enchantment Industry",
179-
"stat.create_enchantment_industry.enchant": "Blaze Enchanter Usage",
180-
"stat.create_enchantment_industry.enchanting_template_applied": "Experience Produced by Mechanical Grindstone",
181-
"stat.create_enchantment_industry.enchanting_template_enchanted": "Experience Produced by Mechanical Grindstone",
182-
"stat.create_enchantment_industry.forge": "Blaze Forger Usage",
183-
"stat.create_enchantment_industry.mechanical_grindstone_experience": "Experience Produced by Mechanical Grindstone",
184-
"stat.create_enchantment_industry.print": "Printer Usage",
185-
"stat.create_enchantment_industry.super_enchant": "Super Enchant Time (include Blaze Enchanter & Blaze Forger)"
179+
"stat.create_enchantment_industry.enchant": "Blaze Enchanter Used",
180+
"stat.create_enchantment_industry.forge": "Blaze Forger Used",
181+
"stat.create_enchantment_industry.mechanical_grindstone_experience": "Experience Produced (by Mechanical Grindstone)",
182+
"stat.create_enchantment_industry.print": "Printer Used",
183+
"stat.create_enchantment_industry.super_enchant": "Super-Enchant"
186184
}

src/generated/resources/assets/create_enchantment_industry/lang/zh_cn.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"advancement.create_enchantment_industry.gone_with_the_foil.desc": "Watch an enchanted item be disenchanted by a Mechanical Grindstone",
2727
"advancement.create_enchantment_industry.great_publisher": "Great Publisher",
2828
"advancement.create_enchantment_industry.great_publisher.desc": "Printer prints 1,000 times",
29-
"advancement.create_enchantment_industry.grind_to_polish": "GRIND_TO_POLISH",
29+
"advancement.create_enchantment_industry.grind_to_polish": "Grind To Polish",
3030
"advancement.create_enchantment_industry.grind_to_polish.desc": "Sandpaper? I've gotten better one",
3131
"advancement.create_enchantment_industry.lightning_catalysis": "Lightning Catalysis",
3232
"advancement.create_enchantment_industry.lightning_catalysis.desc": "Obtain Super Experience",
@@ -177,11 +177,9 @@
177177
"item.create_enchantment_industry.super_enchanting_template": "超越附魔模板",
178178
"item.create_enchantment_industry.super_experience_nugget": "超越经验颗粒",
179179
"itemGroup.create_enchantment_industry.base": "机械动力:附魔工业",
180-
"stat.create_enchantment_industry.enchant": "Blaze Enchanter Usage",
181-
"stat.create_enchantment_industry.enchanting_template_applied": "Experience Produced by Mechanical Grindstone",
182-
"stat.create_enchantment_industry.enchanting_template_enchanted": "Experience Produced by Mechanical Grindstone",
183-
"stat.create_enchantment_industry.forge": "Blaze Forger Usage",
184-
"stat.create_enchantment_industry.mechanical_grindstone_experience": "Experience Produced by Mechanical Grindstone",
185-
"stat.create_enchantment_industry.print": "Printer Usage",
186-
"stat.create_enchantment_industry.super_enchant": "Super Enchant Time (include Blaze Enchanter & Blaze Forger)"
180+
"stat.create_enchantment_industry.enchant": "Blaze Enchanter Used",
181+
"stat.create_enchantment_industry.forge": "Blaze Forger Used",
182+
"stat.create_enchantment_industry.mechanical_grindstone_experience": "Experience Produced (by Mechanical Grindstone)",
183+
"stat.create_enchantment_industry.print": "Printer Used",
184+
"stat.create_enchantment_industry.super_enchant": "Super-Enchant"
187185
}

src/generated/resources/data/create_enchantment_industry/advancement/brand_registry.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
"parent": "create_enchantment_industry:copiable_mystery",
33
"criteria": {
44
"0": {
5-
"conditions": {
6-
"items": [
7-
{
8-
"items": "create_enchantment_industry:blaze_forger"
9-
}
10-
]
11-
},
12-
"trigger": "minecraft:inventory_changed"
5+
"trigger": "create_enchantment_industry:brand_registry"
136
}
147
},
158
"display": {

src/generated/resources/data/create_enchantment_industry/advancement/root.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"display": {
88
"announce_to_chat": false,
9-
"background": "create_enchantment_industry:textures/gui/advancements.png",
9+
"background": "create_enchantment_industry:textures/block/super_experience_block.png",
1010
"description": {
1111
"color": "#DBA213",
1212
"translate": "advancement.create_enchantment_industry.root.desc"

src/main/java/plus/dragons/createenchantmentindustry/common/registry/CEIStats.java

+5-13
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,23 @@
1111

1212
public class CEIStats {
1313
public static final RegistryEntry<ResourceLocation,ResourceLocation> GRINDSTONE_EXPERIENCE = create("mechanical_grindstone_experience")
14-
.lang("Experience Produced by Mechanical Grindstone")
15-
.register();
16-
17-
public static final RegistryEntry<ResourceLocation,ResourceLocation> TEMPLATE_ENCHANTED = create("enchanting_template_enchanted")
18-
.lang("Experience Produced by Mechanical Grindstone")
19-
.register();
20-
21-
public static final RegistryEntry<ResourceLocation,ResourceLocation> TEMPLATE_APPLIED = create("enchanting_template_applied")
22-
.lang("Experience Produced by Mechanical Grindstone")
14+
.lang("Experience Produced (by Mechanical Grindstone)")
2315
.register();
2416

2517
public static final RegistryEntry<ResourceLocation,ResourceLocation> SUPER_ENCHANT = create("super_enchant")
26-
.lang("Super Enchant Time (include Blaze Enchanter & Blaze Forger)")
18+
.lang("Super-Enchant")
2719
.register();
2820

2921
public static final RegistryEntry<ResourceLocation,ResourceLocation> PRINT = create("print")
30-
.lang("Printer Usage")
22+
.lang("Printer Used")
3123
.register();
3224

3325
public static final RegistryEntry<ResourceLocation,ResourceLocation> FORGE = create("forge")
34-
.lang("Blaze Forger Usage")
26+
.lang("Blaze Forger Used")
3527
.register();
3628

3729
public static final RegistryEntry<ResourceLocation,ResourceLocation> ENCHANT = create("enchant")
38-
.lang("Blaze Enchanter Usage")
30+
.lang("Blaze Enchanter Used")
3931
.register();
4032

4133
private static CustomStatBuilder<CDPRegistrate> create(String id){

src/main/java/plus/dragons/createenchantmentindustry/data/CEIAdvancements.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class CEIAdvancements implements DataProvider {
7070
.after(EXPERIENCED_ENGINEER)),
7171

7272
GRIND_TO_POLISH = create("grind_to_polish",b -> b.icon(AllItems.SAND_PAPER) // 磨砺成莹
73-
.title("GRIND_TO_POLISH")
73+
.title("Grind To Polish")
7474
.description("Sandpaper? I've gotten better one")
7575
.special(CDPAdvancement.TaskType.NOISY)
7676
.after(GONE_WITH_THE_FOIL)),
@@ -192,7 +192,6 @@ public class CEIAdvancements implements DataProvider {
192192
BRAND_REGISTRY = create("brand_registry",b -> b.icon(CEIBlocks.BLAZE_FORGER) // 商标注册
193193
.title("Brand Registry")
194194
.description("Using the printer to name an item")
195-
.whenIconCollected()
196195
.after(COPIABLE_MYSTERY)),
197196

198197
GREAT_PUBLISHER = create("great_publisher",b -> b.icon(CEIBlocks.PRINTER) // 大出版家

src/main/java/plus/dragons/createenchantmentindustry/util/CEIAdvancement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected void addToAdvancementEntries() {
2626

2727
@Override
2828
protected @NotNull ResourceLocation getBackground() {
29-
return CEICommon.asResource("textures/gui/advancements.png");
29+
return CEICommon.asResource("textures/block/super_experience_block.png");
3030
}
3131

3232
@Override

0 commit comments

Comments
 (0)