From 4d2572db2cd7cddc928d56426586de841d2369b5 Mon Sep 17 00:00:00 2001 From: ACGaming <4818419+ACGaming@users.noreply.github.com> Date: Mon, 13 Sep 2021 20:00:16 +0200 Subject: [PATCH] Fix Gisela, nerf spawn rates --- .../spackenmobs/entities/EntityGisela.java | 24 +++--- .../acgaming/spackenmobs/misc/ModConfigs.java | 80 +++++++++---------- .../spackenmobs/misc/ModSoundEvents.java | 1 - .../spackenmobs/misc/RegistryHandler.java | 2 - 4 files changed, 49 insertions(+), 58 deletions(-) diff --git a/src/main/java/mod/acgaming/spackenmobs/entities/EntityGisela.java b/src/main/java/mod/acgaming/spackenmobs/entities/EntityGisela.java index c9a3661..6cf1ce3 100644 --- a/src/main/java/mod/acgaming/spackenmobs/entities/EntityGisela.java +++ b/src/main/java/mod/acgaming/spackenmobs/entities/EntityGisela.java @@ -2,6 +2,7 @@ package mod.acgaming.spackenmobs.entities; import net.minecraft.block.Block; import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.*; import net.minecraft.entity.passive.EntityAnimal; @@ -13,12 +14,14 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import mod.acgaming.spackenmobs.misc.ModSoundEvents; + public class EntityGisela extends EntityAnimal { public EntityGisela(World worldIn) { super(worldIn); - this.setSize(0.9F, 1.4F); + this.setSize(0.6F, 1.8F); } public EntityGisela createChild(EntityAgeable ageable) @@ -31,11 +34,12 @@ public class EntityGisela extends EntityAnimal this.tasks.addTask(0, new EntityAISwimming(this)); this.tasks.addTask(1, new EntityAIPanic(this, 2.0D)); this.tasks.addTask(2, new EntityAIMate(this, 1.0D)); - this.tasks.addTask(3, new EntityAITempt(this, 1.25D, Items.SUGAR, true)); + this.tasks.addTask(3, new EntityAITempt(this, 1.25D, Items.SUGAR, false)); this.tasks.addTask(4, new EntityAIFollowParent(this, 1.25D)); this.tasks.addTask(5, new EntityAIWanderAvoidWater(this, 1.0D)); this.tasks.addTask(6, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); this.tasks.addTask(7, new EntityAILookIdle(this)); + this.targetTasks.addTask(1, new EntityAINearestAttackableTarget<>(this, EntityLiving.class, true)); } protected void applyEntityAttributes() @@ -47,31 +51,21 @@ public class EntityGisela extends EntityAnimal protected SoundEvent getAmbientSound() { - return SoundEvents.ENTITY_COW_AMBIENT; + return ModSoundEvents.ENTITY_GISELA_AMBIENT; } protected SoundEvent getHurtSound(DamageSource damageSourceIn) { - return SoundEvents.ENTITY_COW_HURT; + return ModSoundEvents.ENTITY_GISELA_HURT; } protected SoundEvent getDeathSound() { - return SoundEvents.ENTITY_COW_DEATH; - } - - protected float getSoundVolume() - { - return 0.6F; + return ModSoundEvents.ENTITY_GISELA_HURT; } protected void playStepSound(BlockPos pos, Block blockIn) { this.playSound(SoundEvents.ENTITY_COW_STEP, 0.15F, 1.0F); } - - public float getEyeHeight() - { - return this.isChild() ? this.height : 1.3F; - } } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java index 1528ccb..d0fd9d9 100644 --- a/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java +++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModConfigs.java @@ -41,90 +41,90 @@ public class ModConfigs @Name("Allow tilera Ghast to spawn?") public static boolean tileraGhast_spawn = true; - @Name("ApoRed spawn probability:") - public static int ApoRed_weight = 15; + @Name("ApoRed spawn weight:") + public static int ApoRed_weight = 10; @Name("ApoRed min group size:") public static int ApoRed_min = 1; @Name("ApoRed max group size:") - public static int ApoRed_max = 2; - @Name("Baka Mitai Creeper spawn probability:") + public static int ApoRed_max = 1; + @Name("Baka Mitai Creeper spawn weight:") public static int BakaMitaiCreeper_weight = 10; @Name("Baka Mitai Creeper min group size:") public static int BakaMitaiCreeper_min = 1; @Name("Baka Mitai Creeper max group size:") - public static int BakaMitaiCreeper_max = 2; - @Name("Drachenlord spawn probability:") - public static int Drachenlord_weight = 15; + public static int BakaMitaiCreeper_max = 1; + @Name("Drachenlord spawn weight:") + public static int Drachenlord_weight = 10; @Name("Drachenlord min group size:") public static int Drachenlord_min = 1; @Name("Drachenlord max group size:") - public static int Drachenlord_max = 2; - @Name("Friedrich Liechtenstein spawn probability:") - public static int Friedrich_weight = 15; + public static int Drachenlord_max = 1; + @Name("Friedrich Liechtenstein spawn weight:") + public static int Friedrich_weight = 10; @Name("Friedrich Liechtenstein min group size:") public static int Friedrich_min = 1; @Name("Friedrich Liechtenstein max group size:") - public static int Friedrich_max = 2; - @Name("Holzstammhuhn spawn probability:") - public static int Holzstammhuhn_weight = 15; + public static int Friedrich_max = 1; + @Name("Holzstammhuhn spawn weight:") + public static int Holzstammhuhn_weight = 10; @Name("Holzstammhuhn min group size:") public static int Holzstammhuhn_min = 1; @Name("Holzstammhuhn max group size:") - public static int Holzstammhuhn_max = 2; - @Name("Islamist spawn probability:") - public static int Islamist_weight = 15; + public static int Holzstammhuhn_max = 1; + @Name("Islamist spawn weight:") + public static int Islamist_weight = 10; @Name("Islamist min group size:") public static int Islamist_min = 1; @Name("Islamist max group size:") - public static int Islamist_max = 2; - @Name("Jens spawn probability:") - public static int Jens_weight = 15; + public static int Islamist_max = 1; + @Name("Jens spawn weight:") + public static int Jens_weight = 10; @Name("Jens min group size:") public static int Jens_min = 1; @Name("Jens max group size:") - public static int Jens_max = 2; - @Name("Marcell D'Avis spawn probability:") - public static int MarcellDAvis_weight = 15; + public static int Jens_max = 1; + @Name("Marcell D'Avis spawn weight:") + public static int MarcellDAvis_weight = 10; @Name("Marcell D'Avis min group size:") public static int MarcellDAvis_min = 1; @Name("Marcell D'Avis max group size:") - public static int MarcellDAvis_max = 2; - @Name("Mr. Bean spawn probability:") - public static int MrBean_weight = 15; + public static int MarcellDAvis_max = 1; + @Name("Mr. Bean spawn weight:") + public static int MrBean_weight = 10; @Name("Mr. Bean min group size:") public static int MrBean_min = 1; @Name("Mr. Bean max group size:") - public static int MrBean_max = 2; - @Name("Schalker spawn probability:") + public static int MrBean_max = 1; + @Name("Schalker spawn weight:") public static int Schalker_weight = 10; @Name("Schalker min group size:") public static int Schalker_min = 1; @Name("Schalker max group size:") - public static int Schalker_max = 2; - @Name("Smava Creeper spawn probability:") - public static int SmavaCreeper_weight = 15; + public static int Schalker_max = 1; + @Name("Smava Creeper spawn weight:") + public static int SmavaCreeper_weight = 10; @Name("Smava Creeper min group size:") public static int SmavaCreeper_min = 1; @Name("Smava Creeper max group size:") - public static int SmavaCreeper_max = 2; - @Name("MZTEWolf spawn probability:") - public static int MZTEWolf_weight = 15; + public static int SmavaCreeper_max = 1; + @Name("MZTEWolf spawn weight:") + public static int MZTEWolf_weight = 10; @Name("MZTEWolf min group size:") public static int MZTEWolf_min = 1; @Name("MZTEWolf max group size:") - public static int MZTEWolf_max = 2; - @Name("Gisela spawn probability:") - public static int Gisela_weight = 15; + public static int MZTEWolf_max = 1; + @Name("Gisela spawn weight:") + public static int Gisela_weight = 10; @Name("Gisela min group size:") public static int Gisela_min = 1; @Name("Gisela max group size:") - public static int Gisela_max = 2; - @Name("tilera Ghast spawn probability:") - public static int tileraGhast_weight = 15; + public static int Gisela_max = 1; + @Name("tilera Ghast spawn weight:") + public static int tileraGhast_weight = 10; @Name("tilera Ghast min group size:") public static int tileraGhast_min = 1; @Name("tilera Ghast max group size:") - public static int tileraGhast_max = 2; + public static int tileraGhast_max = 1; @Name("Time in seconds Jens needs to digest:") public static int Jens_digest_time = 120; diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModSoundEvents.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModSoundEvents.java index 67371ae..5f608bb 100644 --- a/src/main/java/mod/acgaming/spackenmobs/misc/ModSoundEvents.java +++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModSoundEvents.java @@ -56,5 +56,4 @@ public class ModSoundEvents public static final SoundEvent ENTITY_GISELA_AMBIENT = new SoundEvent(new ResourceLocation("spackenmobs:entities.gisela.ambient")); public static final SoundEvent ENTITY_GISELA_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.gisela.hurt")); - public static final SoundEvent ENTITY_GISELA_DEATH = new SoundEvent(new ResourceLocation("spackenmobs:entities.gisela.death")); } \ No newline at end of file diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandler.java b/src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandler.java index 22da356..30490f4 100644 --- a/src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandler.java +++ b/src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandler.java @@ -238,7 +238,5 @@ public class RegistryHandler event.getRegistry().register(ModSoundEvents.ENTITY_GISELA_AMBIENT); ModSoundEvents.ENTITY_GISELA_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.gisela.hurt")); event.getRegistry().register(ModSoundEvents.ENTITY_GISELA_HURT); - ModSoundEvents.ENTITY_GISELA_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.gisela.death")); - event.getRegistry().register(ModSoundEvents.ENTITY_GISELA_DEATH); } } \ No newline at end of file