From 167ea42ec8668542ce112cc3c128535a1b104f06 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 31 Mar 2025 20:56:33 +0700
Subject: [PATCH] idea refactor moment
---
.../kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt | 2 +-
.../kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt | 2 +-
.../ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt
index d9bac01f2..b884fb89a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt
@@ -27,7 +27,7 @@ class HurtTrigger(id: ResourceLocation) : MCriterionTrigger<HurtTrigger.Instance
ContextAwarePredicate.CODEC.optionalFieldOf("predicate").forGetter(Instance::predicate),
DamagePredicateCodec.optionalFieldOf("damagePredicate").forGetter(Instance::damagePredicate),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
- ).apply(it, HurtTrigger::Instance)
+ ).apply(it, ::Instance)
}
inner class Instance(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt
index b8ab9d2d3..97ae650ce 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt
@@ -19,7 +19,7 @@ class ItemTrigger(id: ResourceLocation) : MCriterionTrigger<ItemTrigger.Instance
ItemPredicate.CODEC.fieldOf("predicate").forGetter(Instance::predicate),
Codec.BOOL.optionalFieldOf("invert", false).forGetter(Instance::invert),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
- ).apply(it, ItemTrigger::Instance)
+ ).apply(it, ::Instance)
}
inner class Instance(val predicate: ItemPredicate, val invert: Boolean = false, player: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(player)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt
index 099f1d30a..8839b95df 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt
@@ -11,7 +11,7 @@ class SingletonTrigger(id: ResourceLocation) : MCriterionTrigger<SingletonTrigge
override val codec: Codec<Instance> = RecordCodecBuilder.create {
it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
- ).apply(it, SingletonTrigger::Instance)
+ ).apply(it, ::Instance)
}
val empty = Instance()