diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt index ed1655e51..fa7d66bdc 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt @@ -345,20 +345,6 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang serializer.accept(ENDER_TELEPORTER) - val PHANTOM_ATTRACTOR = - AndroidResearchType.Builder(modLocation(MNames.PHANTOM_ATTRACTOR)) - .withExperience(20) - .withDescription() - .withIcon(ResearchIcons.ICON_PHANTOM_ATTRACTOR) - .addFeatureResult(AndroidFeatures.PHANTOM_ATTRACTOR) - .addPrerequisite(NANOBOTS) - .addItem(MItems.PHANTOM_ATTRACTOR) - .addItem(MItemTags.COPPER_WIRES, 2) - .addItem(MItemTags.TRITANIUM_PLATES, 2) - .build() - - serializer.accept(PHANTOM_ATTRACTOR) - val JUMP_BOOST_1 = AndroidResearchType.Builder(modLocation(MNames.JUMP_BOOST + "_1")) .withExperience(27) @@ -511,13 +497,6 @@ fun addResearchData(serializer: Consumer, lang: MatteryLang russian("Используйте с осторожностью, так как данная технология сама по себе не поглащает урон от падения!") } - add(PHANTOM_ATTRACTOR, "Builtin Phantom Attractor") { - russian("Встроенный Приманщик Фантомов") - } - add(PHANTOM_ATTRACTOR, "description", "Allows to attract phantoms while active under same conditions as non-Androids") { - russian("Позволяет привлекать фантомов под теми же условиями, как и не Андроиды") - } - add(JUMP_BOOST_1, "Jump Boost") { russian("Усилитель Прыжка") } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index efaf4c0c7..ec5f59c67 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -628,7 +628,6 @@ private fun androidFeatures(provider: MatteryLanguageProvider) { add(AndroidFeatures.NANOBOTS_ARMOR, "Nanobots Armor") add(AndroidFeatures.ITEM_MAGNET, "Item Magnet") add(AndroidFeatures.STEP_ASSIST, "Step Assist") - add(AndroidFeatures.PHANTOM_ATTRACTOR, "Phantom Attractor") add(AndroidFeatures.JUMP_BOOST, "Jump Boost") add(AndroidFeatures.ENDER_TELEPORTER, "Ender Teleporter") } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index ad0fc506c..bfe2cda11 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -633,7 +633,6 @@ private fun androidFeatures(provider: MatteryLanguageProvider) { add(AndroidFeatures.NANOBOTS_ARMOR, "Броня из наноботов") add(AndroidFeatures.ITEM_MAGNET, "Предметный магнит") add(AndroidFeatures.STEP_ASSIST, "Помощник подъёма") - add(AndroidFeatures.PHANTOM_ATTRACTOR, "Приманщик фантомов") add(AndroidFeatures.JUMP_BOOST, "Усилитель прыжка") add(AndroidFeatures.ENDER_TELEPORTER, "Телепортатор края") } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/PhantomAttractorFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/PhantomAttractorFeature.kt deleted file mode 100644 index b8dd02dd1..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/PhantomAttractorFeature.kt +++ /dev/null @@ -1,14 +0,0 @@ -package ru.dbotthepony.mc.otm.android.feature - -import com.mojang.blaze3d.vertex.PoseStack -import net.minecraft.client.gui.GuiGraphics -import ru.dbotthepony.mc.otm.android.AndroidSwitchableFeature -import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability -import ru.dbotthepony.mc.otm.client.render.ResearchIcons -import ru.dbotthepony.mc.otm.registry.AndroidFeatures - -class PhantomAttractorFeature(android: MatteryPlayerCapability) : AndroidSwitchableFeature(AndroidFeatures.PHANTOM_ATTRACTOR, android) { - override fun renderIcon(graphics: GuiGraphics, x: Float, y: Float, width: Float, height: Float) { - ResearchIcons.ICON_PHANTOM_ATTRACTOR.render(graphics, x, y, width, height) - } -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index af3645ec9..36c96ccb7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -1274,14 +1274,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial */ @JvmStatic fun phantomSpawnHook(iterator: Iterator): Iterator { - return iterator.filter { - if (it.matteryPlayer?.isAndroid == true) { - val feature = it.matteryPlayer?.getFeature(AndroidFeatures.PHANTOM_ATTRACTOR) as AndroidSwitchableFeature? - feature?.isActive == true - } else { - true - } - } + return iterator.filter { it.matteryPlayer?.isAndroid != true } } /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidFeatures.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidFeatures.kt index c1ee11123..bfaf0ed4b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidFeatures.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidFeatures.kt @@ -21,7 +21,6 @@ object AndroidFeatures { val SHOCKWAVE: AndroidFeatureType by registry.register(MNames.SHOCKWAVE) { AndroidFeatureType(::ShockwaveFeature) } val ITEM_MAGNET: AndroidFeatureType by registry.register(MNames.ITEM_MAGNET) { AndroidFeatureType(::ItemMagnetFeature) } val FALL_DAMPENERS: AndroidFeatureType by registry.register(MNames.FALL_DAMPENERS) { AndroidFeatureType(::FallDampenersFeature) } - val PHANTOM_ATTRACTOR: AndroidFeatureType by registry.register(MNames.PHANTOM_ATTRACTOR) { AndroidFeatureType(::PhantomAttractorFeature) } val JUMP_BOOST: AndroidFeatureType by registry.register(MNames.JUMP_BOOST) { AndroidFeatureType(::JumpBoostFeature) } val ENDER_TELEPORTER: AndroidFeatureType by registry.register(MNames.ENDER_TELEPORTER) { AndroidFeatureType(::EnderTeleporterFeature) }