diff --git a/src/main/java/com/lzxnone/terraria/ModKeyBindings.java b/src/main/java/com/lzxnone/terraria/ModKeyBindings.java index f0c5cd6..7d70706 100644 --- a/src/main/java/com/lzxnone/terraria/ModKeyBindings.java +++ b/src/main/java/com/lzxnone/terraria/ModKeyBindings.java @@ -37,10 +37,20 @@ public class ModKeyBindings { "key.categories.lzxnoneterraria" ); + public static final KeyMapping TOGGLE_SUMMON_FREE_TARGETING = new KeyMapping( + "key.lzxnoneterraria.toggle_summon_free_targeting", + KeyConflictContext.IN_GAME, + KeyModifier.NONE, + InputConstants.Type.KEYSYM, + GLFW.GLFW_KEY_V, + "key.categories.lzxnoneterraria" + ); + @SubscribeEvent public static void registerKeys(RegisterKeyMappingsEvent event) { event.register(KILL_MODE); event.register(CLEAR_SUMMON); event.register(CLEAR_ALL_SUMMONS); + event.register(TOGGLE_SUMMON_FREE_TARGETING); } } diff --git a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java index 2277e68..2e3eff7 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java +++ b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java @@ -27,4 +27,7 @@ public class ModAttachments { public static final Supplier>> SUMMON_WEAPON_SUMMONS = ATTACHMENT_TYPES.register("summon_weapon_summons", () -> AttachmentType.>builder((Supplier>) ArrayList::new).serialize(Codec.list(Codec.STRING.xmap(UUID::fromString, UUID::toString))).build()); + public static final Supplier> SUMMON_FREE_TARGETING = + ATTACHMENT_TYPES.register("summon_free_targeting", () -> AttachmentType.builder(() -> true).serialize(Codec.BOOL).build()); + } diff --git a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java index cd4b2e4..1b3239b 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java @@ -12,6 +12,7 @@ import com.lzxnone.terraria.item.weapon.melee.Zenith; import com.lzxnone.terraria.network.payload.ClearSummonPayload; import com.lzxnone.terraria.network.payload.DevilsDevastationKillModePayload; import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; +import com.lzxnone.terraria.network.payload.ToggleSummonFreeTargetingPayload; import com.lzxnone.terraria.network.payload.ZenithScrollPayload; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -125,5 +126,8 @@ public class InputHandler { while(ModKeyBindings.CLEAR_ALL_SUMMONS.consumeClick()) { PacketDistributor.sendToServer(new ClearSummonPayload("")); } + while(ModKeyBindings.TOGGLE_SUMMON_FREE_TARGETING.consumeClick()) { + PacketDistributor.sendToServer(new ToggleSummonFreeTargetingPayload(true)); + } } } 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 f4fb737..7137a63 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -58,7 +58,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.DEVILS_DEVASTATION_MARK, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING, StaticSummonBehaviors.LAST_PRISM_TRI, - StaticSummonBehaviors.LAST_PRISM_BEAM -> { + StaticSummonBehaviors.LAST_PRISM_BEAM, + StaticSummonBehaviors.TERRAPRISMA -> { return 15; } default -> { diff --git a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java index 86178d1..85cf403 100644 --- a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java +++ b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java @@ -13,6 +13,7 @@ public class ModEnchantments { public static final ResourceKey MANA_GATHERING_CURSE = create("mana_gathering_curse"); public static final ResourceKey ARCANE_AMPLIFICATION = create("arcane_amplification"); public static final ResourceKey SUMMON_AMPLIFICATION = create("summon_amplification"); + public static final ResourceKey BARREN_LAND = create("barren_land"); private static ResourceKey create(String name) { return ResourceKey.create( diff --git a/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java b/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java index badac9e..a43d7a1 100644 --- a/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java @@ -16,20 +16,20 @@ public class BrewingRecipeHandler { event.getBuilder().addMix(ModPotions.SHORT_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_0); event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_0); - event.getBuilder().addMix(ModPotions.LONG_SUMMON_0, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_1); + event.getBuilder().addMix(ModPotions.LONG_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.SHORT_SUMMON_1); event.getBuilder().addMix(ModPotions.SHORT_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_1); event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_1); event.getBuilder().addMix(ModPotions.LONG_SUMMON_1, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_2); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_2, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_2); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_2, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_2); + event.getBuilder().addMix(ModPotions.SHORT_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_2); + event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_2); event.getBuilder().addMix(ModPotions.LONG_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_3); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_3, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_3); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_3, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_3); + event.getBuilder().addMix(ModPotions.SHORT_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_3); + event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_3); event.getBuilder().addMix(ModPotions.LONG_SUMMON_3, Items.NETHERITE_BLOCK, ModPotions.SHORT_SUMMON_4); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_4, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_4); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_4, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_4); + event.getBuilder().addMix(ModPotions.SHORT_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.MEDIUM_SUMMON_4); + event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.LONG_SUMMON_4); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java index fe27635..d2270b3 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java @@ -6,6 +6,7 @@ import com.lzxnone.terraria.effect.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.entity.summon.StaticSummon; +import net.minecraft.ChatFormatting; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; @@ -76,7 +77,8 @@ public class SummonWeapon extends Weapon { summons.add(summon.getUUID()); player.setData(ModAttachments.SUMMON_WEAPON_SUMMONS, summons); player.displayClientMessage( - Component.translatable("message.lzxnoneterraria.current_summons", summons.size(), maxSummonCount), + Component.translatable("message.lzxnoneterraria.current_summons", summons.size(), maxSummonCount) + .withStyle(summons.size() < maxSummonCount ? ChatFormatting.GREEN : ChatFormatting.RED), true ); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java index b5269df..dc19c63 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.item.weapon.summon; import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -14,9 +15,9 @@ import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; -import com.mojang.math.Axis; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.Mth; @@ -28,7 +29,10 @@ import net.minecraft.world.entity.monster.Monster; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; +import net.minecraft.world.level.ClipContext; import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import org.joml.Quaternionf; import org.joml.Vector3f; @@ -478,10 +482,16 @@ public class Terraprisma extends SummonWeapon { return playerAttacker; } + if(!player.getData(ModAttachments.SUMMON_FREE_TARGETING)) { + return null; + } + + boolean ignoreBlockOcclusion = hasBarrenLand(summon, player); List monsters = summon.level().getEntitiesOfClass( Monster.class, AABB.ofSize(summon.position(), getTargetRange() * 2.0D, getTargetRange() * 2.0D, getTargetRange() * 2.0D), - FilterUtil.createMonsterFilter(player) + monster -> FilterUtil.createMonsterFilter(player).test(monster) + && (ignoreBlockOcclusion || hasFreeTargetLineOfSight(player, monster)) ); monsters.sort(Comparator.comparingDouble(monster -> monster.distanceToSqr(summon.position()))); if(!monsters.isEmpty()) { @@ -498,6 +508,29 @@ public class Terraprisma extends SummonWeapon { && FilterUtil.createLivingTargetFilter(summon, player).test(target); } + private static boolean hasFreeTargetLineOfSight(Player player, LivingEntity target) { + BlockHitResult hitResult = player.level().clip(new ClipContext( + player.getEyePosition(), + target.getEyePosition(), + ClipContext.Block.COLLIDER, + ClipContext.Fluid.NONE, + player + )); + return hitResult.getType() == HitResult.Type.MISS; + } + + private static boolean hasBarrenLand(StaticSummon summon, Player player) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(sourceStack.isEmpty()) sourceStack = player.getWeaponItem(); + if(sourceStack.isEmpty()) return false; + + return player.registryAccess() + .lookupOrThrow(Registries.ENCHANTMENT) + .get(ModEnchantments.BARREN_LAND) + .map(sourceStack::getEnchantmentLevel) + .orElse(0) > 0; + } + private static Entity getTarget(StaticSummon summon) { CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); if(customData.contains("target") && summon.level() instanceof ServerLevel serverLevel) { diff --git a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java index 2526b98..6e5d774 100644 --- a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java +++ b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java @@ -43,6 +43,11 @@ public class ModNetwork { ClearSummonPayload.CODEC, ClearSummonHandler::handle ); + registrar.playToServer( + ToggleSummonFreeTargetingPayload.TYPE, + ToggleSummonFreeTargetingPayload.CODEC, + ToggleSummonFreeTargetingHandler::handle + ); registrar.playToClient( ScreenShakePayload.TYPE, ScreenShakePayload.CODEC, diff --git a/src/main/java/com/lzxnone/terraria/network/handler/ClearSummonHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/ClearSummonHandler.java index e1142b6..0ce1691 100644 --- a/src/main/java/com/lzxnone/terraria/network/handler/ClearSummonHandler.java +++ b/src/main/java/com/lzxnone/terraria/network/handler/ClearSummonHandler.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.weapon.SummonWeapon; import com.lzxnone.terraria.network.payload.ClearSummonPayload; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; @@ -40,14 +41,21 @@ public class ClearSummonHandler { player.setData(ModAttachments.SUMMON_WEAPON_SUMMONS, remainingSummons); player.displayClientMessage( - clearAll - ? Component.translatable("message.lzxnoneterraria.clear_all_summons") - : Component.translatable("message.lzxnoneterraria.clear_summon", getSummonName(id)), + getClearMessage(clearAll, id), true ); }); }; + private static Component getClearMessage(boolean clearAll, String id) { + if(clearAll) { + return Component.translatable("message.lzxnoneterraria.clear_all_summons") + .withStyle(ChatFormatting.GREEN); + } + return Component.translatable("message.lzxnoneterraria.clear_summon", getSummonName(id).copy().withStyle(ChatFormatting.RED)) + .withStyle(ChatFormatting.GREEN); + } + private static Component getSummonName(String id) { if(StaticSummonBehaviors.TERRAPRISMA.equals(id)) { return Component.translatable("item.lzxnoneterraria.terraprisma"); diff --git a/src/main/java/com/lzxnone/terraria/network/handler/ToggleSummonFreeTargetingHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/ToggleSummonFreeTargetingHandler.java new file mode 100644 index 0000000..b45ccda --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/handler/ToggleSummonFreeTargetingHandler.java @@ -0,0 +1,25 @@ +package com.lzxnone.terraria.network.handler; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.network.payload.ToggleSummonFreeTargetingPayload; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public class ToggleSummonFreeTargetingHandler { + public static void handle(final ToggleSummonFreeTargetingPayload payload, final IPayloadContext context) { + context.enqueueWork(() -> { + Player player = context.player(); + if(player.level().isClientSide()) return; + + boolean enabled = !player.getData(ModAttachments.SUMMON_FREE_TARGETING); + player.setData(ModAttachments.SUMMON_FREE_TARGETING, enabled); + player.displayClientMessage( + Component.translatable(enabled + ? "message.lzxnoneterraria.summon_free_targeting_enabled" + : "message.lzxnoneterraria.summon_free_targeting_disabled"), + true + ); + }); + } +} diff --git a/src/main/java/com/lzxnone/terraria/network/payload/ToggleSummonFreeTargetingPayload.java b/src/main/java/com/lzxnone/terraria/network/payload/ToggleSummonFreeTargetingPayload.java new file mode 100644 index 0000000..145ed11 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/payload/ToggleSummonFreeTargetingPayload.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 ToggleSummonFreeTargetingPayload(boolean ignored) implements CustomPacketPayload { + public static final CustomPacketPayload.Type TYPE = new CustomPacketPayload.Type<>( + ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "toggle_summon_free_targeting_payload") + ); + + public static final StreamCodec CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, ToggleSummonFreeTargetingPayload::ignored, + ToggleSummonFreeTargetingPayload::new + ); + + @Override + public CustomPacketPayload.Type type() { + return TYPE; + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 0dad713..735af99 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -39,6 +39,7 @@ "enchantment.lzxnoneterraria.mana_gathering_curse": "Mana Gathering Curse", "enchantment.lzxnoneterraria.arcane_amplification": "Arcane Amplification", "enchantment.lzxnoneterraria.summon_amplification": "Summon Amplification", + "enchantment.lzxnoneterraria.barren_land": "Barren Land", "death.attack.lzxnoneterraria.player_normal": "%1$s was slain by %2$s", "death.attack.lzxnoneterraria.player_normal.item": "%1$s was slain by %2$s using %3$s", @@ -71,9 +72,12 @@ "key.lzxnoneterraria.kill_mode": "Kill Mode", "key.lzxnoneterraria.clear_summon": "Clear Selected Summons", "key.lzxnoneterraria.clear_all_summons": "Clear All Summons", + "key.lzxnoneterraria.toggle_summon_free_targeting": "Toggle Summon Free Targeting", "message.lzxnoneterraria.current_summons": "Current summons %s/%s", "message.lzxnoneterraria.clear_all_summons": "Cleared all summons", "message.lzxnoneterraria.clear_summon": "Cleared %s", + "message.lzxnoneterraria.summon_free_targeting_enabled": "Summon free targeting : enabled", + "message.lzxnoneterraria.summon_free_targeting_disabled": "Summon free targeting : disabled", "lzxnoneterraria.configuration.title": "LzxnoneTerraria Config", "lzxnoneterraria.configuration.nav_weapon": "Weapon", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index e18597d..f2b978d 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -39,6 +39,7 @@ "enchantment.lzxnoneterraria.mana_gathering_curse": "聚魔诅咒", "enchantment.lzxnoneterraria.arcane_amplification": "奥术增幅", "enchantment.lzxnoneterraria.summon_amplification": "召唤增幅", + "enchantment.lzxnoneterraria.barren_land": "寸草不生", "death.attack.lzxnoneterraria.player_normal": "%1$s 被 %2$s 击杀", "death.attack.lzxnoneterraria.player_normal.item": "%1$s 被 %2$s 用 %3$s 击杀", @@ -70,9 +71,12 @@ "key.lzxnoneterraria.kill_mode": "进入杀戮模式", "key.lzxnoneterraria.clear_summon": "清除指定召唤物", "key.lzxnoneterraria.clear_all_summons": "清除所有召唤物", + "key.lzxnoneterraria.toggle_summon_free_targeting": "开关召唤物自由寻敌", "message.lzxnoneterraria.current_summons": "当前召唤物 %s/%s", "message.lzxnoneterraria.clear_all_summons": "已清除所有召唤物", "message.lzxnoneterraria.clear_summon": "已清除%s", + "message.lzxnoneterraria.summon_free_targeting_enabled": "召唤物自由寻敌 : 开启", + "message.lzxnoneterraria.summon_free_targeting_disabled": "召唤物自由寻敌 : 关闭", "lzxnoneterraria.configuration.title": "LzxnoneTerraria 配置", "lzxnoneterraria.configuration.nav_weapon": "武器", diff --git a/src/main/resources/data/lzxnoneterraria/enchantment/barren_land.json b/src/main/resources/data/lzxnoneterraria/enchantment/barren_land.json new file mode 100644 index 0000000..442deab --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/enchantment/barren_land.json @@ -0,0 +1,21 @@ +{ + "anvil_cost": 8, + "description": { + "translate": "enchantment.lzxnoneterraria.barren_land" + }, + "max_cost": { + "base": 50, + "per_level_above_first": 0 + }, + "max_level": 1, + "min_cost": { + "base": 20, + "per_level_above_first": 0 + }, + "primary_items": "#lzxnoneterraria:summon_weapons", + "slots": [ + "mainhand" + ], + "supported_items": "#lzxnoneterraria:summon_weapons", + "weight": 2 +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/last_prism.json b/src/main/resources/data/lzxnoneterraria/recipe/last_prism.json new file mode 100644 index 0000000..82b913b --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/last_prism.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "ECE", + "BAB", + "EDE" + ], + "key": { + "A": { "item": "minecraft:terragrim" }, + "B": { "item": "minecraft:amethyst_shard" }, + "C": { "item": "minecraft:conduit" }, + "D": { "item": "minecraft:heavy_core" }, + "E": { "item": "minecraft:netherite_block" } + }, + "result": { + "id": "lzxnoneterraria:last_prism", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/lzxnoneterraria/recipe/terraprisma.json b/src/main/resources/data/lzxnoneterraria/recipe/terraprisma.json new file mode 100644 index 0000000..0acaed2 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/terraprisma.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "ECE", + "BAB", + "EDE" + ], + "key": { + "A": { "item": "minecraft:terragrim" }, + "B": { "item": "minecraft:end_crystal" }, + "C": { "item": "minecraft:conduit" }, + "D": { "item": "minecraft:heavy_core" }, + "E": { "item": "minecraft:netherite_block" } + }, + "result": { + "id": "lzxnoneterraria:terraprisma", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json b/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json index 8ad33dc..35dcd41 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json +++ b/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json @@ -6,6 +6,7 @@ "lzxnoneterraria:mana_gathering", "lzxnoneterraria:mana_gathering_curse", "lzxnoneterraria:arcane_amplification", - "lzxnoneterraria:summon_amplification" + "lzxnoneterraria:summon_amplification", + "lzxnoneterraria:barren_land" ] } diff --git a/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json index 3a46605..2710812 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json +++ b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json @@ -5,6 +5,7 @@ "lzxnoneterraria:mana_efficiency", "lzxnoneterraria:mana_gathering", "lzxnoneterraria:arcane_amplification", - "lzxnoneterraria:summon_amplification" + "lzxnoneterraria:summon_amplification", + "lzxnoneterraria:barren_land" ] } diff --git a/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json b/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json index 8ad33dc..35dcd41 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json +++ b/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json @@ -6,6 +6,7 @@ "lzxnoneterraria:mana_gathering", "lzxnoneterraria:mana_gathering_curse", "lzxnoneterraria:arcane_amplification", - "lzxnoneterraria:summon_amplification" + "lzxnoneterraria:summon_amplification", + "lzxnoneterraria:barren_land" ] }