From ed7fd8d44075bfb54477e87e7f8d62f5d0d2af52 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Wed, 5 Aug 2026 00:59:06 +0800 Subject: [PATCH] v1.7.2 --- ...ClientStaticProjectileRenderBehaviors.java | 2 + .../client/item/ClientDropFallenStar.java | 8 +- .../accessory/ClientAccessoryFallenStar.java | 72 +++++++++ .../ModCreativeModeTabs.java | 5 + .../projectile/StaticProjectileBehaviors.java | 3 + .../terraria/event/AccessoryEventHandler.java | 71 +------- .../terraria/event/EffectLogicHandler.java | 3 +- .../terraria/event/EntityEventHandler.java | 18 ++- .../com/lzxnone/terraria/item/ModItems.java | 5 + .../item/accessory/AccessoryUtil.java | 153 +++++++++++++++++- .../item/accessory/AvengerEmblem.java | 60 +++++++ .../item/accessory/CrossNecklace.java | 62 +++++++ .../terraria/item/accessory/HandWarmer.java | 29 ++++ .../terraria/item/accessory/StarCloak.java | 63 ++++++++ .../terraria/item/accessory/StarVeil.java | 83 ++++++++++ .../item/effect/FallenStarSummoner.java | 86 ++++++++++ .../effect/FireBlockImmunityModifier.java | 2 +- .../item/effect/FreezingImmunityModifier.java | 8 + .../item/effect/InvulnerableTimeModifier.java | 8 + .../terraria/item/weapon/melee/Starfury.java | 2 +- .../terraria/ui/config/ConfigList.java | 6 + .../lzxnone/terraria/utils/DamageUtil.java | 10 +- .../assets/lzxnoneterraria/lang/en_us.json | 13 ++ .../assets/lzxnoneterraria/lang/zh_cn.json | 15 +- .../models/item/avenger_emblem.json | 6 + .../models/item/cross_necklace.json | 6 + .../models/item/hand_warmer.json | 6 + .../models/item/star_cloak.json | 6 + .../models/item/star_veil.json | 6 + .../textures/item/avenger_emblem.png | Bin 0 -> 245 bytes .../textures/item/cross_necklace.png | Bin 0 -> 216 bytes .../textures/item/hand_warmer.png | Bin 0 -> 229 bytes .../textures/item/star_cloak.png | Bin 0 -> 207 bytes .../textures/item/star_veil.png | Bin 0 -> 308 bytes .../recipe/avenger_emblem_ranger.json | 33 ++++ .../recipe/avenger_emblem_sorcerer.json | 33 ++++ .../recipe/avenger_emblem_summoner.json | 33 ++++ .../recipe/avenger_emblem_warrior.json | 33 ++++ .../lzxnoneterraria/recipe/star_veil.json | 16 ++ .../lzxnoneterraria/tags/item/accessory.json | 5 + 40 files changed, 884 insertions(+), 86 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/accessory/ClientAccessoryFallenStar.java create mode 100644 src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java create mode 100644 src/main/java/com/lzxnone/terraria/item/accessory/CrossNecklace.java create mode 100644 src/main/java/com/lzxnone/terraria/item/accessory/HandWarmer.java create mode 100644 src/main/java/com/lzxnone/terraria/item/accessory/StarCloak.java create mode 100644 src/main/java/com/lzxnone/terraria/item/accessory/StarVeil.java create mode 100644 src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java create mode 100644 src/main/java/com/lzxnone/terraria/item/effect/FreezingImmunityModifier.java create mode 100644 src/main/java/com/lzxnone/terraria/item/effect/InvulnerableTimeModifier.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/avenger_emblem.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/cross_necklace.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/hand_warmer.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/star_cloak.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/star_veil.json create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/avenger_emblem.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/cross_necklace.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/hand_warmer.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/star_cloak.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/star_veil.png create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_ranger.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_sorcerer.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_summoner.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_warrior.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/star_veil.json diff --git a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java index a73e771..e7f8663 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java @@ -1,5 +1,6 @@ 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.ClientDevilsDevastation; 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.SUPER_STAR_PRISMATIC_BOLT, ClientSuperStarShooter.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) { diff --git a/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java b/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java index d6168b2..093fc31 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java +++ b/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; import com.lzxnone.terraria.entity.ModRenderTypes; import com.lzxnone.terraria.entity.TintedVertexConsumer; import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.MathUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; @@ -91,13 +92,12 @@ public class ClientDropFallenStar { if(summon.onGround()) return; Vec3 dir = summon.getDeltaMovement().normalize(); - float yRot = (float)(Mth.atan2(dir.x, dir.z) * Mth.RAD_TO_DEG); - float xRot = (float)(Mth.atan2(dir.y, Math.sqrt(dir.x * dir.x + dir.z * dir.z)) * Mth.RAD_TO_DEG); + float[] xyRot = MathUtil.computeXYRot(dir.toVector3f()); poseStack.pushPose(); poseStack.translate(-dir.x * 2, -dir.y * 2, -dir.z * 2); - poseStack.mulPose(Axis.YP.rotationDegrees(yRot)); - poseStack.mulPose(Axis.XP.rotationDegrees(-xRot)); + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); poseStack.mulPose(Axis.YP.rotationDegrees(270.0F)); VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(STAR_WAVE_RES)); diff --git a/src/main/java/com/lzxnone/terraria/client/item/accessory/ClientAccessoryFallenStar.java b/src/main/java/com/lzxnone/terraria/client/item/accessory/ClientAccessoryFallenStar.java new file mode 100644 index 0000000..6dc6020 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/accessory/ClientAccessoryFallenStar.java @@ -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); + } +} diff --git a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java index 411c787..9745092 100644 --- a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java @@ -76,6 +76,11 @@ public class ModCreativeModeTabs { output.accept(ModItems.COBALT_SHIELD.get()); output.accept(ModItems.OBSIDIAN_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.BLINDFOLD.get()); output.accept(ModItems.FAST_CLOCK.get()); diff --git a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java index df6aad4..1bcf645 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.entity.projectile; 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.ranged.Flamethrower; 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 SUPER_STAR_PRISMATIC_BOLT = "super_star_prismatic_blot"; public static final String POSSESSION_PROJECTILE = "possession_projectile"; + public static final String ACCESSORY_FALLEN_STAR_PROJECTILE = "accessory_fallen_star_projectile"; static { BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() { @@ -59,6 +61,7 @@ public class StaticProjectileBehaviors { BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR); BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR); BEHAVIORS.put(POSSESSION_PROJECTILE, Possession.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(ACCESSORY_FALLEN_STAR_PROJECTILE, FallenStarSummoner.PROJECTILE_BEHAVIOR); } public static IStaticProjectileBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java index 137b7a7..d546856 100644 --- a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java @@ -1,13 +1,7 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.effect.ModEffects; 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.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -15,73 +9,10 @@ import top.theillusivec4.curios.api.event.CurioChangeEvent; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class AccessoryEventHandler { - @SubscribeEvent public static void onCurioChange(CurioChangeEvent event) { LivingEntity entity = event.getEntity(); if(entity.level().isClientSide()) return; - removeImmuneEffects(entity); - } - - public static boolean isImmuneToEffect(LivingEntity entity, Holder 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]; + AccessoryUtil.removeImmuneEffects(entity); } } diff --git a/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java index 7539007..f7d731f 100644 --- a/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java @@ -3,6 +3,7 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; 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.utils.SoundUtil; import net.minecraft.core.Holder; @@ -25,7 +26,7 @@ public class EffectLogicHandler { if(!entity.level().isClientSide()) { MobEffectInstance instance = event.getEffectInstance(); if(instance == null) return; - if(AccessoryEventHandler.isImmuneToEffect(entity, instance.getEffect())) { + if(AccessoryUtil.isImmuneToEffect(entity, instance.getEffect())) { event.setResult(MobEffectEvent.Applicable.Result.DO_NOT_APPLY); } } diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index aa99d5a..9a7251d 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.ModEffects; 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.summon.whip.Possession; 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.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.item.Items; 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.LivingDeathEvent; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; +import net.neoforged.neoforge.event.tick.PlayerTickEvent; import java.util.List; import java.util.UUID; @@ -31,7 +34,7 @@ public class EntityEventHandler { if(entity.level().isClientSide()) return; DamageSource source = event.getSource(); 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); } } @@ -40,6 +43,9 @@ public class EntityEventHandler { public static void onLivingDamage(LivingDamageEvent.Post event) { //支配之鞭 预兆标记 Possession.markEvent(event); + + AccessoryUtil.applyInvulnerableTimeModifier(event.getEntity()); + AccessoryUtil.applyFallenStarSummoner(event.getEntity()); } @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); + } + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 1348814..abf1fd0 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -121,6 +121,11 @@ public class ModItems { public static final DeferredItem COBALT_SHIELD = ITEMS.register("cobalt_shield", CobaltShield::new); public static final DeferredItem OBSIDIAN_SHIELD = ITEMS.register("obsidian_shield", ObsidianShield::new); public static final DeferredItem ANKH_SHIELD = ITEMS.register("ankh_shield", AnkhShield::new); + public static final DeferredItem AVENGER_EMBLEM = ITEMS.register("avenger_emblem", AvengerEmblem::new); + public static final DeferredItem CROSS_NECKLACE = ITEMS.register("cross_necklace", CrossNecklace::new); + public static final DeferredItem STAR_CLOAK = ITEMS.register("star_cloak", StarCloak::new); + public static final DeferredItem STAR_VEIL = ITEMS.register("star_veil", StarVeil::new); + public static final DeferredItem HAND_WARMER = ITEMS.register("hand_warmer", HandWarmer::new); public static final DeferredItem BEZOAR = ITEMS.register("bezoar", Bezoar::new); public static final DeferredItem BLINDFOLD = ITEMS.register("blindfold", Blindfold::new); public static final DeferredItem FAST_CLOCK = ITEMS.register("fast_clock", FastClock::new); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java index 21cff96..d6da1d9 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -1,18 +1,36 @@ 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.player.Player; 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.type.inventory.IDynamicStackHandler; import java.util.function.BiConsumer; public class AccessoryUtil { - public static final String TERRARIA_ACCESSORY_SLOT = "terraria_accessory"; - public static void forEachAccessory(LivingEntity entity, BiConsumer consumer) { CuriosApi.getCuriosInventory(entity) - .flatMap(handler -> handler.getStacksHandler(TERRARIA_ACCESSORY_SLOT)) + .flatMap(handler -> handler.getStacksHandler("terraria_accessory")) .ifPresent(stacksHandler -> { IDynamicStackHandler stacks = stacksHandler.getStacks(); for(int i = 0; i < stacks.getSlots(); i++) { @@ -23,4 +41,133 @@ public class AccessoryUtil { } }); } + + public static boolean isImmuneToEffect(LivingEntity entity, Holder 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); + } + } + } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java new file mode 100644 index 0000000..8bd346a --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java @@ -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, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, 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 tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.damage_increase", + EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER) + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CrossNecklace.java b/src/main/java/com/lzxnone/terraria/item/accessory/CrossNecklace.java new file mode 100644 index 0000000..dd214bd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CrossNecklace.java @@ -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 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)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/HandWarmer.java b/src/main/java/com/lzxnone/terraria/item/accessory/HandWarmer.java new file mode 100644 index 0000000..ffe4780 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/HandWarmer.java @@ -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 tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.freeze_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/StarCloak.java b/src/main/java/com/lzxnone/terraria/item/accessory/StarCloak.java new file mode 100644 index 0000000..4766187 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/StarCloak.java @@ -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 tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fallen_star_summon" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/StarVeil.java b/src/main/java/com/lzxnone/terraria/item/accessory/StarVeil.java new file mode 100644 index 0000000..7ab93b7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/StarVeil.java @@ -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 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)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java b/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java new file mode 100644 index 0000000..dad5526 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java @@ -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(); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java index 226b165..c5aa8dc 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java @@ -5,5 +5,5 @@ import net.minecraft.world.item.ItemStack; public interface FireBlockImmunityModifier { //火块(火/灵魂火/岩浆块)免疫 - default boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { return false; } + boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity); } diff --git a/src/main/java/com/lzxnone/terraria/item/effect/FreezingImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/FreezingImmunityModifier.java new file mode 100644 index 0000000..eb6bc01 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/FreezingImmunityModifier.java @@ -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); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/InvulnerableTimeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/InvulnerableTimeModifier.java new file mode 100644 index 0000000..aad71ab --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/InvulnerableTimeModifier.java @@ -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); +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java index df71f8e..f98cc65 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java @@ -166,7 +166,7 @@ public class Starfury extends MeleeWeapon { StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), level); projectile.setOwner(player); - projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, player.getWeaponItem().copy()); + projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, itemstack.copy()); projectile.setPos(spawnPos); projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.STARFURY_STAR); projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "item"); diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index b24c384..57c93aa 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -19,6 +19,9 @@ import com.lzxnone.terraria.item.accessory.AnkhCharm; import com.lzxnone.terraria.item.accessory.CobaltShield; import com.lzxnone.terraria.item.accessory.ObsidianShield; 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.NecromanticScroll; import com.lzxnone.terraria.item.accessory.PapyrusScarab; @@ -164,6 +167,9 @@ public class ConfigList { CobaltShield.CONFIG_LIST_ITEM, ObsidianShield.CONFIG_LIST_ITEM, AnkhShield.CONFIG_LIST_ITEM, + StarCloak.CONFIG_LIST_ITEM, + CrossNecklace.CONFIG_LIST_ITEM, + StarVeil.CONFIG_LIST_ITEM, ManaFlower.CONFIG_LIST_ITEM, HerculesBeetle.CONFIG_LIST_ITEM, NecromanticScroll.CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index ee48f61..4edfc9e 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -3,14 +3,11 @@ package com.lzxnone.terraria.utils; import com.lzxnone.terraria.damage.ModDamageTypes; import com.lzxnone.terraria.effect.IchorEffect; 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.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.*; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; 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.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.phys.Vec3; @@ -29,12 +25,18 @@ import java.util.Objects; public class DamageUtil { public enum DamageCategory { + NORMAL, MELEE, RANGED, SUMMON, MAGIC, 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) { return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.MELEE); } diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 25de151..38e9578 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -99,6 +99,11 @@ "item.lzxnoneterraria.cobalt_shield": "Cobalt Shield", "item.lzxnoneterraria.obsidian_shield": "Obsidian 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.blindfold": "Blindfold", "item.lzxnoneterraria.fast_clock": "Fast Clock", @@ -174,6 +179,10 @@ "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", "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_decrease": "-%s%% melee damage", @@ -187,6 +196,10 @@ "lzxnoneterraria.configuration.knockback_resistance.tooltip": "Grants this amount of knockback resistance while equipped", "lzxnoneterraria.configuration.defense": "Defense", "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_decrease": "-%s%% ranged damage", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 3db4084..9a8dee5 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -99,6 +99,11 @@ "item.lzxnoneterraria.cobalt_shield": "钴护盾", "item.lzxnoneterraria.obsidian_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.blindfold": "蒙眼布", "item.lzxnoneterraria.fast_clock": "快走闹钟", @@ -175,6 +180,10 @@ "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", "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_decrease": "近战伤害 -%s%%", @@ -188,6 +197,10 @@ "lzxnoneterraria.configuration.knockback_resistance.tooltip": "佩戴后获得该数值的抗性击退", "lzxnoneterraria.configuration.defense": "防御", "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_decrease": "远程伤害 -%s%%", @@ -200,7 +213,7 @@ "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", "tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%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.tooltip": "佩戴后魔力消耗乘以该倍率", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/avenger_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/avenger_emblem.json new file mode 100644 index 0000000..7489fc7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/avenger_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/avenger_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/cross_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/cross_necklace.json new file mode 100644 index 0000000..7197e8b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/cross_necklace.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/cross_necklace" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/hand_warmer.json b/src/main/resources/assets/lzxnoneterraria/models/item/hand_warmer.json new file mode 100644 index 0000000..28729ec --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/hand_warmer.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/hand_warmer" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/star_cloak.json b/src/main/resources/assets/lzxnoneterraria/models/item/star_cloak.json new file mode 100644 index 0000000..04a926c --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/star_cloak.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/star_cloak" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/star_veil.json b/src/main/resources/assets/lzxnoneterraria/models/item/star_veil.json new file mode 100644 index 0000000..517431f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/star_veil.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/star_veil" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/avenger_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/avenger_emblem.png new file mode 100644 index 0000000000000000000000000000000000000000..6d1106b7ea45cc9c835dee715fb99b43fd608ac3 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*t3?v(r4=o2$Dgizru0UErLBYYnVd27sMhqMw zAtCqg-;ZSAdn==|n@_fbLG-_0D1VZL0Z<)dNswPKgTu2MX+TcBr;B4q#jVndj=au> zJj@q@I9P*0s5OA2HAtd0P-5rKyJbK2&*YytFJxzyRa=v&^!}KP6F%kUuRFHLzVBGW z)q2P7XF`jcvuNXF)6USc<mRY!>-KN>$u{krXR-Xu-5~cfc)I$ztaD0e0s!6vR(t>e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/cross_necklace.png b/src/main/resources/assets/lzxnoneterraria/textures/item/cross_necklace.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d01d1cd010cb992480bfcca74d7fdb8f9ee5fd GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^Qb4T0!VDz;wU(LzDd_;85LY1m|L6AqpU#}w>M^BG zqAG^V-hOLr_?c!U&Kv( zOa825;Rfel>sfRi)A_MLb7|!nqI?eT1UeB;15@;=h Mr>mdKI;Vst0A7wyc>n+a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/hand_warmer.png b/src/main/resources/assets/lzxnoneterraria/textures/item/hand_warmer.png new file mode 100644 index 0000000000000000000000000000000000000000..a9677f17537fe91eee3c76f7d4df5dfb43f50493 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0H^rPR@#fVFEw@Q)_Dr zGqcYho?p6jap%^pDcgOv1Em>Dg8YIR9G=}s19B=nT^vIyZq;7A&3izBgEb&5fi)b4 zj=wv)Y#+x{_jjDfR=C8AioD%=FoVn3`y_+!!>Hvh4v!5~ol-ycs4~xqxGyVtVy1C~ zWy7is*JXA%MoVvE({m`BSo?q}`(++WhyzSwNs3}w3$?uCFE82rz1x_1M(Bz+xomelGkO+YLgFg>@ncT#;ybU2*L0yLe-c zR>Sm*rbZl2UJ^Q~UU#*4npS+>mU&nIkmA)tQA_d+yVvvvYQCS^RVc^!Eavql8;0gJ zU-w;`mdKI;Vst E03s57+5i9m literal 0 HcmV?d00001 diff --git a/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_ranger.json b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_ranger.json new file mode 100644 index 0000000..afaf5f8 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_ranger.json @@ -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 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_sorcerer.json b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_sorcerer.json new file mode 100644 index 0000000..372e953 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_sorcerer.json @@ -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 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_summoner.json b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_summoner.json new file mode 100644 index 0000000..c306f59 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_summoner.json @@ -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 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_warrior.json b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_warrior.json new file mode 100644 index 0000000..7ed512b --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/avenger_emblem_warrior.json @@ -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 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/star_veil.json b/src/main/resources/data/lzxnoneterraria/recipe/star_veil.json new file mode 100644 index 0000000..c8154bc --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/star_veil.json @@ -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 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json index c70a3bc..67c2694 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -13,6 +13,11 @@ "lzxnoneterraria:cobalt_shield", "lzxnoneterraria:obsidian_shield", "lzxnoneterraria:ankh_shield", + "lzxnoneterraria:avenger_emblem", + "lzxnoneterraria:cross_necklace", + "lzxnoneterraria:star_cloak", + "lzxnoneterraria:star_veil", + "lzxnoneterraria:hand_warmer", "lzxnoneterraria:bezoar", "lzxnoneterraria:blindfold", "lzxnoneterraria:fast_clock",