Skip to content

Commit 32eed47

Browse files
CleverNucleusCleverNucleus
committed
Updated and Fixes
*Updated loom version *Updated fabric-api version +Updated README to include credits *Updated chinese localisation +Added config option to blacklist mobs from dropping relics *Fixed issue that caused relics to not properly affix to armour items and miscalculate their attributes. *Fixed issue that caused incompatibility with Wizards *Changed version semantics: previously was major.middle.minor versioning; now is major.middle.minor-mcversion. This change was made because we would have to increment based not just on changes but on how many versions of the game we would support - which was dumb.
1 parent e8b1eb4 commit 32eed47

File tree

9 files changed

+86
-79
lines changed

9 files changed

+86
-79
lines changed

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ All randomness and chance to drop is weighted and fully configurable.
4242

4343
#### Contributors/Credits
4444

45-
- [Bonsaiheldin](https://opengameart.org/content/shiny-rpg-potions-16x16)
46-
- [Joe Williamson](https://twitter.com/joecreates)
47-
- [MoneySoup008](https://github.com/MoneySoup008)
45+
- [Bonsaiheldin](https://opengameart.org/content/shiny-rpg-potions-16x16) | Texures
46+
- [Joe Williamson](https://twitter.com/joecreates) | Textures
47+
- [MoneySoup008](https://github.com/MoneySoup008) | Chinese translation
48+
- [ChromaPIE](https://github.com/ChromaPIE) | Chinese translation

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.modrinth.minotaur.dependencies.VersionDependency
22

33
plugins {
4-
id 'fabric-loom' version '1.0-SNAPSHOT'
4+
id 'fabric-loom' version '1.1-SNAPSHOT'
55
id 'maven-publish'
66
id "com.modrinth.minotaur" version "2.+"
77
}
@@ -114,7 +114,7 @@ modrinth {
114114
loaders = ["fabric"]
115115
dependencies = [
116116
new VersionDependency("XqLNMi9J", "required"),
117-
new VersionDependency("rb058LpZ", "required"),
117+
new VersionDependency("nGjEofGc", "required"),
118118
new VersionDependency("eg2fdUIU", "embedded")
119119
]
120120
}

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ org.gradle.jvmargs=-Xmx1G
22

33
minecraft_version=1.18.2
44
yarn_mappings=1.18.2+build.4
5-
loader_version=0.14.10
5+
loader_version=0.14.14
66

7-
mod_version = 3.1.6
7+
mod_version = 3.3.0+1.18.2
88
maven_group = com.github.clevernucleus
99
archives_base_name = relicex
1010

11-
fabric_version=0.66.0+1.18.2
12-
dataattributes_version=1.3.0
11+
fabric_version=0.75.1+1.18.2
12+
dataattributes_version=1.3.2
1313
opc_version=0.5.2
1414
cardinal_components_version=4.2.0
1515
placeholder_api=1.1.3+1.17.1
16-
playerex_version=3.4.0
16+
playerex_version=3.4.2
1717
arl_version=0.1.3
1818
trinkets_version=3.3.1
1919
cloth_config_version=6.3.81
20-
modmenu_version=3.2.4
20+
modmenu_version=3.2.5

‎src/main/java/com/github/clevernucleus/relicex/config/RelicExConfig.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.github.clevernucleus.relicex.config;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import com.github.clevernucleus.relicex.RelicEx;
47

58
import me.shedaniel.autoconfig.ConfigData;
@@ -57,4 +60,7 @@ public final class RelicExConfig implements ConfigData {
5760
@ConfigEntry.BoundedDiscrete(min = 0, max = 100)
5861
@ConfigEntry.Gui.Tooltip
5962
public int mobDropIsTomeChance = 10;
63+
64+
@ConfigEntry.Gui.Tooltip
65+
public List<String> mobDropBlacklist = new ArrayList<String>();
6066
}

‎src/main/java/com/github/clevernucleus/relicex/mixin/ArmorItemMixin.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ abstract class ArmorItemMixin extends Item implements ItemHelper {
3232
@Final
3333
protected EquipmentSlot slot;
3434

35-
@Shadow
36-
@Final
37-
private Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
38-
3935
private ArmorItemMixin(Settings settings) { super(settings); }
4036

4137
@Override
@@ -51,9 +47,10 @@ public void appendTooltip(ItemStack stack, World world, List<Text> tooltip, Tool
5147
public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(ItemStack stack, EquipmentSlot slot) {
5248
NbtCompound tag = stack.getOrCreateNbt();
5349
Multimap<EntityAttribute, EntityAttributeModifier> modifiers = ArrayListMultimap.create();
54-
EntityAttributeCollection.readFromNbt(tag, this.slot.getName(), modifiers, this.attributeModifiers);
50+
Multimap<EntityAttribute, EntityAttributeModifier> fallbacks = super.getAttributeModifiers(stack, slot);
51+
EntityAttributeCollection.readFromNbt(tag, this.slot.getName(), modifiers, fallbacks);
5552

56-
return slot == this.slot ? (modifiers.isEmpty() ? this.attributeModifiers : modifiers) : super.getAttributeModifiers(stack, slot);
53+
return slot == this.slot ? (modifiers.isEmpty() ? fallbacks : modifiers) : fallbacks;
5754
}
5855

5956
@Override

‎src/main/java/com/github/clevernucleus/relicex/mixin/LivingEntityMixin.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.github.clevernucleus.relicex.RelicEx;
1313
import com.github.clevernucleus.relicex.config.RelicExConfig;
1414

15+
import net.minecraft.entity.EntityType;
1516
import net.minecraft.entity.LivingEntity;
1617
import net.minecraft.entity.attribute.EntityAttributes;
1718
import net.minecraft.entity.damage.DamageSource;
@@ -26,9 +27,9 @@ abstract class LivingEntityMixin {
2627
@Inject(method = "dropLoot", at = @At("TAIL"))
2728
private void relicex_dropLoot(DamageSource source, boolean causedByPlayer, CallbackInfo ci) {
2829
LivingEntity livingEntity = (LivingEntity)(Object)this;
29-
30-
if(!(livingEntity instanceof Monster)) return;
3130
RelicExConfig config = RelicEx.config();
31+
32+
if(!(livingEntity instanceof Monster) || config.mobDropBlacklist.contains(EntityType.getId(livingEntity.getType()).toString())) return;
3233
Random random = new Random();
3334

3435
if(config.dropsOnlyFromPlayerKills && !causedByPlayer) return;

‎src/main/resources/assets/relicex/lang/en_us.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
"text.autoconfig.relicex.option.mobDropIsGreaterOrbChance.@Tooltip": "The chance for a RelicEx mob drop to be a Greater Orb of Regret.",
2727
"text.autoconfig.relicex.option.mobDropIsTomeChance": "Mob Drop is Tome",
2828
"text.autoconfig.relicex.option.mobDropIsTomeChance.@Tooltip": "The chance for a RelicEx mob drop to be a Tome.",
29+
"text.autoconfig.relicex.option.mobDropBlacklist": "Mob Drop Blacklist",
30+
"text.autoconfig.relicex.option.mobDropBlacklist.@Tooltip": "Entity types in this list will not drop relics/health potions.",
2931
"item.relicex.small_health_potion": "Small Health Potion",
3032
"item.relicex.medium_health_potion": "Medium Health Potion",
3133
"item.relicex.large_health_potion": "Large Health Potion",

‎src/main/resources/assets/relicex/lang/zh_cn.json‎

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,58 @@
11
{
2-
"text.autoconfig.relicex.title": "RelicEx Config Options",
3-
"text.autoconfig.relicex.option.chestsHaveLoot": "宝箱生成圣物物品",
4-
"text.autoconfig.relicex.option.chestsHaveLoot.@Tooltip": "若启用, 将在宝箱中生成圣物道具",
5-
"text.autoconfig.relicex.option.chestsHaveRelicChance": "宝箱生成遗物的概率",
6-
"text.autoconfig.relicex.option.chestsHaveRelicChance.@Tooltip": "将会有多少概率在宝箱中生成圣物战利品",
7-
"text.autoconfig.relicex.option.chestsHaveLesserOrbChance": "宝箱生成小遗物之球的概率",
8-
"text.autoconfig.relicex.option.chestsHaveLesserOrbChance.@Tooltip": "将会有多少概率在宝箱中生成小遗物之球",
9-
"text.autoconfig.relicex.option.chestsHaveGreaterOrbChance": "宝箱生成大遗物之球的概率",
10-
"text.autoconfig.relicex.option.chestsHaveGreaterOrbChance.@Tooltip": "将会有多少概率在宝箱中生成大遗物之球",
11-
"text.autoconfig.relicex.option.chestsHaveTomeChance": "宝箱生成巨著的概率",
12-
"text.autoconfig.relicex.option.chestsHaveTomeChance.@Tooltip": "将会有多少概率在宝箱中生成巨著",
13-
"text.autoconfig.relicex.option.dragonDropsStone": "龙血石",
14-
"text.autoconfig.relicex.option.dragonDropsStone.@Tooltip": "若启用, 末影龙会在死亡时掉落龙血石",
15-
"text.autoconfig.relicex.option.mobsDropLootChance": "怪物掉落概率",
16-
"text.autoconfig.relicex.option.mobsDropLootChance.@Tooltip": "怪物掉落圣物战利品的概率",
17-
"text.autoconfig.relicex.option.dropsOnlyFromPlayerKills": "仅玩家击杀",
18-
"text.autoconfig.relicex.option.dropsOnlyFromPlayerKills.@Tooltip": "如果启用, 怪物则仅会在玩家击杀所造成的死亡之前提下掉落圣物战利品",
19-
"text.autoconfig.relicex.option.mobDropIsRelicChance": "模组专属的强化怪物(血条超越原版怪物, 但外貌与原版怪物无异)的掉落概率",
20-
"text.autoconfig.relicex.option.mobDropIsRelicChance.@Tooltip": "将会有多少概率让强化怪物掉落圣物战利品",
21-
"text.autoconfig.relicex.option.mobDropIsPotionChance": "生命恢复药掉率",
22-
"text.autoconfig.relicex.option.mobDropIsPotionChance.@Tooltip": "将会有多少概率在击杀怪物后掉落生命恢复药(生命回复药并不是药剂, 而是一个瞬间拾取瞬间使用的道具, 有专属音效)",
23-
"text.autoconfig.relicex.option.mobDropIsLesserOrbChance": "小遗物之球掉落概率(仅模组专属强化怪掉落)",
24-
"text.autoconfig.relicex.option.mobDropIsLesserOrbChance.@Tooltip": "强化怪物掉落小遗物之球的概率",
25-
"text.autoconfig.relicex.option.mobDropIsGreaterOrbChance": "大遗物之球掉落概率(同小遗物之球)",
26-
"text.autoconfig.relicex.option.mobDropIsGreaterOrbChance.@Tooltip": "强化怪物掉落大遗物之球的概率",
27-
"text.autoconfig.relicex.option.mobDropIsTomeChance": "巨著掉率(同大小球)",
28-
"text.autoconfig.relicex.option.mobDropIsTomeChance.@Tooltip": "强化怪物掉落巨著的概率",
29-
"item.relicex.small_health_potion": "小型生命回复药",
30-
"item.relicex.medium_health_potion": "中型生命回复药",
31-
"item.relicex.large_health_potion": "大型生命回复药",
32-
"item.relicex.tome": "巨著",
33-
"item.relicex.dragon_stone": "龙血石",
34-
"item.relicex.lesser_orb_of_regret": "小遗物之球",
35-
"item.relicex.greater_orb_of_regret": "大遗物之球",
36-
"item.relicex.amulet_relic": "护身符",
37-
"item.relicex.ring_relic": "戒指",
38-
"item.relicex.head_relic": "头盔",
39-
"item.relicex.chest_relic": "胸甲",
40-
"item.relicex.relic_shard": "圣物碎片",
41-
"tooltip.relicex.worn": "穿戴时:",
42-
"tooltip.relicex.tome": "这本巨著蕴含着神秘力量(level:+1)",
43-
"tooltip.relicex.dragon_stone": "重置等级",
44-
"tooltip.relicex.greater_orb_of_regret": "重置所有等级点数",
45-
"tooltip.relicex.lesser_orb_of_regret": "重置1点等级点数",
46-
"message.relicex.dragon_stone": "准备好还俗了吗?(重复右键使用确认还俗!)",
47-
"rareness.relicex.common": "普通",
48-
"rareness.relicex.uncommon": "非同寻常",
49-
"rareness.relicex.rare": "稀有",
50-
"rareness.relicex.epic": "史诗",
51-
"rareness.relicex.mythical": "神秘",
52-
"rareness.relicex.legendary": "传说",
53-
"rareness.relicex.immortal": "不朽",
54-
"sound.relicex.level_refund": "重置等级音效",
55-
"sound.relicex.potion_use": "生命回复药音效"
2+
"text.autoconfig.relicex.title": "RelicEx配置选项",
3+
"text.autoconfig.relicex.option.chestsHaveLoot": "生成战利品",
4+
"text.autoconfig.relicex.option.chestsHaveLoot.@Tooltip": "设为“true”时，战利品箱中将生成RelicEx的物品。",
5+
"text.autoconfig.relicex.option.chestsHaveRelicChance": "古遗物生成几率",
6+
"text.autoconfig.relicex.option.chestsHaveRelicChance.@Tooltip": "战利品箱中生成古遗物的几率。",
7+
"text.autoconfig.relicex.option.chestsHaveLesserOrbChance": "小悔过宝珠生成几率",
8+
"text.autoconfig.relicex.option.chestsHaveLesserOrbChance.@Tooltip": "战利品箱中生成小悔过宝珠的几率。",
9+
"text.autoconfig.relicex.option.chestsHaveGreaterOrbChance": "大悔过宝珠生成几率",
10+
"text.autoconfig.relicex.option.chestsHaveGreaterOrbChance.@Tooltip": "战利品箱中生成大悔过宝珠的几率。",
11+
"text.autoconfig.relicex.option.chestsHaveTomeChance": "宝典生成几率",
12+
"text.autoconfig.relicex.option.chestsHaveTomeChance.@Tooltip": "战利品箱中生成宝典的几率。",
13+
"text.autoconfig.relicex.option.dragonDropsStone": "末影龙掉落龙石",
14+
"text.autoconfig.relicex.option.dragonDropsStone.@Tooltip": "设为“true”时，末影龙会在死亡后掉落龙石。",
15+
"text.autoconfig.relicex.option.mobsDropLootChance": "怪物掉落战利品几率",
16+
"text.autoconfig.relicex.option.mobsDropLootChance.@Tooltip": "怪物掉落RelicEx战利品的几率",
17+
"text.autoconfig.relicex.option.dropsOnlyFromPlayerKills": "仅玩家击杀",
18+
"text.autoconfig.relicex.option.dropsOnlyFromPlayerKills.@Tooltip": "设为“true”时，怪物仅会在被玩家击杀后掉落RelicEx战利品。",
19+
"text.autoconfig.relicex.option.mobDropIsRelicChance": "怪物掉落战利品几率",
20+
"text.autoconfig.relicex.option.mobDropIsRelicChance.@Tooltip": "由RelicEx强化的怪物掉落RelicEx战利品的几率",
21+
"text.autoconfig.relicex.option.mobDropIsPotionChance": "怪物掉落生命药水几率",
22+
"text.autoconfig.relicex.option.mobDropIsPotionChance.@Tooltip": "由RelicEx强化的怪物掉落生命药水的几率",
23+
"text.autoconfig.relicex.option.mobDropIsLesserOrbChance": "怪物掉落小悔过宝珠几率",
24+
"text.autoconfig.relicex.option.mobDropIsLesserOrbChance.@Tooltip": "由RelicEx强化的怪物掉落小悔过宝珠的几率",
25+
"text.autoconfig.relicex.option.mobDropIsGreaterOrbChance": "怪物掉落大悔过宝珠几率",
26+
"text.autoconfig.relicex.option.mobDropIsGreaterOrbChance.@Tooltip": "由RelicEx强化的怪物掉落大悔过宝珠的几率",
27+
"text.autoconfig.relicex.option.mobDropIsTomeChance": "怪物掉落宝典几率",
28+
"text.autoconfig.relicex.option.mobDropIsTomeChance.@Tooltip": "由RelicEx强化的怪物掉落宝典的几率",
29+
"text.autoconfig.relicex.option.mobDropBlacklist": "掉落战利品怪物黑名单",
30+
"text.autoconfig.relicex.option.mobDropBlacklist.@Tooltip": "所设定类型的实体不会掉落遗物及生命药水。",
31+
"item.relicex.small_health_potion": "小瓶生命药水",
32+
"item.relicex.medium_health_potion": "中瓶生命药水",
33+
"item.relicex.large_health_potion": "大瓶生命药水",
34+
"item.relicex.tome": "宝典",
35+
"item.relicex.dragon_stone": "龙石",
36+
"item.relicex.lesser_orb_of_regret": "小悔过宝珠",
37+
"item.relicex.greater_orb_of_regret": "大悔过宝珠",
38+
"item.relicex.amulet_relic": "古遗物",
39+
"item.relicex.ring_relic": "古遗物",
40+
"item.relicex.head_relic": "古遗物",
41+
"item.relicex.chest_relic": "古遗物",
42+
"item.relicex.relic_shard": "古遗物碎片",
43+
"tooltip.relicex.worn": "穿戴时：",
44+
"tooltip.relicex.tome": "内含1个属性等级",
45+
"tooltip.relicex.dragon_stone": "将玩家的属性等级重置为0",
46+
"tooltip.relicex.greater_orb_of_regret": "返还所有已花费的技能点数",
47+
"tooltip.relicex.lesser_orb_of_regret": "返还1个已花费的技能点数",
48+
"message.relicex.dragon_stone": "确定将属性等级重置为0吗？",
49+
"rareness.relicex.common": "普通",
50+
"rareness.relicex.uncommon": "罕见",
51+
"rareness.relicex.rare": "珍稀",
52+
"rareness.relicex.epic": "史诗",
53+
"rareness.relicex.mythical": "神话",
54+
"rareness.relicex.legendary": "传说",
55+
"rareness.relicex.immortal": "不朽",
56+
"sound.relicex.level_refund": "重置属性等级",
57+
"sound.relicex.potion_use": "使用生命药水"
5658
}

‎src/main/resources/fabric.mod.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"name": "RelicEx",
66
"description": "Bridges Trinkets and PlayerEx.",
77
"authors": [
8-
"CleverNucleus",
9-
"Bonsaiheldin | http://bonsaiheld.org",
10-
"Joe Williamson | @JoeCreates"
8+
"CleverNucleus"
119
],
1210
"contact": {
1311
"homepage": "https://www.curseforge.com/minecraft/mc-mods/relicex",
@@ -33,9 +31,9 @@
3331
"relicex.mixins.json"
3432
],
3533
"depends": {
36-
"fabricloader": ">=0.14.10",
37-
"fabric": ">=0.66.0",
38-
"playerex": ">=3.4.0",
34+
"fabricloader": ">=0.14.14",
35+
"fabric": ">=0.75.1",
36+
"playerex": ">=3.4.2",
3937
"trinkets": ">=3.3.1",
4038
"cloth-config": ">=6.0.0",
4139
"minecraft": "1.18.2",

0 commit comments

Comments
 (0)