Remove phantom attractor as android feature

This commit is contained in:
DBotThePony 2023-06-20 20:41:35 +07:00
parent ab61101ab6
commit 378f39b877
Signed by: DBot
GPG Key ID: DCC23B5715498507
6 changed files with 1 additions and 46 deletions

View File

@ -345,20 +345,6 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
serializer.accept(ENDER_TELEPORTER) 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 = val JUMP_BOOST_1 =
AndroidResearchType.Builder(modLocation(MNames.JUMP_BOOST + "_1")) AndroidResearchType.Builder(modLocation(MNames.JUMP_BOOST + "_1"))
.withExperience(27) .withExperience(27)
@ -511,13 +497,6 @@ fun addResearchData(serializer: Consumer<AndroidResearchType>, lang: MatteryLang
russian("Используйте с осторожностью, так как данная технология сама по себе не поглащает урон от падения!") 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") { add(JUMP_BOOST_1, "Jump Boost") {
russian("Усилитель Прыжка") russian("Усилитель Прыжка")
} }

View File

@ -628,7 +628,6 @@ private fun androidFeatures(provider: MatteryLanguageProvider) {
add(AndroidFeatures.NANOBOTS_ARMOR, "Nanobots Armor") add(AndroidFeatures.NANOBOTS_ARMOR, "Nanobots Armor")
add(AndroidFeatures.ITEM_MAGNET, "Item Magnet") add(AndroidFeatures.ITEM_MAGNET, "Item Magnet")
add(AndroidFeatures.STEP_ASSIST, "Step Assist") add(AndroidFeatures.STEP_ASSIST, "Step Assist")
add(AndroidFeatures.PHANTOM_ATTRACTOR, "Phantom Attractor")
add(AndroidFeatures.JUMP_BOOST, "Jump Boost") add(AndroidFeatures.JUMP_BOOST, "Jump Boost")
add(AndroidFeatures.ENDER_TELEPORTER, "Ender Teleporter") add(AndroidFeatures.ENDER_TELEPORTER, "Ender Teleporter")
} }

View File

@ -633,7 +633,6 @@ private fun androidFeatures(provider: MatteryLanguageProvider) {
add(AndroidFeatures.NANOBOTS_ARMOR, "Броня из наноботов") add(AndroidFeatures.NANOBOTS_ARMOR, "Броня из наноботов")
add(AndroidFeatures.ITEM_MAGNET, "Предметный магнит") add(AndroidFeatures.ITEM_MAGNET, "Предметный магнит")
add(AndroidFeatures.STEP_ASSIST, "Помощник подъёма") add(AndroidFeatures.STEP_ASSIST, "Помощник подъёма")
add(AndroidFeatures.PHANTOM_ATTRACTOR, "Приманщик фантомов")
add(AndroidFeatures.JUMP_BOOST, "Усилитель прыжка") add(AndroidFeatures.JUMP_BOOST, "Усилитель прыжка")
add(AndroidFeatures.ENDER_TELEPORTER, "Телепортатор края") add(AndroidFeatures.ENDER_TELEPORTER, "Телепортатор края")
} }

View File

@ -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)
}
}

View File

@ -1274,14 +1274,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial
*/ */
@JvmStatic @JvmStatic
fun phantomSpawnHook(iterator: Iterator<Player>): Iterator<Player> { fun phantomSpawnHook(iterator: Iterator<Player>): Iterator<Player> {
return iterator.filter { return iterator.filter { it.matteryPlayer?.isAndroid != true }
if (it.matteryPlayer?.isAndroid == true) {
val feature = it.matteryPlayer?.getFeature(AndroidFeatures.PHANTOM_ATTRACTOR) as AndroidSwitchableFeature?
feature?.isActive == true
} else {
true
}
}
} }
/** /**

View File

@ -21,7 +21,6 @@ object AndroidFeatures {
val SHOCKWAVE: AndroidFeatureType<ShockwaveFeature> by registry.register(MNames.SHOCKWAVE) { AndroidFeatureType(::ShockwaveFeature) } val SHOCKWAVE: AndroidFeatureType<ShockwaveFeature> by registry.register(MNames.SHOCKWAVE) { AndroidFeatureType(::ShockwaveFeature) }
val ITEM_MAGNET: AndroidFeatureType<ItemMagnetFeature> by registry.register(MNames.ITEM_MAGNET) { AndroidFeatureType(::ItemMagnetFeature) } val ITEM_MAGNET: AndroidFeatureType<ItemMagnetFeature> by registry.register(MNames.ITEM_MAGNET) { AndroidFeatureType(::ItemMagnetFeature) }
val FALL_DAMPENERS: AndroidFeatureType<FallDampenersFeature> by registry.register(MNames.FALL_DAMPENERS) { AndroidFeatureType(::FallDampenersFeature) } val FALL_DAMPENERS: AndroidFeatureType<FallDampenersFeature> by registry.register(MNames.FALL_DAMPENERS) { AndroidFeatureType(::FallDampenersFeature) }
val PHANTOM_ATTRACTOR: AndroidFeatureType<PhantomAttractorFeature> by registry.register(MNames.PHANTOM_ATTRACTOR) { AndroidFeatureType(::PhantomAttractorFeature) }
val JUMP_BOOST: AndroidFeatureType<JumpBoostFeature> by registry.register(MNames.JUMP_BOOST) { AndroidFeatureType(::JumpBoostFeature) } val JUMP_BOOST: AndroidFeatureType<JumpBoostFeature> by registry.register(MNames.JUMP_BOOST) { AndroidFeatureType(::JumpBoostFeature) }
val ENDER_TELEPORTER: AndroidFeatureType<EnderTeleporterFeature> by registry.register(MNames.ENDER_TELEPORTER) { AndroidFeatureType(::EnderTeleporterFeature) } val ENDER_TELEPORTER: AndroidFeatureType<EnderTeleporterFeature> by registry.register(MNames.ENDER_TELEPORTER) { AndroidFeatureType(::EnderTeleporterFeature) }