v1.4.2-t2
This commit is contained in:
1 parent
4dbd696911
commit
d04c730b67
4 files changed
+14
-8
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
package com.lzxnone.terraria.effect;
|
package com.lzxnone.terraria.effect;
|
||||||
|
|
||||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
||||||
import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
|
import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
|
||||||
import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
|
import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
|
||||||
@@ -46,7 +47,7 @@ public class EffectLogicHandler {
|
|||||||
new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect));
|
new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect));
|
||||||
}
|
}
|
||||||
if(currentEffect == ModEffects.KILL_MODE) {
|
if(currentEffect == ModEffects.KILL_MODE) {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.KIll_MODE_COOLDOWN_TIME, 0);
|
||||||
entity.addEffect(effectInstance);
|
entity.addEffect(effectInstance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -68,7 +69,7 @@ public class EffectLogicHandler {
|
|||||||
new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect));
|
new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect));
|
||||||
}
|
}
|
||||||
if(currentEffect == ModEffects.KILL_MODE) {
|
if(currentEffect == ModEffects.KILL_MODE) {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.KIll_MODE_COOLDOWN_TIME, 0);
|
||||||
entity.addEffect(effectInstance);
|
entity.addEffect(effectInstance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.lzxnone.terraria.effect;
|
package com.lzxnone.terraria.effect;
|
||||||
|
|
||||||
import com.lzxnone.terraria.item.ModItems;
|
import com.lzxnone.terraria.item.ModItems;
|
||||||
|
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||||
import net.minecraft.world.effect.MobEffect;
|
import net.minecraft.world.effect.MobEffect;
|
||||||
import net.minecraft.world.effect.MobEffectCategory;
|
import net.minecraft.world.effect.MobEffectCategory;
|
||||||
import net.minecraft.world.effect.MobEffectInstance;
|
import net.minecraft.world.effect.MobEffectInstance;
|
||||||
@@ -22,7 +23,7 @@ public class KillModeEffect extends MobEffect {
|
|||||||
if(!entity.level().isClientSide()) {
|
if(!entity.level().isClientSide()) {
|
||||||
ItemStack stack = entity.getMainHandItem();
|
ItemStack stack = entity.getMainHandItem();
|
||||||
if(!stack.is(ModItems.DEVILS_DEVASTATION.get())) {
|
if(!stack.is(ModItems.DEVILS_DEVASTATION.get())) {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.KIll_MODE_COOLDOWN_TIME, 0);
|
||||||
entity.addEffect(effectInstance);
|
entity.addEffect(effectInstance);
|
||||||
|
|
||||||
MobEffectInstance effectInstance2 = entity.getEffect(ModEffects.KILL_MODE);
|
MobEffectInstance effectInstance2 = entity.getEffect(ModEffects.KILL_MODE);
|
||||||
|
|||||||
@@ -87,6 +87,10 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final float ENERGY_WAVE_LENGTH = 30;
|
public static final float ENERGY_WAVE_LENGTH = 30;
|
||||||
public static final int ENERGY_WAVE_SEG = 20;
|
public static final int ENERGY_WAVE_SEG = 20;
|
||||||
|
|
||||||
|
//杀戮模式
|
||||||
|
public static final int KIll_MODE_TIME = 100;
|
||||||
|
public static final int KIll_MODE_COOLDOWN_TIME = 100;
|
||||||
|
|
||||||
//右键射出的弹射
|
//右键射出的弹射
|
||||||
public static final int PROJECTILE_TRAIL_LENGTH = 10;
|
public static final int PROJECTILE_TRAIL_LENGTH = 10;
|
||||||
public static final float PROJECTILE_TRAIL_RADIUS = 0.25F;
|
public static final float PROJECTILE_TRAIL_RADIUS = 0.25F;
|
||||||
@@ -116,7 +120,6 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final float PROJECTILE_HIT_LIGHTNING_JITTER = 0.45F;
|
public static final float PROJECTILE_HIT_LIGHTNING_JITTER = 0.45F;
|
||||||
|
|
||||||
//标记
|
//标记
|
||||||
public static final int MARK_LIFETIME = 100;
|
|
||||||
public static final float MARK_RADIUS = 0.25f;
|
public static final float MARK_RADIUS = 0.25f;
|
||||||
public static final float MARK_LENGTH = 2.0f;
|
public static final float MARK_LENGTH = 2.0f;
|
||||||
|
|
||||||
@@ -645,7 +648,7 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
summon.setPos(pos);
|
summon.setPos(pos);
|
||||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK);
|
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK);
|
||||||
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
||||||
summon.getEntityData().set(StaticSummon.LIFETIME, MARK_LIFETIME);
|
summon.getEntityData().set(StaticSummon.LIFETIME, KIll_MODE_TIME);
|
||||||
summon.getEntityData().set(StaticSummon.GLOW, true);
|
summon.getEntityData().set(StaticSummon.GLOW, true);
|
||||||
|
|
||||||
CompoundTag summonCustomData = new CompoundTag();
|
CompoundTag summonCustomData = new CompoundTag();
|
||||||
@@ -687,13 +690,13 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA);
|
CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA);
|
||||||
if(projectile.getOwner() instanceof LivingEntity livingEntity) {
|
if(projectile.getOwner() instanceof LivingEntity livingEntity) {
|
||||||
if(customData.contains("validHit")) {
|
if(customData.contains("validHit")) {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, KIll_MODE_TIME, 0);
|
||||||
livingEntity.addEffect(effectInstance);
|
livingEntity.addEffect(effectInstance);
|
||||||
|
|
||||||
MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE_COOLDOWN);
|
MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE_COOLDOWN);
|
||||||
if(effectInstance2 != null) livingEntity.removeEffect(effectInstance2.getEffect());
|
if(effectInstance2 != null) livingEntity.removeEffect(effectInstance2.getEffect());
|
||||||
}else {
|
}else {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, KIll_MODE_COOLDOWN_TIME, 0);
|
||||||
livingEntity.addEffect(effectInstance);
|
livingEntity.addEffect(effectInstance);
|
||||||
|
|
||||||
MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE);
|
MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE);
|
||||||
|
|||||||
+2
-1
@@ -2,6 +2,7 @@ package com.lzxnone.terraria.network.handler;
|
|||||||
|
|
||||||
import com.lzxnone.terraria.effect.ModEffects;
|
import com.lzxnone.terraria.effect.ModEffects;
|
||||||
import com.lzxnone.terraria.item.ModItems;
|
import com.lzxnone.terraria.item.ModItems;
|
||||||
|
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||||
import com.lzxnone.terraria.network.payload.DevilsDevastationKillModePayload;
|
import com.lzxnone.terraria.network.payload.DevilsDevastationKillModePayload;
|
||||||
import net.minecraft.world.effect.MobEffectInstance;
|
import net.minecraft.world.effect.MobEffectInstance;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
@@ -20,7 +21,7 @@ public class DevilsDevastationKillModeHandler {
|
|||||||
MobEffectInstance instance = player.getEffect(ModEffects.KILL_MODE_COOLDOWN);
|
MobEffectInstance instance = player.getEffect(ModEffects.KILL_MODE_COOLDOWN);
|
||||||
MobEffectInstance instance2 = player.getEffect(ModEffects.KILL_MODE);
|
MobEffectInstance instance2 = player.getEffect(ModEffects.KILL_MODE);
|
||||||
if(instance == null && instance2 == null) {
|
if(instance == null && instance2 == null) {
|
||||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, 100, 0);
|
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, DevilsDevastation.KIll_MODE_TIME, 0);
|
||||||
player.addEffect(effectInstance);
|
player.addEffect(effectInstance);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user