diff --git a/gradle.properties b/gradle.properties index fc79e50..5bc778b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.2.3 +mod_version=1.3.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/Config.java b/src/main/java/com/lzxnone/terraria/Config.java index dd25a6c..9635843 100644 --- a/src/main/java/com/lzxnone/terraria/Config.java +++ b/src/main/java/com/lzxnone/terraria/Config.java @@ -116,6 +116,15 @@ public class Config { public static final ModConfigSpec.DoubleValue ZENITH_TRAIL_ALPHA; public static final ModConfigSpec.IntValue ZENITH_TRAIL_MAX_LENGTH; + public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_PROJECTILE_DAMAGE; + public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_BOUNDING_BOX_SIZE; + public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_PROJECTILE_SPEED; + public static final ModConfigSpec.IntValue FIRST_FRACTAL_PROJECTILE_LIFETIME; + public static final ModConfigSpec.BooleanValue FIRST_FRACTAL_DISTANCE_MODE; + public static final ModConfigSpec.IntValue FIRST_FRACTAL_SCROLL_SPEED; + public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_MAX_RANGE; + public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_SPAWN_RANGE; + public static final ModConfigSpec.IntValue TRUE_EXCALIBUR_ROTATE_RANGE; public static final ModConfigSpec.IntValue TRUE_EXCALIBUR_MAX_HIT_COUNT; public static final ModConfigSpec.DoubleValue TRUE_EXCALIBUR_DAMAGE; @@ -238,6 +247,15 @@ public class Config { public static double zenithTrailAlpha; public static int zenithTrailMaxLength; + public static double firstFractalProjectileDamage; + public static double firstFractalBoundingBoxSize; + public static double firstFractalProjectileSpeed; + public static int firstFractalProjectileLifetime; + public static boolean firstFractalDistanceMode; + public static int firstFractalScrollSpeed; + public static double firstFractalMaxRange; + public static double firstFractalSpawnRange; + public static int trueExcaliburRotateRange; public static int trueExcaliburMaxHitCount; public static double trueExcaliburDamage; @@ -694,6 +712,42 @@ public class Config { builder.pop(); + builder.push("first_fractal_settings"); + + FIRST_FRACTAL_PROJECTILE_DAMAGE = builder + .comment("弹射伤害") + .defineInRange("first_fractal_projectile_damage", 10.0, 0, 2147483647.0); + + FIRST_FRACTAL_BOUNDING_BOX_SIZE = builder + .comment("弹射碰撞箱大小") + .defineInRange("first_fractal_bounding_box_size", 1.5, 0.5, 10.0); + + FIRST_FRACTAL_PROJECTILE_SPEED = builder + .comment("弹射速度") + .defineInRange("first_fractal_projectile_speed", 1.5, 0, 10.0); + + FIRST_FRACTAL_PROJECTILE_LIFETIME = builder + .comment("弹射生命周期") + .defineInRange("first_fractal_projectile_lifetime", 30, 1, 1200); + + FIRST_FRACTAL_DISTANCE_MODE = builder + .comment("使用相对距离模式") + .define("first_fractal_distance_mode", true); + + FIRST_FRACTAL_SCROLL_SPEED = builder + .comment("滚轮调节距离速度") + .defineInRange("first_fractal_scroll_speed", 4, 0, 128); + + FIRST_FRACTAL_MAX_RANGE = builder + .comment("最大范围") + .defineInRange("first_fractal_max_range", 64.0, 1.0, 1024.0); + + FIRST_FRACTAL_SPAWN_RANGE = builder + .comment("弹射生成范围") + .defineInRange("first_fractal_spawn_range", 16.0, 1.0, 64.0); + + builder.pop(); + builder.push("true_excalibur_settings"); TRUE_EXCALIBUR_ROTATE_RANGE = builder @@ -852,6 +906,14 @@ public class Config { zenithScale = ZENITH_SCALE.get(); zenithTrailAlpha = ZENITH_TRAIL_ALPHA.get(); zenithTrailMaxLength = ZENITH_TRAIL_MAX_LENGTH.get(); + firstFractalProjectileDamage = FIRST_FRACTAL_PROJECTILE_DAMAGE.get(); + firstFractalBoundingBoxSize = FIRST_FRACTAL_BOUNDING_BOX_SIZE.get(); + firstFractalProjectileSpeed = FIRST_FRACTAL_PROJECTILE_SPEED.get(); + firstFractalProjectileLifetime = FIRST_FRACTAL_PROJECTILE_LIFETIME.get(); + firstFractalDistanceMode = FIRST_FRACTAL_DISTANCE_MODE.get(); + firstFractalScrollSpeed = FIRST_FRACTAL_SCROLL_SPEED.get(); + firstFractalMaxRange = FIRST_FRACTAL_MAX_RANGE.get(); + firstFractalSpawnRange = FIRST_FRACTAL_SPAWN_RANGE.get(); trueExcaliburRotateRange = TRUE_EXCALIBUR_ROTATE_RANGE.get(); trueExcaliburMaxHitCount = TRUE_EXCALIBUR_MAX_HIT_COUNT.get(); trueExcaliburDamage = TRUE_EXCALIBUR_DAMAGE.get(); diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index 066d383..51e7f96 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -1,11 +1,8 @@ package com.lzxnone.terraria; import com.lzxnone.terraria.entity.ModEntities; -import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.beam.SwordBeamRenderer; -import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.projectile.StaticProjectileRenderer; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonRenderer; import com.lzxnone.terraria.particle.*; import net.minecraft.client.renderer.entity.BeeRenderer; 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 dc7ae78..3a59059 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 @@ -39,5 +39,6 @@ public class ModCreativeModeTabs { output.accept(ModItems.BLADE_OF_GRASS.get()); output.accept(ModItems.VOLCANO.get()); output.accept(ModItems.TERRAGRIM.get()); + output.accept(ModItems.FIRST_FRACTAL.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 7e8a9e8..8b142cb 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -27,7 +27,7 @@ public class MEntityLuminance implements EntityLuminance { public @Range(from = 0, to = 15) int getLuminance(@NonNull ItemLightSourceManager itemLightSourceManager, @NonNull Entity entity) { if(entity instanceof StaticProjectile projectile) { switch(projectile.getEntityData().get(StaticProjectile.BEHAVIOR)) { - case StaticProjectileBehaviors.ENCHANTED_SWORD_BEAM, StaticProjectileBehaviors.STARFURY_STAR, StaticProjectileBehaviors.STAR_WRATH_STAR, StaticProjectileBehaviors.ZENITH_PROJECTILE -> { + case StaticProjectileBehaviors.ENCHANTED_SWORD_BEAM, StaticProjectileBehaviors.STARFURY_STAR, StaticProjectileBehaviors.STAR_WRATH_STAR, StaticProjectileBehaviors.ZENITH_PROJECTILE, StaticProjectileBehaviors.MURAMASA_PROJECTILE -> { return 15; } default -> { @@ -36,7 +36,7 @@ public class MEntityLuminance implements EntityLuminance { } }else if(entity instanceof StaticSummon summon) { switch(summon.getEntityData().get(StaticProjectile.BEHAVIOR)) { - case StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, StaticSummonBehaviors.INFLUX_WAVER_BEAM, StaticSummonBehaviors.MEOWMERE_PROJECTILE, StaticSummonBehaviors.TERRA_BLADE_BEAM -> { + case StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, StaticSummonBehaviors.INFLUX_WAVER_BEAM, StaticSummonBehaviors.MEOWMERE_PROJECTILE, StaticSummonBehaviors.TERRA_BLADE_BEAM, StaticSummonBehaviors.TRUE_NIGHTS_EDGE_BEAM, StaticSummonBehaviors.NIGHTS_EDGE_BEAM, StaticSummonBehaviors.LIGHTS_BANE_SLASH, StaticSummonBehaviors.TERRAGRIM_BEAM, StaticSummonBehaviors.FIRST_FRACTAL_PROJECTILE -> { return 15; } default -> { @@ -45,7 +45,7 @@ public class MEntityLuminance implements EntityLuminance { } }else if(entity instanceof SwordBeam beam) { switch(beam.getEntityData().get(SwordBeam.BEHAVIOR)) { - case SwordBeamBehaviors.THE_HORSEMANS_BLADE, SwordBeamBehaviors.TERRA_BLADE -> { + case SwordBeamBehaviors.THE_HORSEMANS_BLADE, SwordBeamBehaviors.TERRA_BLADE, SwordBeamBehaviors.TRUE_EXCALIBUR, SwordBeamBehaviors.TRUE_NIGHTS_EDGE, SwordBeamBehaviors.EXCALIBUR, SwordBeamBehaviors.NIGHTS_EDGE -> { return 15; } default -> { diff --git a/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java b/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java index 7fa6992..ebed35b 100644 --- a/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java +++ b/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java @@ -9,7 +9,6 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.mojang.blaze3d.vertex.ByteBufferBuilder; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/lzxnone/terraria/entity/ModEntities.java b/src/main/java/com/lzxnone/terraria/entity/ModEntities.java index 0a13bb3..407299c 100644 --- a/src/main/java/com/lzxnone/terraria/entity/ModEntities.java +++ b/src/main/java/com/lzxnone/terraria/entity/ModEntities.java @@ -5,7 +5,6 @@ import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; -import com.lzxnone.terraria.entity.summon.StaticSummonRenderer; import net.minecraft.core.registries.Registries; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/lzxnone/terraria/entity/beam/SwordBeam.java b/src/main/java/com/lzxnone/terraria/entity/beam/SwordBeam.java index f57fdc4..308790d 100644 --- a/src/main/java/com/lzxnone/terraria/entity/beam/SwordBeam.java +++ b/src/main/java/com/lzxnone/terraria/entity/beam/SwordBeam.java @@ -75,7 +75,9 @@ public class SwordBeam extends Entity { if(this.entityData.get(OWNER).orElse(null) != null) { UUID uuid = this.entityData.get(OWNER).orElse(null); if(!this.level().isClientSide()) { - setOwner(((ServerLevel) this.level()).getEntity(uuid)); + if(uuid != null) { + setOwner(((ServerLevel) this.level()).getEntity(uuid)); + } }else { for(Entity entity : this.level().getEntities(this, this.getBoundingBox().inflate(64.0))) { if(entity.getUUID().equals(uuid)) { diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java index b1da385..2bc16c8 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java @@ -85,7 +85,9 @@ public class StaticSummon extends Entity { if(this.entityData.get(OWNER).orElse(null) != null) { UUID uuid = this.entityData.get(OWNER).orElse(null); if(!this.level().isClientSide()) { - setOwner(((ServerLevel) this.level()).getEntity(uuid)); + if(uuid != null) { + setOwner(((ServerLevel) this.level()).getEntity(uuid)); + } }else { for(Entity entity : this.level().getEntities(this, this.getBoundingBox().inflate(64.0))) { if(entity.getUUID().equals(uuid)) { 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 1dfd277..0ba1695 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -18,6 +18,7 @@ public class StaticSummonBehaviors { public static final String NIGHTS_EDGE_BEAM = "nights_edge_beam"; public static final String LIGHTS_BANE_SLASH = "lights_bane_slash"; public static final String TERRAGRIM_BEAM = "terragrim_beam"; + public static final String FIRST_FRACTAL_PROJECTILE = "first_fractal_projectile"; static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); @@ -30,6 +31,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(NIGHTS_EDGE_BEAM, NightsEdge.SUMMON_BEHAVIOR); BEHAVIORS.put(LIGHTS_BANE_SLASH, LightsBane.SUMMON_BEHAVIOR); BEHAVIORS.put(TERRAGRIM_BEAM, Terragrim.SUMMON_BEHAVIOR); + BEHAVIORS.put(FIRST_FRACTAL_PROJECTILE, FirstFractal.SUMMON_BEHAVIOR); } public static IStaticSummonBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonRenderer.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonRenderer.java index ad07262..8625f80 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonRenderer.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonRenderer.java @@ -1,11 +1,15 @@ package com.lzxnone.terraria.entity.summon; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.PathfinderMob; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.item.ItemStack; @@ -16,6 +20,25 @@ public class StaticSummonRenderer extends EntityRenderer { super(context); } + private static PlayerModel WIDE_MODEL = null; + private static PlayerModel SLIM_MODEL = null; + + public static PlayerModel getWideModel() { + if(WIDE_MODEL == null) { + var modelSet = Minecraft.getInstance().getEntityModels(); + WIDE_MODEL = new PlayerModel<>(modelSet.bakeLayer(ModelLayers.PLAYER), false); + } + return WIDE_MODEL; + } + + public static PlayerModel getSlimModel() { + if(SLIM_MODEL == null) { + var modelSet = Minecraft.getInstance().getEntityModels(); + SLIM_MODEL = new PlayerModel<>(modelSet.bakeLayer(ModelLayers.PLAYER_SLIM), true); + } + return SLIM_MODEL; + } + @Override public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { diff --git a/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java b/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java index a4ef8b5..b8acafc 100644 --- a/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java @@ -3,8 +3,10 @@ package com.lzxnone.terraria.event_handler; import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.weapon.melee.FirstFractal; import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword; import com.lzxnone.terraria.item.weapon.melee.Zenith; +import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; import com.lzxnone.terraria.network.payload.ZenithScrollPayload; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -58,6 +60,31 @@ public class InputHandler { PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta)); } + }else if(mainHand.getItem() instanceof FirstFractal) { + int count = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getInt("attackCount"); + double scrollDelta = event.getScrollDeltaY(); + if(scrollDelta != 0 && count > 0) { + event.setCanceled(true); + double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + + double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; + + if(Config.firstFractalDistanceMode) { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; + }else { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < 0) finalDelta = 0; + } + MutableComponent displayText = Component.empty(); + displayText.append(Component.literal(String.format("%s", Config.firstFractalDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) + .append(Component.literal(String.format("%.1f", 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 d9ca3cd..9b547ea 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -2,6 +2,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.melee.*; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; @@ -32,6 +33,7 @@ public class ModItems { public static final DeferredItem EXCALIBUR = ITEMS.register("excalibur", Excalibur::new); public static final DeferredItem TRUE_EXCALIBUR = ITEMS.register("true_excalibur", TrueExcalibur::new); public static final DeferredItem TRUE_COPPER_SHORTSWORD = ITEMS.register("true_copper_shortsword", TrueCopperShortsword::new); + public static final DeferredItem FIRST_FRACTAL = ITEMS.register("first_fractal", FirstFractal::new); //弹射物 public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", EnchantedSwordBeam::new); @@ -42,4 +44,19 @@ public class ModItems { public static final DeferredItem STAR_WRATH_STAR = ITEMS.register("star_wrath_star", StarWrathStar::new); public static final DeferredItem MEOWMERE_PROJECTILE = ITEMS.register("meowmere_projectile", MeowmereProjectile::new); public static final DeferredItem LEAF_PROJECTILE = ITEMS.register("leaf_projectile", LeafProjectile::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE0 = ITEMS.register("first_fractal_projectile0", FirstFractalProjectile0::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE1 = ITEMS.register("first_fractal_projectile1", FirstFractalProjectile1::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE2 = ITEMS.register("first_fractal_projectile2", FirstFractalProjectile2::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE3 = ITEMS.register("first_fractal_projectile3", FirstFractalProjectile3::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE4 = ITEMS.register("first_fractal_projectile4", FirstFractalProjectile4::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE5 = ITEMS.register("first_fractal_projectile5", FirstFractalProjectile5::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE6 = ITEMS.register("first_fractal_projectile6", FirstFractalProjectile6::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE7 = ITEMS.register("first_fractal_projectile7", FirstFractalProjectile7::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE8 = ITEMS.register("first_fractal_projectile8", FirstFractalProjectile8::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE9 = ITEMS.register("first_fractal_projectile9", FirstFractalProjectile9::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE10 = ITEMS.register("first_fractal_projectile10", FirstFractalProjectile10::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE11 = ITEMS.register("first_fractal_projectile11", FirstFractalProjectile11::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE12 = ITEMS.register("first_fractal_projectile12", FirstFractalProjectile12::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE13 = ITEMS.register("first_fractal_projectile13", FirstFractalProjectile13::new); + public static final DeferredItem FIRST_FRACTAL_PROJECTILE14 = ITEMS.register("first_fractal_projectile14", FirstFractalProjectile14::new); } diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java new file mode 100644 index 0000000..31d0e41 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile0 extends Item { + public FirstFractalProjectile0() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java new file mode 100644 index 0000000..4f2e7a9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile1 extends Item { + public FirstFractalProjectile1() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java new file mode 100644 index 0000000..f4f655a --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile10 extends Item { + public FirstFractalProjectile10() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java new file mode 100644 index 0000000..4831aa1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile11 extends Item { + public FirstFractalProjectile11() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java new file mode 100644 index 0000000..0aa8b3f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile12 extends Item { + public FirstFractalProjectile12() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java new file mode 100644 index 0000000..750c14c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile13 extends Item { + public FirstFractalProjectile13() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java new file mode 100644 index 0000000..a30b34b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile14 extends Item { + public FirstFractalProjectile14() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java new file mode 100644 index 0000000..c1463e1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile2 extends Item { + public FirstFractalProjectile2() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java new file mode 100644 index 0000000..617937e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile3 extends Item { + public FirstFractalProjectile3() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java new file mode 100644 index 0000000..351d647 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile4 extends Item { + public FirstFractalProjectile4() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java new file mode 100644 index 0000000..d598584 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile5 extends Item { + public FirstFractalProjectile5() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java new file mode 100644 index 0000000..fd1fc46 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile6 extends Item { + public FirstFractalProjectile6() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java new file mode 100644 index 0000000..b29f2ce --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile7 extends Item { + public FirstFractalProjectile7() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java new file mode 100644 index 0000000..4328c72 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile8 extends Item { + public FirstFractalProjectile8() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java new file mode 100644 index 0000000..c245bde --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.first_fractal; + +import net.minecraft.world.item.Item; + +public class FirstFractalProjectile9 extends Item { + public FirstFractalProjectile9() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java new file mode 100644 index 0000000..97bfe36 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java @@ -0,0 +1,396 @@ +package com.lzxnone.terraria.item.weapon.melee; + +import com.lzxnone.terraria.Config; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.TintedVertexConsumer; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.summon.*; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.particle.ZenithTrailParticleOptions; +import com.lzxnone.terraria.utils.*; +import com.mojang.authlib.GameProfile; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.PlayerModel; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.resources.PlayerSkin; +import net.minecraft.core.component.DataComponents; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FastColor; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlotGroup; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; +import org.joml.Matrix4f; +import org.joml.Vector3f; + +import java.util.List; +import java.util.UUID; + +public class FirstFractal extends SwordItem { + public FirstFractal() { + super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() + .add(Attributes.ATTACK_DAMAGE, + new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 20.0, AttributeModifier.Operation.ADD_VALUE), + EquipmentSlotGroup.MAINHAND) + .add(Attributes.ATTACK_SPEED, + new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), + EquipmentSlotGroup.MAINHAND) + .build() + )); + } + + private static ItemStack[] weapons; + + private static ItemStack[] getWeapons() { + if(weapons == null) { + weapons = new ItemStack[]{ + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE0.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE1.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE2.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE3.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE4.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE5.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE6.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE7.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE8.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE9.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE10.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE11.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE12.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE13.get()), + new ItemStack(ModItems.FIRST_FRACTAL_PROJECTILE14.get()), + }; + } + return weapons; + } + + public static final Vector3f[] COLORS = new Vector3f[] { + new Vector3f(1.0f, 0.0f, 0.0f), // 红 (Red) + new Vector3f(1.0f, 0.5f, 0.0f), // 橙 (Orange) + new Vector3f(1.0f, 1.0f, 0.0f), // 黄 (Yellow) + new Vector3f(0.0f, 1.0f, 0.0f), // 绿 (Green) + new Vector3f(0.0f, 1.0f, 1.0f), // 青 (Cyan) + new Vector3f(0.0f, 0.0f, 1.0f), // 蓝 (Blue) + new Vector3f(0.5f, 0.0f, 1.0f) // 紫 (Violet) + }; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/beam_sparkle.png"); + public static final ResourceLocation RES2 = ResourceLocation.parse("lzxnoneterraria:textures/vfx/first_fractal_star.png"); + + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + UUID uuid = summon.getEntityData().get(StaticSummon.OWNER).orElse(null); + if(uuid == null) return; + ItemStack item = summon.getEntityData().get(StaticSummon.ITEM); + if(item == ItemStack.EMPTY) return; + + GameProfile profile = new GameProfile(uuid, ""); + PlayerSkin playerSkin = Minecraft.getInstance().getSkinManager().getInsecureSkin(profile); + + boolean isSlim = playerSkin.model() == PlayerSkin.Model.SLIM; + PlayerModel activeModel = isSlim ? StaticSummonRenderer.getSlimModel() : StaticSummonRenderer.getWideModel(); + activeModel.head.resetPose(); + activeModel.body.resetPose(); + activeModel.rightArm.resetPose(); + activeModel.leftArm.resetPose(); + activeModel.rightLeg.resetPose(); + activeModel.leftLeg.resetPose(); + activeModel.young = false; + + //确定模型方向 + activeModel.rightArm.xRot = (float) Math.toRadians(-90); + activeModel.leftArm.xRot = (float) Math.toRadians(-90); + activeModel.rightArm.yRot = (float) Math.toRadians(-30); + activeModel.leftArm.yRot = (float) Math.toRadians(30); + activeModel.rightLeg.xRot = (float) Math.toRadians(-30); + activeModel.leftLeg.xRot = (float) Math.toRadians(30); + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon.getLookAngle().toVector3f(), 0); + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + + Vector3f color = new Vector3f( + summon.getEntityData().get(StaticSummon.COLOR_R), + summon.getEntityData().get(StaticSummon.COLOR_G), + summon.getEntityData().get(StaticSummon.COLOR_B) + ); + + float radio = (float) (summon.getEntityData().get(StaticSummon.AGE) + partialTick) / (float) summon.getEntityData().get(StaticSummon.LIFETIME); + float alpha; + if(radio < 0.25f) { + alpha = radio / 0.25f; + }else if(radio > 0.75f) { + alpha = 1.0f - (radio - 0.75f) / 0.25f; + }else { + alpha = 1.0f; + } + + if(alpha < 0.001f) return; + + //流星 + poseStack.pushPose(); + float starHalfWidth = 45 * 0.06f; + float starHalfHeight = 17 * 0.06f; + VertexConsumer starConsumer = bufferSource.getBuffer(RenderType.entityTranslucentEmissive(RES2)); + + poseStack.translate( + dirs[0].x * 0 + dirs[1].x * 1.3, + dirs[0].y * 0 + dirs[1].y * 1.3, + dirs[0].z * 0 + dirs[1].z * 1.3 + ); + + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); + + poseStack.mulPose(Axis.YP.rotationDegrees(270)); + + poseStack.scale(0.75f + alpha * 0.25f, 0.75f + alpha * 0.25f , 0.75f + alpha * 0.25f); + for(int i = 0; i < 3; i++) { + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha * 0.5f).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha * 0.5f).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha * 0.5f).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha * 0.5f).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + } + poseStack.popPose(); + + //闪烁 + poseStack.pushPose(); + float sparkleHalfWidth = 32 * 0.12f; + float sparkleHalfHeight = 32 * 0.03f; + + VertexConsumer sparkleConsumer = bufferSource.getBuffer(RenderType.entityTranslucentEmissive(RES)); + + poseStack.translate( + dirs[0].x * 2 + dirs[1].x * 1.3, + dirs[0].y * 2 + dirs[1].y * 1.3, + dirs[0].z * 2 + dirs[1].z * 1.3 + ); + + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + + poseStack.mulPose(Axis.YP.rotationDegrees(270)); + + poseStack.scale(alpha, alpha , alpha); + + for(int i = 0; i < 3; i++) { + sparkleConsumer.addVertex(poseStack.last().pose(), -sparkleHalfWidth, -sparkleHalfHeight, 0.01f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + sparkleConsumer.addVertex(poseStack.last().pose(), sparkleHalfWidth, -sparkleHalfHeight, 0.01f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + sparkleConsumer.addVertex(poseStack.last().pose(), sparkleHalfWidth, sparkleHalfHeight, 0.01f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + sparkleConsumer.addVertex(poseStack.last().pose(), -sparkleHalfWidth, sparkleHalfHeight, 0.01f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + } + poseStack.popPose(); + + //剑 + poseStack.pushPose(); + + poseStack.translate( + dirs[0].x * 2.2 + dirs[1].x * 1.5, + dirs[0].y * 2.2 + dirs[1].y * 1.5, + dirs[0].z * 2.2 + dirs[1].z * 1.5 + ); + + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); + + poseStack.mulPose(Axis.YP.rotationDegrees(270)); + poseStack.mulPose(Axis.ZP.rotationDegrees(-45)); + + poseStack.scale(4.0f, 4.0f , 4.0f); + + Minecraft.getInstance().getItemRenderer().renderStatic( + item, + ItemDisplayContext.NONE, + LightTexture.FULL_BRIGHT, + OverlayTexture.NO_OVERLAY, + poseStack, + renderType -> { + VertexConsumer vertexConsumer = bufferSource.getBuffer(renderType); + return new TintedVertexConsumer(vertexConsumer, 1.0f, 1.0f, 1.0f, alpha); + }, + summon.level(), + 0 + ); + + poseStack.popPose(); + + //模型 + poseStack.pushPose(); + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); + + poseStack.mulPose(Axis.YP.rotationDegrees(180)); + + poseStack.scale(-1.0F, -1.0F, 1.0F); + poseStack.translate(0.0F, -1.501F, 0.0F); + + VertexConsumer modelConsumer = bufferSource.getBuffer(RenderType.entityTranslucent(playerSkin.texture())); + + int packedColor = FastColor.ARGB32.color(Math.min((int)(alpha * 255), 255), 255, 255, 255); + activeModel.renderToBuffer(poseStack, modelConsumer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, packedColor); + poseStack.popPose(); + + } + + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.firstFractalProjectileSpeed)); + + summon.setBoundingBox(new AABB( + summon.getX() - Config.firstFractalBoundingBoxSize, summon.getY() - Config.firstFractalBoundingBoxSize, summon.getZ() - Config.firstFractalBoundingBoxSize, + summon.getX() + Config.firstFractalBoundingBoxSize, summon.getY() + Config.firstFractalBoundingBoxSize, summon.getZ() + Config.firstFractalBoundingBoxSize + )); + + if(!summon.level().isClientSide()) { + if(summon.getOwner() instanceof Player player) { + List targets = summon.level().getEntitiesOfClass( + Entity.class, + summon.getBoundingBox(), + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + for(Entity target : targets) { + if(DamageUtil.attack(player, target, (float) Config.firstFractalProjectileDamage)) { + target.invulnerableTime = 10; + } + } + } + }else { + Vector3f color = new Vector3f( + summon.getEntityData().get(StaticSummon.COLOR_R), + summon.getEntityData().get(StaticSummon.COLOR_G), + summon.getEntityData().get(StaticSummon.COLOR_B) + ); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon.getLookAngle().toVector3f(), 0); + ZenithTrailParticleOptions options = new ZenithTrailParticleOptions(0.05f, 40, true, color, dirs[1], dirs[2], 90); + Vec3 pos = MathUtil.toVec3(dirs[1]).scale(Math.random() * 2).add(summon.position()); + Vec3 speed = MathUtil.toVec3(dirs[0]).scale(Config.firstFractalProjectileSpeed); + ParticleUtil.addParticle( + summon.level(), options, + pos, 0, + speed, 0 + ); + } + } + }; + + public static void summon(Player player, double deltaDist) { + if(!player.level().isClientSide()) { + Vec3 targetPos; + if(Config.firstFractalDistanceMode) { + Vec3 origin = MathUtil.getCrosshairPos(player, player.level(), Config.firstFractalMaxRange); + double dist = origin.subtract(player.getEyePosition()).length(); + double maxScale = Config.firstFractalMaxRange - dist; + double minScale = -dist; + double scale = Math.min(deltaDist, maxScale); + if(deltaDist < minScale) scale = -minScale; + targetPos = origin.add(player.getLookAngle().normalize().scale(scale)); + }else { + targetPos = player.getEyePosition().add(player.getLookAngle().normalize().scale(Math.min(deltaDist, Config.firstFractalMaxRange))); + } + + Vec3 summonPos = MathUtil.getRandomPosInRadius(targetPos, Config.firstFractalSpawnRange); + Vector3f color = COLORS[player.getRandom().nextInt(COLORS.length)]; + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), player.level()); + summon.setOwner(player); + summon.setPos(summonPos); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.FIRST_FRACTAL_PROJECTILE); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.ITEM, getWeapons()[player.getRandom().nextInt(getWeapons().length)]); + summon.getEntityData().set(StaticSummon.COLOR_R, color.x); + summon.getEntityData().set(StaticSummon.COLOR_G, color.y); + summon.getEntityData().set(StaticSummon.COLOR_B, color.z); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.getEntityData().set(StaticSummon.LIFETIME, Config.firstFractalProjectileLifetime); + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(targetPos.subtract(summonPos).toVector3f(), 0); + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + summon.setXRot(xyRot[0]); + summon.xRotO = xyRot[0]; + summon.setYRot(xyRot[1]); + summon.yRotO = xyRot[1]; + + summon.setNoGravity(true); + summon.noPhysics = true; + + player.level().addFreshEntity(summon); + } + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + + if(!level.isClientSide()) { + CustomData.update(DataComponents.CUSTOM_DATA, stack, + tag -> tag.putInt("attackCount", 3)); + }else { + SoundUtil.playClientSound(player, ModSounds.WAVE.get()); + } + + player.getCooldowns().addCooldown(stack.getItem(), 3); + return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); + } + + @Override + public void inventoryTick(ItemStack stack, Level level, net.minecraft.world.entity.Entity entity, int slotId, boolean isSelected) { + super.inventoryTick(stack, level, entity, slotId, isSelected); + if(entity instanceof Player player) { + if(isSelected) { + if(player.tickCount % 3 == 0) { + double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getInt("attackCount"); + if(count > 0) { + summon(player, deltaDist); + CustomData.update(DataComponents.CUSTOM_DATA, stack, + tag -> tag.putInt("attackCount", count - 1)); + } + } + }else { + int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getInt("attackCount"); + if(count > 0) { + CustomData.update(DataComponents.CUSTOM_DATA, stack, + tag -> tag.putInt("attackCount", 0)); + } + } + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java index 71108e2..ae2a219 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java @@ -110,26 +110,27 @@ public class InfluxWaver extends SwordItem { if(customData.contains("target")) { Entity target = summon.level().getEntity(customData.getInt("target")); if(target == null || !target.isAlive()) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); checkEntity = false; }else { - Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); - summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(Config.influxWaverSpeed)); + //Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); + //summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(Config.influxWaverSpeed)); } }else { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); checkEntity = false; } + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); } } - if(idx > 0) { + /*if(idx > 0) { float[] xyRot = MathUtil.computeXYRot(MathUtil.toVector3f(summon.getDeltaMovement())); summon.setXRot(xyRot[0]); summon.xRotO = xyRot[0]; summon.setYRot(xyRot[1]); summon.yRotO = xyRot[1]; - } + }*/ //碰撞逻辑 if(!summon.level().isClientSide()) { @@ -186,7 +187,8 @@ public class InfluxWaver extends SwordItem { summon.setOwner(player); summon.setPos(pos); - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + //Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(dir.toVector3f(), player.getYRot()); float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.xRotO = xyRot[0]; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java index e2e988b..c155cfd 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java @@ -143,8 +143,8 @@ public class LightsBane extends SwordItem { )); if(!summon.level().isClientSide() && summon.getOwner() instanceof Player player) { - List targets = summon.level().getEntitiesOfClass(LivingEntity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); - for(LivingEntity target : targets) { + List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); + for(Entity target : targets) { float damage = customData.contains("big") && customData.getBoolean("big") ? (float) Config.lightsBaneBigDamage : (float) Config.lightsBaneSmallDamage; if(DamageUtil.attack(player, target, damage)) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java index 821d742..0953fdf 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java @@ -332,8 +332,8 @@ public class NightsEdge extends SwordItem { if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); if(count < Config.nightsEdgeProjectileMaxHitCount) { - List targets = summon.level().getEntitiesOfClass(LivingEntity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); - for(LivingEntity target : targets) { + List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); + for(Entity target : targets) { if(count >= Config.nightsEdgeProjectileMaxHitCount) break; if(DamageUtil.attack(player, target, (float) Config.nightsEdgeProjectileDamage)) { count++; @@ -469,7 +469,6 @@ public class NightsEdge extends SwordItem { SwordBeamBehaviors.getBehavior("nights_edge").generate(player, BEAM_DATA); }else { SoundUtil.playClientSound(player, ModSounds.WAVE.get()); - SoundUtil.playClientSound(player, ModSounds.WAVE3.get()); } return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } 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 6cadb79..28da52e 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 @@ -371,8 +371,8 @@ public class TerraBlade extends SwordItem { //碰撞计算 if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); - List targets = summon.level().getEntitiesOfClass(LivingEntity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); - for(LivingEntity target : targets) { + List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); + for(Entity target : targets) { if(DamageUtil.attack(player, target, (float) Config.terraProjectileDamage * (float) Math.pow(Config.terraProjectileDamageDecay, count))) { count++; ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java index 0a70b3c..cf7e93b 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java @@ -145,24 +145,32 @@ public class Terragrim extends SwordItem { )); if(!summon.level().isClientSide()) { if(summon.getOwner() instanceof Player player) { - List targets = summon.level().getEntitiesOfClass( - LivingEntity.class, + List targets = summon.level().getEntitiesOfClass( + Entity.class, summon.getBoundingBox(), - FilterUtil.createLivingTargetFilter(summon, player) + FilterUtil.createTargetFilter(summon, player) ); - for(LivingEntity target : targets) { - AttributeInstance knockbackResist = null; - double originalResist = 0.0; - knockbackResist = target.getAttribute(Attributes.KNOCKBACK_RESISTANCE); - if(knockbackResist != null) { - originalResist = knockbackResist.getBaseValue(); - knockbackResist.setBaseValue(Math.max(0.9, originalResist)); - } - if(DamageUtil.attack(player, target, (float) Config.terragrimDamage)) { - target.invulnerableTime = 0; - } - if(knockbackResist != null) { - knockbackResist.setBaseValue(originalResist); + for(Entity target : targets) { + if(target instanceof LivingEntity livingEntity) { + AttributeInstance knockbackResist = null; + double originalResist = 0.0; + knockbackResist = livingEntity.getAttribute(Attributes.KNOCKBACK_RESISTANCE); + if(knockbackResist != null) { + originalResist = knockbackResist.getBaseValue(); + knockbackResist.setBaseValue(Math.max(0.9, originalResist)); + } + + if(DamageUtil.attack(player, target, (float) Config.terragrimDamage)) { + target.invulnerableTime = 0; + } + + if(knockbackResist != null) { + knockbackResist.setBaseValue(originalResist); + } + }else { + if(DamageUtil.attack(player, target, (float) Config.terragrimDamage)) { + target.invulnerableTime = 0; + } } } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java index b6e02c5..aaa2931 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java @@ -435,8 +435,8 @@ public class TrueNightsEdge extends SwordItem { if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); if(count < Config.trueNightsEdgeProjectileMaxHitCount) { - List targets = summon.level().getEntitiesOfClass(LivingEntity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); - for(LivingEntity target : targets) { + List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); + for(Entity target : targets) { if(count >= Config.trueNightsEdgeProjectileMaxHitCount) break; if(DamageUtil.attack(player, target, (float) Config.trueNightsEdgeProjectileDamage)) { count++; @@ -572,7 +572,6 @@ public class TrueNightsEdge extends SwordItem { SwordBeamBehaviors.getBehavior("true_nights_edge").generate(player, BEAM_DATA); }else { SoundUtil.playClientSound(player, ModSounds.WAVE.get()); - SoundUtil.playClientSound(player, ModSounds.WAVE3.get()); } return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java index 03472fe..91ea956 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java @@ -327,12 +327,12 @@ public class Zenith extends SwordItem { )); if(!projectile.level().isClientSide()) { - List targets = projectile.level().getEntitiesOfClass( - LivingEntity.class, + List targets = projectile.level().getEntitiesOfClass( + Entity.class, projectile.getBoundingBox(), - FilterUtil.createLivingTargetFilter(projectile, projectile.getOwner()) + FilterUtil.createTargetFilter(projectile, projectile.getOwner()) ); - for(LivingEntity target : targets) this.onHitEntity(projectile, new EntityHitResult(target, target.position())); + for(Entity target : targets) this.onHitEntity(projectile, new EntityHitResult(target, target.position())); }else { if(lifeRadio > 0.1f && lifeRadio < 0.9f && projectile.getRandom().nextInt(5) == 0) { Vector3f color = new Vector3f( diff --git a/src/main/java/com/lzxnone/terraria/mixin/ZenithRenderMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ZenithRenderMixin.java index 2dfd24e..d14466a 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/ZenithRenderMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/ZenithRenderMixin.java @@ -31,7 +31,7 @@ public class ZenithRenderMixin { MultiBufferSource buffer, int combinedLight, CallbackInfo ci) { if(!player.isScoping()) { - if(stack.is(ModItems.ZENITH.get()) || stack.is(ModItems.TRUE_COPPER_SHORTSWORD.get())) { + if(stack.is(ModItems.ZENITH.get()) || stack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || stack.is(ModItems.FIRST_FRACTAL.get())) { int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getInt("attackCount"); if(count > 0) { @@ -56,7 +56,7 @@ public class ZenithRenderMixin { boolean leftHand, PoseStack poseStack, MultiBufferSource buffer, int seed, CallbackInfo ci) { - if(itemStack.is(ModItems.ZENITH.get()) || itemStack.is(ModItems.TRUE_COPPER_SHORTSWORD.get())) { + if(itemStack.is(ModItems.ZENITH.get()) || itemStack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || itemStack.is(ModItems.FIRST_FRACTAL.get())) { int count = itemStack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getInt("attackCount"); if(count > 0) { diff --git a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java index 4cb7897..57923b5 100644 --- a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java +++ b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java @@ -1,8 +1,10 @@ package com.lzxnone.terraria.network; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.network.handler.FirstFractalScrollHandler; import com.lzxnone.terraria.network.handler.SwordBeamHandler; import com.lzxnone.terraria.network.handler.ZenithScrollHandler; +import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; import com.lzxnone.terraria.network.payload.SwordBeamPayload; import com.lzxnone.terraria.network.payload.ZenithScrollPayload; import net.neoforged.bus.api.SubscribeEvent; @@ -25,5 +27,10 @@ public class ModNetwork { ZenithScrollPayload.CODEC, ZenithScrollHandler::handle ); + registrar.playToServer( + FirstFractalScrollPayload.TYPE, + FirstFractalScrollPayload.CODEC, + FirstFractalScrollHandler::handle + ); } } diff --git a/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java new file mode 100644 index 0000000..bf488f0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java @@ -0,0 +1,40 @@ +package com.lzxnone.terraria.network.handler; + +import com.lzxnone.terraria.Config; +import com.lzxnone.terraria.item.weapon.melee.FirstFractal; +import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public class FirstFractalScrollHandler { + public static void handle(final FirstFractalScrollPayload payload, final IPayloadContext context) { + context.enqueueWork(() -> { + Level level = context.player().level(); + if(level.isClientSide()) return; + Player player = context.player(); + ItemStack weapon = player.getMainHandItem(); + if(weapon.getItem() instanceof FirstFractal) { + double scrollDelta = payload.scrollDelta(); + double deltaDist = weapon.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; + + if(Config.firstFractalDistanceMode) { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; + }else { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < 0) finalDelta = 0; + } + + double finalDelta1 = finalDelta; + CustomData.update(DataComponents.CUSTOM_DATA, weapon, + tag -> tag.putDouble("deltaDist", finalDelta1)); + } + }); + } +} diff --git a/src/main/java/com/lzxnone/terraria/network/payload/FirstFractalScrollPayload.java b/src/main/java/com/lzxnone/terraria/network/payload/FirstFractalScrollPayload.java new file mode 100644 index 0000000..67527e8 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/payload/FirstFractalScrollPayload.java @@ -0,0 +1,23 @@ +package com.lzxnone.terraria.network.payload; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record FirstFractalScrollPayload(double scrollDelta) implements CustomPacketPayload { + public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>( + ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "first_fractal_scroll_payload") + ); + + public static final StreamCodec CODEC = StreamCodec.composite( + ByteBufCodecs.DOUBLE, FirstFractalScrollPayload::scrollDelta, + FirstFractalScrollPayload::new + ); + + @Override + public CustomPacketPayload.Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java index 19b5776..96f2dfd 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.particle; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.utils.MathUtil; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Camera; @@ -45,6 +46,7 @@ public class ZenithTrailParticle extends TextureSheetParticle { this.dir = new Vec3(xSpeed, ySpeed, zSpeed).normalize(); this.up = new Vec3(options.up).normalize(); this.right = new Vec3(options.right).normalize(); + this.angle = options.angle; this.rCol = options.color.x; this.gCol = options.color.y; diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index d9a4db5..288555f 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -24,6 +24,7 @@ "item.lzxnoneterraria.excalibur": "Excalibur", "item.lzxnoneterraria.true_excalibur": "True Excalibur", "item.lzxnoneterraria.true_copper_shortsword": "True Copper Shortsword", + "item.lzxnoneterraria.first_fractal": "First Fractal", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", @@ -244,6 +245,24 @@ "lzxnoneterraria.configuration.zenith_trail_max_length": "Trail Length", "lzxnoneterraria.configuration.zenith_trail_max_length.tooltip": "Maximum number of trail segments", + "lzxnoneterraria.configuration.first_fractal_settings": "First Fractal Settings", + "lzxnoneterraria.configuration.first_fractal_projectile_damage": "Projectile Damage", + "lzxnoneterraria.configuration.first_fractal_projectile_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size": "Bounding Box Size", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB collision box half-size", + "lzxnoneterraria.configuration.first_fractal_projectile_speed": "Projectile Speed", + "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "Projectile movement speed", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "Projectile Lifetime", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "Projectile duration in ticks", + "lzxnoneterraria.configuration.first_fractal_distance_mode": "Enable Relative Distance Mode", + "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "Whether projectile range follows crosshair distance", + "lzxnoneterraria.configuration.first_fractal_scroll_speed": "Scroll Speed", + "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "Mouse scroll adjustment speed", + "lzxnoneterraria.configuration.first_fractal_max_range": "Max Range", + "lzxnoneterraria.configuration.first_fractal_max_range.tooltip": "Maximum projectile travel range", + "lzxnoneterraria.configuration.first_fractal_spawn_range": "Spawn Range", + "lzxnoneterraria.configuration.first_fractal_spawn_range.tooltip": "Projectile spawn radius around target", + "lzxnoneterraria.configuration.true_excalibur_settings": "True Excalibur Settings", "lzxnoneterraria.configuration.true_excalibur_rotate_range": "Blade Rotate Range", "lzxnoneterraria.configuration.true_excalibur_rotate_range.tooltip": "Blade rotation angle range", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 3274d73..52340c5 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -24,6 +24,7 @@ "item.lzxnoneterraria.excalibur": "断钢剑", "item.lzxnoneterraria.true_excalibur": "真断钢剑", "item.lzxnoneterraria.true_copper_shortsword": "真铜短剑", + "item.lzxnoneterraria.first_fractal": "第一分形", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", @@ -244,6 +245,24 @@ "lzxnoneterraria.configuration.zenith_trail_max_length": "尾迹长度", "lzxnoneterraria.configuration.zenith_trail_max_length.tooltip": "尾迹最大段数", + "lzxnoneterraria.configuration.first_fractal_settings": "第一分形 设置", + "lzxnoneterraria.configuration.first_fractal_projectile_damage": "弹射伤害", + "lzxnoneterraria.configuration.first_fractal_projectile_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size": "碰撞箱大小", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB 碰撞箱半边长", + "lzxnoneterraria.configuration.first_fractal_projectile_speed": "弹射速度", + "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "弹射物移动速度", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "弹射生命周期", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "弹射物持续时间(刻)", + "lzxnoneterraria.configuration.first_fractal_distance_mode": "启用相对距离模式", + "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "弹射范围是否跟随准星距离", + "lzxnoneterraria.configuration.first_fractal_scroll_speed": "鼠标滚轮调节距离的速度", + "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "鼠标滚轮调节距离的速度", + "lzxnoneterraria.configuration.first_fractal_max_range": "最大范围", + "lzxnoneterraria.configuration.first_fractal_max_range.tooltip": "弹射物最大飞行距离", + "lzxnoneterraria.configuration.first_fractal_spawn_range": "生成范围", + "lzxnoneterraria.configuration.first_fractal_spawn_range.tooltip": "弹射物在目标周围生成半径", + "lzxnoneterraria.configuration.true_excalibur_settings": "真断钢剑 设置", "lzxnoneterraria.configuration.true_excalibur_rotate_range": "刀光偏转角范围", "lzxnoneterraria.configuration.true_excalibur_rotate_range.tooltip": "刀光旋转角度范围", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal.json new file mode 100644 index 0000000..6609dcb --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/weapon3", + "textures": { + "layer0": "lzxnoneterraria:item/first_fractal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile0.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile0.json new file mode 100644 index 0000000..71eb0d5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile0.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/first_fractal_projectile0" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile1.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile1.json new file mode 100644 index 0000000..5804d26 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile1.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile1"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile10.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile10.json new file mode 100644 index 0000000..2e7fdbe --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile10.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile10"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile11.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile11.json new file mode 100644 index 0000000..7dc56fe --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile11.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile11"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile12.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile12.json new file mode 100644 index 0000000..c15c6ba --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile12.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile12"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile13.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile13.json new file mode 100644 index 0000000..b112397 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile13.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile13"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile14.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile14.json new file mode 100644 index 0000000..81bacf0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile14.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile14"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile2.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile2.json new file mode 100644 index 0000000..4864dd4 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile2.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile2"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile3.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile3.json new file mode 100644 index 0000000..d5125a9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile3.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile3"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile4.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile4.json new file mode 100644 index 0000000..99f3bbc --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile4.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile4"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile5.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile5.json new file mode 100644 index 0000000..9860658 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile5.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile5"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile6.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile6.json new file mode 100644 index 0000000..2efb9ae --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile6.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile6"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile7.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile7.json new file mode 100644 index 0000000..880b405 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile7.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile7"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile8.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile8.json new file mode 100644 index 0000000..74eb48e --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile8.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile8"}} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile9.json b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile9.json new file mode 100644 index 0000000..39f33c9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/first_fractal_projectile9.json @@ -0,0 +1 @@ +{"parent":"item/generated","textures":{"layer0":"lzxnoneterraria:item/first_fractal_projectile9"}} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal.png new file mode 100644 index 0000000..25d0398 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile0.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile0.png new file mode 100644 index 0000000..7bb89f8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile0.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile1.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile1.png new file mode 100644 index 0000000..f071445 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile10.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile10.png new file mode 100644 index 0000000..6094b8c Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile10.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile11.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile11.png new file mode 100644 index 0000000..46d90fe Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile11.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile12.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile12.png new file mode 100644 index 0000000..9a9c86f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile12.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile13.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile13.png new file mode 100644 index 0000000..3258601 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile13.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile14.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile14.png new file mode 100644 index 0000000..7e58cd8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile14.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile2.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile2.png new file mode 100644 index 0000000..1845e48 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile2.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile3.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile3.png new file mode 100644 index 0000000..16b4571 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile3.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile4.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile4.png new file mode 100644 index 0000000..94ee8b5 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile4.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile5.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile5.png new file mode 100644 index 0000000..2107ea9 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile5.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile6.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile6.png new file mode 100644 index 0000000..3eb725c Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile6.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile7.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile7.png new file mode 100644 index 0000000..d0c2053 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile7.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile8.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile8.png new file mode 100644 index 0000000..3eb725c Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile8.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile9.png b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile9.png new file mode 100644 index 0000000..dba5eb8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/first_fractal_projectile9.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/first_fractal_star.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/first_fractal_star.png new file mode 100644 index 0000000..0500d5f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/first_fractal_star.png differ diff --git a/src/main/resources/data/lzxnoneterraria/weapon_attributes/first_fractal.json b/src/main/resources/data/lzxnoneterraria/weapon_attributes/first_fractal.json new file mode 100644 index 0000000..11bc472 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/weapon_attributes/first_fractal.json @@ -0,0 +1,3 @@ +{ + "parent": "bettercombat:claymore" +} \ No newline at end of file