This commit is contained in:
LZX committed 2026-08-05 21:02:38 +08:00
1 parent 075aef4525
commit f7c396f37f
28 files changed
+558 -19

No files matched your search

@@ -99,6 +99,10 @@ public class ModCreativeModeTabs {
output.accept(ModItems.SUMMONER_EMBLEM.get());
output.accept(ModItems.RANGER_EMBLEM.get());
output.accept(ModItems.SORCERER_EMBLEM.get());
output.accept(ModItems.SHARK_TOOTH_NECKLACE.get());
output.accept(ModItems.HONEY_COMB.get());
output.accept(ModItems.STINGER_NECKLACE.get());
output.accept(ModItems.BEE_CLOAK.get());
}).build());
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> BLOCK_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_block_0", () -> CreativeModeTab.builder()
@@ -36,6 +36,7 @@ public class BeeSummon extends Bee {
public LivingEntity owner = null;
public ItemStack stackSource = ItemStack.EMPTY;
public double damage = 0.0D;
public BeeSummon(EntityType<? extends Bee> entityType, Level level) {
super(entityType, level);
@@ -126,10 +127,10 @@ public class BeeSummon extends Bee {
if(owner == null) return false;
boolean isHurt;
if(owner instanceof Player) {
isHurt = DamageUtil.meleeAttack(this, target, stackSource, (float) BeeKeeper.getBeeDamage(), 1.0f);
isHurt = DamageUtil.meleeAttack(this, target, stackSource, (float) damage, 1.0f);
}else {
DamageSource damageSource = this.damageSources().mobAttack(owner);
isHurt = target.hurt(damageSource, (float) BeeKeeper.getBeeDamage());
isHurt = target.hurt(damageSource, (float) damage);
}
if(isHurt) {
@@ -9,6 +9,7 @@ import com.lzxnone.terraria.item.accessory.AccessoryUtil;
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.tags.DamageTypeTags;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.entity.Entity;
@@ -33,10 +34,21 @@ public class EntityEventHandler {
LivingEntity entity = event.getEntity();
if(entity.level().isClientSide()) return;
DamageSource source = event.getSource();
if(!source.is(DamageTypes.IN_FIRE) && !source.is(DamageTypes.HOT_FLOOR) && !source.is(DamageTypes.CAMPFIRE)) return;
if(AccessoryUtil.isFireBlockImmune(entity)) {
event.setCanceled(true);
Entity attacker = event.getSource().getEntity();
//免疫火块
if(source.is(DamageTypes.IN_FIRE) || source.is(DamageTypes.HOT_FLOOR) || source.is(DamageTypes.CAMPFIRE)) {
if(AccessoryUtil.isFireBlockImmune(entity)) event.setCanceled(true);
}
//进行护甲修饰
if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) {
if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity);
}
}
@SubscribeEvent
public static void onArmorPierceRemove(LivingDamageEvent.Pre event) {
//移除护甲
AccessoryUtil.removeTargetArmorModifiers(event.getEntity());
}
@SubscribeEvent
@@ -44,8 +56,11 @@ public class EntityEventHandler {
//支配之鞭 预兆标记
Possession.markEvent(event);
AccessoryUtil.applyInvulnerableTimeModifier(event.getEntity());
AccessoryUtil.applyFallenStarSummoner(event.getEntity());
if(event.getEntity() instanceof Player player) {
AccessoryUtil.applyInvulnerableTimeModifier(player);
AccessoryUtil.applyFallenStarSummoner(player);
AccessoryUtil.applyBeeSummoner(player);
}
}
@SubscribeEvent
@@ -144,6 +144,10 @@ public class ModItems {
public static final DeferredItem<Item> SUMMONER_EMBLEM = ITEMS.register("summoner_emblem", SummonerEmblem::new);
public static final DeferredItem<Item> RANGER_EMBLEM = ITEMS.register("ranger_emblem", RangerEmblem::new);
public static final DeferredItem<Item> SORCERER_EMBLEM = ITEMS.register("sorcerer_emblem", SorcererEmblem::new);
public static final DeferredItem<Item> SHARK_TOOTH_NECKLACE = ITEMS.register("shark_tooth_necklace", SharkToothNecklace::new);
public static final DeferredItem<Item> HONEY_COMB = ITEMS.register("honey_comb", HoneyComb::new);
public static final DeferredItem<Item> STINGER_NECKLACE = ITEMS.register("stinger_necklace", StingerNecklace::new);
public static final DeferredItem<Item> BEE_CLOAK = ITEMS.register("bee_cloak", BeeCloak::new);
//食物
public static final DeferredItem<Item> MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new);
@@ -1,23 +1,25 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.ModSounds;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.effect.ModEffects;
import com.lzxnone.terraria.entity.ModEntities;
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors;
import com.lzxnone.terraria.entity.summon.BeeSummon;
import com.lzxnone.terraria.item.ModItems;
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier;
import com.lzxnone.terraria.item.effect.FreezingImmunityModifier;
import com.lzxnone.terraria.item.effect.InvulnerableTimeModifier;
import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier;
import com.lzxnone.terraria.item.effect.*;
import com.lzxnone.terraria.utils.MathUtil;
import com.lzxnone.terraria.utils.SoundUtil;
import net.minecraft.core.Holder;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.Vec3;
@@ -113,6 +115,46 @@ public class AccessoryUtil {
return result[0];
}
//为目标挂载护甲/护甲韧性减小修饰符(返回是否实际挂载了)
public static boolean applyTargetArmorModifiers(LivingEntity attacker, LivingEntity target) {
double[] armorReduction = {0.0D};
double[] toughnessReduction = {0.0D};
AccessoryUtil.forEachAccessory(attacker, (accessory, stack) -> {
if(accessory instanceof TargetArmorModifier modifier) {
armorReduction[0] += modifier.getTargetArmorReduction(stack, attacker, target);
toughnessReduction[0] += modifier.getTargetArmorToughnessReduction(stack, attacker, target);
}
});
boolean applied = false;
if(armorReduction[0] > 0.0D) {
AttributeInstance armor = target.getAttribute(Attributes.ARMOR);
if(armor != null) {
armor.addTransientModifier(new AttributeModifier(TARGET_ARMOR_PIERCE_ID, -armorReduction[0], AttributeModifier.Operation.ADD_VALUE));
applied = true;
}
}
if(toughnessReduction[0] > 0.0D) {
AttributeInstance toughness = target.getAttribute(Attributes.ARMOR_TOUGHNESS);
if(toughness != null) {
toughness.addTransientModifier(new AttributeModifier(TARGET_ARMOR_TOUGHNESS_PIERCE_ID, -toughnessReduction[0], AttributeModifier.Operation.ADD_VALUE));
applied = true;
}
}
return applied;
}
//移除为目标挂载的护甲/护甲韧性减小修饰符(幂等)
public static void removeTargetArmorModifiers(LivingEntity target) {
AttributeInstance armor = target.getAttribute(Attributes.ARMOR);
if(armor != null) armor.removeModifier(TARGET_ARMOR_PIERCE_ID);
AttributeInstance toughness = target.getAttribute(Attributes.ARMOR_TOUGHNESS);
if(toughness != null) toughness.removeModifier(TARGET_ARMOR_TOUGHNESS_PIERCE_ID);
}
private static final ResourceLocation TARGET_ARMOR_PIERCE_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "target_armor_pierce");
private static final ResourceLocation TARGET_ARMOR_TOUGHNESS_PIERCE_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "target_armor_toughness_pierce");
public static void applyInvulnerableTimeModifier(LivingEntity entity) {
double finalTime = entity.invulnerableTime;
double[] rate = {1.0D};
@@ -170,4 +212,27 @@ public class AccessoryUtil {
}
}
}
public static void applyBeeSummoner(LivingEntity entity) {
int[] maxCount = {0};
double[] damage = {0.0D};
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
if(accessory instanceof BeeSummoner summoner) {
maxCount[0] = Math.max(summoner.getBeeSummonMaxCount(stack, entity), maxCount[0]);
damage[0] = Math.max(summoner.getBeeSummonDamage(stack, entity), damage[0]);
}
});
int count = maxCount[0] > 0 ? entity.level().random.nextInt(maxCount[0]) + 1 : 0;
while(count-- > 0) {
BeeSummon bee = ModEntities.BEE_SUMMON.get().create(entity.level());
if(bee != null) {
bee.owner = entity;
bee.stackSource = ItemStack.EMPTY;
bee.damage = damage[0];
bee.setPos(new Vec3(entity.getX(), entity.getY() + entity.getBbHeight() / 2, entity.getZ()));
entity.level().addFreshEntity(bee);
}
}
}
}
@@ -0,0 +1,94 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.effect.BeeSummoner;
import com.lzxnone.terraria.item.effect.FallenStarSummoner;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigInt;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import java.util.List;
public class BeeCloak extends AccessoryItem implements FallenStarSummoner, BeeSummoner {
public static final ConfigDouble FALLEN_STAR_DAMAGE = new ConfigDouble(
"accessory.bee_cloak.fallen_star_damage",
"fallen_star_damage",
7.0D,
0.0D,
8388600.0D
);
public static final ConfigInt BEE_SUMMON_MAX_COUNT = new ConfigInt(
"accessory.bee_cloak.bee_summon_max_count",
"bee_summon_max_count",
3,
0,
100
);
public static final ConfigDouble BEE_SUMMON_DAMAGE = new ConfigDouble(
"accessory.bee_cloak.bee_summon_damage",
"bee_summon_damage",
2.0D,
0.0D,
1000.0D
);
public BeeCloak() {
super(new Item.Properties().stacksTo(1));
}
@Override
public boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity) {
return true;
}
@Override
public double getFallenStarDamage(ItemStack stack, LivingEntity entity) {
return FALLEN_STAR_DAMAGE.get();
}
@Override
public int getBeeSummonMaxCount(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_MAX_COUNT.get();
}
@Override
public double getBeeSummonDamage(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_DAMAGE.get();
}
public static final IConfigData CONFIG_DATA = new IConfigData() {
@Override
public void onConfigLoad() {
ConfigStruct.loadAll(FALLEN_STAR_DAMAGE, BEE_SUMMON_MAX_COUNT, BEE_SUMMON_DAMAGE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"bee_cloak",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/bee_cloak.png"),
Component.translatable("item.lzxnoneterraria.bee_cloak"),
CONFIG_DATA
);
@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.fallen_star_summon"
).withStyle(ChatFormatting.GRAY));
if(BEE_SUMMON_MAX_COUNT.get() > 0) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.bee_summon"
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,73 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.effect.BeeSummoner;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigInt;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import java.util.List;
public class HoneyComb extends AccessoryItem implements BeeSummoner {
public static final ConfigInt BEE_SUMMON_MAX_COUNT = new ConfigInt(
"accessory.honey_comb.bee_summon_max_count",
"bee_summon_max_count",
3,
0,
100
);
public static final ConfigDouble BEE_SUMMON_DAMAGE = new ConfigDouble(
"accessory.honey_comb.bee_summon_damage",
"bee_summon_damage",
2.0D,
0.0D,
1000.0D
);
public HoneyComb() {
super(new Item.Properties().stacksTo(1));
}
@Override
public int getBeeSummonMaxCount(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_MAX_COUNT.get();
}
@Override
public double getBeeSummonDamage(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_DAMAGE.get();
}
public static final IConfigData CONFIG_DATA = new IConfigData() {
@Override
public void onConfigLoad() {
ConfigStruct.loadAll(BEE_SUMMON_MAX_COUNT, BEE_SUMMON_DAMAGE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"honey_comb",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/honey_comb.png"),
Component.translatable("item.lzxnoneterraria.honey_comb"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
if(BEE_SUMMON_MAX_COUNT.get() > 0) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.bee_summon"
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,62 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
import com.lzxnone.terraria.item.effect.TargetArmorModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import java.util.List;
public class SharkToothNecklace extends AccessoryItem implements TargetArmorModifier {
public static final ConfigDouble ARMOR_PIERCE = new ConfigDouble(
"accessory.shark_tooth_necklace.armor_pierce",
"armor_pierce",
2.0D,
0.0D,
100.0D
);
public SharkToothNecklace() {
super(new Item.Properties().stacksTo(1));
}
@Override
public double getTargetArmorReduction(ItemStack stack, LivingEntity entity, LivingEntity target) {
return ARMOR_PIERCE.get();
}
public static final IConfigData CONFIG_DATA = new IConfigData() {
@Override
public void onConfigLoad() {
ConfigStruct.loadAll(ARMOR_PIERCE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"shark_tooth_necklace",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/shark_tooth_necklace.png"),
Component.translatable("item.lzxnoneterraria.shark_tooth_necklace"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
if(ARMOR_PIERCE.get() > 0.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.armor_pierce_bonus",
EffectTooltipUtil.formatNumber(ARMOR_PIERCE.get())
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,93 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.effect.BeeSummoner;
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
import com.lzxnone.terraria.item.effect.TargetArmorModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigInt;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import java.util.List;
public class StingerNecklace extends AccessoryItem implements TargetArmorModifier, BeeSummoner {
public static final ConfigDouble ARMOR_PIERCE = new ConfigDouble(
"accessory.stinger_necklace.armor_pierce",
"armor_pierce",
2.0D,
0.0D,
100.0D
);
public static final ConfigInt BEE_SUMMON_MAX_COUNT = new ConfigInt(
"accessory.stinger_necklace.bee_summon_max_count",
"bee_summon_max_count",
3,
0,
100
);
public static final ConfigDouble BEE_SUMMON_DAMAGE = new ConfigDouble(
"accessory.stinger_necklace.bee_summon_damage",
"bee_summon_damage",
2.0D,
0.0D,
1000.0D
);
public StingerNecklace() {
super(new Item.Properties().stacksTo(1));
}
@Override
public double getTargetArmorReduction(ItemStack stack, LivingEntity entity, LivingEntity target) {
return ARMOR_PIERCE.get();
}
@Override
public int getBeeSummonMaxCount(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_MAX_COUNT.get();
}
@Override
public double getBeeSummonDamage(ItemStack stack, LivingEntity entity) {
return BEE_SUMMON_DAMAGE.get();
}
public static final IConfigData CONFIG_DATA = new IConfigData() {
@Override
public void onConfigLoad() {
ConfigStruct.loadAll(ARMOR_PIERCE, BEE_SUMMON_MAX_COUNT, BEE_SUMMON_DAMAGE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"stinger_necklace",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/stinger_necklace.png"),
Component.translatable("item.lzxnoneterraria.stinger_necklace"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
if(ARMOR_PIERCE.get() > 0.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.armor_pierce_bonus",
EffectTooltipUtil.formatNumber(ARMOR_PIERCE.get())
).withStyle(ChatFormatting.GRAY));
}
if(BEE_SUMMON_MAX_COUNT.get() > 0) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.bee_summon"
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,9 @@
package com.lzxnone.terraria.item.effect;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
public interface BeeSummoner {
int getBeeSummonMaxCount(ItemStack stack, LivingEntity entity);
double getBeeSummonDamage(ItemStack stack, LivingEntity entity);
}
@@ -40,7 +40,7 @@ public interface FallenStarSummoner {
double[] fallenStarDamage = {0.0D};
AccessoryUtil.forEachAccessory(player, (accessory, accessoryStack) -> {
if(accessory instanceof FallenStarSummoner summoner) {
fallenStarDamage[0] = summoner.getFallenStarDamage(accessoryStack, player);
fallenStarDamage[0] = Math.max(summoner.getFallenStarDamage(accessoryStack, player), fallenStarDamage[0]);
}
});
if(DamageUtil.meleeAttack(projectile, target, stack, (float) fallenStarDamage[0], 1.0f)) {
@@ -0,0 +1,12 @@
package com.lzxnone.terraria.item.effect;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
public interface TargetArmorModifier {
//对目标护甲的减少修饰(正数 = 减少的目标护甲值)
default double getTargetArmorReduction(ItemStack stack, LivingEntity entity, LivingEntity target) { return 0.0D; }
//对目标护甲韧性的减少修饰(正数 = 减少的目标护甲韧性值)
default double getTargetArmorToughnessReduction(ItemStack stack, LivingEntity entity, LivingEntity target) { return 0.0D; }
}
@@ -74,10 +74,6 @@ public class BeeKeeper extends MeleeWeapon {
}
};
public static float getBeeDamage() {
return BEE_DAMAGE.get();
}
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"bee_keeper",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/bee_keeper.png"),
@@ -110,6 +106,7 @@ public class BeeKeeper extends MeleeWeapon {
if(bee != null) {
bee.owner = player;
bee.stackSource = itemStack.copy();
bee.damage = BEE_DAMAGE.get();
bee.setPos(new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()));
player.level().addFreshEntity(bee);
}
@@ -30,6 +30,10 @@ import com.lzxnone.terraria.item.accessory.WarriorEmblem;
import com.lzxnone.terraria.item.accessory.SummonerEmblem;
import com.lzxnone.terraria.item.accessory.RangerEmblem;
import com.lzxnone.terraria.item.accessory.SorcererEmblem;
import com.lzxnone.terraria.item.accessory.SharkToothNecklace;
import com.lzxnone.terraria.item.accessory.HoneyComb;
import com.lzxnone.terraria.item.accessory.StingerNecklace;
import com.lzxnone.terraria.item.accessory.BeeCloak;
import com.lzxnone.terraria.item.weapon.magic.LastPrism;
import com.lzxnone.terraria.item.weapon.melee.BeeKeeper;
import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass;
@@ -178,7 +182,11 @@ public class ConfigList {
WarriorEmblem.CONFIG_LIST_ITEM,
SummonerEmblem.CONFIG_LIST_ITEM,
RangerEmblem.CONFIG_LIST_ITEM,
SorcererEmblem.CONFIG_LIST_ITEM
SorcererEmblem.CONFIG_LIST_ITEM,
SharkToothNecklace.CONFIG_LIST_ITEM,
HoneyComb.CONFIG_LIST_ITEM,
StingerNecklace.CONFIG_LIST_ITEM,
BeeCloak.CONFIG_LIST_ITEM
});
ITEMS.put(ENCHANTMENT, new ConfigListItem[]{
ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM,
@@ -120,6 +120,10 @@
"item.lzxnoneterraria.summoner_emblem": "Summoner Emblem",
"item.lzxnoneterraria.ranger_emblem": "Ranger Emblem",
"item.lzxnoneterraria.sorcerer_emblem": "Sorcerer Emblem",
"item.lzxnoneterraria.shark_tooth_necklace": "Shark Tooth Necklace",
"item.lzxnoneterraria.honey_comb": "Honey Comb",
"item.lzxnoneterraria.stinger_necklace": "Stinger Necklace",
"item.lzxnoneterraria.bee_cloak": "Bee Cloak",
"item.lzxnoneterraria.mana_crystal": "Mana Crystal",
"item.lzxnoneterraria.summoning_potion": "Summoning Potion",
"item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion",
@@ -183,6 +187,8 @@
"tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%",
"tooltip.lzxnoneterraria.fallen_star_summon": "Summons falling stars when damaged",
"tooltip.lzxnoneterraria.invulnerable_time_bonus": "Extends invulnerability time after being hit x%s",
"tooltip.lzxnoneterraria.armor_pierce_bonus": "Armor Pierce +%s",
"tooltip.lzxnoneterraria.bee_summon": "Releases bees when damaged",
"tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage",
"tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage",
@@ -198,6 +204,12 @@
"lzxnoneterraria.configuration.defense.tooltip": "Grants this amount of armor while equipped",
"lzxnoneterraria.configuration.fallen_star_damage": "Fallen Star Damage",
"lzxnoneterraria.configuration.fallen_star_damage.tooltip": "Damage dealt by falling stars",
"lzxnoneterraria.configuration.armor_pierce": "Armor Pierce",
"lzxnoneterraria.configuration.armor_pierce.tooltip": "Attacks ignore this much target armor while equipped",
"lzxnoneterraria.configuration.bee_summon_max_count": "Bee Summon Max Count",
"lzxnoneterraria.configuration.bee_summon_max_count.tooltip": "Max bees released when damaged",
"lzxnoneterraria.configuration.bee_summon_damage": "Bee Summon Damage",
"lzxnoneterraria.configuration.bee_summon_damage.tooltip": "Damage dealt by each bee",
"lzxnoneterraria.configuration.invulnerable_time_multiplier": "Invulnerable Time Multiplier",
"lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "Invulnerability time after being hit is multiplied by this value",
@@ -120,6 +120,10 @@
"item.lzxnoneterraria.summoner_emblem": "召唤师徽章",
"item.lzxnoneterraria.ranger_emblem": "游侠徽章",
"item.lzxnoneterraria.sorcerer_emblem": "巫师徽章",
"item.lzxnoneterraria.shark_tooth_necklace": "鲨鱼项链",
"item.lzxnoneterraria.honey_comb": "蜂窝",
"item.lzxnoneterraria.stinger_necklace": "毒刺项链",
"item.lzxnoneterraria.bee_cloak": "蜜蜂斗篷",
"item.lzxnoneterraria.mana_crystal": "魔力水晶",
"item.lzxnoneterraria.summoning_potion": "召唤药水",
"item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水",
@@ -184,6 +188,8 @@
"tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%",
"tooltip.lzxnoneterraria.fallen_star_summon": "受到伤害后会使星星坠落",
"tooltip.lzxnoneterraria.invulnerable_time_bonus": "延长受伤后的无敌状态时间 x%s",
"tooltip.lzxnoneterraria.armor_pierce_bonus": "护甲穿透 +%s",
"tooltip.lzxnoneterraria.bee_summon": "受到伤害后释放蜜蜂",
"tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%",
"tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%",
@@ -199,6 +205,12 @@
"lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的防御",
"lzxnoneterraria.configuration.fallen_star_damage": "星星伤害",
"lzxnoneterraria.configuration.fallen_star_damage.tooltip": "星星坠落造成的伤害",
"lzxnoneterraria.configuration.armor_pierce": "护甲穿透",
"lzxnoneterraria.configuration.armor_pierce.tooltip": "佩戴后攻击无视目标该数值的护甲",
"lzxnoneterraria.configuration.bee_summon_max_count": "蜜蜂数量",
"lzxnoneterraria.configuration.bee_summon_max_count.tooltip": "受到伤害后释放的最大蜜蜂数",
"lzxnoneterraria.configuration.bee_summon_damage": "蜜蜂伤害",
"lzxnoneterraria.configuration.bee_summon_damage.tooltip": "每只蜜蜂的攻击伤害",
"lzxnoneterraria.configuration.invulnerable_time_multiplier": "无敌时间倍率",
"lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "受伤后的无敌时间乘以该倍率",
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lzxnoneterraria:item/bee_cloak"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lzxnoneterraria:item/honey_comb"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lzxnoneterraria:item/shark_tooth_necklace"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "lzxnoneterraria:item/stinger_necklace"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "lzxnoneterraria:star_cloak"
},
{
"item": "lzxnoneterraria:honey_comb"
}
],
"result": {
"id": "lzxnoneterraria:bee_cloak",
"count": 1
}
}
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"HHH",
"H H",
"HHH"
],
"key": {
"H": {
"item": "minecraft:honeycomb"
}
},
"result": {
"id": "lzxnoneterraria:honey_comb",
"count": 1
}
}
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "lzxnoneterraria:shark_tooth_necklace"
},
{
"item": "lzxnoneterraria:honey_comb"
}
],
"result": {
"id": "lzxnoneterraria:stinger_necklace",
"count": 1
}
}
@@ -35,6 +35,10 @@
"lzxnoneterraria:warrior_emblem",
"lzxnoneterraria:summoner_emblem",
"lzxnoneterraria:ranger_emblem",
"lzxnoneterraria:sorcerer_emblem"
"lzxnoneterraria:sorcerer_emblem",
"lzxnoneterraria:shark_tooth_necklace",
"lzxnoneterraria:honey_comb",
"lzxnoneterraria:stinger_necklace",
"lzxnoneterraria:bee_cloak"
]
}