From a59d9c37403a0b6285d499b8ddbc2a88afe5127b Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Mon, 3 Aug 2026 01:54:03 +0800 Subject: [PATCH] v1.6.1 --- .../dynamic_lights/MEntityLuminance.java | 6 +- .../entity/summon/IStaticSummonBehavior.java | 2 +- .../terraria/event/EntityEventHandler.java | 39 +++++++++++ .../event/FallenStarEventHandler.java | 68 +++++++++++++++++++ .../weapon/summon/minion/MinionWeapon.java | 2 +- .../summon/minion/StardustDragonStaff.java | 6 +- .../weapon/summon/minion/Terraprisma.java | 2 +- .../assets/lzxnoneterraria/lang/en_us.json | 8 +-- .../assets/lzxnoneterraria/lang/zh_cn.json | 8 +-- .../lzxnoneterraria/recipe/elf_melter.json | 20 ++++++ .../lzxnoneterraria/recipe/flamethrower.json | 20 ++++++ .../lzxnoneterraria/recipe/mana_crystal.json | 25 +++++++ .../data/lzxnoneterraria/recipe/meowmere.json | 2 +- .../lzxnoneterraria/recipe/possession.json | 20 ++++++ .../data/lzxnoneterraria/recipe/sdmg.json | 2 +- .../recipe/snowball_cannon.json | 18 +++++ .../lzxnoneterraria/recipe/star_cannon.json | 18 +++++ .../recipe/stardust_dragon_staff.json | 20 ++++++ .../recipe/super_star_shooter.json | 19 ++++++ .../recipe/true_excalibur.json | 2 +- .../recipe/true_nights_edge.json | 2 +- 21 files changed, 289 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/elf_melter.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/flamethrower.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/mana_crystal.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/possession.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/snowball_cannon.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/star_cannon.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/stardust_dragon_staff.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/super_star_shooter.json 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 6f7c3f3..8791cd5 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -34,7 +34,8 @@ public class MEntityLuminance implements EntityLuminance { StaticProjectileBehaviors.MURAMASA_PROJECTILE, StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE, StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE2, - StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE3 -> { + StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE3, + StaticProjectileBehaviors.POSSESSION_PROJECTILE -> { return 15; } default -> { @@ -61,7 +62,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.LAST_PRISM_BEAM, StaticSummonBehaviors.TERRAPRISMA, StaticSummonBehaviors.FLAMETHROWER_FLAME, - StaticSummonBehaviors.ELF_MELTER_FLAME -> { + StaticSummonBehaviors.ELF_MELTER_FLAME, + StaticSummonBehaviors.STARDUST_DRAGON -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java b/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java index b674d74..d8c3c11 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java @@ -12,7 +12,7 @@ public interface IStaticSummonBehavior { if(summon.getEntityData().get(StaticSummon.AGE) > summon.getEntityData().get(StaticSummon.LIFETIME)) { onDied(summon); }else { - summon.getEntityData().set(StaticSummon.AGE, summon.getEntityData().get(StaticSummon.AGE) + 1); + if(summon.getEntityData().get(StaticSummon.AGE) != -114514) summon.getEntityData().set(StaticSummon.AGE, summon.getEntityData().get(StaticSummon.AGE) + 1); } } diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 870cba4..bdd1394 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -2,12 +2,14 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerSummon; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.item.weapon.summon.whip.Possession; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -16,12 +18,27 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.LivingDamageEvent; import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; import java.util.List; import java.util.UUID; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EntityEventHandler { + @SubscribeEvent + public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + if(event.getEntity() instanceof ServerPlayer player) { + clearPlayerSummons(player); + } + } + + @SubscribeEvent + public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { + if(event.getEntity() instanceof ServerPlayer player) { + clearPlayerSummons(player); + } + } + @SubscribeEvent public static void onLivingDamage(LivingDamageEvent.Post event) { //支配之鞭 预兆标记 @@ -32,6 +49,10 @@ public class EntityEventHandler { public static void onEntityDeath(LivingDeathEvent event) { LivingEntity livingEntity = event.getEntity(); if(livingEntity.level() instanceof ServerLevel serverLevel) { + if(livingEntity instanceof ServerPlayer player) { + clearPlayerSummons(player); + } + //迈达斯生成绿宝石 if(livingEntity.hasEffect(ModEffects.MIDAS) && livingEntity.getRandom().nextFloat() < MidasEffect.getDropChance()) { livingEntity.spawnAtLocation(new ItemStack(Items.EMERALD)); @@ -47,4 +68,22 @@ public class EntityEventHandler { } } } + + private static void clearPlayerSummons(ServerPlayer player) { + PlayerSummon playerSummon = player.getData(ModAttachments.PLAYER_SUMMON); + discardSummonSlots(player.serverLevel(), playerSummon.getMinionSlots()); + discardSummonSlots(player.serverLevel(), playerSummon.getSentrySlots()); + playerSummon.getMinionSlots().clear(); + playerSummon.getSentrySlots().clear(); + player.setData(ModAttachments.PLAYER_SUMMON, playerSummon); + } + + private static void discardSummonSlots(ServerLevel serverLevel, List slots) { + for(PlayerSummon.SummonSlot slot : slots) { + for(UUID uuid : slot.getSummons()) { + Entity entity = serverLevel.getEntity(uuid); + if(entity != null) entity.discard(); + } + } + } } diff --git a/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java b/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java new file mode 100644 index 0000000..7a1c7d6 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java @@ -0,0 +1,68 @@ +package com.lzxnone.terraria.event; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.util.Mth; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.phys.Vec3; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.tick.PlayerTickEvent; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID) +public class FallenStarEventHandler { + private static final int CHECK_INTERVAL = 20; + private static final double SPAWN_CHANCE = 0.004D; + private static final int MIN_SPAWN_RADIUS = 24; + private static final int MAX_SPAWN_RADIUS = 64; + private static final int SPAWN_HEIGHT = 48; + private static final int MAX_ATTEMPTS = 8; + private static final double FALL_SPEED = -0.65D; + + @SubscribeEvent + public static void onPlayerTick(PlayerTickEvent.Post event) { + if(!(event.getEntity() instanceof ServerPlayer player)) return; + if(!(player.level() instanceof ServerLevel serverLevel)) return; + if(serverLevel.dimension() != Level.OVERWORLD) return; + if(!serverLevel.isNight()) return; + if(player.tickCount % CHECK_INTERVAL != 0) return; + + RandomSource random = player.getRandom(); + if(random.nextDouble() >= SPAWN_CHANCE) return; + + Vec3 spawnPos = getSpawnPos(serverLevel, player, random); + if(spawnPos == null) return; + + ItemEntity fallenStar = new ItemEntity(serverLevel, spawnPos.x, spawnPos.y, spawnPos.z, new ItemStack(ModItems.FALLEN_STAR.get())); + fallenStar.setDeltaMovement(0.0D, FALL_SPEED, 0.0D); + fallenStar.setDefaultPickUpDelay(); + serverLevel.addFreshEntity(fallenStar); + SoundUtil.playServerSound(fallenStar, ModSounds.STAR_FALL.get(), 2.0f, 1.0f); + } + + private static Vec3 getSpawnPos(ServerLevel level, ServerPlayer player, RandomSource random) { + for(int i = 0; i < MAX_ATTEMPTS; i++) { + double angle = random.nextDouble() * Math.PI * 2.0D; + double radius = Mth.lerp(random.nextDouble(), MIN_SPAWN_RADIUS, MAX_SPAWN_RADIUS); + int x = Mth.floor(player.getX() + Math.cos(angle) * radius); + int z = Mth.floor(player.getZ() + Math.sin(angle) * radius); + int surfaceY = level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z); + BlockPos surfacePos = new BlockPos(x, surfaceY, z); + if(!level.hasChunkAt(surfacePos)) continue; + if(!level.canSeeSky(surfacePos)) continue; + + int y = Math.min(level.getMaxBuildHeight() - 2, surfaceY + SPAWN_HEIGHT); + return new Vec3(x + 0.5D, y, z + 0.5D); + } + return null; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java index 34a5ba4..2954d37 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java @@ -64,7 +64,7 @@ public class MinionWeapon extends SummonWeapon { summonData.setMinionSlots(slots); player.setData(ModAttachments.PLAYER_SUMMON, summonData); player.displayClientMessage( - Component.translatable("message.lzxnoneterraria.current_summons", slots.size(), maxSummonCount) + Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount) .withStyle(slots.size() < maxSummonCount ? net.minecraft.ChatFormatting.GREEN : net.minecraft.ChatFormatting.RED), true ); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java index ecab28d..22102d1 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java @@ -505,7 +505,7 @@ public class StardustDragonStaff extends MinionWeapon { summonData.setMinionSlots(slots); player.setData(ModAttachments.PLAYER_SUMMON, summonData); player.displayClientMessage( - Component.translatable("message.lzxnoneterraria.current_summons", slots.size(), maxSummonCount) + Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount) .withStyle(net.minecraft.ChatFormatting.RED), true ); @@ -570,7 +570,7 @@ public class StardustDragonStaff extends MinionWeapon { summonData.setMinionSlots(slots); player.setData(ModAttachments.PLAYER_SUMMON, summonData); player.displayClientMessage( - Component.translatable("message.lzxnoneterraria.current_summons", slots.size(), maxSummonCount) + Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount) .withStyle(slots.size() < maxSummonCount ? net.minecraft.ChatFormatting.GREEN : net.minecraft.ChatFormatting.RED), true ); @@ -590,7 +590,7 @@ public class StardustDragonStaff extends MinionWeapon { summon.setPos(player.position()); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, 72000); + summon.getEntityData().set(StaticSummon.LIFETIME, -114514); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index f2fab39..f568a10 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -471,7 +471,7 @@ public class Terraprisma extends MinionWeapon { summon.getEntityData().set(StaticSummon.SCALE_X, 2.0f); summon.getEntityData().set(StaticSummon.SCALE_Y, 1.0f); summon.getEntityData().set(StaticSummon.SCALE_Z, 1.0f); - summon.getEntityData().set(StaticSummon.LIFETIME, 72000); + summon.getEntityData().set(StaticSummon.LIFETIME, -114514); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy(); summonData.putFloat("damage", DAMAGE.get()); diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index ffdb3d7..33ceddc 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -146,9 +146,9 @@ "key.lzxnoneterraria.clear_summon": "Clear Selected Summons", "key.lzxnoneterraria.clear_all_summons": "Clear All Summons", "key.lzxnoneterraria.toggle_summon_attack_mode": "Toggle Summon Attack Mode", - "message.lzxnoneterraria.current_summons": "Current summons %s/%s", + "message.lzxnoneterraria.current_minions": "Current minions %s / %s", "message.lzxnoneterraria.clear_all_summons": "Cleared all summons", - "message.lzxnoneterraria.clear_summon": "Cleared %s", + "message.lzxnoneterraria.clear_summon": "Cleared %s's summons", "message.lzxnoneterraria.summon_attack_mode": "Summon attack mode: %s", "message.lzxnoneterraria.summon_attack_mode.passive": "Passive", "message.lzxnoneterraria.summon_attack_mode.neutral": "Neutral", @@ -223,8 +223,8 @@ "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "Max Magic Damage Reduction", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "Magic damage reduction at maximum duration, from 0 to 1", "lzxnoneterraria.configuration.summon_settings": "Summon Settings", - "lzxnoneterraria.configuration.summon_summon_count_per_level": "Summon Count Per Level", - "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra summon count granted by each level of the summon effect", + "lzxnoneterraria.configuration.summon_summon_count_per_level": "Minion Count Per Level", + "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra minion count granted by each level of the summon effect", "lzxnoneterraria.configuration.enchanted_sword_settings": "Enchanted Sword Settings", "lzxnoneterraria.configuration.enchanted_sword_damage": "Projectile Damage", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "Damage per hit", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index cd18622..108666a 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -145,9 +145,9 @@ "key.lzxnoneterraria.clear_summon": "清除指定召唤物", "key.lzxnoneterraria.clear_all_summons": "清除所有召唤物", "key.lzxnoneterraria.toggle_summon_attack_mode": "切换召唤物攻击模式", - "message.lzxnoneterraria.current_summons": "当前召唤物 %s/%s", + "message.lzxnoneterraria.current_minions": "当前仆从 %s / %s", "message.lzxnoneterraria.clear_all_summons": "已清除所有召唤物", - "message.lzxnoneterraria.clear_summon": "已清除%s", + "message.lzxnoneterraria.clear_summon": "已清除 %s 的召唤物", "message.lzxnoneterraria.summon_attack_mode": "召唤物攻击模式: %s", "message.lzxnoneterraria.summon_attack_mode.passive": "被动", "message.lzxnoneterraria.summon_attack_mode.neutral": "中立", @@ -222,8 +222,8 @@ "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "最大魔法伤害降低", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "达到最大持续时间时降低的魔法伤害比例,范围 0~1", "lzxnoneterraria.configuration.summon_settings": "召唤 设置", - "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级召唤数量", - "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的召唤物数量", + "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级仆从数量", + "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的仆从数量", "lzxnoneterraria.configuration.enchanted_sword_settings": "附魔剑 设置", "lzxnoneterraria.configuration.enchanted_sword_damage": "弹射伤害", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "每次命中伤害", diff --git a/src/main/resources/data/lzxnoneterraria/recipe/elf_melter.json b/src/main/resources/data/lzxnoneterraria/recipe/elf_melter.json new file mode 100644 index 0000000..47a3bb1 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/elf_melter.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "CCC", + "BAB", + "DDE" + ], + "key": { + "A": { "item": "lzxnoneterraria:flamethrower" }, + "B": { "item": "minecraft:conduit" }, + "C": { "item": "minecraft:blue_ice"}, + "D": { "item": "minecraft:slime_ball"}, + "E": { "item": "minecraft:netherite_block"} + }, + "result": { + "id": "lzxnoneterraria:elf_melter", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/flamethrower.json b/src/main/resources/data/lzxnoneterraria/recipe/flamethrower.json new file mode 100644 index 0000000..c5c098f --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/flamethrower.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "BBB", + "AAA", + "CDE" + ], + "key": { + "A": { "item": "lzxnoneterraria:clockwork_assault_rifle" }, + "B": { "item": "minecraft:flint_and_steel" }, + "C": { "item": "minecraft:lava_bucket"}, + "D": { "item": "minecraft:slime_ball"}, + "E": { "item": "minecraft:netherite_ingot"} + }, + "result": { + "id": "lzxnoneterraria:flamethrower", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mana_crystal.json b/src/main/resources/data/lzxnoneterraria/recipe/mana_crystal.json new file mode 100644 index 0000000..bcdf2e3 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/mana_crystal.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "lzxnoneterraria:fallen_star" + }, + { + "item": "lzxnoneterraria:fallen_star" + }, + { + "item": "lzxnoneterraria:fallen_star" + }, + { + "item": "lzxnoneterraria:fallen_star" + }, + { + "item": "lzxnoneterraria:fallen_star" + } + ], + "result": { + "id": "lzxnoneterraria:mana_crystal", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/meowmere.json b/src/main/resources/data/lzxnoneterraria/recipe/meowmere.json index 733e017..51cf387 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/meowmere.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/meowmere.json @@ -9,7 +9,7 @@ "key": { "A": { "item": "minecraft:diamond_block" }, "B": { "item": "minecraft:nether_star" }, - "C": { "item": "minecraft:dragon_egg" }, + "C": { "item": "minecraft:dragon_head" }, "D": { "item": "minecraft:stick" }, "E": { "item": "minecraft:mace" }, "F": { "item": "minecraft:ominous_bottle" } diff --git a/src/main/resources/data/lzxnoneterraria/recipe/possession.json b/src/main/resources/data/lzxnoneterraria/recipe/possession.json new file mode 100644 index 0000000..61de392 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/possession.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "ECE", + "BAB", + "EDE" + ], + "key": { + "A": { "item": "minecraft:netherite_upgrade_smithing_template" }, + "B": { "item": "minecraft:silence_armor_trim_smithing_template" }, + "C": { "item": "minecraft:conduit" }, + "D": { "item": "minecraft:heavy_core" }, + "E": { "item": "minecraft:netherite_block" } + }, + "result": { + "id": "lzxnoneterraria:possession", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/sdmg.json b/src/main/resources/data/lzxnoneterraria/recipe/sdmg.json index 85f061f..6309603 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/sdmg.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/sdmg.json @@ -12,7 +12,7 @@ "C": { "item": "lzxnoneterraria:tactical_shotgun" }, "D": { "item": "lzxnoneterraria:sniper_rifle" }, "E": { "item": "lzxnoneterraria:sniper_rifle" }, - "F": { "item": "minecraft:dragon_egg" }, + "F": { "item": "minecraft:netherite_upgrade_smithing_template" }, "G": { "item": "minecraft:nether_star" } }, "result": { diff --git a/src/main/resources/data/lzxnoneterraria/recipe/snowball_cannon.json b/src/main/resources/data/lzxnoneterraria/recipe/snowball_cannon.json new file mode 100644 index 0000000..36eb870 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/snowball_cannon.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "BBB", + "AAA", + "ACC" + ], + "key": { + "A": { "item": "minecraft:iron_block" }, + "B": { "item": "minecraft:snow_block" }, + "C": { "item": "minecraft:ice"} + }, + "result": { + "id": "lzxnoneterraria:snowball_cannon", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/star_cannon.json b/src/main/resources/data/lzxnoneterraria/recipe/star_cannon.json new file mode 100644 index 0000000..466b2d2 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/star_cannon.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "CCC", + "BAA", + "CCC" + ], + "key": { + "A": { "item": "minecraft:netherite_ingot" }, + "B": { "item": "minecraft:heavy_core" }, + "C": { "item": "lzxnoneterraria:fallen_star"} + }, + "result": { + "id": "lzxnoneterraria:star_cannon", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/stardust_dragon_staff.json b/src/main/resources/data/lzxnoneterraria/recipe/stardust_dragon_staff.json new file mode 100644 index 0000000..0ded878 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/stardust_dragon_staff.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "ECE", + "BAB", + "EDE" + ], + "key": { + "A": { "item": "minecraft:netherite_upgrade_smithing_template" }, + "B": { "item": "minecraft:dragon_head" }, + "C": { "item": "minecraft:conduit" }, + "D": { "item": "minecraft:heavy_core" }, + "E": { "item": "minecraft:netherite_block" } + }, + "result": { + "id": "lzxnoneterraria:stardust_dragon_staff", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/super_star_shooter.json b/src/main/resources/data/lzxnoneterraria/recipe/super_star_shooter.json new file mode 100644 index 0000000..251a813 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/super_star_shooter.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "CCC", + "DBA", + "CCC" + ], + "key": { + "A": { "item": "minecraft:netherite_block" }, + "B": { "item": "lzxnoneterraria:star_cannon" }, + "C": { "item": "lzxnoneterraria:mana_crystal"}, + "D": { "item": "minecraft:conduit"} + }, + "result": { + "id": "lzxnoneterraria:super_star_shooter", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/true_excalibur.json b/src/main/resources/data/lzxnoneterraria/recipe/true_excalibur.json index 682b018..bebecb3 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/true_excalibur.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/true_excalibur.json @@ -8,7 +8,7 @@ ], "key": { "A": { "item": "lzxnoneterraria:excalibur" }, - "B": { "item": "minecraft:dragon_egg" }, + "B": { "item": "minecraft:echo_shard" }, "C": { "item": "minecraft:nether_star" }, "D": { "item": "minecraft:netherite_ingot" }, "E": { "item": "minecraft:dragon_head" } diff --git a/src/main/resources/data/lzxnoneterraria/recipe/true_nights_edge.json b/src/main/resources/data/lzxnoneterraria/recipe/true_nights_edge.json index 564600a..43a4314 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/true_nights_edge.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/true_nights_edge.json @@ -8,7 +8,7 @@ ], "key": { "A": { "item": "lzxnoneterraria:nights_edge" }, - "B": { "item": "minecraft:dragon_egg" }, + "B": { "item": "minecraft:echo_shard" }, "C": { "item": "minecraft:nether_star" }, "D": { "item": "minecraft:netherite_ingot" }, "E": { "item": "minecraft:dragon_head" }