From 426cb569f10e1d2457371791e131a1fa5b4d83cb Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Sat, 25 Jul 2026 20:40:38 +0800 Subject: [PATCH] v1.6.0 --- .../java/com/lzxnone/terraria/ModSounds.java | 4 + .../ModCreativeModeTabs.java | 7 + .../dynamic_lights/MEntityLuminance.java | 4 +- .../terraria/entity/ModRenderTypes.java | 63 ++ .../entity/summon/StaticSummonBehaviors.java | 5 + .../terraria/event/GuiRenderHandler.java | 2 +- .../lzxnone/terraria/event/InputHandler.java | 10 +- .../com/lzxnone/terraria/item/ModItems.java | 4 + .../terraria/item/weapon/magic/LastPrism.java | 573 ++++++++++++++++++ .../item/weapon/melee/TerraBlade.java | 272 +++++---- .../terraria/mixin/ItemInHandRenderMixin.java | 7 + .../lzxnone/terraria/mixin/UseSpeedMixin.java | 3 +- .../terraria/ui/config/ConfigList.java | 4 +- .../assets/lzxnoneterraria/lang/en_us.json | 22 +- .../assets/lzxnoneterraria/lang/zh_cn.json | 21 +- .../models/item/last_prism.json | 6 + .../assets/lzxnoneterraria/sounds.json | 3 + .../assets/lzxnoneterraria/sounds/beam2.ogg | Bin 0 -> 19498 bytes .../textures/item/last_prism.png | Bin 0 -> 222 bytes 19 files changed, 867 insertions(+), 143 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/last_prism.json create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/beam2.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/last_prism.png diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index 73684b6..44b4c07 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -15,6 +15,10 @@ public class ModSounds { SOUND_EVENTS.register("beam", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "beam"))); + public static final Supplier BEAM2 = + SOUND_EVENTS.register("beam2", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "beam2"))); public static final Supplier MAX_MANA = SOUND_EVENTS.register("max_mana", () -> SoundEvent.createVariableRangeEvent( 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 503eed2..c98340c 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 @@ -47,4 +47,11 @@ public class ModCreativeModeTabs { .displayItems((parameters, output) -> { output.accept(ModItems.DEVILS_DEVASTATION.get()); }).build()); + + public static final DeferredHolder MAGIC_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_magic_0", () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.lzxnoneterraria.magic")) + .icon(() -> ModItems.LAST_PRISM.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(ModItems.LAST_PRISM.get()); + }).build()); } diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 743a1ff..f4fb737 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -56,7 +56,9 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.DEVILS_DEVASTATION_STUCK_PROJECTILE, StaticSummonBehaviors.DEVILS_DEVASTATION_LIGHTNING, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK, - StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING -> { + StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING, + StaticSummonBehaviors.LAST_PRISM_TRI, + StaticSummonBehaviors.LAST_PRISM_BEAM -> { return 15; } default -> { diff --git a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java index b13d328..708b95a 100644 --- a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java @@ -40,6 +40,48 @@ public class ModRenderTypes { ); } + public static RenderType entityTranslucentEmissiveTriangles(ResourceLocation texture) { + return RenderType.create( + "m_entity_translucent_emissive_triangles", + DefaultVertexFormat.NEW_ENTITY, + VertexFormat.Mode.TRIANGLES, + 1536, + false, + false, + RenderType.CompositeState.builder() + .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER) + .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) + .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) + .setCullState(RenderStateShard.NO_CULL) + .setLightmapState(RenderStateShard.NO_LIGHTMAP) + .setOverlayState(RenderStateShard.OVERLAY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) + .createCompositeState(true) + ); + } + + public static RenderType entitySolidEmissiveTriangles(ResourceLocation texture) { + return RenderType.create( + "m_entity_solid_emissive_triangles", + DefaultVertexFormat.NEW_ENTITY, + VertexFormat.Mode.TRIANGLES, + 1536, + false, + false, + RenderType.CompositeState.builder() + .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER) + .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) + .setTransparencyState(RenderStateShard.NO_TRANSPARENCY) + .setCullState(RenderStateShard.NO_CULL) + .setLightmapState(RenderStateShard.NO_LIGHTMAP) + .setOverlayState(RenderStateShard.OVERLAY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) + .createCompositeState(true) + ); + } + public static RenderType entityAdditiveEmissive(ResourceLocation texture) { return RenderType.create( "m_entity_additive_emissive", @@ -61,6 +103,27 @@ public class ModRenderTypes { ); } + public static RenderType entityAdditiveEmissiveTriangles(ResourceLocation texture) { + return RenderType.create( + "m_entity_additive_emissive_triangles", + DefaultVertexFormat.NEW_ENTITY, + VertexFormat.Mode.TRIANGLES, + 1536, + false, + false, + RenderType.CompositeState.builder() + .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER) + .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) + .setTransparencyState(ADDITIVE_TRANSPARENCY) + .setCullState(RenderStateShard.NO_CULL) + .setLightmapState(RenderStateShard.NO_LIGHTMAP) + .setOverlayState(RenderStateShard.OVERLAY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) + .createCompositeState(true) + ); + } + public static RenderType entityTranslucent(ResourceLocation texture) { return RenderType.create( "m_entity_translucent", 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 5f22aea..ca7ec91 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.entity.summon; +import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; import java.util.HashMap; @@ -25,6 +26,8 @@ public class StaticSummonBehaviors { public static final String DEVILS_DEVASTATION_LIGHTNING = "devils_devastation_lightning"; public static final String DEVILS_DEVASTATION_MARK = "devils_devastation_mark"; public static final String DEVILS_DEVASTATION_MARK_LIGHTNING = "devils_devastation_mark_lightning"; + public static final String LAST_PRISM_TRI = "last_prism_tri"; + public static final String LAST_PRISM_BEAM = "last_prism_beam"; static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); @@ -44,6 +47,8 @@ public class StaticSummonBehaviors { BEHAVIORS.put(DEVILS_DEVASTATION_LIGHTNING, DevilsDevastation.SUMMON_BEHAVIOR2); BEHAVIORS.put(DEVILS_DEVASTATION_MARK, DevilsDevastation.SUMMON_BEHAVIOR3); BEHAVIORS.put(DEVILS_DEVASTATION_MARK_LIGHTNING, DevilsDevastation.SUMMON_BEHAVIOR4); + BEHAVIORS.put(LAST_PRISM_TRI, LastPrism.SUMMON_BEHAVIOR); + BEHAVIORS.put(LAST_PRISM_BEAM, LastPrism.SUMMON_BEHAVIOR2); } public static IStaticSummonBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/event/GuiRenderHandler.java b/src/main/java/com/lzxnone/terraria/event/GuiRenderHandler.java index 1ddb3da..6511e93 100644 --- a/src/main/java/com/lzxnone/terraria/event/GuiRenderHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/GuiRenderHandler.java @@ -25,7 +25,7 @@ public class GuiRenderHandler { ItemStack stack = player.getMainHandItem(); if(stack.is(ModItems.DEVILS_DEVASTATION.get()) && player.getEffect(ModEffects.KILL_MODE) != null) { - Component text = Component.translatable("effect.lzxnoneterraria.kill_mode"); + Component text = Component.translatable("tooltip.lzxnoneterraria.devils_devastation_kill_mode"); Font font = minecraft.font; String plainText = text.getString(); int yShift = Math.max(minecraft.gui.leftHeight, minecraft.gui.rightHeight) + (68 - 59); diff --git a/src/main/java/com/lzxnone/terraria/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/event/InputHandler.java index df587a7..1ae2600 100644 --- a/src/main/java/com/lzxnone/terraria/event/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/InputHandler.java @@ -56,8 +56,9 @@ public class InputHandler { } MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", Zenith.isDistanceMode() ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) - .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); + displayText.append(Component.translatable(Zenith.isDistanceMode() ? "tooltip.lzxnoneterraria.relative_distance" : "tooltip.lzxnoneterraria.absolute_distance").withStyle(ChatFormatting.WHITE)) + .append(Component.literal(": ").withStyle(ChatFormatting.WHITE)) + .append(Component.literal(String.format("%.2f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); player.displayClientMessage(displayText, true); PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta)); @@ -81,8 +82,9 @@ public class InputHandler { else if(finalDelta < 0) finalDelta = 0; } MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", FirstFractal.isDistanceMode() ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) - .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); + displayText.append(Component.translatable(FirstFractal.isDistanceMode() ? "tooltip.lzxnoneterraria.relative_distance" : "tooltip.lzxnoneterraria.absolute_distance").withStyle(ChatFormatting.WHITE)) + .append(Component.literal(": ").withStyle(ChatFormatting.WHITE)) + .append(Component.literal(String.format("%.2f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); player.displayClientMessage(displayText, true); PacketDistributor.sendToServer(new FirstFractalScrollPayload(scrollDelta)); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index bbe06bf..1f34c55 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -3,6 +3,7 @@ package com.lzxnone.terraria.item; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.projectile.*; import com.lzxnone.terraria.item.projectile.first_fractal.*; +import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.*; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; @@ -37,6 +38,9 @@ public class ModItems { public static final DeferredItem MACE = ITEMS.register("mace", Mace::new); public static final DeferredItem DEVILS_DEVASTATION = ITEMS.register("devils_devastation", DevilsDevastation::new); + //魔法武器 + public static final DeferredItem LAST_PRISM = ITEMS.register("last_prism", LastPrism::new); + //弹射物 public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", EnchantedSwordBeam::new); public static final DeferredItem STARFURY_STAR = ITEMS.register("starfury_star", StarfuryStar::new); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java new file mode 100644 index 0000000..d0fdfa2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java @@ -0,0 +1,573 @@ +package com.lzxnone.terraria.item.weapon.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.ModRenderTypes; +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.item.ModItems; +import com.lzxnone.terraria.item.weapon.melee.Mace; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.ParticleUtil; +import com.lzxnone.terraria.utils.SoundUtil; +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.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Matrix4f; +import org.joml.Quaternionf; +import org.joml.Vector3f; +import org.jspecify.annotations.NonNull; + +import java.util.List; +import java.util.Optional; + +public class LastPrism extends Item { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.last_prism.damage"; + public static final float DAMAGE_DEFAULT = 100.0f; + public static final float DAMAGE_MIN = 0.0f; + public static final float DAMAGE_MAX = 8388600.0f; + + public static final String CHARGE_TIME_PATH = "weapon.last_prism.charge_time"; + public static final int CHARGE_TIME_DEFAULT = 67; + public static final int CHARGE_TIME_MIN = 1; + public static final int CHARGE_TIME_MAX = 72000; + + public static final String MAX_USE_TIME_PATH = "weapon.last_prism.max_use_time"; + public static final int MAX_USE_TIME_DEFAULT = 60 * 20; + public static final int MAX_USE_TIME_MIN = 1; + public static final int MAX_USE_TIME_MAX = 72000; + + public static final String MAX_RANGE_PATH = "weapon.last_prism.max_range"; + public static final double MAX_RANGE_DEFAULT = 64.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 512.0; + + public LastPrism() { + super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("last_prism_damage"), configTooltip("last_prism_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadIntConfig(CHARGE_TIME_PATH, configText("last_prism_charge_time"), configTooltip("last_prism_charge_time"), CHARGE_TIME_DEFAULT, CHARGE_TIME_MIN, CHARGE_TIME_MAX); + ConfigFactory.loadIntConfig(MAX_USE_TIME_PATH, configText("last_prism_max_use_time"), configTooltip("last_prism_max_use_time"), MAX_USE_TIME_DEFAULT, MAX_USE_TIME_MIN, MAX_USE_TIME_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("last_prism_max_range"), configTooltip("last_prism_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static int getChargeTime() { + return Math.clamp(ConfigUtil.readInt(CHARGE_TIME_PATH, CHARGE_TIME_DEFAULT), CHARGE_TIME_MIN, CHARGE_TIME_MAX); + } + + public static int getMaxUseTime() { + return Math.clamp(ConfigUtil.readInt(MAX_USE_TIME_PATH, MAX_USE_TIME_DEFAULT), MAX_USE_TIME_MIN, MAX_USE_TIME_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "last_prism", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/last_prism.png"), + Component.translatable("item.lzxnoneterraria.last_prism"), + CONFIG_DATA + ); + + public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/normal_trail.png"); + public static final int RING = 8; + public static final float MAX_ROTATE = 36.0f; + public static final float MAX_RADIUS = 0.5f; + public static final float DELTA_DIST = 0.5f; + public static final float MIN_DIST = 0.25f; + 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), + new Vector3f(1.0F, 1.0F, 0.6F), + new Vector3f(1.0F, 0.9F, 0.0F), + new Vector3f(0.5F, 1.0F, 0.5F), + new Vector3f(0.0F, 1.0F, 0.2F), + new Vector3f(1.0F, 0.6F, 0.8F), + new Vector3f(1.0F, 0.0F, 1.0F), + new Vector3f(1.0F, 0.8F, 0.5F), + new Vector3f(1.0F, 0.5F, 0.0F), + new Vector3f(0.7F, 0.7F, 0.7F) + } + ); + + private static final Vector3f[] BEAM_COLORS = { + new Vector3f(1.0f, 0.0f, 0.0f), + new Vector3f(1.0f, 1.0f, 0.0f), + new Vector3f(0.5f, 0.0f, 0.5f), + new Vector3f(0.0f, 1.0f, 0.0f), + new Vector3f(0.0f, 1.0f, 1.0f), + new Vector3f(1.0f, 0.0f, 0.5f) + }; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + Entity owner = summon.getOwner(); + if(owner == null) return; + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(owner); + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + + float time = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + float size = 0.35F; + float hue = (time * 0.02F) % 1.0F; + float baseZ = -size / 3.0F; + float baseRadius = size * 2.0F * Mth.sqrt(2.0F) / 3.0F; + + Vec3 v0 = new Vec3(0.0D, 0.0D, size); + Vec3 v1 = new Vec3(baseRadius, 0.0D, baseZ); + Vec3 v2 = new Vec3(baseRadius * Math.cos(Math.toRadians(120.0D)), baseRadius * Math.sin(Math.toRadians(120.0D)), baseZ); + Vec3 v3 = new Vec3(baseRadius * Math.cos(Math.toRadians(240.0D)), baseRadius * Math.sin(Math.toRadians(240.0D)), baseZ); + + poseStack.pushPose(); + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); + + poseStack.mulPose(Axis.ZP.rotationDegrees(computePrismAngle(time))); + + Matrix4f matrix = poseStack.last().pose(); + VertexConsumer innerConsumer = bufferSource.getBuffer(ModRenderTypes.entitySolidEmissiveTriangles(RES)); + renderTetrahedronFace(innerConsumer, matrix, v0, v1, v2, 1.0F, 1.0F, 1.0F, 0.5f); + renderTetrahedronFace(innerConsumer, matrix, v0, v3, v1, 1.0F, 1.0F, 1.0F, 0.5f); + renderTetrahedronFace(innerConsumer, matrix, v0, v2, v3, 1.0F, 1.0F, 1.0F, 0.5f); + renderTetrahedronFace(innerConsumer, matrix, v1, v3, v2, 1.0F, 1.0F, 1.0F, 0.5f); + + float outerScale = 1.2F; + VertexConsumer outerConsumer = bufferSource.getBuffer(ModRenderTypes.entitySolidEmissiveTriangles(RES)); + renderTetrahedronFace(outerConsumer, matrix, v0.scale(outerScale), v1.scale(outerScale), v2.scale(outerScale), hue); + renderTetrahedronFace(outerConsumer, matrix, v0.scale(outerScale), v3.scale(outerScale), v1.scale(outerScale), hue + 0.25F); + renderTetrahedronFace(outerConsumer, matrix, v0.scale(outerScale), v2.scale(outerScale), v3.scale(outerScale), hue + 0.50F); + renderTetrahedronFace(outerConsumer, matrix, v1.scale(outerScale), v3.scale(outerScale), v2.scale(outerScale), hue + 0.75F); + poseStack.popPose(); + } + + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + if(summon.getOwner() instanceof Player player) { + ItemStack stack = player.getMainHandItem(); + if(!stack.is(ModItems.LAST_PRISM.get()) || !player.isUsingItem()) { + this.onDied(summon); + return; + } + ItemStack usingStack = player.getUseItem(); + if(!usingStack.is(ModItems.LAST_PRISM.get())) { + this.onDied(summon); + return; + } + Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon.getOwner()); + Vec3 pos = summon.getOwner().getEyePosition().add(MathUtil.toVec3(dirs[0]).scale(1.25)).add(MathUtil.toVec3(dirs[1]).scale(-1.0)); + summon.setPos(pos); + } + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + return summon.getBoundingBox().inflate(2.0); + } + }; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR2 = new IStaticSummonBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon beam)) return; + if(!(beam.getOwner() instanceof StaticSummon tri)) return; + + BeamData beamData = computeBeamData(tri, getBeamIndex(beam), partialTick); + if(beamData == null) return; + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); + Matrix4f matrix = poseStack.last().pose(); + List points = List.of(beamData.start(), beamData.end()); + + renderTube(consumer, matrix, beam.position(), + points, beamData.radius() * 0.8f, 1.0f, 1.0f, 1.0f, 1.0f, false); + renderTube(consumer, matrix, beam.position(), + points, beamData.radius(), beam.getEntityData().get(StaticSummon.COLOR_A), + beam.getEntityData().get(StaticSummon.COLOR_R), + beam.getEntityData().get(StaticSummon.COLOR_G), + beam.getEntityData().get(StaticSummon.COLOR_B), false); + } + + @Override + public void tick(StaticSummon beam) { + this.checkBeforeTick(beam); + if(!(beam.getOwner() instanceof StaticSummon tri)) { + this.onDied(beam); + return; + } + if(!(tri.getOwner() instanceof Player player)) { + this.onDied(beam); + return; + } + + ItemStack stack = player.getMainHandItem(); + ItemStack usingStack = player.getUseItem(); + if(!stack.is(ModItems.LAST_PRISM.get()) || !player.isUsingItem() || !usingStack.is(ModItems.LAST_PRISM.get())) { + this.onDied(beam); + return; + } + + beam.setPos(tri.position()); + BeamData beamData = computeBeamData(tri, getBeamIndex(beam), 0.0f); + if(beamData == null) return; + + if(beamData.blocked() && beam.level() instanceof ServerLevel serverLevel) { + ParticleUtil.addParticles( + serverLevel, + PARTICLE, + beamData.end(), + new Vec3(0.08, 0.08, 0.08), + 0.05, + 2 + ); + } + + AABB searchBox = new AABB(beamData.start(), beamData.end()).inflate(1.0f); + List entities = beam.level().getEntities( + beam, + searchBox, + FilterUtil.createTargetFilter(beam, player) + ); + + for(Entity hitEntity : entities) { + AABB entityBox = hitEntity.getBoundingBox().inflate(beamData.radius()); + Optional clipResult = entityBox.clip(beamData.start(), beamData.end()); + if(entityBox.contains(beamData.start()) || clipResult.isPresent()) { + if(DamageUtil.attack(player, hitEntity, getDamage() * beamData.ratio())) { + hitEntity.invulnerableTime = 5; + } + } + } + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon beam) { + if(!(beam.getOwner() instanceof StaticSummon tri)) return IStaticSummonBehavior.super.getBoundingBoxForCulling(beam); + BeamData beamData = computeBeamData(tri, getBeamIndex(beam), 0.0f); + if(beamData == null) return IStaticSummonBehavior.super.getBoundingBoxForCulling(beam); + return new AABB(beamData.start(), beamData.end()).inflate(MAX_RADIUS + 1.0f); + } + }; + + private record BeamData(Vec3 start, Vec3 end, float radius, float ratio, boolean blocked) {} + + private static int getBeamIndex(StaticSummon beam) { + CompoundTag customData = beam.getEntityData().get(StaticSummon.CUSTOM_DATA); + return Mth.clamp(customData.getInt("idx"), 0, BEAM_COLORS.length - 1); + } + + private static BeamData computeBeamData(StaticSummon tri, int idx, float partialTick) { + Entity owner = tri.getOwner(); + if(owner == null) return null; + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(owner); + float time = tri.getEntityData().get(StaticSummon.AGE) + partialTick; + float angle = computePrismAngle(time); + float ratio = Math.min(1.0f, time / getChargeTime()); + double maxRange = getMaxRange(); + double dy = maxRange / 2; + + Vec3 basePos = tri.position().add(MathUtil.toVec3(dirs[0]).scale(0.5f)); + Vector3f baseDir = MathUtil.toVec3(dirs[0]) + .scale(maxRange) + .add(MathUtil.toVec3(dirs[1]).scale(dy * (1.0f - ratio))) + .toVector3f(); + Vector3f deltaDir = MathUtil.toVec3(dirs[1]) + .scale(DELTA_DIST * (1.0f - ratio) + MIN_DIST) + .toVector3f(); + + Quaternionf rotation = new Quaternionf().fromAxisAngleRad(dirs[0], (float) Math.toRadians(angle + 60.0 * idx)); + Vec3 shootDir = MathUtil.toVec3(baseDir.rotate(rotation)); + Vec3 shootPos = basePos.add(MathUtil.toVec3(deltaDir.rotate(rotation))); + Vec3 endPos = shootPos.add(shootDir); + boolean blocked = false; + + BlockHitResult blockHit = tri.level().clip(new ClipContext( + shootPos, + endPos, + ClipContext.Block.COLLIDER, + ClipContext.Fluid.NONE, + tri + )); + if(blockHit.getType() != HitResult.Type.MISS) { + endPos = blockHit.getLocation(); + blocked = true; + } + + return new BeamData(shootPos, endPos, MAX_RADIUS * ratio, ratio, blocked); + } + + private static float computePrismAngle(float time) { + int chargeTime = getChargeTime(); + float a = MAX_ROTATE / chargeTime; + float v = Math.min(a * time, MAX_ROTATE); + if(v < MAX_ROTATE) { + return 0.5f * a * time * time; + } + return 0.5f * a * chargeTime * chargeTime + v * time; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if(stack.is(ModItems.LAST_PRISM.get()) && !player.level().isClientSide()) { + Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + Vec3 pos = player.getEyePosition().add(MathUtil.toVec3(dirs[0]).scale(0.5)).add(MathUtil.toVec3(dirs[1]).scale(-1.0)); + summon.setPos(pos); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LAST_PRISM_TRI); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, 72000); + summon.getEntityData().set(StaticSummon.GLOW, true); + + summon.setNoGravity(true); + summon.noPhysics = true; + + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + + level.addFreshEntity(summon); + + for(int i = 0; i < BEAM_COLORS.length; i++) { + StaticSummon beam = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + Vector3f color = BEAM_COLORS[i]; + beam.setOwner(summon); + beam.setPos(pos); + beam.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LAST_PRISM_BEAM); + beam.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + beam.getEntityData().set(StaticSummon.LIFETIME, getMaxUseTime()); + beam.getEntityData().set(StaticSummon.GLOW, true); + beam.getEntityData().set(StaticSummon.COLOR_R, color.x); + beam.getEntityData().set(StaticSummon.COLOR_G, color.y); + beam.getEntityData().set(StaticSummon.COLOR_B, color.z); + beam.getEntityData().set(StaticSummon.COLOR_A, 1.0f); + + CompoundTag customData = new CompoundTag(); + customData.putInt("idx", i); + beam.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + + beam.setNoGravity(true); + beam.noPhysics = true; + + level.addFreshEntity(beam); + } + + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); + } + return InteractionResultHolder.pass(stack); + } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } + + @Override + public void onUseTick(Level level, LivingEntity livingEntity, ItemStack stack, int count) { + if(!(livingEntity instanceof Player player)) return; + if(level.isClientSide()) return; + if(player.tickCount % 20 == 0) { + SoundUtil.playClientSound(player, ModSounds.BEAM2.get()); + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return getMaxUseTime(); + } + + private static void renderTetrahedronFace( + VertexConsumer buffer, + Matrix4f matrix, + Vec3 v0, + Vec3 v1, + Vec3 v2, + float hue + ) { + float[] color0 = computeSoftPrismColor(hue); + float[] color1 = computeSoftPrismColor(hue + 0.10F); + float[] color2 = computeSoftPrismColor(hue + 0.20F); + + renderTetrahedronVertex(buffer, matrix, v0, color0[0], color0[1], color0[2]); + renderTetrahedronVertex(buffer, matrix, v1, color1[0], color1[1], color1[2]); + renderTetrahedronVertex(buffer, matrix, v2, color2[0], color2[1], color2[2]); + } + + private static void renderTetrahedronFace( + VertexConsumer buffer, + Matrix4f matrix, + Vec3 v0, + Vec3 v1, + Vec3 v2, + float r, + float g, + float b, + float alpha + ) { + renderTetrahedronVertex(buffer, matrix, v0, r, g, b, alpha); + renderTetrahedronVertex(buffer, matrix, v1, r, g, b, alpha); + renderTetrahedronVertex(buffer, matrix, v2, r, g, b, alpha); + } + + private static void renderTetrahedronVertex( + VertexConsumer buffer, + Matrix4f matrix, + Vec3 vertex, + float r, + float g, + float b + ) { + renderTetrahedronVertex(buffer, matrix, vertex, r, g, b, 1.0F); + } + + private static void renderTetrahedronVertex( + VertexConsumer buffer, + Matrix4f matrix, + Vec3 vertex, + float r, + float g, + float b, + float alpha + ) { + buffer.addVertex(matrix, (float)vertex.x, (float)vertex.y, (float)vertex.z) + .setColor(r, g, b, alpha) + .setUv(0.5F, 0.5F) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(LightTexture.FULL_BRIGHT) + .setNormal(0.0F, 1.0F, 0.0F); + } + + private static float[] computeSoftPrismColor(float hue) { + float normalizedHue = Math.floorMod((int)(hue * 1000.0F), 1000) / 1000.0F; + int color = Mth.hsvToRgb(normalizedHue, 0.85F, 1.0F); + float rainbowR = ((color >> 16) & 255) / 255.0F; + float rainbowG = ((color >> 8) & 255) / 255.0F; + float rainbowB = (color & 255) / 255.0F; + float tint = 0.75F; + + return new float[]{ + 1.0F * (1.0F - tint) + rainbowR * tint, + 1.0F * (1.0F - tint) + rainbowG * tint, + 1.0F * (1.0F - tint) + rainbowB * tint + }; + } + + public static void renderTube(VertexConsumer buffer, Matrix4f matrix, Vec3 entityWorldPos, + List points, float radius, float alpha, float colorR, float colorG, float colorB, boolean linear) { + int n = points.size(); + if(n < 2) return; + + Vector3f[][] oriDirs = new Vector3f[n][3]; + Vec3[] dir = new Vec3[n], up = new Vec3[n], right = new Vec3[n]; + for(int i = 0;i < n;i++) { + if(i == n - 1) oriDirs[i] = MathUtil.computeCoordinateSystem(points.get(n - 1).subtract(points.get(n - 2)).toVector3f(), 0); + else oriDirs[i] = MathUtil.computeCoordinateSystem(points.get(i + 1).subtract(points.get(i)).toVector3f(), 0); + dir[i] = MathUtil.toVec3(oriDirs[i][0]); + up[i] = MathUtil.toVec3(oriDirs[i][1]); + right[i] = MathUtil.toVec3(oriDirs[i][2]); + } + + for(int i = 0;i < n - 1;i++) { + float r0 = linear ? radius * (1.0F - (float) i / (float) (n - 1)) : radius; + float r1 = linear ? radius * (1.0F - (float) (i + 1) / (float) (n - 1)) : radius; + if(r0 <= 0.001F && r1 <= 0.001F) continue; + Vec3 N = right[i], B = up[i], N1 = right[i + 1], B1 = up[i + 1]; + Vec3 P = points.get(i), P1 = points.get(i + 1); + for(int j = 0;j < RING;j++) { + float a0 = (float) (2.0 * Math.PI * j / RING); + float a1 = (float) (2.0 * Math.PI * (j + 1) / RING); + Vec3 d0 = computeRingDir(N, B, a0); + Vec3 d1 = computeRingDir(N1, B1, a0); + Vec3 d0b = computeRingDir(N, B, a1); + Vec3 d1b = computeRingDir(N1, B1, a1); + Vec3 v0 = P.add(d0.scale(r0)); + Vec3 v1 = P1.add(d1.scale(r1)); + Vec3 v2 = P1.add(d1b.scale(r1)); + Vec3 v3 = P.add(d0b.scale(r0)); + for(int k = 0;k < 3;k++) { + writeVert(buffer, matrix, entityWorldPos, v0, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v1, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v2, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + writeVert(buffer, matrix, entityWorldPos, v3, 0.5f, 0.5f, alpha, colorR, colorG, colorB); + } + } + } + } + + public static Vec3 computeRingDir(Vec3 n, Vec3 b, float ang) { + return n.scale(Math.cos(ang)).add(b.scale(Math.sin(ang))); + } + + public static void writeVert(VertexConsumer buffer, Matrix4f matrix, Vec3 entityWorldPos, + Vec3 worldPos, float u, float v, float alpha, float colorR, float colorG, float colorB) { + double lx = worldPos.x - entityWorldPos.x; + double ly = worldPos.y - entityWorldPos.y; + double lz = worldPos.z - entityWorldPos.z; + + buffer.addVertex(matrix, (float)lx, (float)ly, (float)lz) + .setColor(colorR, colorG, colorB, 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/item/weapon/melee/TerraBlade.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java index 48cb631..998885e 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java @@ -297,153 +297,159 @@ public class TerraBlade extends SwordItem { float size = 1.0f - 0.25f * progress; poseStack.scale(size, size, size); - VertexConsumer vertexConsumer0 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES0)); + float[] dz = {0.1f, 0f, -0.1f}; - //左边 - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 18 * (1.0f - progress), SwordBeam.DIST); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 18 * (1.0f - progress), rotate); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, - COLOR0.x(), COLOR0.y(), COLOR0.z(), alpha, halfWidth, halfHeight, 0f, 0, -0.01f); - poseStack.popPose(); + for(int x = 0;x < 3;x++) { + VertexConsumer vertexConsumer0 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES0)); - //中间 - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, - COLOR1.x(), COLOR1.y(), COLOR1.z(), alpha, halfWidth, halfHeight, 0f, 0f, 0f); - poseStack.popPose(); - - //右边 - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 108, SwordBeam.DIST); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -9 * (1.0f - progress), rotate); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, - COLOR2.x(), COLOR2.y(), COLOR2.z(), alpha, halfWidth, halfHeight, 0f, 0, 0.01f); - poseStack.popPose(); - - VertexConsumer vertexConsumer1 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES1)); - - //三线 - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST / 1.5f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - poseStack.scale(0.5f, 0.5f, 0.5f); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, - 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f); - poseStack.popPose(); - - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST / 1.25f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - poseStack.scale(0.75f, 0.75f, 0.75f); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, - 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f); - poseStack.popPose(); - - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST * 1.15f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - poseStack.scale(0.95f, 0.95f, 0.95f); - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, - 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f); - poseStack.popPose(); - - VertexConsumer vertexConsumer2 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES2)); - - //边缘高光 - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 100, SwordBeam.DIST * 1.15f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - poseStack.scale(1.0f, 1.0f, 1.0f); - for(int i = 0;i < 5;i++) { - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer2, - COLOR2.x(), COLOR2.y(), COLOR2.z(), alpha, halfWidth, halfHeight, 0f, 0f, 0.03f); - } - poseStack.popPose(); - - - float sparkleAlpha; - if(progress < FADE_IN) { - sparkleAlpha = 0; - }else if(progress > FADE_OUT) { - sparkleAlpha = 1.0f - (progress - FADE_OUT) / (1.0f - FADE_OUT); - }else { - sparkleAlpha = (progress - FADE_IN) / (FADE_OUT - FADE_IN); - } - - VertexConsumer vertexConsumer3 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES3)); - - //闪烁(外层) - poseStack.pushPose(); - for(int k = 0;k < 2;k++) { + //左边 poseStack.pushPose(); - if(k == 0) { - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 60.0 * progress, SwordBeam.DIST * 2f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 60 * progress, rotate); - }else { - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 + 60.0 * progress, SwordBeam.DIST * 2f + 0.5f * progress); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -60 * progress, rotate); - } - for(int j = 0; j < 2; j++) { - poseStack.pushPose(); - if(j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); - else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); - poseStack.scale(0.5f, 0.5f, 0.5f); - for(int i = 0; i < 5; i++) { - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, - COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f); - } - poseStack.popPose(); - } + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 18 * (1.0f - progress), SwordBeam.DIST); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 18 * (1.0f - progress), rotate); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, + COLOR0.x(), COLOR0.y(), COLOR0.z(), alpha, halfWidth, halfHeight, 0f, 0, -0.01f + dz[x]); poseStack.popPose(); - } - poseStack.popPose(); - //闪烁(中层) - poseStack.pushPose(); - for(int k = 0;k < 2;k++) { + + //中间 poseStack.pushPose(); - if(k == 0) { - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 30.0 * progress, SwordBeam.DIST * 2f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 30 * progress, rotate); - }else { - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 + 30.0 * progress, SwordBeam.DIST * 2.1f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -30 * progress, rotate); - } - for(int j = 0; j < 2; j++) { - poseStack.pushPose(); - if(j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); - else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); - poseStack.scale(0.75f, 0.75f, 0.75f); - for(int i = 0; i < 5; i++) { - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, - COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f); - } - poseStack.popPose(); - } + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, + COLOR1.x(), COLOR1.y(), COLOR1.z(), alpha, halfWidth, halfHeight, 0f, 0f, 0f + dz[x]); poseStack.popPose(); - } - poseStack.popPose(); - //闪烁(内层) - poseStack.pushPose(); - RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST * 2f); - RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); - for(int j = 0; j < 2; j++) { + //右边 poseStack.pushPose(); - if(j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); - else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 108, SwordBeam.DIST); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -9 * (1.0f - progress), rotate); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer0, + COLOR2.x(), COLOR2.y(), COLOR2.z(), alpha, halfWidth, halfHeight, 0f, 0, 0.01f + dz[x]); + poseStack.popPose(); + + VertexConsumer vertexConsumer1 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES1)); + + //三线 + poseStack.pushPose(); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST / 1.5f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); + poseStack.scale(0.5f, 0.5f, 0.5f); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, + 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f + dz[x]); + poseStack.popPose(); + + poseStack.pushPose(); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST / 1.25f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); + poseStack.scale(0.75f, 0.75f, 0.75f); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, + 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f + dz[x]); + poseStack.popPose(); + + poseStack.pushPose(); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST * 1.15f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); + poseStack.scale(0.95f, 0.95f, 0.95f); + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer1, + 1.0f, 1.0f, 1.0f, alpha, halfWidth, halfHeight, 0f, 0f, 0.02f + dz[x]); + poseStack.popPose(); + + VertexConsumer vertexConsumer2 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES2)); + + //边缘高光 + poseStack.pushPose(); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 100, SwordBeam.DIST * 1.15f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); poseStack.scale(1.0f, 1.0f, 1.0f); - for(int i = 0; i < 5; i++) { - RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, - COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f); + for (int i = 0; i < 5; i++) { + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer2, + COLOR2.x(), COLOR2.y(), COLOR2.z(), alpha, halfWidth, halfHeight, 0f, 0f, 0.03f + dz[x]); } poseStack.popPose(); + + + float sparkleAlpha; + if (progress < FADE_IN) { + sparkleAlpha = 0; + } else if (progress > FADE_OUT) { + sparkleAlpha = 1.0f - (progress - FADE_OUT) / (1.0f - FADE_OUT); + } else { + sparkleAlpha = (progress - FADE_IN) / (FADE_OUT - FADE_IN); + } + + VertexConsumer vertexConsumer3 = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES3)); + + //闪烁(外层) + poseStack.pushPose(); + for (int k = 0; k < 2; k++) { + poseStack.pushPose(); + if (k == 0) { + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 60.0 * progress, SwordBeam.DIST * 2f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 60 * progress, rotate); + } else { + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 + 60.0 * progress, SwordBeam.DIST * 2f + 0.5f * progress); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -60 * progress, rotate); + } + for (int j = 0; j < 2; j++) { + poseStack.pushPose(); + if (j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); + else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); + poseStack.scale(0.5f, 0.5f, 0.5f); + for (int i = 0; i < 5; i++) { + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, + COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f + dz[x]); + } + poseStack.popPose(); + } + poseStack.popPose(); + } + poseStack.popPose(); + + //闪烁(中层) + poseStack.pushPose(); + for (int k = 0; k < 2; k++) { + poseStack.pushPose(); + if (k == 0) { + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 - 30.0 * progress, SwordBeam.DIST * 2f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 30 * progress, rotate); + } else { + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90 + 30.0 * progress, SwordBeam.DIST * 2.1f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], -30 * progress, rotate); + } + for (int j = 0; j < 2; j++) { + poseStack.pushPose(); + if (j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); + else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); + poseStack.scale(0.75f, 0.75f, 0.75f); + for (int i = 0; i < 5; i++) { + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, + COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f + dz[x]); + } + poseStack.popPose(); + } + poseStack.popPose(); + } + poseStack.popPose(); + + //闪烁(内层) + poseStack.pushPose(); + RenderUtil.applyTranslate(poseStack, dirs[0], dirs[2], 90, SwordBeam.DIST * 2f); + RenderUtil.applyRotate(poseStack, dirs[0], dirs[1], 0, rotate); + for (int j = 0; j < 2; j++) { + poseStack.pushPose(); + if (j == 0) poseStack.mulPose(Axis.ZP.rotationDegrees(0.0F)); + else poseStack.mulPose(Axis.ZP.rotationDegrees(45.0F)); + poseStack.scale(1.0f, 1.0f, 1.0f); + for (int i = 0; i < 5; i++) { + RenderUtil.renderQuad(poseStack.last().pose(), vertexConsumer3, + COLOR2.x(), COLOR2.y(), COLOR2.z(), sparkleAlpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f + dz[x]); + } + poseStack.popPose(); + } + poseStack.popPose(); + } - poseStack.popPose(); poseStack.popPose(); } diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java index 607b713..382aefc 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java @@ -122,6 +122,13 @@ public class ItemInHandRenderMixin { if(player.getCooldowns().isOnCooldown(itemStack.getItem())) { ci.cancel(); } + }else if(itemStack.is(ModItems.LAST_PRISM) && entity instanceof Player player) { + if(player.isUsingItem()) { + ItemStack usingStack = player.getUseItem(); + if(usingStack.is(itemStack.getItem())) { + ci.cancel(); + } + } } } diff --git a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java index 4bff1bb..3c5046a 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java @@ -18,7 +18,8 @@ public abstract class UseSpeedMixin { || usingItem.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || usingItem.is(ModItems.FIRST_FRACTAL.get()) || usingItem.is(ModItems.TERRAGRIM.get()) - || usingItem.is(ModItems.MACE.get()); + || usingItem.is(ModItems.MACE.get()) + || usingItem.is(ModItems.LAST_PRISM.get()); } @WrapOperation( 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 bd5fc81..3fae34f 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.ui.config; import com.lzxnone.terraria.effect.BloodButcheredEffect; import com.lzxnone.terraria.effect.DemonicFlamesEffect; +import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; import com.lzxnone.terraria.item.weapon.melee.BloodButcherer; @@ -59,7 +60,8 @@ public class ConfigList { Terragrim.CONFIG_LIST_ITEM, FirstFractal.CONFIG_LIST_ITEM, Mace.CONFIG_LIST_ITEM, - DevilsDevastation.CONFIG_LIST_ITEM + DevilsDevastation.CONFIG_LIST_ITEM, + LastPrism.CONFIG_LIST_ITEM }); ITEMS.put(EFFECT, new ConfigListItem[]{ BloodButcheredEffect.CONFIG_LIST_ITEM, diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 29a984b..7752135 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -1,7 +1,9 @@ { "itemGroup.lzxnoneterraria.melee": "Terraria Melee", + "itemGroup.lzxnoneterraria.magic": "Terraria Magic", "itemGroup.lzxnoneterraria.block": "Terraria Block", "itemGroup.lzxnoneterraria.calamity_melee": "Terraria Calamity Melee", + "item.lzxnoneterraria.copper_shortsword": "Copper Shortsword", "item.lzxnoneterraria.enchanted_sword": "Enchanted Sword", "item.lzxnoneterraria.bee_keeper": "Bee Keeper", @@ -27,19 +29,28 @@ "item.lzxnoneterraria.first_fractal": "First Fractal", "item.lzxnoneterraria.mace": "Mace", "item.lzxnoneterraria.devils_devastation": "Devil's Devastation", + "item.lzxnoneterraria.last_prism": "Last Prism", + + "tooltip.lzxnoneterraria.relative_distance": "Relative Distance", + "tooltip.lzxnoneterraria.absolute_distance": "Absolute Distance", + "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "Kill Mode", "tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.", "tooltip.lzxnoneterraria.devils_devastation.1": "Humans understand this force as Havoc, the inevitable sundering of all order in fire.", "tooltip.lzxnoneterraria.devils_devastation.2": "Perhaps this is why the Brimstone Elemental had strength unrivaled by her sisters.", + "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", "entity.lzxnoneterraria.bee_summon": "Bee", + "effect.lzxnoneterraria.confused": "Confused", "effect.lzxnoneterraria.blood_butchered": "Blood Butchered", "effect.lzxnoneterraria.kill_mode": "Kill Mode", "effect.lzxnoneterraria.kill_mode_cooldown": "Kill Mode Cooldown", "effect.lzxnoneterraria.demonic_flames": "Demonic Flames", - "key.lzxnoneterraria.kill_mode": "Kill Mode", + "key.categories.lzxnoneterraria": "lzxnoneterraria", + "key.lzxnoneterraria.kill_mode": "Kill Mode", + "lzxnoneterraria.configuration.title": "LzxnoneTerraria Config", "lzxnoneterraria.configuration.nav_weapon": "Weapon", "lzxnoneterraria.configuration.nav_effect": "Effect", @@ -300,6 +311,15 @@ "lzxnoneterraria.configuration.mace_fly_time.tooltip": "Maximum projectile fly time in ticks", "lzxnoneterraria.configuration.mace_max_range": "Max Range", "lzxnoneterraria.configuration.mace_max_range.tooltip": "Maximum projectile travel range", + "lzxnoneterraria.configuration.last_prism_settings": "Last Prism Settings", + "lzxnoneterraria.configuration.last_prism_damage": "Damage", + "lzxnoneterraria.configuration.last_prism_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.last_prism_charge_time": "Charge Time", + "lzxnoneterraria.configuration.last_prism_charge_time.tooltip": "Time required for beams to converge to full power in ticks", + "lzxnoneterraria.configuration.last_prism_max_use_time": "Max Use Time", + "lzxnoneterraria.configuration.last_prism_max_use_time.tooltip": "Maximum duration of one continuous use in ticks", + "lzxnoneterraria.configuration.last_prism_max_range": "Max Range", + "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "Maximum beam range", "lzxnoneterraria.configuration.devils_devastation_settings": "Devil's Devastation Settings", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index a7a10eb..28d1e37 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -1,7 +1,9 @@ { "itemGroup.lzxnoneterraria.melee": "泰拉瑞亚 近战武器", + "itemGroup.lzxnoneterraria.magic": "泰拉瑞亚 魔法武器", "itemGroup.lzxnoneterraria.block": "泰拉瑞亚 方块", "itemGroup.lzxnoneterraria.calamity_melee": "泰拉瑞亚灾厄 近战武器", + "item.lzxnoneterraria.copper_shortsword": "铜短剑", "item.lzxnoneterraria.enchanted_sword": "附魔剑", "item.lzxnoneterraria.bee_keeper": "养蜂人", @@ -27,9 +29,15 @@ "item.lzxnoneterraria.first_fractal": "第一分形", "item.lzxnoneterraria.mace": "链锤", "item.lzxnoneterraria.devils_devastation": "破灭魔王剑", + "item.lzxnoneterraria.last_prism": "终极棱镜", + + "tooltip.lzxnoneterraria.relative_distance": "相对距离", + "tooltip.lzxnoneterraria.absolute_distance": "绝对距离", + "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "杀戮模式", "tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。", "tooltip.lzxnoneterraria.devils_devastation.1": "人类将这种力量理解为浩劫,即一切秩序在火焰之中的必然毁灭。", "tooltip.lzxnoneterraria.devils_devastation.2": "或许这就是硫磺火元素掌握着她的姐妹所不能匹敌之力量的原因。", + "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", "entity.lzxnoneterraria.bee_summon": "蜜蜂", @@ -38,8 +46,10 @@ "effect.lzxnoneterraria.kill_mode": "杀戮模式", "effect.lzxnoneterraria.kill_mode_cooldown": "杀戮模式 冷却", "effect.lzxnoneterraria.demonic_flames": "恶魔之焰", - "key.lzxnoneterraria.kill_mode": "进入杀戮模式", + "key.categories.lzxnoneterraria": "lzxnoneterraria", + "key.lzxnoneterraria.kill_mode": "进入杀戮模式", + "lzxnoneterraria.configuration.title": "LzxnoneTerraria 配置", "lzxnoneterraria.configuration.nav_weapon": "武器", "lzxnoneterraria.configuration.nav_effect": "药水效果", @@ -300,6 +310,15 @@ "lzxnoneterraria.configuration.mace_fly_time.tooltip": "弹射物最大飞行时间(刻)", "lzxnoneterraria.configuration.mace_max_range": "最大范围", "lzxnoneterraria.configuration.mace_max_range.tooltip": "弹射物最大飞行距离", + "lzxnoneterraria.configuration.last_prism_settings": "终极棱镜 设置", + "lzxnoneterraria.configuration.last_prism_damage": "伤害", + "lzxnoneterraria.configuration.last_prism_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.last_prism_charge_time": "蓄力时间", + "lzxnoneterraria.configuration.last_prism_charge_time.tooltip": "激光聚合到最大威力所需时间(刻)", + "lzxnoneterraria.configuration.last_prism_max_use_time": "最大使用时间", + "lzxnoneterraria.configuration.last_prism_max_use_time.tooltip": "单次持续使用的最大时间(刻)", + "lzxnoneterraria.configuration.last_prism_max_range": "最大范围", + "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "激光最大射程", "lzxnoneterraria.configuration.devils_devastation_settings": "破灭魔王剑 设置", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/last_prism.json b/src/main/resources/assets/lzxnoneterraria/models/item/last_prism.json new file mode 100644 index 0000000..945b1b4 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/last_prism.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/last_prism" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 78b209e..1991771 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -14,6 +14,9 @@ "beam": { "sounds": ["lzxnoneterraria:beam"] }, + "beam2": { + "sounds": ["lzxnoneterraria:beam2"] + }, "star_fall": { "sounds": ["lzxnoneterraria:star_fall"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/beam2.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/beam2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e85f260c53ddf758623c583a3ff6bc107d65c061 GIT binary patch literal 19498 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 T=4q(w761Yur((KvCr%Ur#97{h literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/last_prism.png b/src/main/resources/assets/lzxnoneterraria/textures/item/last_prism.png new file mode 100644 index 0000000000000000000000000000000000000000..f784ed5a2e496f04457451498c343c452b373f48 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)n!VDx2d=-8Tq!a^uLR^9L>(^f&o_qXc*{hBF z_Dx;3ET(EaktajW#Kqv#O_ z4(0%zBTQl&1h^v(Fo|U`a<90veeOK2v#LLrpYWV_Ysw4#rHy}8S+m1uHQn3&Aw1WM z*`X>wh*e_E%9d44g7>;VthnbD{2;8t|K(pfJC*CHTo-QY>dQWUqd9SvnB*_UMbq7! Unba%Tfz~p3y85}Sb4q9e053sSX8-^I literal 0 HcmV?d00001