v1.7.0
This commit is contained in:
1 parent
4ef5640b99
commit
64a21f1f0d
65 files changed
+515
-214
No files matched your search
@@ -1,7 +1,12 @@
|
||||
package com.lzxnone.terraria.attachment;
|
||||
|
||||
import com.mojang.datafixers.util.Either;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.Dynamic;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.nbt.NbtOps;
|
||||
import net.minecraft.nbt.Tag;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -12,26 +17,60 @@ public class TargetMarks {
|
||||
public static final String PROPHETIC = "prophetic";
|
||||
private static final Codec<UUID> UUID_CODEC = Codec.STRING.xmap(UUID::fromString, UUID::toString);
|
||||
private static final UUID EMPTY_OWNER = new UUID(0L, 0L);
|
||||
private static final Codec<CompoundTag> COMPOUND_TAG_CODEC = Codec.PASSTHROUGH.xmap(
|
||||
dynamic -> {
|
||||
Tag tag = dynamic.convert(NbtOps.INSTANCE).getValue();
|
||||
return tag instanceof CompoundTag compoundTag ? compoundTag.copy() : new CompoundTag();
|
||||
},
|
||||
tag -> new Dynamic<>(NbtOps.INSTANCE, tag.copy())
|
||||
);
|
||||
private static final Codec<Map<String, Mark>> MARKS_CODEC = Codec.unboundedMap(Codec.STRING, Mark.CODEC);
|
||||
private static final Codec<TargetMarks> LEGACY_CODEC = MARKS_CODEC.xmap(TargetMarks::new, TargetMarks::getMarks);
|
||||
private static final Codec<TargetMarks> RECORD_CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||
MARKS_CODEC.fieldOf("marks").forGetter(TargetMarks::getMarks),
|
||||
COMPOUND_TAG_CODEC.optionalFieldOf("custom_data", new CompoundTag()).forGetter(TargetMarks::getCustomData)
|
||||
).apply(instance, TargetMarks::new));
|
||||
|
||||
public static final Codec<TargetMarks> CODEC = Codec.unboundedMap(Codec.STRING, Mark.CODEC).xmap(TargetMarks::new, TargetMarks::getMarks);
|
||||
public static final Codec<TargetMarks> CODEC = Codec.either(RECORD_CODEC, LEGACY_CODEC).xmap(
|
||||
either -> either.map(targetMarks -> targetMarks, targetMarks -> targetMarks),
|
||||
targetMarks -> Either.left(targetMarks)
|
||||
);
|
||||
|
||||
private final Map<String, Mark> marks;
|
||||
private CompoundTag customData;
|
||||
|
||||
public TargetMarks() {
|
||||
this(Map.of());
|
||||
this(Map.of(), new CompoundTag());
|
||||
}
|
||||
|
||||
public TargetMarks(Map<String, Mark> marks) {
|
||||
this(marks, new CompoundTag());
|
||||
}
|
||||
|
||||
public TargetMarks(Map<String, Mark> marks, CompoundTag customData) {
|
||||
this.marks = new HashMap<>();
|
||||
if(marks != null) this.marks.putAll(marks);
|
||||
if(marks != null) {
|
||||
marks.forEach((id, mark) -> {
|
||||
if(id != null && mark != null) this.marks.put(id, mark.copy());
|
||||
});
|
||||
}
|
||||
this.customData = customData == null ? new CompoundTag() : customData.copy();
|
||||
}
|
||||
|
||||
public Map<String, Mark> getMarks() {
|
||||
return marks;
|
||||
}
|
||||
|
||||
public CompoundTag getCustomData() {
|
||||
return customData.copy();
|
||||
}
|
||||
|
||||
public void setCustomData(CompoundTag customData) {
|
||||
this.customData = customData == null ? new CompoundTag() : customData.copy();
|
||||
}
|
||||
|
||||
public TargetMarks copy() {
|
||||
return new TargetMarks(marks);
|
||||
return new TargetMarks(marks, customData);
|
||||
}
|
||||
|
||||
public static class Mark {
|
||||
|
||||
@@ -25,6 +25,11 @@ public class RenderConfigs {
|
||||
"render_mixin_setup_anim",
|
||||
true
|
||||
);
|
||||
public static final ConfigBoolean MANA_BAR_ALWAYS_DISPLAY = new ConfigBoolean(
|
||||
"render.mana_bar.always_display",
|
||||
"render_mana_bar_always_display",
|
||||
false
|
||||
);
|
||||
public static final ConfigInt MANA_BAR_X = new ConfigInt(
|
||||
"render.mana_bar.x",
|
||||
"render_mana_bar_x",
|
||||
@@ -47,6 +52,7 @@ public class RenderConfigs {
|
||||
ENABLE_RENDER_HAND,
|
||||
ENABLE_RENDER_ITEM,
|
||||
ENABLE_SETUP_ANIM,
|
||||
MANA_BAR_ALWAYS_DISPLAY,
|
||||
MANA_BAR_X,
|
||||
MANA_BAR_Y
|
||||
);
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ public class ClientStaticSummonRenderBehaviors {
|
||||
BEHAVIORS.put(StaticSummonBehaviors.TERRAPRISMA, ClientTerraprisma.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.POSSESSION, ClientWhip.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.POSSESSION_VISION, DEFAULT_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.STARDUST_DRAGON, ClientStardustDragonStaff.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.STARDUST_DRAGON_STAFF, ClientStardustDragonStaff.SUMMON_BEHAVIOR);
|
||||
|
||||
BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
package com.lzxnone.terraria.client.event;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.item.weapon.summon.minion.MinionWeapon;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
import net.minecraft.world.item.enchantment.ItemEnchantments;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
|
||||
|
||||
@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT)
|
||||
public class ItemTooltipHandler {
|
||||
@SubscribeEvent
|
||||
public static void onItemTooltip(ItemTooltipEvent event) {
|
||||
addEnchantedBookTooltip(event);
|
||||
addMinionWeaponTooltip(event);
|
||||
}
|
||||
|
||||
private static void addEnchantedBookTooltip(ItemTooltipEvent event) {
|
||||
ItemStack stack = event.getItemStack();
|
||||
if(stack.is(Items.ENCHANTED_BOOK)) {
|
||||
ItemEnchantments storedEnchantments = stack.getOrDefault(DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY);
|
||||
if(storedEnchantments.size() == 1) {
|
||||
for(Holder<Enchantment> enchantmentHolder : storedEnchantments.keySet()) {
|
||||
ResourceLocation enchantmentId = enchantmentHolder.unwrapKey()
|
||||
.map(ResourceKey::location)
|
||||
.orElse(null);
|
||||
if(enchantmentId != null && enchantmentId.getNamespace().equals(LzxnoneTerraria.MODID)) {
|
||||
MutableComponent component = Component.translatable(
|
||||
"tooltip.lzxnoneterraria.enchantment." + enchantmentId.getPath()
|
||||
);
|
||||
event.getToolTip().add(component.withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void addMinionWeaponTooltip(ItemTooltipEvent event) {
|
||||
if(event.getItemStack().getItem() instanceof MinionWeapon) {
|
||||
Player player = event.getEntity();
|
||||
if(player != null) {
|
||||
String path = BuiltInRegistries.ITEM.getKey(event.getItemStack().getItem()).getPath();
|
||||
int count = MinionWeapon.getSummonCount(player, path);
|
||||
if(count <= 0) {
|
||||
event.getToolTip().add(
|
||||
Component.translatable("tooltip.lzxnoneterraria.minion_weapon_minion_count", count)
|
||||
.withStyle(ChatFormatting.RED)
|
||||
);
|
||||
}else {
|
||||
event.getToolTip().add(
|
||||
Component.translatable("tooltip.lzxnoneterraria.minion_weapon_minion_count", count)
|
||||
.withStyle(ChatFormatting.GREEN)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@ public class ManaHudRenderer {
|
||||
private static final int SLOT_WIDTH = 8;
|
||||
private static final int SLOT_HEIGHT = 9;
|
||||
private static final int SLOT_GAP = 1;
|
||||
public static int manaBarX;
|
||||
public static int manaBarX = RenderConfigs.MANA_BAR_X.get();
|
||||
public static int manaBarY = RenderConfigs.MANA_BAR_Y.get();
|
||||
|
||||
public static void render(GuiGraphics guiGraphics, LocalPlayer player) {
|
||||
@@ -35,7 +35,7 @@ public class ManaHudRenderer {
|
||||
|
||||
int segmentCount = Mth.clamp(Mth.ceil(maxMana / (float)MANA_PER_STAR), 0, MAX_SEGMENT_COUNT);
|
||||
int currentMana = Mth.clamp(mana.getMana(), 0, maxMana);
|
||||
if(currentMana >= maxMana) return;
|
||||
if(!RenderConfigs.MANA_BAR_ALWAYS_DISPLAY.get() && currentMana >= maxMana) return;
|
||||
|
||||
manaBarX = RenderConfigs.MANA_BAR_X.get();
|
||||
manaBarY = RenderConfigs.MANA_BAR_Y.get();
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
package com.lzxnone.terraria.item;
|
||||
package com.lzxnone.terraria.client.item;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.gui.Font;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
@@ -7,14 +7,19 @@ import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
|
||||
public class ModEnchantments {
|
||||
//魔法武器
|
||||
public static final ResourceKey<Enchantment> MANA_LEAK = create("mana_leak");
|
||||
public static final ResourceKey<Enchantment> MANA_EFFICIENCY = create("mana_efficiency");
|
||||
public static final ResourceKey<Enchantment> ARCANE_AMPLIFICATION = create("arcane_amplification");
|
||||
public static final ResourceKey<Enchantment> SUMMON_AMPLIFICATION = create("summon_amplification");
|
||||
|
||||
//远程武器
|
||||
public static final ResourceKey<Enchantment> AMMO_EXHAUSTION = create("ammo_exhaustion");
|
||||
public static final ResourceKey<Enchantment> BULLET_HELL = create("bullet_hell");
|
||||
public static final ResourceKey<Enchantment> GUNPOWDER = create("gunpowder");
|
||||
public static final ResourceKey<Enchantment> STEADY_BREATH = create("steady_breath");
|
||||
|
||||
//召唤武器
|
||||
public static final ResourceKey<Enchantment> SUMMON_AMPLIFICATION = create("summon_amplification");
|
||||
public static final ResourceKey<Enchantment> BARREN_LAND = create("barren_land");
|
||||
|
||||
private static ResourceKey<Enchantment> create(String name) {
|
||||
|
||||
@@ -44,7 +44,7 @@ public class StaticSummonBehaviors {
|
||||
public static final String LAST_PRISM_TRI = "last_prism_tri";
|
||||
public static final String LAST_PRISM_BEAM = "last_prism_beam";
|
||||
public static final String TERRAPRISMA = "terraprisma";
|
||||
public static final String STARDUST_DRAGON = "stardust_dragon_staff";
|
||||
public static final String STARDUST_DRAGON_STAFF = "stardust_dragon_staff";
|
||||
public static final String POSSESSION = "possession";
|
||||
public static final String POSSESSION_VISION = "possession_vision";
|
||||
|
||||
@@ -96,7 +96,7 @@ public class StaticSummonBehaviors {
|
||||
BEHAVIORS.put(LAST_PRISM_TRI, LastPrism.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(LAST_PRISM_BEAM, LastPrism.SUMMON_BEHAVIOR2);
|
||||
BEHAVIORS.put(TERRAPRISMA, Terraprisma.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(STARDUST_DRAGON, StardustDragonStaff.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(STARDUST_DRAGON_STAFF, StardustDragonStaff.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(POSSESSION, Whip.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(POSSESSION_VISION, Possession.SUMMON_BEHAVIOR);
|
||||
|
||||
|
||||
@@ -21,6 +21,11 @@ public class BrewingRecipeHandler {
|
||||
Ingredient.of(Items.SADDLE),
|
||||
new ItemStack(ModItems.SUMMONING_POTION.get())
|
||||
);
|
||||
event.getBuilder().addRecipe(
|
||||
DataComponentIngredient.of(false, PotionContents.createItemStack(Items.POTION, Potions.AWKWARD)),
|
||||
Ingredient.of(ModItems.FALLEN_STAR),
|
||||
new ItemStack(ModItems.LESSER_MANA_POTION.get())
|
||||
);
|
||||
event.getBuilder().addRecipe(
|
||||
Ingredient.of(ModItems.LESSER_MANA_POTION.get()),
|
||||
Ingredient.of(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM),
|
||||
|
||||
@@ -2,14 +2,12 @@ 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;
|
||||
@@ -18,27 +16,12 @@ 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) {
|
||||
//支配之鞭 预兆标记
|
||||
@@ -49,10 +32,6 @@ 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));
|
||||
@@ -68,22 +47,4 @@ 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<PlayerSummon.SummonSlot> slots) {
|
||||
for(PlayerSummon.SummonSlot slot : slots) {
|
||||
for(UUID uuid : slot.getSummons()) {
|
||||
Entity entity = serverLevel.getEntity(uuid);
|
||||
if(entity != null) entity.discard();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
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.network.PlayerSummonSync;
|
||||
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.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
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 PlayerSummonClearEventHandler {
|
||||
@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 onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
|
||||
if(event.getEntity() instanceof ServerPlayer player) {
|
||||
clearPlayerSummons(player);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onEntityDeath(LivingDeathEvent event) {
|
||||
LivingEntity livingEntity = event.getEntity();
|
||||
if(livingEntity.level() instanceof ServerLevel serverLevel) {
|
||||
if(livingEntity instanceof ServerPlayer player) {
|
||||
clearPlayerSummons(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
PlayerSummonSync.setAndSync(player, playerSummon);
|
||||
}
|
||||
|
||||
private static void discardSummonSlots(ServerLevel serverLevel, List<PlayerSummon.SummonSlot> slots) {
|
||||
for(PlayerSummon.SummonSlot slot : slots) {
|
||||
for(UUID uuid : slot.getSummons()) {
|
||||
Entity entity = serverLevel.getEntity(uuid);
|
||||
if(entity != null) entity.discard();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.lzxnone.terraria.integration.jei;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import mezz.jei.api.IModPlugin;
|
||||
import mezz.jei.api.JeiPlugin;
|
||||
import mezz.jei.api.constants.RecipeTypes;
|
||||
import mezz.jei.api.recipe.vanilla.IJeiBrewingRecipe;
|
||||
import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
|
||||
import mezz.jei.api.registration.IRecipeRegistration;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import org.jspecify.annotations.NonNull;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@JeiPlugin
|
||||
public class LzxnoneTerrariaJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public @NonNull ResourceLocation getPluginUid() {
|
||||
return ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "jei_plugin");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerRecipes(IRecipeRegistration registration) {
|
||||
IVanillaRecipeFactory factory = registration.getVanillaRecipeFactory();
|
||||
List<IJeiBrewingRecipe> recipes = List.of(
|
||||
factory.createBrewingRecipe(
|
||||
List.of(new ItemStack(Items.BROWN_MUSHROOM), new ItemStack(Items.RED_MUSHROOM)),
|
||||
List.of(new ItemStack(ModItems.LESSER_MANA_POTION.get())),
|
||||
new ItemStack(ModItems.MANA_POTION.get()),
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "brewing/mana_potion")
|
||||
)
|
||||
);
|
||||
registration.addRecipes(RecipeTypes.BREWING, recipes);
|
||||
|
||||
registration.addItemStackInfo(
|
||||
new ItemStack(ModItems.FALLEN_STAR.get()),
|
||||
Component.translatable("jei.lzxnoneterraria.info.fallen_star")
|
||||
);
|
||||
registration.addItemStackInfo(
|
||||
new ItemStack(ModItems.NATURES_GIFT.get()),
|
||||
Component.translatable("jei.lzxnoneterraria.info.natures_gift")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package com.lzxnone.terraria.item;
|
||||
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.item.Tier;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
||||
public enum ModTiers implements Tier {
|
||||
COPPER(BlockTags.INCORRECT_FOR_IRON_TOOL, 200, 4.0F, 1.0F, 5, Ingredient.EMPTY),
|
||||
ENCHANTED_SWORD(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 500, 6.0F, 3.0F, 14, Ingredient.EMPTY);
|
||||
|
||||
private final TagKey<Block> tag;
|
||||
private final int uses;
|
||||
private final float speed;
|
||||
private final float attackDamageBonus;
|
||||
private final int enchantmentValue;
|
||||
private final Ingredient repairIngredient;
|
||||
|
||||
ModTiers(TagKey<Block> tag, int uses, float speed, float attackDamageBonus, int enchantmentValue, Ingredient repairIngredient) {
|
||||
this.tag = tag;
|
||||
this.uses = uses;
|
||||
this.speed = speed;
|
||||
this.attackDamageBonus = attackDamageBonus;
|
||||
this.enchantmentValue = enchantmentValue;
|
||||
this.repairIngredient = repairIngredient;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUses() {
|
||||
return this.uses;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSpeed() {
|
||||
return this.speed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getAttackDamageBonus() {
|
||||
return this.attackDamageBonus;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TagKey<Block> getIncorrectBlocksForDrops() {
|
||||
return this.tag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEnchantmentValue() {
|
||||
return this.enchantmentValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Ingredient getRepairIngredient() {
|
||||
return this.repairIngredient;
|
||||
}
|
||||
}
|
||||
@@ -48,6 +48,6 @@ public class ManaCrystal extends Food {
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
|
||||
tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mana_crystal.0").withStyle(ChatFormatting.GRAY));
|
||||
tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mana_crystal").withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public abstract class AbstractManaPotion extends Potion {
|
||||
|
||||
@Override
|
||||
protected String getTooltipKey() {
|
||||
return "tooltip.lzxnoneterraria.mana_potion.0";
|
||||
return "tooltip.lzxnoneterraria.mana_potion";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.lzxnone.terraria.item.potion;
|
||||
|
||||
import com.lzxnone.terraria.effect.ModEffects;
|
||||
import com.lzxnone.terraria.effect.SummonEffect;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
@@ -16,6 +17,11 @@ public class SummoningPotion extends Potion {
|
||||
|
||||
@Override
|
||||
protected String getTooltipKey() {
|
||||
return "tooltip.lzxnoneterraria.summoning_potion.0";
|
||||
return "tooltip.lzxnoneterraria.summoning_potion";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object[] getTooltipArgs() {
|
||||
return new Object[]{SummonEffect.getSummonCountPerLevel()};
|
||||
}
|
||||
}
|
||||
@@ -988,14 +988,6 @@ public class DevilsDevastation extends MeleeWeapon {
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static Vec3 computeRingDir(Vec3 n, Vec3 b, float ang) {
|
||||
return n.scale(Math.cos(ang)).add(b.scale(Math.sin(ang)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static final IItemWaveBehavior ITEM_WAVE_BEHAVIOR = new IItemWaveBehavior() {
|
||||
@Override
|
||||
public void onLeftClickAir(PlayerInteractEvent.LeftClickEmpty event) {
|
||||
|
||||
@@ -6,9 +6,12 @@ import com.lzxnone.terraria.effect.ModEffects;
|
||||
import com.lzxnone.terraria.effect.SummonEffect;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.network.PlayerSummonSync;
|
||||
import com.lzxnone.terraria.item.weapon.SummonWeapon;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -19,8 +22,10 @@ import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.boss.EnderDragonPart;
|
||||
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Tier;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
import net.minecraft.world.level.ClipContext;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
@@ -44,6 +49,15 @@ public class MinionWeapon extends SummonWeapon {
|
||||
return 1 + (instance == null ? 0 : (instance.getAmplifier() + 1) * SummonEffect.getSummonCountPerLevel());
|
||||
}
|
||||
|
||||
public static int getSummonCount(Player player, String id) {
|
||||
List<PlayerSummon.SummonSlot> slots = player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots();
|
||||
int count = 0;
|
||||
for(PlayerSummon.SummonSlot slot : slots) {
|
||||
if(slot.getId().equals(id)) count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
public static void addFreshSummon(Player player, String id, List<? extends Entity> slotSummons) {
|
||||
if(!(player.level() instanceof ServerLevel serverLevel)) return;
|
||||
if(slotSummons.isEmpty()) return;
|
||||
@@ -62,7 +76,7 @@ public class MinionWeapon extends SummonWeapon {
|
||||
|
||||
slots.add(new PlayerSummon.SummonSlot(id, slotSummons.stream().map(Entity::getUUID).toList()));
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
player.displayClientMessage(
|
||||
Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount)
|
||||
.withStyle(slots.size() < maxSummonCount ? net.minecraft.ChatFormatting.GREEN : net.minecraft.ChatFormatting.RED),
|
||||
|
||||
+17
-17
@@ -9,6 +9,7 @@ import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import com.lzxnone.terraria.network.PlayerSummonSync;
|
||||
import com.lzxnone.terraria.particle.DustParticleOptions;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
@@ -135,7 +136,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
if(!customData.contains("head")) {
|
||||
if(customData.contains("uuid")) {
|
||||
Entity entity = serverLevel.getEntity(customData.getUUID("uuid"));
|
||||
if(!(entity instanceof StaticSummon summon1) || !summon1.isAlive() || !summon1.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON)) onDied(summon);
|
||||
if(!(entity instanceof StaticSummon summon1) || !summon1.isAlive() || !summon1.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) onDied(summon);
|
||||
}else {
|
||||
onDied(summon);
|
||||
}
|
||||
@@ -152,7 +153,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
int stardustDragonSlotCount = 0;
|
||||
if(summon.getOwner() instanceof Player player) {
|
||||
for(PlayerSummon.SummonSlot slot : player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots()) {
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON)) stardustDragonSlotCount++;
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) stardustDragonSlotCount++;
|
||||
}
|
||||
}
|
||||
float damage = DAMAGE.get() + ADD_DAMAGE.get() * Math.max(0, stardustDragonSlotCount - 1);
|
||||
@@ -167,7 +168,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
public static void tickDragonSegments(StaticSummon head, Player player, ServerLevel serverLevel) {
|
||||
List<PlayerSummon.SummonSlot> stardustDragonSlots = new ArrayList<>();
|
||||
for(PlayerSummon.SummonSlot slot : player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots()) {
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON)) stardustDragonSlots.add(slot);
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) stardustDragonSlots.add(slot);
|
||||
}
|
||||
if(stardustDragonSlots.isEmpty()) return;
|
||||
|
||||
@@ -216,14 +217,14 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
|
||||
private static CompoundTag repairTailPrevious(StaticSummon tailSummon, Player player, ServerLevel serverLevel, CompoundTag customData) {
|
||||
Entity previous = customData.contains("uuid") ? serverLevel.getEntity(customData.getUUID("uuid")) : null;
|
||||
if(previous instanceof StaticSummon previousSummon && previousSummon.isAlive() && previousSummon.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON)) {
|
||||
if(previous instanceof StaticSummon previousSummon && previousSummon.isAlive() && previousSummon.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) {
|
||||
return customData;
|
||||
}
|
||||
|
||||
UUID fallbackUUID = null;
|
||||
PlayerSummon.SummonSlot tailSlot = null;
|
||||
for(PlayerSummon.SummonSlot slot : player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots()) {
|
||||
if(!slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON)) continue;
|
||||
if(!slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) continue;
|
||||
if(slot.getSummons().contains(tailSummon.getUUID())) {
|
||||
tailSlot = slot;
|
||||
continue;
|
||||
@@ -265,7 +266,6 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
public static void onState(StaticSummon summon, Player player) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
int state = customData.contains("state") ? customData.getInt("state") : 0;
|
||||
LzxnoneTerraria.LOGGER.info("{}", state);
|
||||
if(state == State.IDLE.ordinal()) {
|
||||
storeSummonTarget(summon, findSummonTarget(summon, player, RANGE.get()));
|
||||
}else if(state == State.WANDER.ordinal()) {
|
||||
@@ -376,7 +376,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
int segmentCount = 1;
|
||||
if(summon.getOwner() instanceof Player player) {
|
||||
for(PlayerSummon.SummonSlot slot : player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots()) {
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON)) {
|
||||
if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) {
|
||||
segmentCount = Math.max(segmentCount, slot.getSummons().size());
|
||||
break;
|
||||
}
|
||||
@@ -445,13 +445,13 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
List<PlayerSummon.SummonSlot> stardustDragonSlots = new ArrayList<>();
|
||||
int maxSummonCount = Math.max(1, getMaxSummonCount(player));
|
||||
slots.removeIf(slot -> {
|
||||
boolean stardustDragon = slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON);
|
||||
boolean stardustDragon = slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF);
|
||||
if(stardustDragon) stardustDragonSlots.add(slot);
|
||||
return stardustDragon;
|
||||
});
|
||||
if(stardustDragonSlots.isEmpty()) {
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
}
|
||||
if(stardustDragonSlots.isEmpty()) {
|
||||
StaticSummon headSummon = createSummon(level, player, hand);
|
||||
@@ -482,14 +482,14 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
tailCustomData.putUUID("uuid", bodySummonB.getUUID());
|
||||
tailSummon.getEntityData().set(StaticSummon.CUSTOM_DATA, tailCustomData);
|
||||
|
||||
MinionWeapon.addFreshSummon(player, StaticSummonBehaviors.STARDUST_DRAGON, List.of(headSummon, bodySummonA, bodySummonB, tailSummon));
|
||||
MinionWeapon.addFreshSummon(player, StaticSummonBehaviors.STARDUST_DRAGON_STAFF, List.of(headSummon, bodySummonA, bodySummonB, tailSummon));
|
||||
}else {
|
||||
PlayerSummon.SummonSlot stardustDragonTailSlot = stardustDragonSlots.getLast();
|
||||
UUID tailUUID = stardustDragonTailSlot.getSummons().getLast();
|
||||
if(!(serverLevel.getEntity(tailUUID) instanceof StaticSummon tailSummon) || !tailSummon.isAlive()) {
|
||||
slots.addAll(stardustDragonSlots);
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
SoundUtil.playClientSound(player, ModSounds.SUMMON.get());
|
||||
return InteractionResultHolder.consume(stack);
|
||||
}
|
||||
@@ -503,7 +503,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
}else {
|
||||
slots.addAll(stardustDragonSlots);
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
player.displayClientMessage(
|
||||
Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount)
|
||||
.withStyle(net.minecraft.ChatFormatting.RED),
|
||||
@@ -524,7 +524,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
if(tailCustomData.contains("uuid")) {
|
||||
UUID tailPreviousUUID = tailCustomData.getUUID("uuid");
|
||||
Entity tailPrevious = serverLevel.getEntity(tailPreviousUUID);
|
||||
if(tailPrevious instanceof StaticSummon previousSummon && previousSummon.isAlive() && previousSummon.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON)) {
|
||||
if(tailPrevious instanceof StaticSummon previousSummon && previousSummon.isAlive() && previousSummon.getEntityData().get(StaticSummon.BEHAVIOR).equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) {
|
||||
previousUUID = tailPreviousUUID;
|
||||
}
|
||||
}
|
||||
@@ -543,7 +543,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
if(previousUUID == null) {
|
||||
slots.addAll(stardustDragonSlots);
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
SoundUtil.playClientSound(player, ModSounds.SUMMON.get());
|
||||
return InteractionResultHolder.consume(stack);
|
||||
}
|
||||
@@ -565,10 +565,10 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
tailCustomData.putUUID("uuid", bodySummonB.getUUID());
|
||||
tailSummon.getEntityData().set(StaticSummon.CUSTOM_DATA, tailCustomData);
|
||||
|
||||
stardustDragonSlots.addFirst(new PlayerSummon.SummonSlot(StaticSummonBehaviors.STARDUST_DRAGON, List.of(bodySummonA.getUUID(), bodySummonB.getUUID())));
|
||||
stardustDragonSlots.addFirst(new PlayerSummon.SummonSlot(StaticSummonBehaviors.STARDUST_DRAGON_STAFF, List.of(bodySummonA.getUUID(), bodySummonB.getUUID())));
|
||||
slots.addAll(stardustDragonSlots);
|
||||
summonData.setMinionSlots(slots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
player.displayClientMessage(
|
||||
Component.translatable("message.lzxnoneterraria.current_minions", slots.size(), maxSummonCount)
|
||||
.withStyle(slots.size() < maxSummonCount ? net.minecraft.ChatFormatting.GREEN : net.minecraft.ChatFormatting.RED),
|
||||
@@ -588,7 +588,7 @@ public class StardustDragonStaff extends MinionWeapon {
|
||||
summon.setOwner(player);
|
||||
summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy());
|
||||
summon.setPos(player.position());
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON);
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON_STAFF);
|
||||
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, StaticSummon.INFINITE_LIFETIME);
|
||||
summon.getEntityData().set(StaticSummon.GLOW, true);
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.lzxnone.terraria.mixin;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import com.lzxnone.terraria.item.ItemNameRenderer;
|
||||
import com.lzxnone.terraria.client.item.ItemNameRenderer;
|
||||
import net.minecraft.client.gui.Font;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.lzxnone.terraria.mixin;
|
||||
|
||||
import com.lzxnone.terraria.item.ItemNameRenderer;
|
||||
import com.lzxnone.terraria.client.item.ItemNameRenderer;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Font;
|
||||
|
||||
@@ -58,5 +58,10 @@ public class ModNetwork {
|
||||
ManaSyncPayload.CODEC,
|
||||
ManaSyncHandler::handle
|
||||
);
|
||||
registrar.playToClient(
|
||||
PlayerSummonSyncPayload.TYPE,
|
||||
PlayerSummonSyncPayload.CODEC,
|
||||
PlayerSummonSyncHandler::handle
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.lzxnone.terraria.network;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.attachment.PlayerSummon;
|
||||
import com.lzxnone.terraria.network.payload.PlayerSummonSyncPayload;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.neoforged.neoforge.network.PacketDistributor;
|
||||
|
||||
public class PlayerSummonSync {
|
||||
public static void setAndSync(Player player, PlayerSummon summonData) {
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
if(player instanceof ServerPlayer serverPlayer) sync(serverPlayer);
|
||||
}
|
||||
|
||||
public static void sync(ServerPlayer player) {
|
||||
PlayerSummon summonData = player.getData(ModAttachments.PLAYER_SUMMON);
|
||||
PacketDistributor.sendToPlayer(player, PlayerSummonSyncPayload.from(summonData));
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.lzxnone.terraria.network.handler;
|
||||
import com.lzxnone.terraria.attachment.PlayerSummon;
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors;
|
||||
import com.lzxnone.terraria.network.PlayerSummonSync;
|
||||
import com.lzxnone.terraria.network.payload.ClearSummonPayload;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -48,7 +49,7 @@ public class ClearSummonHandler {
|
||||
|
||||
PlayerSummon summonData = player.getData(ModAttachments.PLAYER_SUMMON);
|
||||
summonData.setMinionSlots(remainingSlots);
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
player.displayClientMessage(
|
||||
getClearMessage(clearAll, id),
|
||||
true
|
||||
@@ -69,7 +70,7 @@ public class ClearSummonHandler {
|
||||
if(StaticSummonBehaviors.TERRAPRISMA.equals(id)) {
|
||||
return Component.translatable("item.lzxnoneterraria.terraprisma");
|
||||
}
|
||||
if(StaticSummonBehaviors.STARDUST_DRAGON.equals(id)) {
|
||||
if(StaticSummonBehaviors.STARDUST_DRAGON_STAFF.equals(id)) {
|
||||
return Component.translatable("item.lzxnoneterraria.stardust_dragon_staff");
|
||||
}
|
||||
return Component.literal(id);
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.lzxnone.terraria.network.handler;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.network.payload.PlayerSummonSyncPayload;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
|
||||
public class PlayerSummonSyncHandler {
|
||||
public static void handle(final PlayerSummonSyncPayload payload, final IPayloadContext context) {
|
||||
context.enqueueWork(() -> context.player().setData(ModAttachments.PLAYER_SUMMON, payload.toPlayerSummon()));
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -2,6 +2,7 @@ package com.lzxnone.terraria.network.handler;
|
||||
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
import com.lzxnone.terraria.attachment.PlayerSummon;
|
||||
import com.lzxnone.terraria.network.PlayerSummonSync;
|
||||
import com.lzxnone.terraria.network.payload.ToggleSummonAttackModePayload;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
@@ -15,7 +16,7 @@ public class ToggleSummonAttackModeHandler {
|
||||
|
||||
PlayerSummon summonData = player.getData(ModAttachments.PLAYER_SUMMON);
|
||||
PlayerSummon.State mode = summonData.cycleMinionState();
|
||||
player.setData(ModAttachments.PLAYER_SUMMON, summonData);
|
||||
PlayerSummonSync.setAndSync(player, summonData);
|
||||
player.displayClientMessage(
|
||||
Component.translatable("message.lzxnoneterraria.summon_attack_mode", mode.getDisplayName()).withStyle(mode.getColor()),
|
||||
true
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.lzxnone.terraria.network.payload;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.attachment.PlayerSummon;
|
||||
import com.mojang.serialization.DataResult;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.nbt.NbtOps;
|
||||
import net.minecraft.nbt.Tag;
|
||||
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 PlayerSummonSyncPayload(CompoundTag summonData) implements CustomPacketPayload {
|
||||
public static final Type<PlayerSummonSyncPayload> TYPE = new Type<>(
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "player_summon_sync_payload")
|
||||
);
|
||||
|
||||
public static final StreamCodec<FriendlyByteBuf, PlayerSummonSyncPayload> CODEC = StreamCodec.composite(
|
||||
ByteBufCodecs.COMPOUND_TAG, PlayerSummonSyncPayload::summonData,
|
||||
PlayerSummonSyncPayload::new
|
||||
);
|
||||
|
||||
public PlayerSummonSyncPayload {
|
||||
summonData = summonData == null ? new CompoundTag() : summonData.copy();
|
||||
}
|
||||
|
||||
public static PlayerSummonSyncPayload from(PlayerSummon summonData) {
|
||||
DataResult<Tag> result = PlayerSummon.CODEC.encodeStart(NbtOps.INSTANCE, summonData);
|
||||
Tag tag = result.result().orElseGet(CompoundTag::new);
|
||||
return new PlayerSummonSyncPayload(tag instanceof CompoundTag compoundTag ? compoundTag : new CompoundTag());
|
||||
}
|
||||
|
||||
public PlayerSummon toPlayerSummon() {
|
||||
return PlayerSummon.CODEC.parse(NbtOps.INSTANCE, summonData)
|
||||
.result()
|
||||
.orElseGet(PlayerSummon::new);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag summonData() {
|
||||
return summonData.copy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return TYPE;
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
"itemGroup.lzxnoneterraria.accessory": "Terraria Accessories",
|
||||
"itemGroup.lzxnoneterraria.block": "Terraria Block",
|
||||
"itemGroup.lzxnoneterraria.calamity_melee": "Terraria Calamity Melee",
|
||||
"curios.identifier.terraria_accessory": "Terraria Accessory",
|
||||
|
||||
"block.lzxnoneterraria.vision": "Vision",
|
||||
"block.lzxnoneterraria.stardust_dragon_head": "Stardust Dragon Head",
|
||||
@@ -102,6 +103,15 @@
|
||||
"enchantment.lzxnoneterraria.gunpowder": "Gunpowder",
|
||||
"enchantment.lzxnoneterraria.steady_breath": "Steady Breath",
|
||||
"enchantment.lzxnoneterraria.barren_land": "Barren Land",
|
||||
"tooltip.lzxnoneterraria.enchantment.mana_leak": "Increases mana cost for magic weapons",
|
||||
"tooltip.lzxnoneterraria.enchantment.mana_efficiency": "Reduces mana cost for magic weapons",
|
||||
"tooltip.lzxnoneterraria.enchantment.arcane_amplification": "Increases damage dealt by magic weapons",
|
||||
"tooltip.lzxnoneterraria.enchantment.summon_amplification": "Increases damage dealt by summon weapons",
|
||||
"tooltip.lzxnoneterraria.enchantment.ammo_exhaustion": "Consumes extra ammo when firing",
|
||||
"tooltip.lzxnoneterraria.enchantment.bullet_hell": "Gives shots a chance to avoid consuming ammo",
|
||||
"tooltip.lzxnoneterraria.enchantment.gunpowder": "Increases damage dealt by ranged weapons",
|
||||
"tooltip.lzxnoneterraria.enchantment.steady_breath": "Reduces ranged weapon spread",
|
||||
"tooltip.lzxnoneterraria.enchantment.barren_land": "Allows minions to seek enemies through blocks",
|
||||
|
||||
"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",
|
||||
@@ -119,9 +129,13 @@
|
||||
"tooltip.lzxnoneterraria.natures_gift.0": "%s%% reduced mana cost",
|
||||
"tooltip.lzxnoneterraria.mana_flower.0": "%s%% reduced mana cost",
|
||||
"tooltip.lzxnoneterraria.mana_flower.1": "Automatically uses mana potions when mana runs out",
|
||||
"tooltip.lzxnoneterraria.mana_crystal.0": "Permanently increases maximum mana by 20, up to 200",
|
||||
"tooltip.lzxnoneterraria.summoning_potion.0": "Increases minion capacity by 1 for 8 minutes",
|
||||
"tooltip.lzxnoneterraria.mana_potion.0": "Restores %s mana",
|
||||
"tooltip.lzxnoneterraria.mana_crystal": "Permanently increases maximum mana by 20, up to 200",
|
||||
"tooltip.lzxnoneterraria.summoning_potion": "Increases minion capacity by %s for 8 minutes",
|
||||
"tooltip.lzxnoneterraria.mana_potion": "Restores %s mana",
|
||||
"tooltip.lzxnoneterraria.minion_weapon_minion_count": "Minion Count: %s",
|
||||
|
||||
"jei.lzxnoneterraria.info.fallen_star": "Has a chance to fall from the sky at night. Fallen Stars spawn in open areas near players and can be picked up after landing.",
|
||||
"jei.lzxnoneterraria.info.natures_gift": "Can be found in dungeon chests.",
|
||||
|
||||
"entity.lzxnoneterraria.static_projectile": "Projectile",
|
||||
"entity.lzxnoneterraria.static_summon": "Summon",
|
||||
@@ -192,6 +206,8 @@
|
||||
"lzxnoneterraria.configuration.render_mixin_render_item.tooltip": "Enables item rendering mixins",
|
||||
"lzxnoneterraria.configuration.render_mixin_setup_anim": "Enable setupAnim",
|
||||
"lzxnoneterraria.configuration.render_mixin_setup_anim.tooltip": "Enables model animation adjustment mixin",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_always_display": "Always Show Mana Bar",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_always_display.tooltip": "Keeps the mana bar visible even when mana is full",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_x": "Mana Bar X",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_x.tooltip": "Screen X coordinate of the mana bar's top-left corner",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_y": "Mana Bar Y",
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
"itemGroup.lzxnoneterraria.accessory": "泰拉瑞亚 饰品",
|
||||
"itemGroup.lzxnoneterraria.block": "泰拉瑞亚 方块",
|
||||
"itemGroup.lzxnoneterraria.calamity_melee": "泰拉瑞亚灾厄 近战武器",
|
||||
"curios.identifier.terraria_accessory": "泰拉瑞亚饰品",
|
||||
|
||||
"block.lzxnoneterraria.vision": "幻象",
|
||||
"block.lzxnoneterraria.stardust_dragon_head": "星尘龙头部",
|
||||
@@ -102,6 +103,15 @@
|
||||
"enchantment.lzxnoneterraria.gunpowder": "火药",
|
||||
"enchantment.lzxnoneterraria.steady_breath": "屏息",
|
||||
"enchantment.lzxnoneterraria.barren_land": "寸草不生",
|
||||
"tooltip.lzxnoneterraria.enchantment.mana_leak": "增加魔法武器的魔力消耗",
|
||||
"tooltip.lzxnoneterraria.enchantment.mana_efficiency": "降低魔法武器的魔力消耗",
|
||||
"tooltip.lzxnoneterraria.enchantment.arcane_amplification": "提高魔法武器造成的伤害",
|
||||
"tooltip.lzxnoneterraria.enchantment.summon_amplification": "提高召唤武器造成的伤害",
|
||||
"tooltip.lzxnoneterraria.enchantment.ammo_exhaustion": "射击时额外消耗弹药",
|
||||
"tooltip.lzxnoneterraria.enchantment.bullet_hell": "射击时有概率不消耗弹药",
|
||||
"tooltip.lzxnoneterraria.enchantment.gunpowder": "提高远程武器造成的伤害",
|
||||
"tooltip.lzxnoneterraria.enchantment.steady_breath": "降低远程武器的散射",
|
||||
"tooltip.lzxnoneterraria.enchantment.barren_land": "召唤物可以隔着方块寻找敌人",
|
||||
|
||||
"death.attack.lzxnoneterraria.player_normal": "%1$s 被 %2$s 击杀",
|
||||
"death.attack.lzxnoneterraria.player_normal.item": "%1$s 被 %2$s 用 %3$s 击杀",
|
||||
@@ -119,9 +129,13 @@
|
||||
"tooltip.lzxnoneterraria.natures_gift.0": "魔力花费降低 %s%%",
|
||||
"tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 %s%%",
|
||||
"tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水",
|
||||
"tooltip.lzxnoneterraria.mana_crystal.0": "永久提升 20 点最大魔力,最高提升到 200",
|
||||
"tooltip.lzxnoneterraria.summoning_potion.0": "增加 1 个仆从栏位,持续 8 分钟",
|
||||
"tooltip.lzxnoneterraria.mana_potion.0": "恢复 %s 点魔力",
|
||||
"tooltip.lzxnoneterraria.mana_crystal": "永久提升 20 点最大魔力,最高提升到 200",
|
||||
"tooltip.lzxnoneterraria.summoning_potion": "增加 %s 个仆从栏位,持续 8 分钟",
|
||||
"tooltip.lzxnoneterraria.mana_potion": "恢复 %s 点魔力",
|
||||
"tooltip.lzxnoneterraria.minion_weapon_minion_count": "仆从数量: %s",
|
||||
|
||||
"jei.lzxnoneterraria.info.fallen_star": "夜晚时有概率从天空坠落。坠落之星会在玩家附近的露天区域生成,落地后可以拾取。",
|
||||
"jei.lzxnoneterraria.info.natures_gift": "可在地牢箱子中找到。",
|
||||
|
||||
"entity.lzxnoneterraria.static_projectile": "弹射物",
|
||||
"entity.lzxnoneterraria.static_summon": "召唤物",
|
||||
@@ -191,6 +205,8 @@
|
||||
"lzxnoneterraria.configuration.render_mixin_render_item.tooltip": "启用物品渲染相关 mixin",
|
||||
"lzxnoneterraria.configuration.render_mixin_setup_anim": "启用 setupAnim",
|
||||
"lzxnoneterraria.configuration.render_mixin_setup_anim.tooltip": "启用模型动作修正相关 mixin",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_always_display": "始终显示魔力条",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_always_display.tooltip": "魔力已满时仍然显示魔力条",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_x": "魔力条 X 坐标",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_x.tooltip": "魔力条左上角的屏幕 X 坐标",
|
||||
"lzxnoneterraria.configuration.render_mana_bar_y": "魔力条 Y 坐标",
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"lzxnoneterraria:natures_gift",
|
||||
"lzxnoneterraria:mana_flower"
|
||||
"#lzxnoneterraria:accessory"
|
||||
]
|
||||
}
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"anvil_cost": 6,
|
||||
"anvil_cost": 2,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.arcane_amplification"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 60,
|
||||
"per_level_above_first": 15
|
||||
"base": 21,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"max_level": 3,
|
||||
"min_cost": {
|
||||
"base": 15,
|
||||
"per_level_above_first": 15
|
||||
"base": 1,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:magic_weapons",
|
||||
"slots": [
|
||||
"mainhand"
|
||||
],
|
||||
"supported_items": "#lzxnoneterraria:magic_weapons",
|
||||
"weight": 3
|
||||
"weight": 10
|
||||
}
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"anvil_cost": 8,
|
||||
"anvil_cost": 10,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.barren_land"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 50,
|
||||
"base": 100,
|
||||
"per_level_above_first": 0
|
||||
},
|
||||
"max_level": 1,
|
||||
"min_cost": {
|
||||
"base": 20,
|
||||
"base": 30,
|
||||
"per_level_above_first": 0
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:summon_weapons",
|
||||
"primary_items": "#lzxnoneterraria:minion_summon_weapons",
|
||||
"slots": [
|
||||
"mainhand"
|
||||
],
|
||||
"supported_items": "#lzxnoneterraria:summon_weapons",
|
||||
"supported_items": "#lzxnoneterraria:minion_summon_weapons",
|
||||
"weight": 2
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
{
|
||||
"anvil_cost": 6,
|
||||
"anvil_cost": 5,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.bullet_hell"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 55,
|
||||
"per_level_above_first": 12
|
||||
"base": 30,
|
||||
"per_level_above_first": 10
|
||||
},
|
||||
"max_level": 3,
|
||||
"min_cost": {
|
||||
"base": 10,
|
||||
"per_level_above_first": 12
|
||||
"per_level_above_first": 10
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:ranged_weapons",
|
||||
"slots": [
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"anvil_cost": 6,
|
||||
"anvil_cost": 2,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.gunpowder"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 60,
|
||||
"per_level_above_first": 15
|
||||
"base": 21,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"max_level": 3,
|
||||
"min_cost": {
|
||||
"base": 15,
|
||||
"per_level_above_first": 15
|
||||
"base": 1,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:ranged_weapons",
|
||||
"slots": [
|
||||
"mainhand"
|
||||
],
|
||||
"supported_items": "#lzxnoneterraria:ranged_weapons",
|
||||
"weight": 3
|
||||
"weight": 10
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"anvil_cost": 4,
|
||||
"anvil_cost": 5,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.mana_efficiency"
|
||||
},
|
||||
"exclusive_set": "#lzxnoneterraria:exclusive_set/mana_consume",
|
||||
"max_cost": {
|
||||
"base": 55,
|
||||
"per_level_above_first": 12
|
||||
"base": 30,
|
||||
"per_level_above_first": 10
|
||||
},
|
||||
"max_level": 3,
|
||||
"min_cost": {
|
||||
"base": 10,
|
||||
"per_level_above_first": 12
|
||||
"per_level_above_first": 10
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:magic_weapons",
|
||||
"slots": [
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"anvil_cost": 6,
|
||||
"anvil_cost": 10,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.steady_breath"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 45,
|
||||
"base": 100,
|
||||
"per_level_above_first": 0
|
||||
},
|
||||
"max_level": 1,
|
||||
"min_cost": {
|
||||
"base": 10,
|
||||
"base": 30,
|
||||
"per_level_above_first": 0
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:spread_ranged_weapons",
|
||||
@@ -17,5 +17,5 @@
|
||||
"mainhand"
|
||||
],
|
||||
"supported_items": "#lzxnoneterraria:spread_ranged_weapons",
|
||||
"weight": 5
|
||||
"weight": 2
|
||||
}
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"anvil_cost": 6,
|
||||
"anvil_cost": 2,
|
||||
"description": {
|
||||
"translate": "enchantment.lzxnoneterraria.summon_amplification"
|
||||
},
|
||||
"max_cost": {
|
||||
"base": 60,
|
||||
"per_level_above_first": 15
|
||||
"base": 21,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"max_level": 3,
|
||||
"min_cost": {
|
||||
"base": 15,
|
||||
"per_level_above_first": 15
|
||||
"base": 1,
|
||||
"per_level_above_first": 11
|
||||
},
|
||||
"primary_items": "#lzxnoneterraria:summon_weapons",
|
||||
"slots": [
|
||||
"mainhand"
|
||||
],
|
||||
"supported_items": "#lzxnoneterraria:summon_weapons",
|
||||
"weight": 3
|
||||
"weight": 10
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:conduit" },
|
||||
"C": { "item": "minecraft:blue_ice"},
|
||||
"D": { "item": "minecraft:slime_ball"},
|
||||
"E": { "item": "minecraft:netherite_block"}
|
||||
"E": { "item": "minecraft:netherite_ingot"}
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:elf_melter",
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "minecraft:gold_block" },
|
||||
"B": { "item": "minecraft:netherite_ingot" },
|
||||
"B": { "item": "minecraft:netherite_scrap" },
|
||||
"C": { "item": "minecraft:diamond_block" },
|
||||
"D": { "item": "minecraft:echo_shard" },
|
||||
"E": { "item": "minecraft:stick" }
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:flint_and_steel" },
|
||||
"C": { "item": "minecraft:lava_bucket"},
|
||||
"D": { "item": "minecraft:slime_ball"},
|
||||
"E": { "item": "minecraft:netherite_ingot"}
|
||||
"E": { "item": "minecraft:netherite_scrap"}
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:flamethrower",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:clockwork_assault_rifle" },
|
||||
"B": { "item": "minecraft:diamond_block" },
|
||||
"C": { "item": "minecraft:netherite_block" },
|
||||
"C": { "item": "minecraft:netherite_scrap" },
|
||||
"D": { "item": "minecraft:gold_block" }
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:amethyst_shard" },
|
||||
"C": { "item": "minecraft:conduit" },
|
||||
"D": { "item": "minecraft:heavy_core" },
|
||||
"E": { "item": "minecraft:netherite_block" }
|
||||
"E": { "item": "minecraft:netherite_scrap" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:last_prism",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:minishark" },
|
||||
"B": { "item": "minecraft:diamond_block" },
|
||||
"C": { "item": "minecraft:netherite_ingot" },
|
||||
"C": { "item": "minecraft:netherite_scrap" },
|
||||
"D": {
|
||||
"type": "neoforge:components",
|
||||
"items": "minecraft:potion",
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
"B": { "item": "lzxnoneterraria:muramasa" },
|
||||
"C": { "item": "lzxnoneterraria:volcano" },
|
||||
"D": { "item": "lzxnoneterraria:lights_bane" },
|
||||
"E": { "item": "minecraft:netherite_ingot" },
|
||||
"E": { "item": "minecraft:netherite_scrap" },
|
||||
"F": { "item": "minecraft:diamond_block" },
|
||||
"G": { "item": "minecraft:nether_star" }
|
||||
"G": { "item": "minecraft:totem_of_undying" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:nights_edge",
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
"B": { "item": "lzxnoneterraria:muramasa" },
|
||||
"C": { "item": "lzxnoneterraria:volcano" },
|
||||
"D": { "item": "lzxnoneterraria:blood_butcherer" },
|
||||
"E": { "item": "minecraft:netherite_ingot" },
|
||||
"E": { "item": "minecraft:netherite_scrap" },
|
||||
"F": { "item": "minecraft:diamond_block" },
|
||||
"G": { "item": "minecraft:nether_star" }
|
||||
"G": { "item": "minecraft:totem_of_undying" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:nights_edge",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:silence_armor_trim_smithing_template" },
|
||||
"C": { "item": "minecraft:conduit" },
|
||||
"D": { "item": "minecraft:heavy_core" },
|
||||
"E": { "item": "minecraft:netherite_block" }
|
||||
"E": { "item": "minecraft:netherite_ingot" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:possession",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"pattern": [
|
||||
"ABC",
|
||||
"DFE",
|
||||
"GGG"
|
||||
"GHG"
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:chain_gun" },
|
||||
@@ -13,7 +13,8 @@
|
||||
"D": { "item": "lzxnoneterraria:sniper_rifle" },
|
||||
"E": { "item": "lzxnoneterraria:sniper_rifle" },
|
||||
"F": { "item": "minecraft:netherite_upgrade_smithing_template" },
|
||||
"G": { "item": "minecraft:nether_star" }
|
||||
"G": { "item": "minecraft:nether_star" },
|
||||
"H": { "item": "minecraft:dragon_head" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:sdmg",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:quad_barrel_shotgun" },
|
||||
"B": { "item": "minecraft:diamond_block" },
|
||||
"C": { "item": "minecraft:netherite_ingot" },
|
||||
"C": { "item": "minecraft:netherite_scrap" },
|
||||
"D": { "item": "minecraft:gold_block" }
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:clockwork_assault_rifle" },
|
||||
"B": { "item": "minecraft:netherite_block" },
|
||||
"B": { "item": "minecraft:netherite_ingot" },
|
||||
"C": { "item": "minecraft:spyglass" },
|
||||
"D": { "item": "minecraft:sea_lantern" }
|
||||
},
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"CCC"
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "minecraft:netherite_ingot" },
|
||||
"A": { "item": "minecraft:netherite_scrap" },
|
||||
"B": { "item": "minecraft:heavy_core" },
|
||||
"C": { "item": "lzxnoneterraria:fallen_star"}
|
||||
},
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:dragon_head" },
|
||||
"C": { "item": "minecraft:conduit" },
|
||||
"D": { "item": "minecraft:heavy_core" },
|
||||
"E": { "item": "minecraft:netherite_block" }
|
||||
"E": { "item": "minecraft:netherite_ingot" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:stardust_dragon_staff",
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"CCC"
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "minecraft:netherite_block" },
|
||||
"A": { "item": "minecraft:netherite_ingot" },
|
||||
"B": { "item": "lzxnoneterraria:star_cannon" },
|
||||
"C": { "item": "lzxnoneterraria:mana_crystal"},
|
||||
"D": { "item": "minecraft:conduit"}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
],
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:shotgun" },
|
||||
"B": { "item": "minecraft:netherite_block" },
|
||||
"B": { "item": "minecraft:netherite_ingot" },
|
||||
"C": { "item": "minecraft:mace" },
|
||||
"D": { "item": "minecraft:silence_armor_trim_smithing_template" }
|
||||
},
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:true_excalibur" },
|
||||
"B": { "item": "lzxnoneterraria:true_nights_edge" },
|
||||
"C": { "item": "minecraft:netherite_block"},
|
||||
"C": { "item": "minecraft:netherite_ingot"},
|
||||
"D": { "item": "minecraft:emerald_block"},
|
||||
"E": { "item": "minecraft:totem_of_undying" },
|
||||
"F": { "item": "minecraft:stick" }
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"B": { "item": "minecraft:end_crystal" },
|
||||
"C": { "item": "minecraft:conduit" },
|
||||
"D": { "item": "minecraft:heavy_core" },
|
||||
"E": { "item": "minecraft:netherite_block" }
|
||||
"E": { "item": "minecraft:netherite_ingot" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:terraprisma",
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
"A": { "item": "lzxnoneterraria:excalibur" },
|
||||
"B": { "item": "minecraft:echo_shard" },
|
||||
"C": { "item": "minecraft:nether_star" },
|
||||
"D": { "item": "minecraft:netherite_ingot" },
|
||||
"E": { "item": "minecraft:dragon_head" }
|
||||
"D": { "item": "minecraft:netherite_scrap" },
|
||||
"E": { "item": "minecraft:dragon_breath" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:true_excalibur",
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
"A": { "item": "lzxnoneterraria:nights_edge" },
|
||||
"B": { "item": "minecraft:echo_shard" },
|
||||
"C": { "item": "minecraft:nether_star" },
|
||||
"D": { "item": "minecraft:netherite_ingot" },
|
||||
"E": { "item": "minecraft:dragon_head" }
|
||||
"D": { "item": "minecraft:netherite_scrap" },
|
||||
"E": { "item": "minecraft:dragon_breath" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:true_nights_edge",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"key": {
|
||||
"A": { "item": "lzxnoneterraria:clockwork_assault_rifle" },
|
||||
"B": { "item": "minecraft:diamond_block" },
|
||||
"C": { "item": "minecraft:netherite_block" },
|
||||
"C": { "item": "minecraft:netherite_ingot" },
|
||||
"D": { "item": "minecraft:emerald_block" }
|
||||
},
|
||||
"result": {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"C": { "item": "lzxnoneterraria:megashark" },
|
||||
"D": { "item": "minecraft:totem_of_undying" },
|
||||
"E": { "item": "minecraft:diamond_block" },
|
||||
"F": { "item": "minecraft:netherite_block" }
|
||||
"F": { "item": "minecraft:netherite_ingot" }
|
||||
},
|
||||
"result": {
|
||||
"id": "lzxnoneterraria:venus_magnum",
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"lzxnoneterraria:natures_gift",
|
||||
"lzxnoneterraria:mana_flower"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"lzxnoneterraria:terraprisma",
|
||||
"lzxnoneterraria:stardust_dragon_staff"
|
||||
]
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
"replace": false,
|
||||
"values": [
|
||||
"lzxnoneterraria:terraprisma",
|
||||
"lzxnoneterraria:stardust_dragon_staff",
|
||||
"lzxnoneterraria:possession"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#lzxnoneterraria:melee_weapons"
|
||||
"#lzxnoneterraria:melee_weapons",
|
||||
"#lzxnoneterraria:ranged_weapons",
|
||||
"#lzxnoneterraria:summon_weapons",
|
||||
"#lzxnoneterraria:magic_weapons"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#lzxnoneterraria:melee_weapons"
|
||||
"#lzxnoneterraria:melee_weapons",
|
||||
"#lzxnoneterraria:ranged_weapons",
|
||||
"#lzxnoneterraria:summon_weapons",
|
||||
"#lzxnoneterraria:magic_weapons"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user