v1.7.2
This commit is contained in:
1 parent
2bae7fee67
commit
ed7fd8d440
40 files changed
+884
-86
No files matched your search
+2
@@ -1,5 +1,6 @@
|
|||||||
package com.lzxnone.terraria.client.entity.projectile;
|
package com.lzxnone.terraria.client.entity.projectile;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.client.item.accessory.ClientAccessoryFallenStar;
|
||||||
import com.lzxnone.terraria.client.item.melee.ClientBladeOfGrass;
|
import com.lzxnone.terraria.client.item.melee.ClientBladeOfGrass;
|
||||||
import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation;
|
import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation;
|
||||||
import com.lzxnone.terraria.client.item.melee.ClientMace;
|
import com.lzxnone.terraria.client.item.melee.ClientMace;
|
||||||
@@ -33,6 +34,7 @@ public class ClientStaticProjectileRenderBehaviors {
|
|||||||
BEHAVIORS.put(StaticProjectileBehaviors.CRYSTAL_FRAGMENT, DEFAULT_BEHAVIOR);
|
BEHAVIORS.put(StaticProjectileBehaviors.CRYSTAL_FRAGMENT, DEFAULT_BEHAVIOR);
|
||||||
BEHAVIORS.put(StaticProjectileBehaviors.SUPER_STAR_PRISMATIC_BOLT, ClientSuperStarShooter.PROJECTILE_BEHAVIOR);
|
BEHAVIORS.put(StaticProjectileBehaviors.SUPER_STAR_PRISMATIC_BOLT, ClientSuperStarShooter.PROJECTILE_BEHAVIOR);
|
||||||
BEHAVIORS.put(StaticProjectileBehaviors.POSSESSION_PROJECTILE, ClientPossession.PROJECTILE_BEHAVIOR);
|
BEHAVIORS.put(StaticProjectileBehaviors.POSSESSION_PROJECTILE, ClientPossession.PROJECTILE_BEHAVIOR);
|
||||||
|
BEHAVIORS.put(StaticProjectileBehaviors.ACCESSORY_FALLEN_STAR_PROJECTILE, ClientAccessoryFallenStar.PROJECTILE_BEHAVIOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IStaticProjectileRenderBehavior getBehavior(String id) {
|
public static IStaticProjectileRenderBehavior getBehavior(String id) {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior;
|
|||||||
import com.lzxnone.terraria.entity.ModRenderTypes;
|
import com.lzxnone.terraria.entity.ModRenderTypes;
|
||||||
import com.lzxnone.terraria.entity.TintedVertexConsumer;
|
import com.lzxnone.terraria.entity.TintedVertexConsumer;
|
||||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||||
|
import com.lzxnone.terraria.utils.MathUtil;
|
||||||
import com.mojang.blaze3d.vertex.PoseStack;
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
import com.mojang.math.Axis;
|
import com.mojang.math.Axis;
|
||||||
@@ -91,13 +92,12 @@ public class ClientDropFallenStar {
|
|||||||
if(summon.onGround()) return;
|
if(summon.onGround()) return;
|
||||||
|
|
||||||
Vec3 dir = summon.getDeltaMovement().normalize();
|
Vec3 dir = summon.getDeltaMovement().normalize();
|
||||||
float yRot = (float)(Mth.atan2(dir.x, dir.z) * Mth.RAD_TO_DEG);
|
float[] xyRot = MathUtil.computeXYRot(dir.toVector3f());
|
||||||
float xRot = (float)(Mth.atan2(dir.y, Math.sqrt(dir.x * dir.x + dir.z * dir.z)) * Mth.RAD_TO_DEG);
|
|
||||||
|
|
||||||
poseStack.pushPose();
|
poseStack.pushPose();
|
||||||
poseStack.translate(-dir.x * 2, -dir.y * 2, -dir.z * 2);
|
poseStack.translate(-dir.x * 2, -dir.y * 2, -dir.z * 2);
|
||||||
poseStack.mulPose(Axis.YP.rotationDegrees(yRot));
|
poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1]));
|
||||||
poseStack.mulPose(Axis.XP.rotationDegrees(-xRot));
|
poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0]));
|
||||||
poseStack.mulPose(Axis.YP.rotationDegrees(270.0F));
|
poseStack.mulPose(Axis.YP.rotationDegrees(270.0F));
|
||||||
|
|
||||||
VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(STAR_WAVE_RES));
|
VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(STAR_WAVE_RES));
|
||||||
|
|||||||
+72
@@ -0,0 +1,72 @@
|
|||||||
|
package com.lzxnone.terraria.client.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior;
|
||||||
|
import com.lzxnone.terraria.entity.ModRenderTypes;
|
||||||
|
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
||||||
|
import com.lzxnone.terraria.utils.MathUtil;
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.minecraft.client.renderer.LightTexture;
|
||||||
|
import net.minecraft.client.renderer.MultiBufferSource;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import org.joml.Matrix4f;
|
||||||
|
|
||||||
|
public class ClientAccessoryFallenStar {
|
||||||
|
private static final ResourceLocation STAR_WAVE_RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/star_wave.png");
|
||||||
|
private static final float STAR_WAVE_HALF_WIDTH = 45 * 0.06F;
|
||||||
|
private static final float STAR_WAVE_HALF_HEIGHT = 17 * 0.06F;
|
||||||
|
private static final float STAR_WAVE_ALPHA = 0.5F;
|
||||||
|
//紫色
|
||||||
|
private static final float STAR_WAVE_COLOR_R = 0.7F;
|
||||||
|
private static final float STAR_WAVE_COLOR_G = 0.3F;
|
||||||
|
private static final float STAR_WAVE_COLOR_B = 1.0F;
|
||||||
|
|
||||||
|
public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() {
|
||||||
|
@Override
|
||||||
|
public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) {
|
||||||
|
if(!(entity instanceof StaticProjectile projectile)) return;
|
||||||
|
ItemStack itemStack = projectile.getEntityData().get(StaticProjectile.ITEM);
|
||||||
|
if(itemStack == ItemStack.EMPTY) return;
|
||||||
|
renderItem(entity, entityYaw, partialTick, poseStack, bufferSource, packedLight);
|
||||||
|
renderStarWave(projectile, poseStack, bufferSource);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private static void renderStarWave(StaticProjectile projectile, PoseStack poseStack, MultiBufferSource bufferSource) {
|
||||||
|
Vec3 dir = projectile.getDeltaMovement().normalize();
|
||||||
|
float[] xyRot = MathUtil.computeXYRot(dir.toVector3f());
|
||||||
|
|
||||||
|
poseStack.pushPose();
|
||||||
|
poseStack.translate(-dir.x * 1.5, -dir.y * 1.5, -dir.z * 1.5);
|
||||||
|
poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1]));
|
||||||
|
poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0]));
|
||||||
|
poseStack.mulPose(Axis.ZP.rotationDegrees(90.0F));
|
||||||
|
poseStack.mulPose(Axis.YP.rotationDegrees(270.0F));
|
||||||
|
|
||||||
|
VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(STAR_WAVE_RES));
|
||||||
|
addQuad(consumer, poseStack.last().pose(), STAR_WAVE_HALF_WIDTH, STAR_WAVE_HALF_HEIGHT,
|
||||||
|
STAR_WAVE_COLOR_R, STAR_WAVE_COLOR_G, STAR_WAVE_COLOR_B, STAR_WAVE_ALPHA);
|
||||||
|
poseStack.popPose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addQuad(VertexConsumer consumer, Matrix4f matrix, float halfWidth, float halfHeight,
|
||||||
|
float r, float g, float b, float alpha) {
|
||||||
|
consumer.addVertex(matrix, -halfWidth, -halfHeight, 0.0F)
|
||||||
|
.setColor(r, g, b, alpha).setUv(0.0F, 1.0F)
|
||||||
|
.setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F);
|
||||||
|
consumer.addVertex(matrix, halfWidth, -halfHeight, 0.0F)
|
||||||
|
.setColor(r, g, b, alpha).setUv(1.0F, 1.0F)
|
||||||
|
.setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F);
|
||||||
|
consumer.addVertex(matrix, halfWidth, halfHeight, 0.0F)
|
||||||
|
.setColor(r, g, b, alpha).setUv(1.0F, 0.0F)
|
||||||
|
.setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F);
|
||||||
|
consumer.addVertex(matrix, -halfWidth, halfHeight, 0.0F)
|
||||||
|
.setColor(r, g, b, alpha).setUv(0.0F, 0.0F)
|
||||||
|
.setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -76,6 +76,11 @@ public class ModCreativeModeTabs {
|
|||||||
output.accept(ModItems.COBALT_SHIELD.get());
|
output.accept(ModItems.COBALT_SHIELD.get());
|
||||||
output.accept(ModItems.OBSIDIAN_SHIELD.get());
|
output.accept(ModItems.OBSIDIAN_SHIELD.get());
|
||||||
output.accept(ModItems.ANKH_SHIELD.get());
|
output.accept(ModItems.ANKH_SHIELD.get());
|
||||||
|
output.accept(ModItems.AVENGER_EMBLEM.get());
|
||||||
|
output.accept(ModItems.CROSS_NECKLACE.get());
|
||||||
|
output.accept(ModItems.STAR_CLOAK.get());
|
||||||
|
output.accept(ModItems.STAR_VEIL.get());
|
||||||
|
output.accept(ModItems.HAND_WARMER.get());
|
||||||
output.accept(ModItems.BEZOAR.get());
|
output.accept(ModItems.BEZOAR.get());
|
||||||
output.accept(ModItems.BLINDFOLD.get());
|
output.accept(ModItems.BLINDFOLD.get());
|
||||||
output.accept(ModItems.FAST_CLOCK.get());
|
output.accept(ModItems.FAST_CLOCK.get());
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.lzxnone.terraria.entity.projectile;
|
package com.lzxnone.terraria.entity.projectile;
|
||||||
|
|
||||||
import com.lzxnone.terraria.item.ammo.CrystalBullet;
|
import com.lzxnone.terraria.item.ammo.CrystalBullet;
|
||||||
|
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
|
||||||
import com.lzxnone.terraria.item.weapon.melee.*;
|
import com.lzxnone.terraria.item.weapon.melee.*;
|
||||||
import com.lzxnone.terraria.item.weapon.ranged.Flamethrower;
|
import com.lzxnone.terraria.item.weapon.ranged.Flamethrower;
|
||||||
import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter;
|
import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter;
|
||||||
@@ -29,6 +30,7 @@ public class StaticProjectileBehaviors {
|
|||||||
public static final String CRYSTAL_FRAGMENT = "crystal_fragment";
|
public static final String CRYSTAL_FRAGMENT = "crystal_fragment";
|
||||||
public static final String SUPER_STAR_PRISMATIC_BOLT = "super_star_prismatic_blot";
|
public static final String SUPER_STAR_PRISMATIC_BOLT = "super_star_prismatic_blot";
|
||||||
public static final String POSSESSION_PROJECTILE = "possession_projectile";
|
public static final String POSSESSION_PROJECTILE = "possession_projectile";
|
||||||
|
public static final String ACCESSORY_FALLEN_STAR_PROJECTILE = "accessory_fallen_star_projectile";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() {
|
BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() {
|
||||||
@@ -59,6 +61,7 @@ public class StaticProjectileBehaviors {
|
|||||||
BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR);
|
BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR);
|
||||||
BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR);
|
BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR);
|
||||||
BEHAVIORS.put(POSSESSION_PROJECTILE, Possession.PROJECTILE_BEHAVIOR);
|
BEHAVIORS.put(POSSESSION_PROJECTILE, Possession.PROJECTILE_BEHAVIOR);
|
||||||
|
BEHAVIORS.put(ACCESSORY_FALLEN_STAR_PROJECTILE, FallenStarSummoner.PROJECTILE_BEHAVIOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IStaticProjectileBehavior getBehavior(String id) {
|
public static IStaticProjectileBehavior getBehavior(String id) {
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
package com.lzxnone.terraria.event;
|
package com.lzxnone.terraria.event;
|
||||||
|
|
||||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
import com.lzxnone.terraria.effect.ModEffects;
|
|
||||||
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
|
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
|
||||||
import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier;
|
|
||||||
import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier;
|
|
||||||
import net.minecraft.core.Holder;
|
|
||||||
import net.minecraft.world.effect.MobEffect;
|
|
||||||
import net.minecraft.world.effect.MobEffects;
|
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.neoforged.bus.api.SubscribeEvent;
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
import net.neoforged.fml.common.EventBusSubscriber;
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
@@ -15,73 +9,10 @@ import top.theillusivec4.curios.api.event.CurioChangeEvent;
|
|||||||
|
|
||||||
@EventBusSubscriber(modid = LzxnoneTerraria.MODID)
|
@EventBusSubscriber(modid = LzxnoneTerraria.MODID)
|
||||||
public class AccessoryEventHandler {
|
public class AccessoryEventHandler {
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onCurioChange(CurioChangeEvent event) {
|
public static void onCurioChange(CurioChangeEvent event) {
|
||||||
LivingEntity entity = event.getEntity();
|
LivingEntity entity = event.getEntity();
|
||||||
if(entity.level().isClientSide()) return;
|
if(entity.level().isClientSide()) return;
|
||||||
removeImmuneEffects(entity);
|
AccessoryUtil.removeImmuneEffects(entity);
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isImmuneToEffect(LivingEntity entity, Holder<MobEffect> effect) {
|
|
||||||
boolean[] result = {false};
|
|
||||||
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
|
||||||
if(result[0]) return;
|
|
||||||
if(accessory instanceof MobEffectImmunityModifier modifier) {
|
|
||||||
if(effect == MobEffects.POISON && modifier.isPoisonImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.WITHER && modifier.isWitherImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.DARKNESS && modifier.isDarknessImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.MOVEMENT_SLOWDOWN && modifier.isSlownessImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.WEAKNESS && modifier.isWeaknessImmunity(stack, entity)
|
|
||||||
|| effect == ModEffects.BLOOD_BUTCHERED && modifier.isBleedImmunity(stack, entity)
|
|
||||||
|| effect == ModEffects.CONFUSED && modifier.isConfusedImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.LEVITATION && modifier.isLevitationImmunity(stack, entity)
|
|
||||||
|| effect == MobEffects.DIG_SLOWDOWN && modifier.isMiningFatigueImmunity(stack, entity)) {
|
|
||||||
result[0] = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return result[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void removeImmuneEffects(LivingEntity entity) {
|
|
||||||
if(entity.hasEffect(MobEffects.POISON) && isImmuneToEffect(entity, MobEffects.POISON)) {
|
|
||||||
entity.removeEffect(MobEffects.POISON);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.WITHER) && isImmuneToEffect(entity, MobEffects.WITHER)) {
|
|
||||||
entity.removeEffect(MobEffects.WITHER);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.DARKNESS) && isImmuneToEffect(entity, MobEffects.DARKNESS)) {
|
|
||||||
entity.removeEffect(MobEffects.DARKNESS);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.MOVEMENT_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.MOVEMENT_SLOWDOWN)) {
|
|
||||||
entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.WEAKNESS) && isImmuneToEffect(entity, MobEffects.WEAKNESS)) {
|
|
||||||
entity.removeEffect(MobEffects.WEAKNESS);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(ModEffects.BLOOD_BUTCHERED) && isImmuneToEffect(entity, ModEffects.BLOOD_BUTCHERED)) {
|
|
||||||
entity.removeEffect(ModEffects.BLOOD_BUTCHERED);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(ModEffects.CONFUSED) && isImmuneToEffect(entity, ModEffects.CONFUSED)) {
|
|
||||||
entity.removeEffect(ModEffects.CONFUSED);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.LEVITATION) && isImmuneToEffect(entity, MobEffects.LEVITATION)) {
|
|
||||||
entity.removeEffect(MobEffects.LEVITATION);
|
|
||||||
}
|
|
||||||
if(entity.hasEffect(MobEffects.DIG_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.DIG_SLOWDOWN)) {
|
|
||||||
entity.removeEffect(MobEffects.DIG_SLOWDOWN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isFireBlockImmune(LivingEntity entity) {
|
|
||||||
boolean[] result = {false};
|
|
||||||
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
|
||||||
if(result[0]) return;
|
|
||||||
if(accessory instanceof FireBlockImmunityModifier modifier) {
|
|
||||||
result[0] = modifier.isFireBlockImmunity(stack, entity);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return result[0];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ package com.lzxnone.terraria.event;
|
|||||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
import com.lzxnone.terraria.ModSounds;
|
import com.lzxnone.terraria.ModSounds;
|
||||||
import com.lzxnone.terraria.effect.ModEffects;
|
import com.lzxnone.terraria.effect.ModEffects;
|
||||||
|
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
|
||||||
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||||
import com.lzxnone.terraria.utils.SoundUtil;
|
import com.lzxnone.terraria.utils.SoundUtil;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
||||||
@@ -25,7 +26,7 @@ public class EffectLogicHandler {
|
|||||||
if(!entity.level().isClientSide()) {
|
if(!entity.level().isClientSide()) {
|
||||||
MobEffectInstance instance = event.getEffectInstance();
|
MobEffectInstance instance = event.getEffectInstance();
|
||||||
if(instance == null) return;
|
if(instance == null) return;
|
||||||
if(AccessoryEventHandler.isImmuneToEffect(entity, instance.getEffect())) {
|
if(AccessoryUtil.isImmuneToEffect(entity, instance.getEffect())) {
|
||||||
event.setResult(MobEffectEvent.Applicable.Result.DO_NOT_APPLY);
|
event.setResult(MobEffectEvent.Applicable.Result.DO_NOT_APPLY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.lzxnone.terraria.attachment.ModAttachments;
|
|||||||
import com.lzxnone.terraria.effect.MidasEffect;
|
import com.lzxnone.terraria.effect.MidasEffect;
|
||||||
import com.lzxnone.terraria.effect.ModEffects;
|
import com.lzxnone.terraria.effect.ModEffects;
|
||||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||||
|
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
|
||||||
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
|
||||||
import com.lzxnone.terraria.item.weapon.summon.whip.Possession;
|
import com.lzxnone.terraria.item.weapon.summon.whip.Possession;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
@@ -12,6 +13,7 @@ import net.minecraft.world.damagesource.DamageSource;
|
|||||||
import net.minecraft.world.damagesource.DamageTypes;
|
import net.minecraft.world.damagesource.DamageTypes;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.Items;
|
import net.minecraft.world.item.Items;
|
||||||
import net.neoforged.bus.api.SubscribeEvent;
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
@@ -19,6 +21,7 @@ import net.neoforged.fml.common.EventBusSubscriber;
|
|||||||
import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
|
import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
|
||||||
import net.neoforged.neoforge.event.entity.living.LivingDeathEvent;
|
import net.neoforged.neoforge.event.entity.living.LivingDeathEvent;
|
||||||
import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
|
import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
@@ -31,7 +34,7 @@ public class EntityEventHandler {
|
|||||||
if(entity.level().isClientSide()) return;
|
if(entity.level().isClientSide()) return;
|
||||||
DamageSource source = event.getSource();
|
DamageSource source = event.getSource();
|
||||||
if(!source.is(DamageTypes.IN_FIRE) && !source.is(DamageTypes.HOT_FLOOR) && !source.is(DamageTypes.CAMPFIRE)) return;
|
if(!source.is(DamageTypes.IN_FIRE) && !source.is(DamageTypes.HOT_FLOOR) && !source.is(DamageTypes.CAMPFIRE)) return;
|
||||||
if(AccessoryEventHandler.isFireBlockImmune(entity)) {
|
if(AccessoryUtil.isFireBlockImmune(entity)) {
|
||||||
event.setCanceled(true);
|
event.setCanceled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,6 +43,9 @@ public class EntityEventHandler {
|
|||||||
public static void onLivingDamage(LivingDamageEvent.Post event) {
|
public static void onLivingDamage(LivingDamageEvent.Post event) {
|
||||||
//支配之鞭 预兆标记
|
//支配之鞭 预兆标记
|
||||||
Possession.markEvent(event);
|
Possession.markEvent(event);
|
||||||
|
|
||||||
|
AccessoryUtil.applyInvulnerableTimeModifier(event.getEntity());
|
||||||
|
AccessoryUtil.applyFallenStarSummoner(event.getEntity());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@@ -61,4 +67,14 @@ public class EntityEventHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onPlayerTick(PlayerTickEvent.Post event) {
|
||||||
|
Player player = event.getEntity();
|
||||||
|
if(player.level().isClientSide()) return;
|
||||||
|
if(player.getTicksFrozen() > 0 && AccessoryUtil.isFreezeImmune(player)) {
|
||||||
|
player.setTicksFrozen(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -121,6 +121,11 @@ public class ModItems {
|
|||||||
public static final DeferredItem<Item> COBALT_SHIELD = ITEMS.register("cobalt_shield", CobaltShield::new);
|
public static final DeferredItem<Item> COBALT_SHIELD = ITEMS.register("cobalt_shield", CobaltShield::new);
|
||||||
public static final DeferredItem<Item> OBSIDIAN_SHIELD = ITEMS.register("obsidian_shield", ObsidianShield::new);
|
public static final DeferredItem<Item> OBSIDIAN_SHIELD = ITEMS.register("obsidian_shield", ObsidianShield::new);
|
||||||
public static final DeferredItem<Item> ANKH_SHIELD = ITEMS.register("ankh_shield", AnkhShield::new);
|
public static final DeferredItem<Item> ANKH_SHIELD = ITEMS.register("ankh_shield", AnkhShield::new);
|
||||||
|
public static final DeferredItem<Item> AVENGER_EMBLEM = ITEMS.register("avenger_emblem", AvengerEmblem::new);
|
||||||
|
public static final DeferredItem<Item> CROSS_NECKLACE = ITEMS.register("cross_necklace", CrossNecklace::new);
|
||||||
|
public static final DeferredItem<Item> STAR_CLOAK = ITEMS.register("star_cloak", StarCloak::new);
|
||||||
|
public static final DeferredItem<Item> STAR_VEIL = ITEMS.register("star_veil", StarVeil::new);
|
||||||
|
public static final DeferredItem<Item> HAND_WARMER = ITEMS.register("hand_warmer", HandWarmer::new);
|
||||||
public static final DeferredItem<Item> BEZOAR = ITEMS.register("bezoar", Bezoar::new);
|
public static final DeferredItem<Item> BEZOAR = ITEMS.register("bezoar", Bezoar::new);
|
||||||
public static final DeferredItem<Item> BLINDFOLD = ITEMS.register("blindfold", Blindfold::new);
|
public static final DeferredItem<Item> BLINDFOLD = ITEMS.register("blindfold", Blindfold::new);
|
||||||
public static final DeferredItem<Item> FAST_CLOCK = ITEMS.register("fast_clock", FastClock::new);
|
public static final DeferredItem<Item> FAST_CLOCK = ITEMS.register("fast_clock", FastClock::new);
|
||||||
|
|||||||
@@ -1,18 +1,36 @@
|
|||||||
package com.lzxnone.terraria.item.accessory;
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.ModSounds;
|
||||||
|
import com.lzxnone.terraria.effect.ModEffects;
|
||||||
|
import com.lzxnone.terraria.entity.ModEntities;
|
||||||
|
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
||||||
|
import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors;
|
||||||
|
import com.lzxnone.terraria.item.ModItems;
|
||||||
|
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
|
||||||
|
import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier;
|
||||||
|
import com.lzxnone.terraria.item.effect.FreezingImmunityModifier;
|
||||||
|
import com.lzxnone.terraria.item.effect.InvulnerableTimeModifier;
|
||||||
|
import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier;
|
||||||
|
import com.lzxnone.terraria.utils.MathUtil;
|
||||||
|
import com.lzxnone.terraria.utils.SoundUtil;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.world.effect.MobEffect;
|
||||||
|
import net.minecraft.world.effect.MobEffects;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import org.joml.Vector3f;
|
||||||
import top.theillusivec4.curios.api.CuriosApi;
|
import top.theillusivec4.curios.api.CuriosApi;
|
||||||
import top.theillusivec4.curios.api.type.inventory.IDynamicStackHandler;
|
import top.theillusivec4.curios.api.type.inventory.IDynamicStackHandler;
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
public class AccessoryUtil {
|
public class AccessoryUtil {
|
||||||
public static final String TERRARIA_ACCESSORY_SLOT = "terraria_accessory";
|
|
||||||
|
|
||||||
public static void forEachAccessory(LivingEntity entity, BiConsumer<AccessoryItem, ItemStack> consumer) {
|
public static void forEachAccessory(LivingEntity entity, BiConsumer<AccessoryItem, ItemStack> consumer) {
|
||||||
CuriosApi.getCuriosInventory(entity)
|
CuriosApi.getCuriosInventory(entity)
|
||||||
.flatMap(handler -> handler.getStacksHandler(TERRARIA_ACCESSORY_SLOT))
|
.flatMap(handler -> handler.getStacksHandler("terraria_accessory"))
|
||||||
.ifPresent(stacksHandler -> {
|
.ifPresent(stacksHandler -> {
|
||||||
IDynamicStackHandler stacks = stacksHandler.getStacks();
|
IDynamicStackHandler stacks = stacksHandler.getStacks();
|
||||||
for(int i = 0; i < stacks.getSlots(); i++) {
|
for(int i = 0; i < stacks.getSlots(); i++) {
|
||||||
@@ -23,4 +41,133 @@ public class AccessoryUtil {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean isImmuneToEffect(LivingEntity entity, Holder<MobEffect> effect) {
|
||||||
|
boolean[] result = {false};
|
||||||
|
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
||||||
|
if(result[0]) return;
|
||||||
|
if(accessory instanceof MobEffectImmunityModifier modifier) {
|
||||||
|
if(effect == MobEffects.POISON && modifier.isPoisonImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.WITHER && modifier.isWitherImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.DARKNESS && modifier.isDarknessImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.MOVEMENT_SLOWDOWN && modifier.isSlownessImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.WEAKNESS && modifier.isWeaknessImmunity(stack, entity)
|
||||||
|
|| effect == ModEffects.BLOOD_BUTCHERED && modifier.isBleedImmunity(stack, entity)
|
||||||
|
|| effect == ModEffects.CONFUSED && modifier.isConfusedImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.LEVITATION && modifier.isLevitationImmunity(stack, entity)
|
||||||
|
|| effect == MobEffects.DIG_SLOWDOWN && modifier.isMiningFatigueImmunity(stack, entity)) {
|
||||||
|
result[0] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return result[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void removeImmuneEffects(LivingEntity entity) {
|
||||||
|
if(entity.hasEffect(MobEffects.POISON) && isImmuneToEffect(entity, MobEffects.POISON)) {
|
||||||
|
entity.removeEffect(MobEffects.POISON);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.WITHER) && isImmuneToEffect(entity, MobEffects.WITHER)) {
|
||||||
|
entity.removeEffect(MobEffects.WITHER);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.DARKNESS) && isImmuneToEffect(entity, MobEffects.DARKNESS)) {
|
||||||
|
entity.removeEffect(MobEffects.DARKNESS);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.MOVEMENT_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.MOVEMENT_SLOWDOWN)) {
|
||||||
|
entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.WEAKNESS) && isImmuneToEffect(entity, MobEffects.WEAKNESS)) {
|
||||||
|
entity.removeEffect(MobEffects.WEAKNESS);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(ModEffects.BLOOD_BUTCHERED) && isImmuneToEffect(entity, ModEffects.BLOOD_BUTCHERED)) {
|
||||||
|
entity.removeEffect(ModEffects.BLOOD_BUTCHERED);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(ModEffects.CONFUSED) && isImmuneToEffect(entity, ModEffects.CONFUSED)) {
|
||||||
|
entity.removeEffect(ModEffects.CONFUSED);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.LEVITATION) && isImmuneToEffect(entity, MobEffects.LEVITATION)) {
|
||||||
|
entity.removeEffect(MobEffects.LEVITATION);
|
||||||
|
}
|
||||||
|
if(entity.hasEffect(MobEffects.DIG_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.DIG_SLOWDOWN)) {
|
||||||
|
entity.removeEffect(MobEffects.DIG_SLOWDOWN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isFireBlockImmune(LivingEntity entity) {
|
||||||
|
boolean[] result = {false};
|
||||||
|
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
||||||
|
if(result[0]) return;
|
||||||
|
if(accessory instanceof FireBlockImmunityModifier modifier) {
|
||||||
|
result[0] = modifier.isFireBlockImmunity(stack, entity);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return result[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isFreezeImmune(LivingEntity entity) {
|
||||||
|
boolean[] result = {false};
|
||||||
|
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
||||||
|
if(result[0]) return;
|
||||||
|
result[0] = accessory instanceof FreezingImmunityModifier modifier && modifier.isFreezingImmunity(stack, entity);
|
||||||
|
});
|
||||||
|
return result[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void applyInvulnerableTimeModifier(LivingEntity entity) {
|
||||||
|
double finalTime = entity.invulnerableTime;
|
||||||
|
double[] rate = {1.0D};
|
||||||
|
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
||||||
|
if(accessory instanceof InvulnerableTimeModifier modifier) {
|
||||||
|
rate[0] *= modifier.getInvulnerableTimeMultiplier(stack, entity);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
finalTime *= rate[0];
|
||||||
|
entity.invulnerableTime = (int) finalTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void applyFallenStarSummoner(LivingEntity entity) {
|
||||||
|
boolean[] result = {false};
|
||||||
|
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
|
||||||
|
if(result[0]) return;
|
||||||
|
if(accessory instanceof FallenStarSummoner summoner) {
|
||||||
|
result[0] = summoner.summonThreeFallenStar(stack, entity);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if(result[0]) {
|
||||||
|
SoundUtil.playServerSound(entity.level(), ModSounds.STAR_FALL.get(), entity.position());
|
||||||
|
for(int i = 0;i < 3;i++) {
|
||||||
|
Vec3 targetPos = entity.position();
|
||||||
|
|
||||||
|
Vec3 spawnPos = new Vec3(
|
||||||
|
targetPos.x + 5.0 * (Math.random() * 2 - 1),
|
||||||
|
targetPos.y + 12,
|
||||||
|
targetPos.z + 5.0 * (Math.random() * 2 - 1)
|
||||||
|
);
|
||||||
|
|
||||||
|
Vector3f[] dirs = MathUtil.computeCoordinateSystem(new Vec3(targetPos.x - spawnPos.x, targetPos.y - spawnPos.y, targetPos.z - spawnPos.z).toVector3f(), 0);
|
||||||
|
|
||||||
|
StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), entity.level());
|
||||||
|
projectile.setOwner(entity);
|
||||||
|
projectile.setPos(spawnPos);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.ACCESSORY_FALLEN_STAR_PROJECTILE);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "custom");
|
||||||
|
projectile.getEntityData().set(StaticProjectile.ORIGIN, MathUtil.toVector3f(spawnPos));
|
||||||
|
projectile.getEntityData().set(StaticProjectile.ITEM, new ItemStack(ModItems.WHITE_STAR.get()));
|
||||||
|
projectile.getEntityData().set(StaticProjectile.LIFETIME, 300);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.DIRECTION, dirs[0]);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.UP, dirs[1]);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.GLOW, true);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.RXP, 90);
|
||||||
|
projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", 2.0));
|
||||||
|
|
||||||
|
CompoundTag customData = new CompoundTag();
|
||||||
|
customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / 2.0));
|
||||||
|
projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData);
|
||||||
|
|
||||||
|
projectile.setDeltaMovement(MathUtil.toVec3(dirs[0]));
|
||||||
|
entity.level().addFreshEntity(projectile);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.google.common.collect.Multimap;
|
||||||
|
import com.google.common.collect.MultimapBuilder;
|
||||||
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.item.effect.DamageModifier;
|
||||||
|
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||||
|
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
||||||
|
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
import top.theillusivec4.curios.api.SlotContext;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class AvengerEmblem extends AccessoryItem implements DamageModifier {
|
||||||
|
public static final double DAMAGE_MULTIPLIER = 1.12D;
|
||||||
|
|
||||||
|
public AvengerEmblem() {
|
||||||
|
super(new Item.Properties().stacksTo(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getDamageMultiplier(ItemStack stack, LivingEntity entity) {
|
||||||
|
return DAMAGE_MULTIPLIER;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {
|
||||||
|
Multimap<Holder<Attribute>, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build();
|
||||||
|
double bonus = DAMAGE_MULTIPLIER - 1.0D;
|
||||||
|
if(bonus != 0.0D) {
|
||||||
|
modifiers.put(
|
||||||
|
Attributes.ATTACK_DAMAGE,
|
||||||
|
new AttributeModifier(
|
||||||
|
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "avenger_emblem_attack_bonus"),
|
||||||
|
bonus,
|
||||||
|
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return modifiers;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.damage_increase",
|
||||||
|
EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER)
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
|
||||||
|
import com.lzxnone.terraria.item.effect.InvulnerableTimeModifier;
|
||||||
|
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||||
|
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class CrossNecklace extends AccessoryItem implements InvulnerableTimeModifier {
|
||||||
|
public static final ConfigDouble INVULNERABLE_TIME_MULTIPLIER = new ConfigDouble(
|
||||||
|
"accessory.cross_necklace.invulnerable_time_multiplier",
|
||||||
|
"invulnerable_time_multiplier",
|
||||||
|
2.0D,
|
||||||
|
1.0D,
|
||||||
|
10.0D
|
||||||
|
);
|
||||||
|
|
||||||
|
public CrossNecklace() {
|
||||||
|
super(new Item.Properties().stacksTo(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getInvulnerableTimeMultiplier(ItemStack stack, LivingEntity entity) {
|
||||||
|
return INVULNERABLE_TIME_MULTIPLIER.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
|
@Override
|
||||||
|
public void onConfigLoad() {
|
||||||
|
ConfigStruct.loadAll(INVULNERABLE_TIME_MULTIPLIER);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
|
"cross_necklace",
|
||||||
|
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/cross_necklace.png"),
|
||||||
|
Component.translatable("item.lzxnoneterraria.cross_necklace"),
|
||||||
|
CONFIG_DATA
|
||||||
|
);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||||
|
if(INVULNERABLE_TIME_MULTIPLIER.get() != 1.0D) {
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.invulnerable_time_bonus",
|
||||||
|
EffectTooltipUtil.formatNumber(INVULNERABLE_TIME_MULTIPLIER.get())
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.item.effect.FreezingImmunityModifier;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class HandWarmer extends AccessoryItem implements FreezingImmunityModifier {
|
||||||
|
public HandWarmer() {
|
||||||
|
super(new Item.Properties().stacksTo(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isFreezingImmunity(ItemStack stack, LivingEntity entity) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.freeze_immunity"
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
|
||||||
|
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||||
|
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class StarCloak extends AccessoryItem implements FallenStarSummoner {
|
||||||
|
public static final ConfigDouble FALLEN_STAR_DAMAGE = new ConfigDouble(
|
||||||
|
"accessory.star_cloak.fallen_star_damage",
|
||||||
|
"fallen_star_damage",
|
||||||
|
7.0D,
|
||||||
|
0.0D,
|
||||||
|
8388600.0D
|
||||||
|
);
|
||||||
|
|
||||||
|
public StarCloak() {
|
||||||
|
super(new Item.Properties().stacksTo(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getFallenStarDamage(ItemStack stack, LivingEntity entity) {
|
||||||
|
return FALLEN_STAR_DAMAGE.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
|
@Override
|
||||||
|
public void onConfigLoad() {
|
||||||
|
ConfigStruct.loadAll(FALLEN_STAR_DAMAGE);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
|
"star_cloak",
|
||||||
|
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/star_cloak.png"),
|
||||||
|
Component.translatable("item.lzxnoneterraria.star_cloak"),
|
||||||
|
CONFIG_DATA
|
||||||
|
);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.fallen_star_summon"
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package com.lzxnone.terraria.item.accessory;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
|
||||||
|
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
|
||||||
|
import com.lzxnone.terraria.item.effect.InvulnerableTimeModifier;
|
||||||
|
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||||
|
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
|
||||||
|
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class StarVeil extends AccessoryItem implements FallenStarSummoner, InvulnerableTimeModifier {
|
||||||
|
public static final ConfigDouble FALLEN_STAR_DAMAGE = new ConfigDouble(
|
||||||
|
"accessory.star_veil.fallen_star_damage",
|
||||||
|
"fallen_star_damage",
|
||||||
|
7.0D,
|
||||||
|
0.0D,
|
||||||
|
8388600.0D
|
||||||
|
);
|
||||||
|
public static final ConfigDouble INVULNERABLE_TIME_MULTIPLIER = new ConfigDouble(
|
||||||
|
"accessory.star_veil.invulnerable_time_multiplier",
|
||||||
|
"invulnerable_time_multiplier",
|
||||||
|
2.0D,
|
||||||
|
1.0D,
|
||||||
|
10.0D
|
||||||
|
);
|
||||||
|
|
||||||
|
public StarVeil() {
|
||||||
|
super(new Item.Properties().stacksTo(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getFallenStarDamage(ItemStack stack, LivingEntity entity) {
|
||||||
|
return FALLEN_STAR_DAMAGE.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getInvulnerableTimeMultiplier(ItemStack stack, LivingEntity entity) {
|
||||||
|
return INVULNERABLE_TIME_MULTIPLIER.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
|
@Override
|
||||||
|
public void onConfigLoad() {
|
||||||
|
ConfigStruct.loadAll(FALLEN_STAR_DAMAGE, INVULNERABLE_TIME_MULTIPLIER);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
|
"star_veil",
|
||||||
|
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/star_veil.png"),
|
||||||
|
Component.translatable("item.lzxnoneterraria.star_veil"),
|
||||||
|
CONFIG_DATA
|
||||||
|
);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.fallen_star_summon"
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
if(INVULNERABLE_TIME_MULTIPLIER.get() != 1.0D) {
|
||||||
|
tooltipComponents.add(Component.translatable(
|
||||||
|
"tooltip.lzxnoneterraria.invulnerable_time_bonus",
|
||||||
|
EffectTooltipUtil.formatNumber(INVULNERABLE_TIME_MULTIPLIER.get())
|
||||||
|
).withStyle(ChatFormatting.GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package com.lzxnone.terraria.item.effect;
|
||||||
|
|
||||||
|
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||||
|
import com.lzxnone.terraria.ModSounds;
|
||||||
|
import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior;
|
||||||
|
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
||||||
|
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
|
||||||
|
import com.lzxnone.terraria.particle.ModParticles;
|
||||||
|
import com.lzxnone.terraria.utils.*;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
import net.minecraft.world.phys.EntityHitResult;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
public interface FallenStarSummoner {
|
||||||
|
boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity);
|
||||||
|
double getFallenStarDamage(ItemStack stack, LivingEntity entity);
|
||||||
|
|
||||||
|
IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() {
|
||||||
|
@Override
|
||||||
|
public void onMoving(StaticProjectile projectile) {
|
||||||
|
ParticleUtil.addParticle(
|
||||||
|
projectile.level(), ModParticles.STAR_PARTICLE.get(),
|
||||||
|
projectile.position(), 1.0,
|
||||||
|
new Vec3(0, 0, 0), 0.1
|
||||||
|
);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onHitEntity(StaticProjectile projectile, EntityHitResult result) {
|
||||||
|
if(!projectile.level().isClientSide()) {
|
||||||
|
Entity target = result.getEntity();
|
||||||
|
Entity owner = projectile.getOwner();
|
||||||
|
if(owner == null) return;
|
||||||
|
if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return;
|
||||||
|
ItemStack stack = projectile.getEntityData().get(StaticProjectile.STACK_SOURCE);
|
||||||
|
double[] fallenStarDamage = {0.0D};
|
||||||
|
AccessoryUtil.forEachAccessory(player, (accessory, accessoryStack) -> {
|
||||||
|
if(accessory instanceof FallenStarSummoner summoner) {
|
||||||
|
fallenStarDamage[0] = summoner.getFallenStarDamage(accessoryStack, player);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if(DamageUtil.meleeAttack(projectile, target, stack, (float) fallenStarDamage[0], 1.0f)) {
|
||||||
|
target.invulnerableTime = 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onHitBlock(StaticProjectile projectile, BlockHitResult result) {
|
||||||
|
CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA);
|
||||||
|
if(!customData.contains("targetLifetime")) return;
|
||||||
|
|
||||||
|
int targetLifetime = customData.getInt("targetLifetime");
|
||||||
|
int age = projectile.getEntityData().get(StaticProjectile.AGE);
|
||||||
|
|
||||||
|
if(!projectile.level().isClientSide()) {
|
||||||
|
if(age < targetLifetime) {
|
||||||
|
EntityHitResult entityHit = CollisionUtil.checkEntityHit(projectile, 3.0);
|
||||||
|
if(entityHit != null) {
|
||||||
|
this.onHitEntity(projectile, entityHit);
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
if(!projectile.level().getBlockState(result.getBlockPos()).getCollisionShape(projectile.level(), result.getBlockPos()).isEmpty()) {
|
||||||
|
onDied(projectile);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void onDied(StaticProjectile projectile) {
|
||||||
|
if(!projectile.level().isClientSide()) {
|
||||||
|
ParticleUtil.addParticles(
|
||||||
|
(ServerLevel) projectile.level(), ModParticles.STAR_PARTICLE.get(),
|
||||||
|
projectile.position(), new Vec3(0.5, 0.5, 0.5),
|
||||||
|
0.2, 25
|
||||||
|
);
|
||||||
|
SoundUtil.playServerSound(projectile.level(), ModSounds.STAR_COLLIDE.get(), projectile.position());
|
||||||
|
projectile.discard();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -5,5 +5,5 @@ import net.minecraft.world.item.ItemStack;
|
|||||||
|
|
||||||
public interface FireBlockImmunityModifier {
|
public interface FireBlockImmunityModifier {
|
||||||
//火块(火/灵魂火/岩浆块)免疫
|
//火块(火/灵魂火/岩浆块)免疫
|
||||||
default boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { return false; }
|
boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package com.lzxnone.terraria.item.effect;
|
||||||
|
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
|
public interface FreezingImmunityModifier {
|
||||||
|
boolean isFreezingImmunity(ItemStack stack, LivingEntity entity);
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package com.lzxnone.terraria.item.effect;
|
||||||
|
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
|
public interface InvulnerableTimeModifier {
|
||||||
|
double getInvulnerableTimeMultiplier(ItemStack stack, LivingEntity entity);
|
||||||
|
}
|
||||||
@@ -166,7 +166,7 @@ public class Starfury extends MeleeWeapon {
|
|||||||
|
|
||||||
StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), level);
|
StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), level);
|
||||||
projectile.setOwner(player);
|
projectile.setOwner(player);
|
||||||
projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, player.getWeaponItem().copy());
|
projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, itemstack.copy());
|
||||||
projectile.setPos(spawnPos);
|
projectile.setPos(spawnPos);
|
||||||
projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.STARFURY_STAR);
|
projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.STARFURY_STAR);
|
||||||
projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "item");
|
projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "item");
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ import com.lzxnone.terraria.item.accessory.AnkhCharm;
|
|||||||
import com.lzxnone.terraria.item.accessory.CobaltShield;
|
import com.lzxnone.terraria.item.accessory.CobaltShield;
|
||||||
import com.lzxnone.terraria.item.accessory.ObsidianShield;
|
import com.lzxnone.terraria.item.accessory.ObsidianShield;
|
||||||
import com.lzxnone.terraria.item.accessory.AnkhShield;
|
import com.lzxnone.terraria.item.accessory.AnkhShield;
|
||||||
|
import com.lzxnone.terraria.item.accessory.StarCloak;
|
||||||
|
import com.lzxnone.terraria.item.accessory.CrossNecklace;
|
||||||
|
import com.lzxnone.terraria.item.accessory.StarVeil;
|
||||||
import com.lzxnone.terraria.item.accessory.HerculesBeetle;
|
import com.lzxnone.terraria.item.accessory.HerculesBeetle;
|
||||||
import com.lzxnone.terraria.item.accessory.NecromanticScroll;
|
import com.lzxnone.terraria.item.accessory.NecromanticScroll;
|
||||||
import com.lzxnone.terraria.item.accessory.PapyrusScarab;
|
import com.lzxnone.terraria.item.accessory.PapyrusScarab;
|
||||||
@@ -164,6 +167,9 @@ public class ConfigList {
|
|||||||
CobaltShield.CONFIG_LIST_ITEM,
|
CobaltShield.CONFIG_LIST_ITEM,
|
||||||
ObsidianShield.CONFIG_LIST_ITEM,
|
ObsidianShield.CONFIG_LIST_ITEM,
|
||||||
AnkhShield.CONFIG_LIST_ITEM,
|
AnkhShield.CONFIG_LIST_ITEM,
|
||||||
|
StarCloak.CONFIG_LIST_ITEM,
|
||||||
|
CrossNecklace.CONFIG_LIST_ITEM,
|
||||||
|
StarVeil.CONFIG_LIST_ITEM,
|
||||||
ManaFlower.CONFIG_LIST_ITEM,
|
ManaFlower.CONFIG_LIST_ITEM,
|
||||||
HerculesBeetle.CONFIG_LIST_ITEM,
|
HerculesBeetle.CONFIG_LIST_ITEM,
|
||||||
NecromanticScroll.CONFIG_LIST_ITEM,
|
NecromanticScroll.CONFIG_LIST_ITEM,
|
||||||
|
|||||||
@@ -3,14 +3,11 @@ package com.lzxnone.terraria.utils;
|
|||||||
import com.lzxnone.terraria.damage.ModDamageTypes;
|
import com.lzxnone.terraria.damage.ModDamageTypes;
|
||||||
import com.lzxnone.terraria.effect.IchorEffect;
|
import com.lzxnone.terraria.effect.IchorEffect;
|
||||||
import com.lzxnone.terraria.effect.ModEffects;
|
import com.lzxnone.terraria.effect.ModEffects;
|
||||||
import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs;
|
|
||||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
|
||||||
import com.lzxnone.terraria.entity.beam.SwordBeam;
|
import com.lzxnone.terraria.entity.beam.SwordBeam;
|
||||||
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
||||||
import com.lzxnone.terraria.entity.summon.BeeSummon;
|
import com.lzxnone.terraria.entity.summon.BeeSummon;
|
||||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||||
import com.lzxnone.terraria.item.weapon.*;
|
import com.lzxnone.terraria.item.weapon.*;
|
||||||
import net.minecraft.core.registries.Registries;
|
|
||||||
import net.minecraft.resources.ResourceKey;
|
import net.minecraft.resources.ResourceKey;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.damagesource.DamageSource;
|
import net.minecraft.world.damagesource.DamageSource;
|
||||||
@@ -21,7 +18,6 @@ import net.minecraft.world.entity.LivingEntity;
|
|||||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.enchantment.Enchantment;
|
|
||||||
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
@@ -29,12 +25,18 @@ import java.util.Objects;
|
|||||||
|
|
||||||
public class DamageUtil {
|
public class DamageUtil {
|
||||||
public enum DamageCategory {
|
public enum DamageCategory {
|
||||||
|
NORMAL,
|
||||||
MELEE,
|
MELEE,
|
||||||
RANGED,
|
RANGED,
|
||||||
SUMMON,
|
SUMMON,
|
||||||
MAGIC,
|
MAGIC,
|
||||||
REAL
|
REAL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean normalAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) {
|
||||||
|
return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.NORMAL);
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean meleeAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) {
|
public static boolean meleeAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) {
|
||||||
return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.MELEE);
|
return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.MELEE);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,6 +99,11 @@
|
|||||||
"item.lzxnoneterraria.cobalt_shield": "Cobalt Shield",
|
"item.lzxnoneterraria.cobalt_shield": "Cobalt Shield",
|
||||||
"item.lzxnoneterraria.obsidian_shield": "Obsidian Shield",
|
"item.lzxnoneterraria.obsidian_shield": "Obsidian Shield",
|
||||||
"item.lzxnoneterraria.ankh_shield": "Ankh Shield",
|
"item.lzxnoneterraria.ankh_shield": "Ankh Shield",
|
||||||
|
"item.lzxnoneterraria.avenger_emblem": "Avenger Emblem",
|
||||||
|
"item.lzxnoneterraria.cross_necklace": "Cross Necklace",
|
||||||
|
"item.lzxnoneterraria.star_cloak": "Star Cloak",
|
||||||
|
"item.lzxnoneterraria.star_veil": "Star Veil",
|
||||||
|
"item.lzxnoneterraria.hand_warmer": "Hand Warmer",
|
||||||
"item.lzxnoneterraria.bezoar": "Bezoar",
|
"item.lzxnoneterraria.bezoar": "Bezoar",
|
||||||
"item.lzxnoneterraria.blindfold": "Blindfold",
|
"item.lzxnoneterraria.blindfold": "Blindfold",
|
||||||
"item.lzxnoneterraria.fast_clock": "Fast Clock",
|
"item.lzxnoneterraria.fast_clock": "Fast Clock",
|
||||||
@@ -174,6 +179,10 @@
|
|||||||
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%",
|
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%",
|
||||||
"tooltip.lzxnoneterraria.defense_bonus": "Defense +%s",
|
"tooltip.lzxnoneterraria.defense_bonus": "Defense +%s",
|
||||||
"tooltip.lzxnoneterraria.fire_block_immunity": "Immune to Fire Blocks",
|
"tooltip.lzxnoneterraria.fire_block_immunity": "Immune to Fire Blocks",
|
||||||
|
"tooltip.lzxnoneterraria.freeze_immunity": "Immune to Freezing",
|
||||||
|
"tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%",
|
||||||
|
"tooltip.lzxnoneterraria.fallen_star_summon": "Summons falling stars when damaged",
|
||||||
|
"tooltip.lzxnoneterraria.invulnerable_time_bonus": "Extends invulnerability time after being hit x%s",
|
||||||
|
|
||||||
"tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage",
|
"tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage",
|
||||||
"tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage",
|
"tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage",
|
||||||
@@ -187,6 +196,10 @@
|
|||||||
"lzxnoneterraria.configuration.knockback_resistance.tooltip": "Grants this amount of knockback resistance while equipped",
|
"lzxnoneterraria.configuration.knockback_resistance.tooltip": "Grants this amount of knockback resistance while equipped",
|
||||||
"lzxnoneterraria.configuration.defense": "Defense",
|
"lzxnoneterraria.configuration.defense": "Defense",
|
||||||
"lzxnoneterraria.configuration.defense.tooltip": "Grants this amount of armor while equipped",
|
"lzxnoneterraria.configuration.defense.tooltip": "Grants this amount of armor while equipped",
|
||||||
|
"lzxnoneterraria.configuration.fallen_star_damage": "Fallen Star Damage",
|
||||||
|
"lzxnoneterraria.configuration.fallen_star_damage.tooltip": "Damage dealt by falling stars",
|
||||||
|
"lzxnoneterraria.configuration.invulnerable_time_multiplier": "Invulnerable Time Multiplier",
|
||||||
|
"lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "Invulnerability time after being hit is multiplied by this value",
|
||||||
|
|
||||||
"tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage",
|
"tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage",
|
||||||
"tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage",
|
"tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage",
|
||||||
|
|||||||
@@ -99,6 +99,11 @@
|
|||||||
"item.lzxnoneterraria.cobalt_shield": "钴护盾",
|
"item.lzxnoneterraria.cobalt_shield": "钴护盾",
|
||||||
"item.lzxnoneterraria.obsidian_shield": "黑曜石护盾",
|
"item.lzxnoneterraria.obsidian_shield": "黑曜石护盾",
|
||||||
"item.lzxnoneterraria.ankh_shield": "十字章护盾",
|
"item.lzxnoneterraria.ankh_shield": "十字章护盾",
|
||||||
|
"item.lzxnoneterraria.avenger_emblem": "复仇者徽章",
|
||||||
|
"item.lzxnoneterraria.cross_necklace": "十字项链",
|
||||||
|
"item.lzxnoneterraria.star_cloak": "星星斗篷",
|
||||||
|
"item.lzxnoneterraria.star_veil": "星星面纱",
|
||||||
|
"item.lzxnoneterraria.hand_warmer": "暖手宝",
|
||||||
"item.lzxnoneterraria.bezoar": "牛黄",
|
"item.lzxnoneterraria.bezoar": "牛黄",
|
||||||
"item.lzxnoneterraria.blindfold": "蒙眼布",
|
"item.lzxnoneterraria.blindfold": "蒙眼布",
|
||||||
"item.lzxnoneterraria.fast_clock": "快走闹钟",
|
"item.lzxnoneterraria.fast_clock": "快走闹钟",
|
||||||
@@ -175,6 +180,10 @@
|
|||||||
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%",
|
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%",
|
||||||
"tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s",
|
"tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s",
|
||||||
"tooltip.lzxnoneterraria.fire_block_immunity": "对火块免疫",
|
"tooltip.lzxnoneterraria.fire_block_immunity": "对火块免疫",
|
||||||
|
"tooltip.lzxnoneterraria.freeze_immunity": "免疫冰冻",
|
||||||
|
"tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%",
|
||||||
|
"tooltip.lzxnoneterraria.fallen_star_summon": "受到伤害后会使星星坠落",
|
||||||
|
"tooltip.lzxnoneterraria.invulnerable_time_bonus": "延长受伤后的无敌状态时间 x%s",
|
||||||
|
|
||||||
"tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%",
|
"tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%",
|
||||||
"tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%",
|
"tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%",
|
||||||
@@ -188,6 +197,10 @@
|
|||||||
"lzxnoneterraria.configuration.knockback_resistance.tooltip": "佩戴后获得该数值的抗性击退",
|
"lzxnoneterraria.configuration.knockback_resistance.tooltip": "佩戴后获得该数值的抗性击退",
|
||||||
"lzxnoneterraria.configuration.defense": "防御",
|
"lzxnoneterraria.configuration.defense": "防御",
|
||||||
"lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的防御",
|
"lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的防御",
|
||||||
|
"lzxnoneterraria.configuration.fallen_star_damage": "星星伤害",
|
||||||
|
"lzxnoneterraria.configuration.fallen_star_damage.tooltip": "星星坠落造成的伤害",
|
||||||
|
"lzxnoneterraria.configuration.invulnerable_time_multiplier": "无敌时间倍率",
|
||||||
|
"lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "受伤后的无敌时间乘以该倍率",
|
||||||
|
|
||||||
"tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%",
|
"tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%",
|
||||||
"tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%",
|
"tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%",
|
||||||
@@ -200,7 +213,7 @@
|
|||||||
"lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率",
|
"lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率",
|
||||||
"tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%",
|
"tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%",
|
||||||
"tooltip.lzxnoneterraria.mana_cost_decrease": "魔力花费 -%s%%",
|
"tooltip.lzxnoneterraria.mana_cost_decrease": "魔力花费 -%s%%",
|
||||||
"tooltip.lzxnoneterraria.auto_mana_potion_use": "魔力枯竭时自动使用魔力药水",
|
"tooltip.lzxnoneterraria.auto_mana_potion_use": "需要时自动使用魔力药水",
|
||||||
"lzxnoneterraria.configuration.mana_cost_multiplier": "魔力消耗倍率",
|
"lzxnoneterraria.configuration.mana_cost_multiplier": "魔力消耗倍率",
|
||||||
"lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率",
|
"lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率",
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"parent": "lzxnoneterraria:item/item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "lzxnoneterraria:item/avenger_emblem"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"parent": "lzxnoneterraria:item/item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "lzxnoneterraria:item/cross_necklace"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"parent": "lzxnoneterraria:item/item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "lzxnoneterraria:item/hand_warmer"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"parent": "lzxnoneterraria:item/item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "lzxnoneterraria:item/star_cloak"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"parent": "lzxnoneterraria:item/item",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "lzxnoneterraria:item/star_veil"
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 245 B |
Binary file not shown.
|
After Width: | Height: | Size: 216 B |
Binary file not shown.
|
After Width: | Height: | Size: 229 B |
Binary file not shown.
|
After Width: | Height: | Size: 207 B |
Binary file not shown.
|
After Width: | Height: | Size: 308 B |
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"category": "equipment",
|
||||||
|
"pattern": [
|
||||||
|
"ABC",
|
||||||
|
"DFD",
|
||||||
|
"DED"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"A": {
|
||||||
|
"item": "minecraft:zombie_head"
|
||||||
|
},
|
||||||
|
"B": {
|
||||||
|
"item": "minecraft:skeleton_skull"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "minecraft:creeper_head"
|
||||||
|
},
|
||||||
|
"D": {
|
||||||
|
"item": "minecraft:diamond"
|
||||||
|
},
|
||||||
|
"E": {
|
||||||
|
"item": "minecraft:netherite_scrap"
|
||||||
|
},
|
||||||
|
"F": {
|
||||||
|
"item": "lzxnoneterraria:ranger_emblem"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"id": "lzxnoneterraria:avenger_emblem",
|
||||||
|
"count": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"category": "equipment",
|
||||||
|
"pattern": [
|
||||||
|
"ABC",
|
||||||
|
"DFD",
|
||||||
|
"DED"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"A": {
|
||||||
|
"item": "minecraft:zombie_head"
|
||||||
|
},
|
||||||
|
"B": {
|
||||||
|
"item": "minecraft:skeleton_skull"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "minecraft:creeper_head"
|
||||||
|
},
|
||||||
|
"D": {
|
||||||
|
"item": "minecraft:diamond"
|
||||||
|
},
|
||||||
|
"E": {
|
||||||
|
"item": "minecraft:netherite_scrap"
|
||||||
|
},
|
||||||
|
"F": {
|
||||||
|
"item": "lzxnoneterraria:sorcerer_emblem"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"id": "lzxnoneterraria:avenger_emblem",
|
||||||
|
"count": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"category": "equipment",
|
||||||
|
"pattern": [
|
||||||
|
"ABC",
|
||||||
|
"DFD",
|
||||||
|
"DED"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"A": {
|
||||||
|
"item": "minecraft:zombie_head"
|
||||||
|
},
|
||||||
|
"B": {
|
||||||
|
"item": "minecraft:skeleton_skull"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "minecraft:creeper_head"
|
||||||
|
},
|
||||||
|
"D": {
|
||||||
|
"item": "minecraft:diamond"
|
||||||
|
},
|
||||||
|
"E": {
|
||||||
|
"item": "minecraft:netherite_scrap"
|
||||||
|
},
|
||||||
|
"F": {
|
||||||
|
"item": "lzxnoneterraria:summoner_emblem"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"id": "lzxnoneterraria:avenger_emblem",
|
||||||
|
"count": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"category": "equipment",
|
||||||
|
"pattern": [
|
||||||
|
"ABC",
|
||||||
|
"DFD",
|
||||||
|
"DED"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"A": {
|
||||||
|
"item": "minecraft:zombie_head"
|
||||||
|
},
|
||||||
|
"B": {
|
||||||
|
"item": "minecraft:skeleton_skull"
|
||||||
|
},
|
||||||
|
"C": {
|
||||||
|
"item": "minecraft:creeper_head"
|
||||||
|
},
|
||||||
|
"D": {
|
||||||
|
"item": "minecraft:diamond"
|
||||||
|
},
|
||||||
|
"E": {
|
||||||
|
"item": "minecraft:netherite_scrap"
|
||||||
|
},
|
||||||
|
"F": {
|
||||||
|
"item": "lzxnoneterraria:warrior_emblem"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"id": "lzxnoneterraria:avenger_emblem",
|
||||||
|
"count": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shapeless",
|
||||||
|
"category": "equipment",
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "lzxnoneterraria:cross_necklace"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "lzxnoneterraria:star_cloak"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"result": {
|
||||||
|
"id": "lzxnoneterraria:star_veil",
|
||||||
|
"count": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,11 @@
|
|||||||
"lzxnoneterraria:cobalt_shield",
|
"lzxnoneterraria:cobalt_shield",
|
||||||
"lzxnoneterraria:obsidian_shield",
|
"lzxnoneterraria:obsidian_shield",
|
||||||
"lzxnoneterraria:ankh_shield",
|
"lzxnoneterraria:ankh_shield",
|
||||||
|
"lzxnoneterraria:avenger_emblem",
|
||||||
|
"lzxnoneterraria:cross_necklace",
|
||||||
|
"lzxnoneterraria:star_cloak",
|
||||||
|
"lzxnoneterraria:star_veil",
|
||||||
|
"lzxnoneterraria:hand_warmer",
|
||||||
"lzxnoneterraria:bezoar",
|
"lzxnoneterraria:bezoar",
|
||||||
"lzxnoneterraria:blindfold",
|
"lzxnoneterraria:blindfold",
|
||||||
"lzxnoneterraria:fast_clock",
|
"lzxnoneterraria:fast_clock",
|
||||||
|
|||||||
Reference in new issue
Block a user