Replace cave spiders poison with weakness effect

hea3ven · Jan 7, 2019 · f4e72fd · f4e72fd
1 parent a520f7b
commit f4e72fd
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
                                 changes += "${entry.msg}\r\n".replace('\'', '\\\'')
                             }
                         }
-                        sh "gradle build check curseforge githubRelease --stacktrace --info -PBUILD_NO=$BUILD_NUMBER -Pcurse_api_key=$curse_api_key -Pgithub_release_token=$github_release_token -Pchangelog='$changes'"
+                        sh "gradle clean build check curseforge githubRelease --stacktrace --info -PBUILD_NO=$BUILD_NUMBER -Pcurse_api_key=$curse_api_key -Pgithub_release_token=$github_release_token -Pchangelog='$changes'"
                     }
                 }
             }

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 project_group=com.hea3ven.dulcedeleche
 project_name=DulceDeLeche
 project_display_name=Dulce De Leche
-project_version=1.1.0
+project_version=1.1.1
 project_class=com.hea3ven.dulcedeleche.ModDulceDeLeche
 project_repo=hea3ven/DulceDeLeche
 project_repo_branch=master

diff --git a/src/main/java/com/hea3ven/dulcedeleche/modules/mobs/mixin/CaveSpiderEntityMixin.java b/src/main/java/com/hea3ven/dulcedeleche/modules/mobs/mixin/CaveSpiderEntityMixin.java
@@ -0,0 +1,35 @@
+package com.hea3ven.dulcedeleche.modules.mobs.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.mob.CaveSpiderEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.mob.SpiderEntity;
+
+import com.hea3ven.dulcedeleche.modules.mobs.MobsModule;
+
+@Mixin(CaveSpiderEntity.class)
+public abstract class CaveSpiderEntityMixin extends SpiderEntity {
+
+    protected CaveSpiderEntityMixin() {
+        super(null, null);
+    }
+
+    @Inject(method = "method_6121(Lnet/minecraft/entity/Entity;)Z", at = @At("HEAD"),
+            cancellable = true)
+    public void onPrepareEntityAttributes(Entity entity, CallbackInfoReturnable<Boolean> info) {
+        if (MobsModule.INSTANCE.cfg.getReplaceCaveSpiderPoison()) {
+            if (super.method_6121(entity)) {
+                MobsModule.INSTANCE.onCaveSpiderEntityDoAttack(this, entity);
+                info.setReturnValue(true);
+            } else {
+                info.setReturnValue(false);
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/com/hea3ven/dulcedeleche/modules/mobs/MobsModule.kt b/src/main/kotlin/com/hea3ven/dulcedeleche/modules/mobs/MobsModule.kt
@@ -1,6 +1,7 @@
 package com.hea3ven.dulcedeleche.modules.mobs
 
 import com.hea3ven.dulcedeleche.Module
+import com.hea3ven.dulcedeleche.modules.mobs.mixin.CaveSpiderEntityMixin
 import net.minecraft.entity.Entity
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.SpawnType
@@ -14,7 +15,7 @@ import net.minecraft.world.IWorld
 import net.minecraft.world.LightType
 
 object MobsModule : Module<MobsModuleConfig>() {
-    override fun createDefaultConfig() = MobsModuleConfig(true, 14.0, true)
+    override fun createDefaultConfig() = MobsModuleConfig(true, 14.0, true, true)
 
     override fun onInitialize() {
     }
@@ -39,5 +40,12 @@ object MobsModule : Module<MobsModuleConfig>() {
             }
         }
     }
+
+    fun onCaveSpiderEntityDoAttack(entity: LivingEntity, target: Entity) {
+        if (target !is LivingEntity) {
+            return
+        }
+        target.addPotionEffect(StatusEffectInstance(StatusEffects.WEAKNESS, 15 * 20));
+    }
 }
 
diff --git a/src/main/kotlin/com/hea3ven/dulcedeleche/modules/mobs/MobsModuleConfig.kt b/src/main/kotlin/com/hea3ven/dulcedeleche/modules/mobs/MobsModuleConfig.kt
@@ -3,4 +3,4 @@ package com.hea3ven.dulcedeleche.modules.mobs
 import com.hea3ven.dulcedeleche.config.BaseModuleConfig
 
 data class MobsModuleConfig(val blockCreeperSpawnInSurface: Boolean, val zombieKnockbackAttributeMultiplier: Double,
-        val spidersApplySlowness: Boolean) : BaseModuleConfig() {}
+        val spidersApplySlowness: Boolean, val replaceCaveSpiderPoison: Boolean) : BaseModuleConfig() {}
diff --git a/src/main/resources/dulcedeleche.mobs.common.json b/src/main/resources/dulcedeleche.mobs.common.json
@@ -5,7 +5,8 @@
     "mixins": [
         "CreeperEntityMixin",
         "ZombieEntityMixin",
-        "MobEntityMixin"
+        "MobEntityMixin",
+        "CaveSpiderEntityMixin"
     ],
     "injectors": {
         "defaultRequire": 1