diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt index 9599e0aef..4d9d3b332 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt @@ -8,7 +8,7 @@ import net.minecraft.world.level.storage.loot.BuiltInLootTables import net.minecraft.world.level.storage.loot.predicates.LootItemCondition import net.minecraftforge.common.loot.LootTableIdCondition import ru.dbotthepony.mc.otm.data.condition.ChanceWithPlaytimeCondition -import ru.dbotthepony.mc.otm.data.condition.HasExosuitCondition +import ru.dbotthepony.mc.otm.data.condition.HasExoPackCondition import ru.dbotthepony.mc.otm.data.condition.ItemInInventoryCondition import ru.dbotthepony.mc.otm.data.condition.KilledByRealPlayerOrIndirectly import ru.dbotthepony.mc.otm.data.loot.LootPoolAppender @@ -128,7 +128,7 @@ fun addLootModifiers(it: LootModifiers) { it.add("exosuit_probe_enderman_drop", BasicLootAppender( arrayOf( LootTableIdCondition(EntityType.ENDERMAN.defaultLootTable), - HasExosuitCondition.INVERTED, + HasExoPackCondition.INVERTED, KilledByRealPlayerOrIndirectly, ChanceWithPlaytimeCondition( minPlaytime = 20 * 60 * 10, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExosuitCondition.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExoPackCondition.kt similarity index 82% rename from src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExosuitCondition.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExoPackCondition.kt index c51ffee1e..297e8638e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExosuitCondition.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/HasExoPackCondition.kt @@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.data.get import ru.dbotthepony.mc.otm.registry.MLootItemConditions -object HasExosuitCondition : LootItemCondition, Serializer, LootItemCondition.Builder { +object HasExoPackCondition : LootItemCondition, Serializer, LootItemCondition.Builder { override fun test(t: LootContext): Boolean { t[LootContextParams.LAST_DAMAGE_PLAYER]?.matteryPlayer?.let { return it.hasExoPack @@ -26,10 +26,10 @@ object HasExosuitCondition : LootItemCondition, Serializer, return MLootItemConditions.HAS_EXOPACK } - override fun serialize(p_79325_: JsonObject, p_79326_: HasExosuitCondition, p_79327_: JsonSerializationContext) { + override fun serialize(p_79325_: JsonObject, p_79326_: HasExoPackCondition, p_79327_: JsonSerializationContext) { } - override fun deserialize(p_79323_: JsonObject, p_79324_: JsonDeserializationContext): HasExosuitCondition { + override fun deserialize(p_79323_: JsonObject, p_79324_: JsonDeserializationContext): HasExoPackCondition { return this } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MLootItemConditions.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MLootItemConditions.kt index f2bbb7f62..20fa79776 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MLootItemConditions.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MLootItemConditions.kt @@ -6,7 +6,7 @@ import net.minecraftforge.eventbus.api.IEventBus import net.minecraftforge.registries.DeferredRegister import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.data.condition.ChanceWithPlaytimeCondition -import ru.dbotthepony.mc.otm.data.condition.HasExosuitCondition +import ru.dbotthepony.mc.otm.data.condition.HasExoPackCondition import ru.dbotthepony.mc.otm.data.condition.ItemInInventoryCondition import ru.dbotthepony.mc.otm.data.condition.KilledByRealPlayer import ru.dbotthepony.mc.otm.data.condition.KilledByRealPlayerOrIndirectly @@ -15,7 +15,7 @@ import ru.dbotthepony.mc.otm.data.condition.ChanceCondition object MLootItemConditions { private val registry = DeferredRegister.create(Registry.LOOT_ITEM_REGISTRY, OverdriveThatMatters.MOD_ID) - val HAS_EXOPACK: LootItemConditionType by registry.register("has_exosuit") { LootItemConditionType(HasExosuitCondition) } + val HAS_EXOPACK: LootItemConditionType by registry.register("has_exopack") { LootItemConditionType(HasExoPackCondition) } val CHANCE_WITH_PLAYTIME: LootItemConditionType by registry.register("chance_with_playtime") { LootItemConditionType(ChanceWithPlaytimeCondition) } val ITEM_IN_INVENTORY: LootItemConditionType by registry.register("item_in_inventory") { LootItemConditionType(ItemInInventoryCondition) } val KILLED_BY_REAL_PLAYER: LootItemConditionType by registry.register("killed_by_real_player") { LootItemConditionType(KilledByRealPlayer) }