Skip to content

Commit 6e3cf48

Browse files
Inf1nltyInf1nlty
committed
Fix curse render
1 parent faacdb0 commit 6e3cf48

20 files changed

Lines changed: 156 additions & 139 deletions

File tree

‎src/generated/resources/.cache/20f5c98dc0fe2d7a53fc98de5b4a9405da0eaab5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.21.1 2025-08-14T14:36:59.4074154 Biome Modifier Registries: ifw
1+
// 1.21.1 2025-09-01T17:11:19.0674146 Biome Modifier Registries: ifw
22
49f499fed8f8f7c797c3124710dff297dfe03998 data/ifw/neoforge/biome_modifier/ifw_add_deepslate_spawns.json
33
d3ce835cbe615798480c31acf5200397159fd125 data/ifw/neoforge/biome_modifier/ifw_add_deep_ores.json
44
5073fcccdb1b63e1972de71daef79b5d55a8ea59 data/ifw/neoforge/biome_modifier/ifw_add_forest_spawns.json
@@ -8,7 +8,7 @@ d3ce835cbe615798480c31acf5200397159fd125 data/ifw/neoforge/biome_modifier/ifw_ad
88
956d62903ec65e1961be03c957e150f715e717ee data/ifw/neoforge/biome_modifier/ifw_add_shallow_cave_spawns.json
99
f204760a74278b1d6101ab42521b8ca6074d5010 data/ifw/neoforge/biome_modifier/ifw_add_silverfish_blocks.json
1010
4ce978fd516237cda2e397b6021e110a6466b02e data/ifw/neoforge/biome_modifier/ifw_modify_spawns.json
11-
78e29f65210883c5baddabec772009c2be349d3e data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
11+
c3c517b6bb5c1a869ec2b8bb6a5895a4eda835c4 data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json
1212
d8062a9987536bc654ee223b0460fb6b8c465eb4 data/ifw/neoforge/biome_modifier/ifw_remove_overworld_spawns.json
1313
e1ad57aee768b341f1e08d868724c970c8f70c9d data/ifw/worldgen/configured_feature/ore_adamantium.json
1414
4f66ef802aa37f492bcc727cffaa821b4411a8fa data/ifw/worldgen/configured_feature/ore_mithril.json

‎src/generated/resources/.cache/9b202840df605b173b28438db133c4554f0ba728‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.21.1 2025-08-14T14:36:59.4094454 Languages: zh_cn for mod: ifw
2-
e58157dc84dda3ac65215ad77f1e0d6f1b359a3d assets/ifw/lang/zh_cn.json
1+
// 1.21.1 2025-09-01T17:14:29.4954278 Languages: zh_cn for mod: ifw
2+
c8d2b2d2f99ec10d1172d25cda4abccf8404ddb4 assets/ifw/lang/zh_cn.json

‎src/generated/resources/.cache/e4beba3a8dbdb37f546ef7961fb2493d4be02251‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.21.1 2025-08-14T14:36:59.4112416 Languages: en_us for mod: ifw
2-
f633d82e520e0fb6fa8f214487a3b3d42bb31bcc assets/ifw/lang/en_us.json
1+
// 1.21.1 2025-09-01T17:14:29.4974274 Languages: en_us for mod: ifw
2+
dbe6cdd1a34a8fb53f8e2b6043dfd8e1c385417c assets/ifw/lang/en_us.json

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

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -215,42 +215,43 @@
215215
"commands.status.melee_damage": "Melee Damage: %s",
216216
"container.enchant.experience.requirement": "Experience Requirement: %s",
217217
"curse.ifw.cannot_drink": "Can't Drink",
218-
"curse.ifw.cannot_drink.desc": "You find yourself unable to drink liquids",
218+
"curse.ifw.cannot_drink.desc": "§cYou find yourself unable to drink liquids",
219219
"curse.ifw.cannot_eat_meats": "Can't Eat Animals",
220-
"curse.ifw.cannot_eat_meats.desc": "You find yourself unable to eat meat or animal products",
220+
"curse.ifw.cannot_eat_meats.desc": "§cYou find yourself unable to eat meat or animal products",
221221
"curse.ifw.cannot_eat_plants": "Can't Eat Plants",
222-
"curse.ifw.cannot_eat_plants.desc": "You find yourself unable to eat seeds and other plant foods",
222+
"curse.ifw.cannot_eat_plants.desc": "§cYou find yourself unable to eat seeds and other plant foods",
223223
"curse.ifw.cannot_hold_breath": "Can't Hold Breath",
224-
"curse.ifw.cannot_hold_breath.desc": "You seem unable to hold your breath for very long",
224+
"curse.ifw.cannot_hold_breath.desc": "§cYou seem unable to hold your breath for very long",
225225
"curse.ifw.cannot_open_chests": "Can't Open Chests",
226-
"curse.ifw.cannot_open_chests.desc": "You find yourself unable to open chests",
226+
"curse.ifw.cannot_open_chests.desc": "§cYou find yourself unable to open chests",
227227
"curse.ifw.cannot_run": "Can't Run",
228-
"curse.ifw.cannot_run.desc": "You find that your legs don't obey when you try to run",
228+
"curse.ifw.cannot_run.desc": "§cYou find that your legs don't obey when you try to run",
229229
"curse.ifw.cannot_sleep": "Can't Sleep",
230-
"curse.ifw.cannot_sleep.desc": "You find yourself unable to sleep at night",
230+
"curse.ifw.cannot_sleep.desc": "§cYou find yourself unable to sleep at night",
231231
"curse.ifw.cannot_wear_armor": "Can't Wear Armor",
232-
"curse.ifw.cannot_wear_armor.desc": "You find yourself unable to wear armor of any sort",
232+
"curse.ifw.cannot_wear_armor.desc": "§cYou find yourself unable to wear armor of any sort",
233233
"curse.ifw.clumsiness": "Clumsiness",
234-
"curse.ifw.clumsiness.desc": "Everything feels clumsy in your hands and crafting is difficult",
234+
"curse.ifw.clumsiness.desc": "§cEverything feels clumsy in your hands and crafting is difficult",
235235
"curse.ifw.endermen_aggro": "Endermen Enemy",
236-
"curse.ifw.endermen_aggro.desc": "Endermen seem to have taken a strong disliking to you",
236+
"curse.ifw.endermen_aggro.desc": "§cEndermen seem to have taken a strong disliking to you",
237237
"curse.ifw.entanglement": "Entanglement",
238-
"curse.ifw.entanglement.desc": "You find yourself having great difficulty moving through vines and other plants",
238+
"curse.ifw.entanglement.desc": "§cYou find yourself having great difficulty moving through vines and other plants",
239239
"curse.ifw.equipment_decays_faster": "Equipment Decay",
240-
"curse.ifw.equipment_decays_faster.desc": "Your equipment is wearing out faster than usual",
240+
"curse.ifw.equipment_decays_faster.desc": "§cYour equipment is wearing out faster than usual",
241241
"curse.ifw.fear_of_creepers": "Fear of Creepers",
242-
"curse.ifw.fear_of_creepers.desc": "You've become fearful of creepers and have difficulty striking them in melee combat",
242+
"curse.ifw.fear_of_creepers.desc": "§cYou've become fearful of creepers and have difficulty striking them in melee combat",
243243
"curse.ifw.fear_of_spiders": "Fear of Spiders",
244-
"curse.ifw.fear_of_spiders.desc": "You've become fearful of spiders and have difficulty striking them in melee combat",
244+
"curse.ifw.fear_of_spiders.desc": "§cYou've become fearful of spiders and have difficulty striking them in melee combat",
245245
"curse.ifw.fear_of_undead": "Fear of Undead",
246-
"curse.ifw.fear_of_undead.desc": "You've become fearful of undead and have difficulty striking them in melee combat",
246+
"curse.ifw.fear_of_undead.desc": "§cYou've become fearful of undead and have difficulty striking them in melee combat",
247247
"curse.ifw.fear_of_wolves": "Fear of Wolves",
248-
"curse.ifw.fear_of_wolves.desc": "You've become fearful of wolves and have difficulty striking them in melee combat",
248+
"curse.ifw.fear_of_wolves.desc": "§cYou've become fearful of wolves and have difficulty striking them in melee combat",
249249
"curse.ifw.none": "Empty",
250-
"curse.ifw.none.desc": "You are not cursed",
251-
"curse.ifw.unknown.desc": "You have been cursed, but its nature is currently unknown.",
250+
"curse.ifw.none.desc": "§cYou are not cursed",
251+
"curse.ifw.unknown.desc": "§cUnknown effect",
252+
"effect.ifw.curse": "Curse",
252253
"effect.ifw.insulin_resistance": "Insulin Resistance",
253-
"effect.ifw.unkonwn.curse": "Unknown Curse",
254+
"effect.ifw.unknown.curse": "Unknown Curse",
254255
"enchantment.ifw.speed": "Speed",
255256
"entity.ifw.ancient_bone_lord": "Ancient Bone Lord",
256257
"entity.ifw.black_widow_spider": "Black Widow Spider",

‎src/generated/resources/assets/ifw/lang/zh_cn.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -215,42 +215,43 @@
215215
"commands.status.melee_damage": "近战伤害: %s",
216216
"container.enchant.experience.requirement": "经验需要: %s",
217217
"curse.ifw.cannot_drink": "汤煲厌食",
218-
"curse.ifw.cannot_drink.desc": "你发现你不能饮用任何汤、煲类食物",
218+
"curse.ifw.cannot_drink.desc": "§c你发现你不能饮用任何汤、煲类食物",
219219
"curse.ifw.cannot_eat_meats": "肉奶厌食",
220-
"curse.ifw.cannot_eat_meats.desc": "你发现你不能食用任何动物制品",
220+
"curse.ifw.cannot_eat_meats.desc": "§c你发现你不能食用任何动物制品",
221221
"curse.ifw.cannot_eat_plants": "蔬果厌食",
222-
"curse.ifw.cannot_eat_plants.desc": "你发现你不能食用任何植物制品",
222+
"curse.ifw.cannot_eat_plants.desc": "§c你发现你不能食用任何植物制品",
223223
"curse.ifw.cannot_hold_breath": "呼吸困难",
224-
"curse.ifw.cannot_hold_breath.desc": "你发现你不能屏息很长时间",
224+
"curse.ifw.cannot_hold_breath.desc": "§c你发现你不能屏息很长时间",
225225
"curse.ifw.cannot_open_chests": "柜子动了",
226-
"curse.ifw.cannot_open_chests.desc": "你发现你无法打开箱子（我柜子怎么动了）",
226+
"curse.ifw.cannot_open_chests.desc": "§c你发现你无法打开箱子（我柜子怎么动了）",
227227
"curse.ifw.cannot_run": "腿脚僵硬",
228-
"curse.ifw.cannot_run.desc": "你发现你不能疾跑",
228+
"curse.ifw.cannot_run.desc": "§c你发现你不能疾跑",
229229
"curse.ifw.cannot_sleep": "失眠症",
230-
"curse.ifw.cannot_sleep.desc": "你发现你在晚上无法入睡",
230+
"curse.ifw.cannot_sleep.desc": "§c你发现你在晚上无法入睡",
231231
"curse.ifw.cannot_wear_armor": "盔甲排斥",
232-
"curse.ifw.cannot_wear_armor.desc": "你发现你不能穿着盔甲",
232+
"curse.ifw.cannot_wear_armor.desc": "§c你发现你不能穿着盔甲",
233233
"curse.ifw.clumsiness": "智力下降",
234-
"curse.ifw.clumsiness.desc": "你发现制作物品变得十分困难",
234+
"curse.ifw.clumsiness.desc": "§c你发现制作物品变得十分困难",
235235
"curse.ifw.endermen_aggro": "末影仇恨",
236-
"curse.ifw.endermen_aggro.desc": "你发现末影人总是对你无缘无故地发起攻击",
236+
"curse.ifw.endermen_aggro.desc": "§c你发现末影人总是对你无缘无故地发起攻击",
237237
"curse.ifw.entanglement": "植物缠绕",
238-
"curse.ifw.entanglement.desc": "你发现你很难穿越草、藤蔓等植物",
238+
"curse.ifw.entanglement.desc": "§c你发现你很难穿越草、藤蔓等植物",
239239
"curse.ifw.equipment_decays_faster": "腐蚀性皮肤",
240-
"curse.ifw.equipment_decays_faster.desc": "你发现你的装备、武器与工具的耐久度下降得更快",
240+
"curse.ifw.equipment_decays_faster.desc": "§c你发现你的装备、武器与工具的耐久度下降得更快",
241241
"curse.ifw.fear_of_creepers": "苦力怕恐惧",
242-
"curse.ifw.fear_of_creepers.desc": "你发现你难以对苦力怕发起有效攻击",
242+
"curse.ifw.fear_of_creepers.desc": "§c你发现你难以对苦力怕发起有效攻击",
243243
"curse.ifw.fear_of_spiders": "蜘蛛恐惧",
244-
"curse.ifw.fear_of_spiders.desc": "你发现你难以对蜘蛛发起有效攻击",
244+
"curse.ifw.fear_of_spiders.desc": "§c你发现你难以对蜘蛛发起有效攻击",
245245
"curse.ifw.fear_of_undead": "亡灵生物恐惧",
246-
"curse.ifw.fear_of_undead.desc": "你发现你难以对亡灵生物发起有效攻击",
246+
"curse.ifw.fear_of_undead.desc": "§c你发现你难以对亡灵生物发起有效攻击",
247247
"curse.ifw.fear_of_wolves": "恶狼恐惧",
248-
"curse.ifw.fear_of_wolves.desc": "你发现你难以对狼发起有效攻击",
248+
"curse.ifw.fear_of_wolves.desc": "§c你发现你难以对狼发起有效攻击",
249249
"curse.ifw.none": "无诅咒",
250-
"curse.ifw.none.desc": "你没有被诅咒",
251-
"curse.ifw.unknown.desc": "你被诅咒了，但诅咒效果未知.",
250+
"curse.ifw.none.desc": "§c你没有被诅咒",
251+
"curse.ifw.unknown.desc": "§c未知效果",
252+
"effect.ifw.curse": "诅咒",
252253
"effect.ifw.insulin_resistance": "胰岛素抵抗",
253-
"effect.ifw.unkonwn.curse": "未知诅咒",
254+
"effect.ifw.unknown.curse": "未知诅咒",
254255
"enchantment.ifw.speed": "速度",
255256
"entity.ifw.ancient_bone_lord": "远古亡骸领主",
256257
"entity.ifw.black_widow_spider": "黑寡妇蜘蛛",

‎src/generated/resources/data/ifw/neoforge/biome_modifier/ifw_remove_overworld_features.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"minecraft:patch_melon_sparse"
88
],
99
"steps": [
10-
"vegetal_decoration",
11-
"lakes"
10+
"lakes",
11+
"vegetal_decoration"
1212
]
1313
}

‎src/main/java/huix/infinity/common/client/resources/PersistentEffectTextureManager.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
66
import net.minecraft.client.renderer.texture.TextureManager;
77
import net.minecraft.client.resources.TextureAtlasHolder;
8-
import net.minecraft.core.Holder;
98
import net.minecraft.resources.ResourceLocation;
109
import net.neoforged.api.distmarker.Dist;
1110
import net.neoforged.api.distmarker.OnlyIn;
@@ -14,7 +13,9 @@
1413
public class PersistentEffectTextureManager extends TextureAtlasHolder {
1514

1615
public PersistentEffectTextureManager(TextureManager textureManager) {
17-
super(textureManager, IFWConstants.LOCATION_P_EFFECT_TEXTURE_ATLAS, ResourceLocation.fromNamespaceAndPath(InfinityWay.MOD_ID, "atlases/persistent_effects"));
16+
super(textureManager,
17+
IFWConstants.PERSISTENT_EFFECTS_ATLAS_LOCATION,
18+
IFWConstants.PERSISTENT_EFFECTS_ATLAS_ID);
1819
}
1920

2021
public TextureAtlasSprite getCurse() {
@@ -25,4 +26,4 @@ public TextureAtlasSprite getInsulinResistance() {
2526
return this.getSprite(ResourceLocation.fromNamespaceAndPath(InfinityWay.MOD_ID, "gui/sprites/insulin_resistance"));
2627
}
2728

28-
}
29+
}

‎src/main/java/huix/infinity/common/world/curse/CurseType.java‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,31 @@
88
import java.util.stream.Collectors;
99

1010
public enum CurseType implements IExtensibleEnum {
11-
12-
none("none"),
13-
equipment_decays_faster("equipment_decays_faster"),
14-
cannot_hold_breath("cannot_hold_breath"),
15-
cannot_run("cannot_run"),
16-
cannot_eat_meats("cannot_eat_meats"),
17-
cannot_eat_plants("cannot_eat_plants"),
18-
cannot_drink("cannot_drink"),
19-
endermen_aggro("endermen_aggro"),
20-
clumsiness("equipment_decays_faster"),
21-
entanglement("equipment_decays_faster"),
22-
cannot_wear_armor("cannot_hold_breath"),
23-
cannot_open_chests("cannot_run"),
24-
cannot_sleep("cannot_eat_meats"),
25-
fear_of_spiders("cannot_eat_plants"),
26-
fear_of_wolves("cannot_drink"),
27-
fear_of_creepers("endermen_aggro"),
28-
fear_of_undead("equipment_decays_faster");
11+
none,
12+
equipment_decays_faster,
13+
cannot_hold_breath,
14+
cannot_run,
15+
cannot_eat_meats,
16+
cannot_eat_plants,
17+
cannot_drink,
18+
endermen_aggro,
19+
clumsiness,
20+
entanglement,
21+
cannot_wear_armor,
22+
cannot_open_chests,
23+
cannot_sleep,
24+
fear_of_spiders,
25+
fear_of_wolves,
26+
fear_of_creepers,
27+
fear_of_undead;
2928

3029
private static final Map<String, CurseType> ID_MAP = Arrays.stream(values()).collect(Collectors.toUnmodifiableMap(CurseType::name, (e) -> e));
3130

32-
private final String name;
33-
CurseType(String name) {
34-
this.name = name;
35-
}
36-
3731
public static CurseType byName(String id) {
3832
return ID_MAP.get(id);
3933
}
4034

41-
42-
4335
public static ExtensionInfo getExtensionInfo() {
4436
return ExtensionInfo.nonExtended(CurseType.class);
4537
}
46-
}
38+
}

‎src/main/java/huix/infinity/datagen/lang/IFWCNLang.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ public IFWCNLang(PackOutput output) {
1616
@Override
1717
protected void addTranslations() {
1818
//诅咒
19+
add("effect.ifw.curse", "诅咒");
1920
add("ifw.witch_curse.curse", "你已经被诅咒了！");
2021
add("ifw.witch_curse.discurse","诅咒消逝");
21-
add("effect.ifw.unkonwn.curse", "未知诅咒");
22+
add("effect.ifw.unknown.curse", "未知诅咒");
2223
add("curse.ifw.none", "无诅咒");
2324
add("curse.ifw.equipment_decays_faster", "腐蚀性皮肤");
2425
add("curse.ifw.cannot_hold_breath", "呼吸困难");
@@ -37,24 +38,24 @@ protected void addTranslations() {
3738
add("curse.ifw.fear_of_creepers", "苦力怕恐惧");
3839
add("curse.ifw.fear_of_undead", "亡灵生物恐惧");
3940
//诅咒描述
40-
add("curse.ifw.unknown.desc", "你被诅咒了，但诅咒效果未知.");
41-
add("curse.ifw.none.desc", "你没有被诅咒");
42-
add("curse.ifw.equipment_decays_faster.desc", "你发现你的装备、武器与工具的耐久度下降得更快");
43-
add("curse.ifw.cannot_hold_breath.desc", "你发现你不能屏息很长时间");
44-
add("curse.ifw.cannot_run.desc", "你发现你不能疾跑");
45-
add("curse.ifw.cannot_eat_meats.desc", "你发现你不能食用任何动物制品");
46-
add("curse.ifw.cannot_eat_plants.desc", "你发现你不能食用任何植物制品");
47-
add("curse.ifw.cannot_drink.desc", "你发现你不能饮用任何汤、煲类食物");
48-
add("curse.ifw.endermen_aggro.desc", "你发现末影人总是对你无缘无故地发起攻击");
49-
add("curse.ifw.clumsiness.desc", "你发现制作物品变得十分困难");
50-
add("curse.ifw.entanglement.desc", "你发现你很难穿越草、藤蔓等植物");
51-
add("curse.ifw.cannot_wear_armor.desc", "你发现你不能穿着盔甲");
52-
add("curse.ifw.cannot_open_chests.desc", "你发现你无法打开箱子（我柜子怎么动了）");
53-
add("curse.ifw.cannot_sleep.desc", "你发现你在晚上无法入睡");
54-
add("curse.ifw.fear_of_spiders.desc", "你发现你难以对蜘蛛发起有效攻击");
55-
add("curse.ifw.fear_of_wolves.desc", "你发现你难以对狼发起有效攻击");
56-
add("curse.ifw.fear_of_creepers.desc", "你发现你难以对苦力怕发起有效攻击");
57-
add("curse.ifw.fear_of_undead.desc", "你发现你难以对亡灵生物发起有效攻击");
41+
add("curse.ifw.unknown.desc", "§c未知效果");
42+
add("curse.ifw.none.desc", "§c你没有被诅咒");
43+
add("curse.ifw.equipment_decays_faster.desc", "§c你发现你的装备、武器与工具的耐久度下降得更快");
44+
add("curse.ifw.cannot_hold_breath.desc", "§c你发现你不能屏息很长时间");
45+
add("curse.ifw.cannot_run.desc", "§c你发现你不能疾跑");
46+
add("curse.ifw.cannot_eat_meats.desc", "§c你发现你不能食用任何动物制品");
47+
add("curse.ifw.cannot_eat_plants.desc", "§c你发现你不能食用任何植物制品");
48+
add("curse.ifw.cannot_drink.desc", "§c你发现你不能饮用任何汤、煲类食物");
49+
add("curse.ifw.endermen_aggro.desc", "§c你发现末影人总是对你无缘无故地发起攻击");
50+
add("curse.ifw.clumsiness.desc", "§c你发现制作物品变得十分困难");
51+
add("curse.ifw.entanglement.desc", "§c你发现你很难穿越草、藤蔓等植物");
52+
add("curse.ifw.cannot_wear_armor.desc", "§c你发现你不能穿着盔甲");
53+
add("curse.ifw.cannot_open_chests.desc", "§c你发现你无法打开箱子（我柜子怎么动了）");
54+
add("curse.ifw.cannot_sleep.desc", "§c你发现你在晚上无法入睡");
55+
add("curse.ifw.fear_of_spiders.desc", "§c你发现你难以对蜘蛛发起有效攻击");
56+
add("curse.ifw.fear_of_wolves.desc", "§c你发现你难以对狼发起有效攻击");
57+
add("curse.ifw.fear_of_creepers.desc", "§c你发现你难以对苦力怕发起有效攻击");
58+
add("curse.ifw.fear_of_undead.desc", "§c你发现你难以对亡灵生物发起有效攻击");
5859

5960
//效果
6061
add("effect.ifw.insulin_resistance", "胰岛素抵抗");

0 commit comments

Comments
 (0)