diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt new file mode 100644 index 000000000..ad7c1a5d4 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt @@ -0,0 +1,23 @@ +package ru.dbotthepony.mc.otm.client.render.entity +import ru.dbotthepony.mc.otm.OverdriveThatMatters +import ru.dbotthepony.mc.otm.core.ResourceLocation + +import net.minecraft.client.model.PlayerModel +import net.minecraft.client.renderer.entity.EntityRendererProvider +import net.minecraft.client.renderer.entity.HumanoidMobRenderer +import net.minecraft.client.model.geom.ModelLayers + +import net.minecraft.resources.ResourceLocation +import net.minecraft.world.entity.EntityType +import net.minecraft.world.entity.Mob + + +class RogueAndroidRenderer(context: EntityRendererProvider.Context, private val entityType: EntityType, private val androidTexture: String) : + HumanoidMobRenderer>( + context, PlayerModel(context.bakeLayer(ModelLayers.PLAYER), false), 0.5f + ) { + + override fun getTextureLocation(entity: T): ResourceLocation { + return ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/entity/android/$androidTexture.png") + } +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt new file mode 100644 index 000000000..0df65bc77 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/AndroidMelee.kt @@ -0,0 +1,56 @@ +package ru.dbotthepony.mc.otm.entity + +import net.minecraft.sounds.SoundEvent +import net.minecraft.sounds.SoundEvents +import net.minecraft.world.entity.EntityType +import net.minecraft.world.entity.LivingEntity +import net.minecraft.world.entity.ai.attributes.AttributeSupplier +import net.minecraft.world.entity.ai.attributes.Attributes +import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal +import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal +import net.minecraft.world.entity.ai.goal.MeleeAttackGoal +import net.minecraft.world.entity.ai.goal.RandomLookAroundGoal +import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal +import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal +import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal +import net.minecraft.world.entity.ai.navigation.GroundPathNavigation +import net.minecraft.world.entity.ai.navigation.PathNavigation +import net.minecraft.world.entity.monster.Monster +import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.ItemStack +import net.minecraft.world.level.Level + +class AndroidMelee(type: EntityType, level: Level) : Monster(type, level) { + + override fun registerGoals() { + goalSelector.addGoal(8, RandomLookAroundGoal(this)) + goalSelector.addGoal(7, WaterAvoidingRandomStrollGoal(this, 0.8)) + goalSelector.addGoal(8, LookAtPlayerGoal(this, Player::class.java, 8f)) + goalSelector.addGoal(3, NearestAttackableTargetGoal(this, LivingEntity::class.java , true, true)) + goalSelector.addGoal(3, NearestAttackableTargetGoal(this, Player::class.java , true, true)) + + goalSelector.addGoal(1, LeapAtTargetGoal(this, 0.4f)) + goalSelector.addGoal(2, MeleeAttackGoal(this, 1.3, true)) + + targetSelector.addGoal(1, HurtByTargetGoal(this)) + } + + override fun getArmorSlots(): MutableIterable { + return super.getArmorSlots() + } + + override fun getHurtSound(damageSource: net.minecraft.world.damagesource.DamageSource): SoundEvent { + return SoundEvents.IRON_GOLEM_HURT + } + + override fun createNavigation(level: Level): PathNavigation = GroundPathNavigation(this, level) + + companion object { + fun createAttributes() : AttributeSupplier.Builder { + return createMonsterAttributes() + .add(Attributes.MAX_HEALTH, 16.0) + .add(Attributes.MOVEMENT_SPEED, 0.3) + .add(Attributes.ATTACK_DAMAGE, 3.0) + } + } +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 8d701847e..03e4d3d46 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -330,6 +330,10 @@ object MNames { const val BREAD_MONSTER = "bread_monster" const val LOADER = "loader" + const val ANDROID_MELEE = "android_melee" + const val ANDROID_RANGED = "android_melee" + const val ANDROID_OVERSEER = "android_melee" + const val PHANTOM_ATTRACTOR = "phantom_attractor" const val JUMP_BOOST = "jump_boost" const val ENDER_TELEPORTER = "ender_teleporter" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MEntityTypes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MEntityTypes.kt index 434309a70..af4a6b109 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MEntityTypes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MEntityTypes.kt @@ -16,6 +16,7 @@ import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent import ru.dbotthepony.mc.otm.client.render.entity.BreadMonsterRenderer import ru.dbotthepony.mc.otm.client.render.entity.LoaderRenderer import ru.dbotthepony.mc.otm.client.render.entity.PlasmaProjectileRenderer +import ru.dbotthepony.mc.otm.client.render.entity.RogueAndroidRenderer import ru.dbotthepony.mc.otm.entity.* import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MNames @@ -57,6 +58,16 @@ object MEntityTypes { .build(MNames.LOADER) } + val ANDROID_MELEE: EntityType by registry.register(MNames.ANDROID_MELEE) { + EntityType.Builder.of(::AndroidMelee, MobCategory.MONSTER) + .sized(1.2f, 2.5f) + .eyeHeight(2.0f) + .passengerAttachments(2.5f) + .clientTrackingRange(12) + .build(MNames.ANDROID_MELEE) + } + + fun register(bus: IEventBus) { registry.register(bus) bus.addListener(this::registerAttributes) @@ -66,6 +77,7 @@ object MEntityTypes { private fun registerAttributes(event: EntityAttributeCreationEvent) { event.put(BREAD_MONSTER, BreadMonster.createAttributes().build()) event.put(LOADER, Loader.createAttributes().build()) + event.put(ANDROID_MELEE, Loader.createAttributes().build()) } @Suppress("unchecked_cast") @@ -80,6 +92,10 @@ object MEntityTypes { EntityRenderers.register(RIDEABLE_DUMMY, ::NoopRenderer) EntityRenderers.register(BREAD_MONSTER, ::BreadMonsterRenderer) EntityRenderers.register(LOADER, ::LoaderRenderer) + + EntityRenderers.register(ANDROID_MELEE) { context -> + RogueAndroidRenderer(context, ANDROID_MELEE, "melee") + } } } } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/entity/android/melee.png b/src/main/resources/assets/overdrive_that_matters/textures/entity/android/melee.png new file mode 100644 index 000000000..bd54b9902 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/entity/android/melee.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/entity/android/ranged.png b/src/main/resources/assets/overdrive_that_matters/textures/entity/android/ranged.png new file mode 100644 index 000000000..65d6b5993 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/entity/android/ranged.png differ