From 573ce1be16525c0e5995eb5097d6724eba180a27 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Sat, 1 Aug 2026 22:44:00 +0800 Subject: [PATCH] v1.6.1 --- .../java/com/lzxnone/terraria/ModSounds.java | 8 + .../com/lzxnone/terraria/block/ModBlocks.java | 11 ++ ...ClientStaticProjectileRenderBehaviors.java | 2 + .../ClientStaticSummonRenderBehaviors.java | 1 + .../client/item/summon/ClientPossession.java | 63 +++++++ .../ModCreativeModeTabs.java | 1 + .../projectile/StaticProjectileBehaviors.java | 3 + .../entity/summon/StaticSummonBehaviors.java | 3 + .../com/lzxnone/terraria/item/ModItems.java | 5 + .../item/weapon/summon/whip/Possession.java | 132 ++++++++++++++ .../item/weapon/summon/whip/Whip.java | 28 ++- .../lzxnoneterraria/blockstates/vision.json | 7 + .../assets/lzxnoneterraria/lang/en_us.json | 1 + .../assets/lzxnoneterraria/lang/zh_cn.json | 1 + .../lzxnoneterraria/models/block/vision.json | 172 ++++++++++++++++++ .../models/item/moon_lord_eye.json | 165 +++++++++++++++++ .../lzxnoneterraria/models/item/vision.json | 3 + .../assets/lzxnoneterraria/sounds.json | 6 + .../assets/lzxnoneterraria/sounds/whip.ogg | Bin 0 -> 11501 bytes .../lzxnoneterraria/sounds/whip_use.ogg | Bin 0 -> 8619 bytes .../lzxnoneterraria/textures/block/vision.png | Bin 0 -> 1187 bytes .../textures/vfx/possession_beam.png | Bin 0 -> 1774 bytes 22 files changed, 609 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/summon/ClientPossession.java create mode 100644 src/main/resources/assets/lzxnoneterraria/blockstates/vision.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/block/vision.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/moon_lord_eye.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/vision.json create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/whip.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/whip_use.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/block/vision.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/vfx/possession_beam.png diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index b21e373..2b1349e 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -51,6 +51,14 @@ public class ModSounds { SOUND_EVENTS.register("summon_terraprisma", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "summon_terraprisma"))); + public static final Supplier WHIP_USE = + SOUND_EVENTS.register("whip_use", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "whip_use"))); + public static final Supplier WHIP = + SOUND_EVENTS.register("whip", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "whip"))); public static final Supplier SHOT = SOUND_EVENTS.register("shot", () -> SoundEvent.createVariableRangeEvent( diff --git a/src/main/java/com/lzxnone/terraria/block/ModBlocks.java b/src/main/java/com/lzxnone/terraria/block/ModBlocks.java index d97e7e4..42a5304 100644 --- a/src/main/java/com/lzxnone/terraria/block/ModBlocks.java +++ b/src/main/java/com/lzxnone/terraria/block/ModBlocks.java @@ -1,8 +1,19 @@ package com.lzxnone.terraria.block; import com.lzxnone.terraria.LzxnoneTerraria; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredRegister; public class ModBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(LzxnoneTerraria.MODID); + + public static final DeferredBlock VISION = BLOCKS.register("vision", () -> new Block( + BlockBehaviour.Properties.of() + .strength(1.0F) + .noOcclusion() + .sound(SoundType.GLASS) + )); } 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 d3511af..a73e771 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 @@ -7,6 +7,7 @@ import com.lzxnone.terraria.client.item.melee.ClientMuramasa; import com.lzxnone.terraria.client.item.melee.ClientZenith; import com.lzxnone.terraria.client.item.ranged.ClientFlamethrower; import com.lzxnone.terraria.client.item.ranged.ClientSuperStarShooter; +import com.lzxnone.terraria.client.item.summon.ClientPossession; import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import java.util.HashMap; @@ -31,6 +32,7 @@ public class ClientStaticProjectileRenderBehaviors { BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE3, ClientDevilsDevastation.PROJECTILE_BEHAVIOR3); 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); } public static IStaticProjectileRenderBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java index 0a0372e..1392cc0 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java @@ -48,6 +48,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.LAST_PRISM_BEAM, ClientLastPrism.SUMMON_BEHAVIOR2); BEHAVIORS.put(StaticSummonBehaviors.TERRAPRISMA, ClientTerraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.POSSESSION, ClientWhip.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.POSSESSION_VISION, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/item/summon/ClientPossession.java b/src/main/java/com/lzxnone/terraria/client/item/summon/ClientPossession.java new file mode 100644 index 0000000..b4a9705 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/summon/ClientPossession.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.client.item.summon; + +import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +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.phys.Vec3; +import org.joml.Matrix4f; + +public class ClientPossession { + public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() { + private static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/possession_beam.png"); + + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticProjectile projectile)) return; + if(projectile.trailPositions.size() < 4) return; + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(RES)); + Matrix4f matrix = poseStack.last().pose(); + Vec3 origin = projectile.getPosition(partialTick); + int pairCount = projectile.trailPositions.size() / 2; + int quadCount = pairCount - 1; + if(quadCount <= 0) return; + + float lifetime = Math.max(1.0F, projectile.getEntityData().get(StaticProjectile.LIFETIME)); + float age = projectile.getEntityData().get(StaticProjectile.AGE) + partialTick; + float baseAlpha = Math.max(0.0F, 1.0F - Math.max(0.0F, age - lifetime * 0.75F) / (lifetime * 0.25F)); + + for(int i = 0; i < quadCount; i++) { + Vec3 headRight = projectile.trailPositions.get(i * 2); + Vec3 headLeft = projectile.trailPositions.get(i * 2 + 1); + Vec3 tailRight = projectile.trailPositions.get((i + 1) * 2); + Vec3 tailLeft = projectile.trailPositions.get((i + 1) * 2 + 1); + + float headU = 1.0F - i / (float)quadCount; + float tailU = 1.0F - (i + 1) / (float)quadCount; + + for(int k = 0;k < 3;k++) { + addVertex(consumer, matrix, headRight.subtract(origin), headU, 0.0F, 1.0f); + addVertex(consumer, matrix, headLeft.subtract(origin), headU, 1.0F, 1.0f); + addVertex(consumer, matrix, tailLeft.subtract(origin), tailU, 1.0F, 1.0f); + addVertex(consumer, matrix, tailRight.subtract(origin), tailU, 0.0F, 1.0f); + } + } + } + + private static void addVertex(VertexConsumer consumer, Matrix4f matrix, Vec3 pos, float u, float v, float alpha) { + consumer.addVertex(matrix, (float)pos.x, (float)pos.y, (float)pos.z) + .setColor(1.0F, 1.0F, 1.0F, alpha) + .setUv(u, v) + .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 76b312f..1c59ed8 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 @@ -118,5 +118,6 @@ public class ModCreativeModeTabs { .displayItems((parameters, output) -> { output.accept(ModItems.TERRAPRISMA.get()); output.accept(ModItems.POSSESSION.get()); + output.accept(ModItems.VISION.get()); }).build()); } 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 3864b30..df6aad4 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java @@ -4,6 +4,7 @@ import com.lzxnone.terraria.item.ammo.CrystalBullet; import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; +import com.lzxnone.terraria.item.weapon.summon.whip.Possession; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; @@ -27,6 +28,7 @@ public class StaticProjectileBehaviors { public static final String DEVILS_DEVASTATION_PROJECTILE3 = "devils_devastation_projectile3"; 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"; static { BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() { @@ -56,6 +58,7 @@ public class StaticProjectileBehaviors { BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE3, DevilsDevastation.PROJECTILE_BEHAVIOR3); BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR); BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(POSSESSION_PROJECTILE, Possession.PROJECTILE_BEHAVIOR); } public static IStaticProjectileBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index 017d222..b4a7332 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -9,6 +9,7 @@ import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; import com.lzxnone.terraria.item.weapon.ranged.StarCannon; import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; import com.lzxnone.terraria.item.weapon.summon.Terraprisma; +import com.lzxnone.terraria.item.weapon.summon.whip.Possession; import com.lzxnone.terraria.item.weapon.summon.whip.Whip; import java.util.HashMap; @@ -40,6 +41,7 @@ public class StaticSummonBehaviors { public static final String LAST_PRISM_BEAM = "last_prism_beam"; public static final String TERRAPRISMA = "terraprisma"; public static final String POSSESSION = "possession"; + public static final String POSSESSION_VISION = "possession_vision"; //通用子弹实体 public static final String MUSKET_BALL = "musket_ball"; @@ -88,6 +90,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(LAST_PRISM_BEAM, LastPrism.SUMMON_BEHAVIOR2); BEHAVIORS.put(TERRAPRISMA, Terraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(POSSESSION, Whip.SUMMON_BEHAVIOR); + BEHAVIORS.put(POSSESSION_VISION, Possession.SUMMON_BEHAVIOR); BEHAVIORS.put(MUSKET_BALL, MusketBall.SUMMON_BEHAVIOR); BEHAVIORS.put(METEOR_SHOT, MeteorShot.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 955f93c..2a701ca 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.item; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.block.ModBlocks; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.accessory.ManaFlower; import com.lzxnone.terraria.item.accessory.NaturesGift; @@ -15,6 +16,7 @@ import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; import com.lzxnone.terraria.item.weapon.ranged.gun.*; import com.lzxnone.terraria.item.weapon.summon.*; import com.lzxnone.terraria.item.weapon.summon.whip.Possession; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; @@ -111,6 +113,9 @@ public class ModItems { //食物 public static final DeferredItem MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new); + //方块 + public static final DeferredItem VISION = ITEMS.register("vision", () -> new BlockItem(ModBlocks.VISION.get(), new Item.Properties())); + //弹射物 public static final DeferredItem BULLET_PROJECTILE = ITEMS.register("bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", () -> new Item(new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java index 0abe75b..b11ab18 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java @@ -1,14 +1,36 @@ package com.lzxnone.terraria.item.weapon.summon.whip; +import com.lzxnone.terraria.block.ModBlocks; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.ParticleUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +import java.util.Locale; public class Possession extends Whip { private static final double RANGE = 32.0D; private static final float DAMAGE = 5.0F; private static final int ROTATE = 60; + private static final double BEAM_SPEED = 1.5; + private static final double BEAM_HEIGHT = 4.0D; + private static final float BEAM_DAMAGE = 5.0f; public Possession() { super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.RARE)); @@ -48,4 +70,114 @@ public class Possession extends Whip { protected int getInvulnerableTime() { return 12; } + + public static final DustParticleOptions PARTICLE = new DustParticleOptions( + 0.1f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(0.0F, 1.0F, 1.0F), + new Vector3f(0.1F, 0.4F, 1.0F) + } + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + int age = summon.getEntityData().get(StaticSummon.AGE); + int lifetime = summon.getEntityData().get(StaticSummon.LIFETIME); + float progress = (float) age / lifetime; + if(progress > 0.5f) { + summon.getEntityData().set(StaticSummon.COLOR_A, Math.max(0, 1.0f - (progress - 0.5f) / 0.5f)); + } + if(progress > 0.25f) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vec3 move = new Vec3( + customData.contains("moveX") ? customData.getDouble("moveX") : 0, + customData.contains("moveY") ? customData.getDouble("moveY") : 0, + customData.contains("moveZ") ? customData.getDouble("moveZ") : 0 + ); + summon.setPos(summon.position().add(move.normalize().scale(0.25))); + } + } + }; + + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { + @Override + public void onMoving(StaticProjectile projectile) { + Vector3f[] dirs = MathUtil.computeCoordinateSystem(projectile.getDeltaMovement().toVector3f(), 0); + Vec3 right = MathUtil.toVec3(dirs[2]); + projectile.trailPositions.addFirst(projectile.position().add(right.scale(0.1))); + projectile.trailPositions.addFirst(projectile.position().add(right.scale(-0.1))); + while(projectile.trailPositions.size() > 10) projectile.trailPositions.removeLast(); + } + + @Override + public void onHitEntity(StaticProjectile projectile, EntityHitResult result) { + if(!projectile.level().isClientSide()) { + Entity target = result.getEntity(); + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), BEAM_DAMAGE, 0)) { + target.invulnerableTime = 5; + } + } + } + }; + + @Override + protected void onHitTarget(StaticSummon summon, Entity target) { + if(summon.level() instanceof ServerLevel serverLevel) { + Vec3 summonPos = MathUtil.getRandomPosOnRadius(summon.position(), 8); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(target.position().subtract(summonPos).toVector3f(), 0); + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + + StaticSummon visionSummon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), serverLevel); + visionSummon.setOwner(summon.getOwner()); + visionSummon.setPos(summonPos); + visionSummon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.POSSESSION_VISION); + visionSummon.getEntityData().set(StaticSummon.RENDER_MODE, "block"); + visionSummon.getEntityData().set(StaticSummon.BLOCK, ModBlocks.VISION.get().defaultBlockState()); + visionSummon.getEntityData().set(StaticSummon.LIFETIME, 40); + visionSummon.getEntityData().set(StaticSummon.GLOW, true); + visionSummon.setNoGravity(true); + visionSummon.noPhysics = true; + visionSummon.setXRot(xyRot[0]); + visionSummon.setYRot(xyRot[1]); + Vec3 randomPos = MathUtil.getRandomPosInRadius(visionSummon.position(), 1); + Vec3 randomDir = randomPos.subtract(visionSummon.position()).normalize(); + CompoundTag customData = new CompoundTag(); + customData.putDouble("moveX", randomDir.x); + customData.putDouble("moveY", randomDir.y); + customData.putDouble("moveZ", randomDir.z); + visionSummon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + summon.level().addFreshEntity(visionSummon); + + double dist = summonPos.subtract(target.getBoundingBox().getCenter()).length(); + int lifetime = Math.max(1, (int)Math.ceil(dist / BEAM_SPEED)); + double speed = dist / lifetime; + double height = Math.min(BEAM_HEIGHT, dist * 0.15D); + + StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), serverLevel); + projectile.setOwner(summon.getOwner()); + projectile.setPos(summonPos); + projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE).copy()); + projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.POSSESSION_PROJECTILE); + projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "custom"); + projectile.getEntityData().set(StaticProjectile.ORIGIN, summonPos.toVector3f()); + 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.LIFETIME, lifetime); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format(Locale.ROOT, "%.5f*t", speed)); + projectile.getEntityData().set( + StaticProjectile.EXPRESSION_Y, + String.format(Locale.ROOT, "%.5f*4*(t/%.5f)*(1-t/%.5f)", height, (double)lifetime, (double)lifetime) + ); + projectile.getEntityData().set(StaticProjectile.GLOW, true); + summon.level().addFreshEntity(projectile); + + ParticleUtil.addParticles( + serverLevel, PARTICLE, + target.getBoundingBox().getCenter(), new Vec3(0, 0, 0), + 0.1, 5 + ); + } + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java index b333dcf..a765f85 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.weapon.summon.whip; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -8,6 +9,7 @@ import com.lzxnone.terraria.item.weapon.SummonWeapon; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; @@ -68,6 +70,10 @@ public abstract class Whip extends SummonWeapon { return 0; } + protected void onTick(StaticSummon summon) {} + + protected void onHitTarget(StaticSummon summon, Entity target) {} + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { @Override public void tick(StaticSummon summon) { @@ -83,9 +89,19 @@ public abstract class Whip extends SummonWeapon { owner.getY() + dirs[0].y * SUMMON_OFFSET_Z + dirs[1].y * SUMMON_OFFSET_Y + dirs[2].y * SUMMON_OFFSET_X, owner.getZ() + dirs[0].z * SUMMON_OFFSET_Z + dirs[1].z * SUMMON_OFFSET_Y + dirs[2].z * SUMMON_OFFSET_X )); + Whip whip = getWhip(summon); + if(whip != null) whip.onTick(summon); hurtTargets(summon); } + @Override + public void onDied(StaticSummon summon) { + if(!summon.level().isClientSide()) { + SoundUtil.playServerSound(summon.level(), ModSounds.WHIP.get(), summon.position()); + summon.discard(); + } + } + @Override public AABB getBoundingBoxForCulling(StaticSummon summon) { CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); @@ -100,7 +116,7 @@ public abstract class Whip extends SummonWeapon { @Override public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - + SoundUtil.playClientSound(player, ModSounds.WHIP_USE.get()); if(!level.isClientSide()) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); @@ -140,7 +156,6 @@ public abstract class Whip extends SummonWeapon { float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); - summon.setDeltaMovement(Vec3.ZERO); level.addFreshEntity(summon); } @@ -152,7 +167,8 @@ public abstract class Whip extends SummonWeapon { if(summon.level().isClientSide()) return; ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - if(!(sourceStack.getItem() instanceof Whip whip)) return; + Whip whip = getWhip(summon); + if(whip == null) return; CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); int lifetime = Math.max(1, summon.getEntityData().get(StaticSummon.LIFETIME)); @@ -177,10 +193,16 @@ public abstract class Whip extends SummonWeapon { if(!intersectsWhip(points, target)) continue; if(DamageUtil.summonAttack(summon, target, sourceStack, whip.getDamage(), whip.getKnockbackScale())) { target.invulnerableTime = whip.getInvulnerableTime(); + whip.onHitTarget(summon, target); } } } + private static Whip getWhip(StaticSummon summon) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + return sourceStack.getItem() instanceof Whip whip ? whip : null; + } + private static boolean intersectsWhip(List points, Entity target) { AABB targetBox = target.getBoundingBox().inflate(HITBOX_INFLATE); for(int i = 0; i < points.size() - 1; i++) { diff --git a/src/main/resources/assets/lzxnoneterraria/blockstates/vision.json b/src/main/resources/assets/lzxnoneterraria/blockstates/vision.json new file mode 100644 index 0000000..31bdda7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/blockstates/vision.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "lzxnoneterraria:block/vision" + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 91cc1c6..046e7c9 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -35,6 +35,7 @@ "item.lzxnoneterraria.last_prism": "Last Prism", "item.lzxnoneterraria.terraprisma": "Terraprisma", "item.lzxnoneterraria.possession": "Possession", + "block.lzxnoneterraria.vision": "Vision", "item.lzxnoneterraria.musket": "Musket", "item.lzxnoneterraria.minishark": "Minishark", "item.lzxnoneterraria.flintlock_pistol": "Flintlock Pistol", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 3f029fc..c88992a 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -35,6 +35,7 @@ "item.lzxnoneterraria.last_prism": "终极棱镜", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", "item.lzxnoneterraria.possession": "支配之鞭", + "block.lzxnoneterraria.vision": "幻视", "item.lzxnoneterraria.musket": "火枪", "item.lzxnoneterraria.minishark": "迷你鲨", "item.lzxnoneterraria.flintlock_pistol": "燧发枪", diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/vision.json b/src/main/resources/assets/lzxnoneterraria/models/block/vision.json new file mode 100644 index 0000000..70d85b2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/block/vision.json @@ -0,0 +1,172 @@ +{ + "format_version": "1.21.11", + "credit": "Made with Codex", + "ambientocclusion": false, + "texture_size": [64, 64], + "textures": { + "0": "lzxnoneterraria:block/vision", + "particle": "lzxnoneterraria:block/vision" + }, + "elements": [ + { + "name": "eye_core", + "from": [3, 3, 3], + "to": [13, 13, 13], + "faces": { + "north": {"uv": [0, 0, 2.5, 2.5], "texture": "#0"}, + "east": {"uv": [0, 2.5, 2.5, 5], "texture": "#0"}, + "south": {"uv": [2.5, 0, 5, 2.5], "texture": "#0"}, + "west": {"uv": [2.5, 2.5, 5, 5], "texture": "#0"}, + "up": {"uv": [2.5, 7.5, 0, 5], "texture": "#0"}, + "down": {"uv": [7.5, 0, 5, 2.5], "texture": "#0"} + } + }, + { + "name": "bottom_rounding", + "from": [5, 13, 5], + "to": [11, 15, 11], + "faces": { + "north": {"uv": [1, 7.5, 2.5, 8], "texture": "#0"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#0"}, + "south": {"uv": [7.5, 1.5, 9, 2], "texture": "#0"}, + "west": {"uv": [7.5, 2, 9, 2.5], "texture": "#0"}, + "up": {"uv": [4, 6.5, 2.5, 5], "texture": "#0"}, + "down": {"uv": [6.5, 2.5, 5, 4], "texture": "#0"} + } + }, + { + "name": "top_rounding", + "from": [5, 1, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [1, 8, 2.5, 8.5], "texture": "#0"}, + "east": {"uv": [2.5, 8, 4, 8.5], "texture": "#0"}, + "south": {"uv": [8, 2.5, 9.5, 3], "texture": "#0"}, + "west": {"uv": [8, 3, 9.5, 3.5], "texture": "#0"}, + "up": {"uv": [5.5, 6.5, 4, 5], "texture": "#0"}, + "down": {"uv": [7, 4, 5.5, 5.5], "texture": "#0"} + } + }, + { + "name": "left_rounding", + "from": [1, 5, 5], + "to": [3, 11, 11], + "faces": { + "north": {"uv": [4, 8, 4.5, 9.5], "texture": "#0"}, + "east": {"uv": [5.5, 5.5, 7, 7], "texture": "#0"}, + "south": {"uv": [4.5, 8, 5, 9.5], "texture": "#0"}, + "west": {"uv": [2.5, 6.5, 4, 8], "texture": "#0"}, + "up": {"uv": [5.5, 9.5, 5, 8], "texture": "#0"}, + "down": {"uv": [0.5, 8.5, 0, 10], "texture": "#0"} + } + }, + { + "name": "right_rounding", + "from": [13, 5, 5], + "to": [15, 11, 11], + "faces": { + "north": {"uv": [0.5, 8.5, 1, 10], "texture": "#0"}, + "east": {"uv": [6.5, 2.5, 8, 4], "texture": "#0"}, + "south": {"uv": [1, 8.5, 1.5, 10], "texture": "#0"}, + "west": {"uv": [4, 6.5, 5.5, 8], "texture": "#0"}, + "up": {"uv": [2, 10, 1.5, 8.5], "texture": "#0"}, + "down": {"uv": [2.5, 8.5, 2, 10], "texture": "#0"} + } + }, + { + "name": "front_rounding", + "from": [5, 5, 13], + "to": [11, 11, 15], + "faces": { + "north": {"uv": [7, 4, 8.5, 5.5], "texture": "#0"}, + "east": {"uv": [2.5, 8.5, 3, 10], "texture": "#0"}, + "south": {"uv": [5.5, 7, 7, 8.5], "texture": "#0"}, + "west": {"uv": [3, 8.5, 3.5, 10], "texture": "#0"}, + "up": {"uv": [9.5, 4, 8, 3.5], "texture": "#0"}, + "down": {"uv": [10, 0, 8.5, 0.5], "texture": "#0"} + } + }, + { + "name": "back_rounding", + "from": [5, 5, 1], + "to": [11, 11, 3], + "faces": { + "north": {"uv": [7, 5.5, 8.5, 7], "texture": "#0"}, + "east": {"uv": [3.5, 8.5, 4, 10], "texture": "#0"}, + "south": {"uv": [7, 7, 8.5, 8.5], "texture": "#0"}, + "west": {"uv": [8.5, 4, 9, 5.5], "texture": "#0"}, + "up": {"uv": [10, 1, 8.5, 0.5], "texture": "#0"}, + "down": {"uv": [7, 8.5, 5.5, 9], "texture": "#0"} + } + }, + { + "name": "front_pupil", + "from": [6, 6, 15], + "to": [10, 10, 16], + "faces": { + "north": {"uv": [0, 7.5, 1, 8.5], "texture": "#0"}, + "east": {"uv": [5, 4, 5.25, 5], "texture": "#0"}, + "south": {"uv": [7.5, 0, 8.5, 1], "texture": "#0"}, + "west": {"uv": [5.25, 4, 5.5, 5], "texture": "#0"}, + "up": {"uv": [9.5, 5.75, 8.5, 5.5], "texture": "#0"}, + "down": {"uv": [9.5, 5.75, 8.5, 6], "texture": "#0"} + } + }, + { + "name": "pupil_highlight", + "from": [7, 8, 16], + "to": [8, 9, 16.5], + "faces": { + "north": {"uv": [8.5, 6, 8.75, 6.25], "texture": "#0"}, + "east": {"uv": [8.5, 6.25, 8.75, 6.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 8.75, 6.75], "texture": "#0"}, + "west": {"uv": [8.5, 6.75, 8.75, 7], "texture": "#0"}, + "up": {"uv": [7.25, 8.75, 7, 8.5], "texture": "#0"}, + "down": {"uv": [8.75, 7, 8.5, 7.25], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 0, 0], + "translation": [0, 2.5, 1], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "rotation": [75, 0, 0], + "translation": [0, 2.5, 1], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, 90, -25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.35, 0.35, 0.35] + }, + "gui": { + "rotation": [30, -135, 0], + "scale": [0.78, 0.78, 0.78] + }, + "fixed": { + "rotation": [0, -180, 0], + "scale": [0.75, 0.75, 0.75] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8] + } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/moon_lord_eye.json b/src/main/resources/assets/lzxnoneterraria/models/item/moon_lord_eye.json new file mode 100644 index 0000000..47bb9d9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/moon_lord_eye.json @@ -0,0 +1,165 @@ +{ + "credit": "Made with Codex", + "texture_size": [32, 32], + "ambientocclusion": false, + "textures": { + "body": "minecraft:block/snow", + "pupil": "minecraft:block/cyan_concrete", + "particle": "minecraft:block/snow" + }, + "elements": [ + { + "name": "eye_core", + "from": [3, 3, 3], + "to": [13, 13, 13], + "faces": { + "north": {"uv": [0, 0, 10, 10], "texture": "#body"}, + "east": {"uv": [0, 0, 10, 10], "texture": "#body"}, + "south": {"uv": [0, 0, 10, 10], "texture": "#body"}, + "west": {"uv": [0, 0, 10, 10], "texture": "#body"}, + "up": {"uv": [0, 0, 10, 10], "texture": "#body"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#body"} + } + }, + { + "name": "top_rounding", + "from": [5, 1, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "east": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "west": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#body"} + } + }, + { + "name": "bottom_rounding", + "from": [5, 13, 5], + "to": [11, 15, 11], + "faces": { + "north": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "east": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "south": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "west": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "down": {"uv": [0, 0, 6, 6], "texture": "#body"} + } + }, + { + "name": "left_rounding", + "from": [1, 5, 5], + "to": [3, 11, 11], + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "up": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "down": {"uv": [0, 0, 2, 6], "texture": "#body"} + } + }, + { + "name": "right_rounding", + "from": [13, 5, 5], + "to": [15, 11, 11], + "faces": { + "north": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "south": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "up": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "down": {"uv": [0, 0, 2, 6], "texture": "#body"} + } + }, + { + "name": "front_rounding", + "from": [5, 5, 13], + "to": [11, 11, 15], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "up": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "down": {"uv": [0, 0, 6, 2], "texture": "#body"} + } + }, + { + "name": "back_rounding", + "from": [5, 5, 1], + "to": [11, 11, 3], + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "east": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#body"}, + "west": {"uv": [0, 0, 2, 6], "texture": "#body"}, + "up": {"uv": [0, 0, 6, 2], "texture": "#body"}, + "down": {"uv": [0, 0, 6, 2], "texture": "#body"} + } + }, + { + "name": "front_pupil", + "from": [6, 6, 15], + "to": [10, 10, 16], + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#pupil"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#pupil"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#pupil"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#pupil"}, + "up": {"uv": [0, 0, 4, 1], "texture": "#pupil"}, + "down": {"uv": [0, 0, 4, 1], "texture": "#pupil"} + } + }, + { + "name": "pupil_highlight", + "from": [7, 8, 16], + "to": [8, 9, 16.5], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#body"}, + "east": {"uv": [0, 0, 0.5, 1], "texture": "#body"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#body"}, + "west": {"uv": [0, 0, 0.5, 1], "texture": "#body"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#body"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#body"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 0, 0], + "translation": [0, 2.5, 1], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "rotation": [75, 0, 0], + "translation": [0, 2.5, 1], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, 90, -25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.35, 0.35, 0.35] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 0, 0], + "scale": [0.78, 0.78, 0.78] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0], + "scale": [0.75, 0.75, 0.75] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/vision.json b/src/main/resources/assets/lzxnoneterraria/models/item/vision.json new file mode 100644 index 0000000..7f26b0f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/vision.json @@ -0,0 +1,3 @@ +{ + "parent": "lzxnoneterraria:block/vision" +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 76c632d..dc9630c 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -29,6 +29,12 @@ "summon_terraprisma": { "sounds": ["lzxnoneterraria:summon_terraprisma"] }, + "whip_use": { + "sounds": ["lzxnoneterraria:whip_use"] + }, + "whip": { + "sounds": ["lzxnoneterraria:whip"] + }, "shot": { "sounds": ["lzxnoneterraria:shot"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/whip.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/whip.ogg new file mode 100644 index 0000000000000000000000000000000000000000..30aba3f4d15d58d99483a902084aa741a7ae8930 GIT binary patch literal 11501 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/whip_use.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/whip_use.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5b48b5fe01d6f2452b93e3a08a2a74477a6bf6f8 GIT binary patch literal 8619 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/block/vision.png b/src/main/resources/assets/lzxnoneterraria/textures/block/vision.png new file mode 100644 index 0000000000000000000000000000000000000000..26d31e56791614e4582987c1d6afa2cf39462850 GIT binary patch literal 1187 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 Q7XSbN07*qoM6N<$f{IK+@&Et; literal 0 HcmV?d00001