v1.6.0
This commit is contained in:
1 parent
0b3690217a
commit
af4cfa8f8b
90 files changed
+1344
-50
No files matched your search
+13
@@ -46,6 +46,19 @@ public class ClientStaticSummonRenderBehaviors {
|
||||
|
||||
BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.SILVER_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.CRYSTAL_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.CURSED_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.CHLOROPHYTE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.HIGH_VELOCITY_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.ICHOR_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.VENOM_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.PARTY_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.NANO_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.EXPLODING_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.GOLDEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.LUMINITE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(StaticSummonBehaviors.TUNGSTEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR);
|
||||
}
|
||||
|
||||
public static IStaticSummonRenderBehavior getBehavior(String id) {
|
||||
|
||||
@@ -22,8 +22,10 @@ public class ClientBulletAmmo {
|
||||
poseStack.pushPose();
|
||||
|
||||
//旋转(方向修正)
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot())));
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot())));
|
||||
//poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot())));
|
||||
//poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot())));
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot()));
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot()));
|
||||
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-90));
|
||||
|
||||
@@ -48,8 +50,11 @@ public class ClientBulletAmmo {
|
||||
poseStack.pushPose();
|
||||
|
||||
//旋转(方向修正)
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot())));
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot())));
|
||||
//poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot())));
|
||||
//poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot())));
|
||||
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot()));
|
||||
poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot()));
|
||||
|
||||
poseStack.mulPose(Axis.ZP.rotationDegrees(90));
|
||||
poseStack.mulPose(Axis.YP.rotationDegrees(-90));
|
||||
|
||||
@@ -62,6 +62,20 @@ public class ModCreativeModeTabs {
|
||||
output.accept(ModItems.SDMG.get());
|
||||
output.accept(ModItems.MUSKET_BALL.get());
|
||||
output.accept(ModItems.METEOR_SHOT.get());
|
||||
output.accept(ModItems.SILVER_BULLET.get());
|
||||
output.accept(ModItems.CRYSTAL_BULLET.get());
|
||||
output.accept(ModItems.CURSED_BULLET.get());
|
||||
output.accept(ModItems.CHLOROPHYTE_BULLET.get());
|
||||
output.accept(ModItems.HIGH_VELOCITY_BULLET.get());
|
||||
output.accept(ModItems.ICHOR_BULLET.get());
|
||||
output.accept(ModItems.VENOM_BULLET.get());
|
||||
output.accept(ModItems.PARTY_BULLET.get());
|
||||
output.accept(ModItems.NANO_BULLET.get());
|
||||
output.accept(ModItems.EXPLODING_BULLET.get());
|
||||
output.accept(ModItems.GOLDEN_BULLET.get());
|
||||
output.accept(ModItems.ENDLESS_MUSKET_POUCH.get());
|
||||
output.accept(ModItems.LUMINITE_BULLET.get());
|
||||
output.accept(ModItems.TUNGSTEN_BULLET.get());
|
||||
}).build());
|
||||
|
||||
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> SUMMON_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_summon_0", () -> CreativeModeTab.builder()
|
||||
|
||||
@@ -64,11 +64,8 @@ public class BloodButcheredEffect extends MobEffect {
|
||||
@Override
|
||||
public boolean applyEffectTick(LivingEntity entity, int amplifier) {
|
||||
if(entity.level() instanceof ServerLevel serverLevel) {
|
||||
MobEffectInstance instance = entity.getEffect(ModEffects.BLOOD_BUTCHERED);
|
||||
if(instance != null) {
|
||||
if(instance.getDuration() % 20 == 0) {
|
||||
entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1));
|
||||
}
|
||||
if(entity.tickCount % 20 == 0) {
|
||||
if(entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1))) entity.invulnerableTime = 10;
|
||||
}
|
||||
|
||||
ParticleUtil.addParticles(
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
package com.lzxnone.terraria.effect;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.particle.CircleParticleOptions;
|
||||
import com.lzxnone.terraria.particle.DustParticleOptions;
|
||||
import com.lzxnone.terraria.particle.ModParticles;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.ParticleUtil;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.effect.MobEffect;
|
||||
import net.minecraft.world.effect.MobEffectCategory;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
public class CursedInfernoEffect extends MobEffect {
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
|
||||
public static final String DAMAGE_PER_LEVEL_PATH = "effect.cursed_inferno.damage_per_level";
|
||||
public static final float DAMAGE_PER_LEVEL_DEFAULT = 2.0f;
|
||||
public static final float DAMAGE_PER_LEVEL_MIN = 0.0f;
|
||||
public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f;
|
||||
|
||||
public CursedInfernoEffect() {
|
||||
super(MobEffectCategory.HARMFUL, 0x66FF00);
|
||||
}
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
ConfigFactory.loadFloatConfig(DAMAGE_PER_LEVEL_PATH, configText("cursed_inferno_damage_per_level"), configTooltip("cursed_inferno_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX);
|
||||
}
|
||||
};
|
||||
|
||||
private static Component configText(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key);
|
||||
}
|
||||
|
||||
private static Component configTooltip(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||
}
|
||||
|
||||
public static float getDamagePerLevel() {
|
||||
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX);
|
||||
}
|
||||
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||
"cursed_inferno",
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/cursed_inferno.png"),
|
||||
Component.translatable("effect.lzxnoneterraria.cursed_inferno"),
|
||||
CONFIG_DATA
|
||||
);
|
||||
|
||||
public static final DustParticleOptions PARTICLE = new DustParticleOptions(
|
||||
0.075f, 0.5f, 40, true, new Vector3f[]{
|
||||
new Vector3f(0.5F, 1.0F, 0.5F),
|
||||
new Vector3f(0.0F, 1.0F, 0.2F)
|
||||
}
|
||||
);
|
||||
|
||||
@Override
|
||||
public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean applyEffectTick(LivingEntity entity, int amplifier) {
|
||||
if(entity.level() instanceof ServerLevel serverLevel) {
|
||||
if(entity.tickCount % 20 == 0) {
|
||||
if(entity.hurt(entity.damageSources().magic(), getDamagePerLevel() * (amplifier + 1))) entity.invulnerableTime = 10;
|
||||
}
|
||||
ParticleUtil.addParticles(
|
||||
serverLevel, PARTICLE,
|
||||
entity.getBoundingBox().getCenter(), new Vec3(0, 0, 0),
|
||||
0.1, 1
|
||||
);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -87,6 +87,8 @@ public class EffectLogicHandler {
|
||||
return
|
||||
effect == ModEffects.CONFUSED
|
||||
|| effect == ModEffects.KILL_MODE
|
||||
|| effect == ModEffects.KILL_MODE_COOLDOWN;
|
||||
|| effect == ModEffects.KILL_MODE_COOLDOWN
|
||||
|| effect == ModEffects.MIDAS
|
||||
|| effect == ModEffects.CURSED_INFERNO;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.lzxnone.terraria.effect;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.effect.MobEffect;
|
||||
import net.minecraft.world.effect.MobEffectCategory;
|
||||
|
||||
public class MidasEffect extends MobEffect {
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
|
||||
public static final String DROP_CHANCE_PATH = "effect.midas.drop_chance";
|
||||
public static final float DROP_CHANCE_DEFAULT = 0.25f;
|
||||
public static final float DROP_CHANCE_MIN = 0.0f;
|
||||
public static final float DROP_CHANCE_MAX = 1.0f;
|
||||
|
||||
public MidasEffect() {
|
||||
super(MobEffectCategory.HARMFUL, 0xFFD700);
|
||||
}
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
ConfigFactory.loadFloatConfig(DROP_CHANCE_PATH, configText("midas_drop_chance"), configTooltip("midas_drop_chance"), DROP_CHANCE_DEFAULT, DROP_CHANCE_MIN, DROP_CHANCE_MAX);
|
||||
}
|
||||
};
|
||||
|
||||
private static Component configText(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key);
|
||||
}
|
||||
|
||||
private static Component configTooltip(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||
}
|
||||
|
||||
public static float getDropChance() {
|
||||
return Math.clamp(ConfigUtil.readFloat(DROP_CHANCE_PATH, DROP_CHANCE_DEFAULT), DROP_CHANCE_MIN, DROP_CHANCE_MAX);
|
||||
}
|
||||
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||
"midas",
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/midas.png"),
|
||||
Component.translatable("effect.lzxnoneterraria.midas"),
|
||||
CONFIG_DATA
|
||||
);
|
||||
}
|
||||
@@ -20,6 +20,10 @@ public class ModEffects {
|
||||
MOB_EFFECTS.register("kill_mode_cooldown", KillModeCooldownEffect::new);
|
||||
public static final DeferredHolder<MobEffect, DemonicFlamesEffect> DEMONIC_FLAMES =
|
||||
MOB_EFFECTS.register("demonic_flames", DemonicFlamesEffect::new);
|
||||
public static final DeferredHolder<MobEffect, CursedInfernoEffect> CURSED_INFERNO =
|
||||
MOB_EFFECTS.register("cursed_inferno", CursedInfernoEffect::new);
|
||||
public static final DeferredHolder<MobEffect, SummonEffect> SUMMON =
|
||||
MOB_EFFECTS.register("summon", SummonEffect::new);
|
||||
public static final DeferredHolder<MobEffect, MidasEffect> MIDAS =
|
||||
MOB_EFFECTS.register("midas", MidasEffect::new);
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.lzxnone.terraria.entity.summon;
|
||||
|
||||
import com.lzxnone.terraria.item.ammo.MeteorShot;
|
||||
import com.lzxnone.terraria.item.ammo.MusketBall;
|
||||
import com.lzxnone.terraria.item.ammo.*;
|
||||
import com.lzxnone.terraria.item.weapon.magic.LastPrism;
|
||||
import com.lzxnone.terraria.item.weapon.melee.*;
|
||||
import com.lzxnone.terraria.item.weapon.summon.Terraprisma;
|
||||
@@ -38,6 +37,19 @@ public class StaticSummonBehaviors {
|
||||
//弹药实体
|
||||
public static final String MUSKET_BALL = "musket_ball";
|
||||
public static final String METEOR_SHOT = "meteor_shot";
|
||||
public static final String SILVER_BULLET = "silver_bullet";
|
||||
public static final String CRYSTAL_BULLET = "crystal_bullet";
|
||||
public static final String CURSED_BULLET = "cursed_bullet";
|
||||
public static final String CHLOROPHYTE_BULLET = "chlorophyte_bullet";
|
||||
public static final String HIGH_VELOCITY_BULLET = "high_velocity_bullet";
|
||||
public static final String ICHOR_BULLET = "ichor_bullet";
|
||||
public static final String VENOM_BULLET = "venom_bullet";
|
||||
public static final String PARTY_BULLET = "party_bullet";
|
||||
public static final String NANO_BULLET = "nano_bullet";
|
||||
public static final String EXPLODING_BULLET = "exploding_bullet";
|
||||
public static final String GOLDEN_BULLET = "golden_bullet";
|
||||
public static final String LUMINITE_BULLET = "luminite_bullet";
|
||||
public static final String TUNGSTEN_BULLET = "tungsten_bullet";
|
||||
|
||||
static {
|
||||
BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {});
|
||||
@@ -64,6 +76,19 @@ public class StaticSummonBehaviors {
|
||||
|
||||
BEHAVIORS.put(MUSKET_BALL, MusketBall.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(METEOR_SHOT, MeteorShot.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(SILVER_BULLET, SilverBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(CRYSTAL_BULLET, CrystalBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(CURSED_BULLET, CursedBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(CHLOROPHYTE_BULLET, ChlorophyteBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(HIGH_VELOCITY_BULLET, HighVelocityBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(ICHOR_BULLET, IchorBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(VENOM_BULLET, VenomBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(PARTY_BULLET, PartyBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(NANO_BULLET, NanoBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(EXPLODING_BULLET, ExplodingBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(GOLDEN_BULLET, GoldenBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(LUMINITE_BULLET, LuminiteBullet.SUMMON_BEHAVIOR);
|
||||
BEHAVIORS.put(TUNGSTEN_BULLET, TungstenBullet.SUMMON_BEHAVIOR);
|
||||
}
|
||||
|
||||
public static IStaticSummonBehavior getBehavior(String id) {
|
||||
|
||||
@@ -2,11 +2,15 @@ package com.lzxnone.terraria.event;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.attachment.ModAttachments;
|
||||
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 net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.entity.living.LivingDeathEvent;
|
||||
@@ -22,6 +26,10 @@ public class EntityDeathEventHandler {
|
||||
|
||||
//消耗插入的破灭魔王剑
|
||||
if(livingEntity.level() instanceof ServerLevel serverLevel) {
|
||||
if(livingEntity.hasEffect(ModEffects.MIDAS) && livingEntity.getRandom().nextFloat() < MidasEffect.getDropChance()) {
|
||||
livingEntity.spawnAtLocation(new ItemStack(Items.EMERALD));
|
||||
}
|
||||
|
||||
List<UUID> stuckList = livingEntity.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE);
|
||||
while(!stuckList.isEmpty()) {
|
||||
UUID uuid = stuckList.getLast();
|
||||
|
||||
@@ -3,8 +3,6 @@ package com.lzxnone.terraria.item;
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.item.ammo.*;
|
||||
import com.lzxnone.terraria.item.projectile.*;
|
||||
import com.lzxnone.terraria.item.projectile.ammo.BulletProjectile;
|
||||
import com.lzxnone.terraria.item.projectile.ammo.MeteorShotProjectile;
|
||||
import com.lzxnone.terraria.item.projectile.first_fractal.*;
|
||||
import com.lzxnone.terraria.item.weapon.magic.*;
|
||||
import com.lzxnone.terraria.item.weapon.melee.*;
|
||||
@@ -52,9 +50,35 @@ public class ModItems {
|
||||
//弹药
|
||||
public static final DeferredItem<Item> MUSKET_BALL = ITEMS.register("musket_ball", MusketBall::new);
|
||||
public static final DeferredItem<Item> METEOR_SHOT = ITEMS.register("meteor_shot", MeteorShot::new);
|
||||
public static final DeferredItem<Item> SILVER_BULLET = ITEMS.register("silver_bullet", SilverBullet::new);
|
||||
public static final DeferredItem<Item> CRYSTAL_BULLET = ITEMS.register("crystal_bullet", CrystalBullet::new);
|
||||
public static final DeferredItem<Item> CURSED_BULLET = ITEMS.register("cursed_bullet", CursedBullet::new);
|
||||
public static final DeferredItem<Item> CHLOROPHYTE_BULLET = ITEMS.register("chlorophyte_bullet", ChlorophyteBullet::new);
|
||||
public static final DeferredItem<Item> HIGH_VELOCITY_BULLET = ITEMS.register("high_velocity_bullet", HighVelocityBullet::new);
|
||||
public static final DeferredItem<Item> ICHOR_BULLET = ITEMS.register("ichor_bullet", IchorBullet::new);
|
||||
public static final DeferredItem<Item> VENOM_BULLET = ITEMS.register("venom_bullet", VenomBullet::new);
|
||||
public static final DeferredItem<Item> PARTY_BULLET = ITEMS.register("party_bullet", PartyBullet::new);
|
||||
public static final DeferredItem<Item> NANO_BULLET = ITEMS.register("nano_bullet", NanoBullet::new);
|
||||
public static final DeferredItem<Item> EXPLODING_BULLET = ITEMS.register("exploding_bullet", ExplodingBullet::new);
|
||||
public static final DeferredItem<Item> GOLDEN_BULLET = ITEMS.register("golden_bullet", GoldenBullet::new);
|
||||
public static final DeferredItem<Item> ENDLESS_MUSKET_POUCH = ITEMS.register("endless_musket_pouch", EndlessMusketPouch::new);
|
||||
public static final DeferredItem<Item> LUMINITE_BULLET = ITEMS.register("luminite_bullet", LuminiteBullet::new);
|
||||
public static final DeferredItem<Item> TUNGSTEN_BULLET = ITEMS.register("tungsten_bullet", TungstenBullet::new);
|
||||
|
||||
public static final DeferredItem<Item> BULLET_PROJECTILE = ITEMS.register("bullet_projectile", BulletProjectile::new);
|
||||
public static final DeferredItem<Item> METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", MeteorShotProjectile::new);
|
||||
public static final DeferredItem<Item> BULLET_PROJECTILE = ITEMS.register("bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> SILVER_BULLET_PROJECTILE = ITEMS.register("silver_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> CRYSTAL_BULLET_PROJECTILE = ITEMS.register("crystal_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> CURSED_BULLET_PROJECTILE = ITEMS.register("cursed_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> CHLOROPHYTE_BULLET_PROJECTILE = ITEMS.register("chlorophyte_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> HIGH_VELOCITY_BULLET_PROJECTILE = ITEMS.register("high_velocity_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> ICHOR_BULLET_PROJECTILE = ITEMS.register("ichor_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> VENOM_BULLET_PROJECTILE = ITEMS.register("venom_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> PARTY_BULLET_PROJECTILE = ITEMS.register("party_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> NANO_BULLET_PROJECTILE = ITEMS.register("nano_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> EXPLODING_BULLET_PROJECTILE = ITEMS.register("exploding_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> GOLDEN_BULLET_PROJECTILE = ITEMS.register("golden_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
public static final DeferredItem<Item> LUMINITE_BULLET_PROJECTILE = ITEMS.register("luminite_bullet_projectile", () -> new Item(new Item.Properties()));
|
||||
|
||||
//召唤武器
|
||||
public static final DeferredItem<Item> TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new);
|
||||
@@ -85,4 +109,5 @@ public class ModItems {
|
||||
public static final DeferredItem<Item> FIRST_FRACTAL_PROJECTILE14 = ITEMS.register("first_fractal_projectile14", FirstFractalProjectile14::new);
|
||||
public static final DeferredItem<Item> MACE_PROJECTILE = ITEMS.register("mace_projectile", MaceProjectile::new);
|
||||
public static final DeferredItem<Item> TERRAPRISMA_SUMMON = ITEMS.register("terraprisma_summon", TerraprismaSummon::new);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class BasicBulletAmmo extends BulletAmmo {
|
||||
public static IStaticSummonBehavior createSummonBehavior(float baseDamage, double speed) {
|
||||
return new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(speed);
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, baseDamage + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ package com.lzxnone.terraria.item.ammo;
|
||||
import net.minecraft.world.item.Item;
|
||||
|
||||
public class BulletAmmo extends Item {
|
||||
public static final int MAX_STACK_SIZE = 99;
|
||||
public static final int MAX_STACK_SIZE = 9999;
|
||||
|
||||
public BulletAmmo() {
|
||||
super(new Item.Properties().stacksTo(MAX_STACK_SIZE));
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class ChlorophyteBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class CrystalBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.effect.ModEffects;
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CursedBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 2.0f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final int EFFECT_TIME = 140;
|
||||
|
||||
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(SPEED);
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
//碰撞检测
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
if(target instanceof LivingEntity livingEntity) {
|
||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CURSED_INFERNO, EFFECT_TIME, 0);
|
||||
livingEntity.addEffect(effectInstance);
|
||||
}
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
//方块检测
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
|
||||
public class EndlessMusketPouch extends Item {
|
||||
public EndlessMusketPouch() {
|
||||
super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class ExplodingBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.effect.ModEffects;
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class GoldenBullet extends BasicBulletAmmo {
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
|
||||
public static final String BASE_DAMAGE_PATH = "ammo.golden_bullet.base_damage";
|
||||
public static final float BASE_DAMAGE_DEFAULT = 1.5f;
|
||||
public static final float BASE_DAMAGE_MIN = 0.0f;
|
||||
public static final float BASE_DAMAGE_MAX = 8388600.0f;
|
||||
|
||||
public static final String SPEED_PATH = "ammo.golden_bullet.speed";
|
||||
public static final double SPEED_DEFAULT = 3.0D;
|
||||
public static final double SPEED_MIN = 0.0D;
|
||||
public static final double SPEED_MAX = 24.0D;
|
||||
|
||||
public static final String EFFECT_TIME_PATH = "ammo.golden_bullet.effect_time";
|
||||
public static final int EFFECT_TIME_DEFAULT = 40;
|
||||
public static final int EFFECT_TIME_MIN = 0;
|
||||
public static final int EFFECT_TIME_MAX = 72000;
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("golden_bullet_base_damage"), configTooltip("golden_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("golden_bullet_speed"), configTooltip("golden_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX);
|
||||
ConfigFactory.loadIntConfig(EFFECT_TIME_PATH, configText("golden_bullet_effect_time"), configTooltip("golden_bullet_effect_time"), EFFECT_TIME_DEFAULT, EFFECT_TIME_MIN, EFFECT_TIME_MAX);
|
||||
}
|
||||
};
|
||||
|
||||
private static Component configText(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key);
|
||||
}
|
||||
|
||||
private static Component configTooltip(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||
}
|
||||
|
||||
public static float getBaseDamage() {
|
||||
return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
}
|
||||
|
||||
public static double getSpeed() {
|
||||
return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX);
|
||||
}
|
||||
|
||||
public static int getEffectTime() {
|
||||
return Math.clamp(ConfigUtil.readInt(EFFECT_TIME_PATH, EFFECT_TIME_DEFAULT), EFFECT_TIME_MIN, EFFECT_TIME_MAX);
|
||||
}
|
||||
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||
"golden_bullet",
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/golden_bullet.png"),
|
||||
Component.translatable("item.lzxnoneterraria.golden_bullet"),
|
||||
CONFIG_DATA
|
||||
);
|
||||
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed());
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
//碰撞检测
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
if(target instanceof LivingEntity livingEntity) {
|
||||
MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.MIDAS, getEffectTime(), 0);
|
||||
livingEntity.addEffect(effectInstance);
|
||||
}
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
//方块检测
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class HighVelocityBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 1.5f;
|
||||
public static final double SPEED = 3.5D;
|
||||
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(SPEED);
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
//碰撞检测
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
//方块检测
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class IchorBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class LuminiteBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -108,7 +108,7 @@ public class MeteorShot extends BulletAmmo {
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.summonAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
if(MeteorShot.incrementHit(summon) >= getMaxHit()) {
|
||||
this.onDied(summon);
|
||||
|
||||
@@ -88,7 +88,7 @@ public class MusketBall extends BulletAmmo {
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.summonAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
this.onDied(summon);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class NanoBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class PartyBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.monster.ZombifiedPiglin;
|
||||
import net.minecraft.world.entity.monster.piglin.Piglin;
|
||||
import net.minecraft.world.entity.monster.piglin.PiglinBrute;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SilverBullet extends BasicBulletAmmo {
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
|
||||
public static final String BASE_DAMAGE_PATH = "ammo.silver_bullet.base_damage";
|
||||
public static final float BASE_DAMAGE_DEFAULT = 1.2f;
|
||||
public static final float BASE_DAMAGE_MIN = 0.0f;
|
||||
public static final float BASE_DAMAGE_MAX = 8388600.0f;
|
||||
|
||||
public static final String SPEED_PATH = "ammo.silver_bullet.speed";
|
||||
public static final double SPEED_DEFAULT = 3.0D;
|
||||
public static final double SPEED_MIN = 0.0D;
|
||||
public static final double SPEED_MAX = 24.0D;
|
||||
|
||||
public static final String PIGLIN_DAMAGE_MULTIPLIER_PATH = "ammo.silver_bullet.piglin_damage_multiplier";
|
||||
public static final float PIGLIN_DAMAGE_MULTIPLIER_DEFAULT = 3.0f;
|
||||
public static final float PIGLIN_DAMAGE_MULTIPLIER_MIN = 0.0f;
|
||||
public static final float PIGLIN_DAMAGE_MULTIPLIER_MAX = 100.0f;
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("silver_bullet_base_damage"), configTooltip("silver_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("silver_bullet_speed"), configTooltip("silver_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX);
|
||||
ConfigFactory.loadFloatConfig(PIGLIN_DAMAGE_MULTIPLIER_PATH, configText("silver_bullet_piglin_damage_multiplier"), configTooltip("silver_bullet_piglin_damage_multiplier"), PIGLIN_DAMAGE_MULTIPLIER_DEFAULT, PIGLIN_DAMAGE_MULTIPLIER_MIN, PIGLIN_DAMAGE_MULTIPLIER_MAX);
|
||||
}
|
||||
};
|
||||
|
||||
private static Component configText(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key);
|
||||
}
|
||||
|
||||
private static Component configTooltip(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||
}
|
||||
|
||||
public static float getBaseDamage() {
|
||||
return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
}
|
||||
|
||||
public static double getSpeed() {
|
||||
return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX);
|
||||
}
|
||||
|
||||
public static float getPiglinDamageMultiplier() {
|
||||
return Math.clamp(ConfigUtil.readFloat(PIGLIN_DAMAGE_MULTIPLIER_PATH, PIGLIN_DAMAGE_MULTIPLIER_DEFAULT), PIGLIN_DAMAGE_MULTIPLIER_MIN, PIGLIN_DAMAGE_MULTIPLIER_MAX);
|
||||
}
|
||||
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||
"silver_bullet",
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/silver_bullet.png"),
|
||||
Component.translatable("item.lzxnoneterraria.silver_bullet"),
|
||||
CONFIG_DATA
|
||||
);
|
||||
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed());
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
//碰撞检测
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
float finalDamage = getBaseDamage() + damage;
|
||||
if(target instanceof Piglin || target instanceof PiglinBrute || target instanceof ZombifiedPiglin) {
|
||||
finalDamage *= getPiglinDamageMultiplier();
|
||||
}
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, finalDamage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
//方块检测
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.LzxnoneTerraria;
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.ui.config.ConfigFactory;
|
||||
import com.lzxnone.terraria.ui.config.ConfigListItem;
|
||||
import com.lzxnone.terraria.ui.config.ConfigUtil;
|
||||
import com.lzxnone.terraria.ui.config.IConfigData;
|
||||
import com.lzxnone.terraria.utils.CollisionUtil;
|
||||
import com.lzxnone.terraria.utils.DamageUtil;
|
||||
import com.lzxnone.terraria.utils.FilterUtil;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class TungstenBullet extends BasicBulletAmmo {
|
||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||
|
||||
public static final String BASE_DAMAGE_PATH = "ammo.tungsten_bullet.base_damage";
|
||||
public static final float BASE_DAMAGE_DEFAULT = 1.2f;
|
||||
public static final float BASE_DAMAGE_MIN = 0.0f;
|
||||
public static final float BASE_DAMAGE_MAX = 8388600.0f;
|
||||
|
||||
public static final String SPEED_PATH = "ammo.tungsten_bullet.speed";
|
||||
public static final double SPEED_DEFAULT = 3.0D;
|
||||
public static final double SPEED_MIN = 0.0D;
|
||||
public static final double SPEED_MAX = 24.0D;
|
||||
|
||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||
@Override
|
||||
public void onConfigLoad() {
|
||||
ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("tungsten_bullet_base_damage"), configTooltip("tungsten_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("tungsten_bullet_speed"), configTooltip("tungsten_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX);
|
||||
}
|
||||
};
|
||||
|
||||
private static Component configText(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key);
|
||||
}
|
||||
|
||||
private static Component configTooltip(String key) {
|
||||
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||
}
|
||||
|
||||
public static float getBaseDamage() {
|
||||
return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX);
|
||||
}
|
||||
|
||||
public static double getSpeed() {
|
||||
return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX);
|
||||
}
|
||||
|
||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||
"tungsten_bullet",
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/tungsten_bullet.png"),
|
||||
Component.translatable("item.lzxnoneterraria.tungsten_bullet"),
|
||||
CONFIG_DATA
|
||||
);
|
||||
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
|
||||
@Override
|
||||
public void tick(StaticSummon summon) {
|
||||
this.checkBeforeTick(summon);
|
||||
Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed());
|
||||
summon.setDeltaMovement(motion);
|
||||
|
||||
//碰撞检测
|
||||
AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25);
|
||||
List<Entity> targets = summon.level().getEntitiesOfClass(
|
||||
Entity.class,
|
||||
hitBox,
|
||||
FilterUtil.createTargetFilter(summon, summon.getOwner())
|
||||
);
|
||||
if(!targets.isEmpty()) {
|
||||
CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA);
|
||||
float damage = customData.contains("damage") ? customData.getFloat("damage") : 0;
|
||||
float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f;
|
||||
int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20;
|
||||
|
||||
ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE);
|
||||
Entity target = targets.getFirst();
|
||||
if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) {
|
||||
target.invulnerableTime = invulnerableTime;
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
|
||||
//方块检测
|
||||
BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion));
|
||||
if(blockHitResult.getType() != HitResult.Type.MISS) {
|
||||
this.onDied(summon);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.lzxnone.terraria.item.ammo;
|
||||
|
||||
import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior;
|
||||
|
||||
public class VenomBullet extends BasicBulletAmmo {
|
||||
public static final float BASE_DAMAGE = 0.8f;
|
||||
public static final double SPEED = 3.0D;
|
||||
public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.lzxnone.terraria.item.projectile.ammo;
|
||||
|
||||
import net.minecraft.world.item.Item;
|
||||
|
||||
public class BulletProjectile extends Item {
|
||||
public BulletProjectile() {
|
||||
super(new Item.Properties());
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.lzxnone.terraria.item.projectile.ammo;
|
||||
|
||||
import net.minecraft.world.item.Item;
|
||||
|
||||
public class MeteorShotProjectile extends Item {
|
||||
public MeteorShotProjectile() {
|
||||
super(new Item.Properties());
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package com.lzxnone.terraria.item.weapon;
|
||||
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
||||
import com.lzxnone.terraria.item.ModItems;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
@@ -90,6 +91,7 @@ public class RangedWeapon extends Weapon {
|
||||
|
||||
ItemStack ammoStack = getAmmoStack(weaponStack);
|
||||
if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return false;
|
||||
if(ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) return true;
|
||||
|
||||
Item ammoItem = ammoStack.getItem();
|
||||
int available = 0;
|
||||
|
||||
@@ -30,11 +30,10 @@ public abstract class HumanoidModelMixin<T extends LivingEntity> {
|
||||
: player.getMainArm().getOpposite();
|
||||
|
||||
if(player.getUseItem().is(ModItems.SDMG.get())) {
|
||||
float horizontalArmRot = (float) Math.toRadians(-90.0D);
|
||||
if(usedArm == HumanoidArm.RIGHT) {
|
||||
this.rightArm.xRot = horizontalArmRot;
|
||||
this.rightArm.xRot = (float) Math.toRadians(player.getXRot() - 90);
|
||||
}else {
|
||||
this.leftArm.xRot = horizontalArmRot;
|
||||
this.leftArm.xRot = (float) Math.toRadians(player.getXRot() - 90);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
package com.lzxnone.terraria.ui.config;
|
||||
|
||||
import com.lzxnone.terraria.effect.BloodButcheredEffect;
|
||||
import com.lzxnone.terraria.effect.CursedInfernoEffect;
|
||||
import com.lzxnone.terraria.effect.DemonicFlamesEffect;
|
||||
import com.lzxnone.terraria.effect.MidasEffect;
|
||||
import com.lzxnone.terraria.effect.SummonEffect;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs;
|
||||
import com.lzxnone.terraria.item.ammo.MeteorShot;
|
||||
import com.lzxnone.terraria.item.ammo.MusketBall;
|
||||
import com.lzxnone.terraria.item.ammo.GoldenBullet;
|
||||
import com.lzxnone.terraria.item.ammo.SilverBullet;
|
||||
import com.lzxnone.terraria.item.ammo.TungstenBullet;
|
||||
import com.lzxnone.terraria.item.weapon.magic.LastPrism;
|
||||
import com.lzxnone.terraria.item.weapon.melee.BeeKeeper;
|
||||
import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass;
|
||||
@@ -76,11 +81,16 @@ public class ConfigList {
|
||||
ITEMS.put(EFFECT, new ConfigListItem[]{
|
||||
BloodButcheredEffect.CONFIG_LIST_ITEM,
|
||||
DemonicFlamesEffect.CONFIG_LIST_ITEM,
|
||||
CursedInfernoEffect.CONFIG_LIST_ITEM,
|
||||
MidasEffect.CONFIG_LIST_ITEM,
|
||||
SummonEffect.CONFIG_LIST_ITEM
|
||||
});
|
||||
ITEMS.put(AMMO, new ConfigListItem[]{
|
||||
MusketBall.CONFIG_LIST_ITEM,
|
||||
MeteorShot.CONFIG_LIST_ITEM
|
||||
MeteorShot.CONFIG_LIST_ITEM,
|
||||
SilverBullet.CONFIG_LIST_ITEM,
|
||||
GoldenBullet.CONFIG_LIST_ITEM,
|
||||
TungstenBullet.CONFIG_LIST_ITEM
|
||||
});
|
||||
ITEMS.put(ENCHANTMENT, new ConfigListItem[]{
|
||||
ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM,
|
||||
|
||||
@@ -18,10 +18,6 @@ import org.joml.Vector3f;
|
||||
public class AmmoUtil {
|
||||
public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f);
|
||||
|
||||
public static StaticSummon createAmmoSummon(Level level, Player player, ItemStack stack) {
|
||||
return createAmmoSummon(level, player, InteractionHand.MAIN_HAND, stack);
|
||||
}
|
||||
|
||||
public static StaticSummon createAmmoSummon(Level level, Player player, InteractionHand hand, ItemStack stack) {
|
||||
Vector3f[] dirs = MathUtil.computeCoordinateSystem(player);
|
||||
Vec3 eyePos = player.getEyePosition();
|
||||
@@ -46,6 +42,20 @@ public class AmmoUtil {
|
||||
|
||||
String ammo = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getString(RangedWeapon.AMMO_KEY);
|
||||
if(ammo.equals("lzxnoneterraria:musket_ball")) setMusketBall(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:silver_bullet")) setSilverBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:crystal_bullet")) setCrystalBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:cursed_bullet")) setCursedBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:chlorophyte_bullet")) setChlorophyteBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:high_velocity_bullet")) setHighVelocityBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:ichor_bullet")) setIchorBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:venom_bullet")) setVenomBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:party_bullet")) setPartyBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:nano_bullet")) setNanoBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:exploding_bullet")) setExplodingBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:golden_bullet")) setGoldenBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:endless_musket_pouch")) setMusketBall(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:luminite_bullet")) setLuminiteBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:tungsten_bullet")) setTungstenBullet(summon);
|
||||
else if(ammo.equals("lzxnoneterraria:meteor_shot")) setMeteorShot(summon);
|
||||
return summon;
|
||||
}
|
||||
@@ -68,6 +78,136 @@ public class AmmoUtil {
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setSilverBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.SILVER_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.SILVER_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setCrystalBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CRYSTAL_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CRYSTAL_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setCursedBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CURSED_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CURSED_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setChlorophyteBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CHLOROPHYTE_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CHLOROPHYTE_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setHighVelocityBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.HIGH_VELOCITY_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.HIGH_VELOCITY_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setIchorBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.ICHOR_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.ICHOR_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setVenomBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.VENOM_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.VENOM_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setPartyBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.PARTY_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.PARTY_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setNanoBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NANO_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.NANO_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setExplodingBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.EXPLODING_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.EXPLODING_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setGoldenBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.GOLDEN_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.GOLDEN_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setLuminiteBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LUMINITE_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.LUMINITE_BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setTungstenBullet(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TUNGSTEN_BULLET);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.BULLET_PROJECTILE.get()));
|
||||
summon.getEntityData().set(StaticSummon.LIFETIME, 100);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f);
|
||||
summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f);
|
||||
summon.setNoGravity(true);
|
||||
}
|
||||
|
||||
public static void setMeteorShot(StaticSummon summon) {
|
||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.METEOR_SHOT);
|
||||
summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.METEOR_SHOT_PROJECTILE.get()));
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package com.lzxnone.terraria.utils;
|
||||
|
||||
import com.lzxnone.terraria.damage.ModDamageTypes;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs;
|
||||
import com.lzxnone.terraria.enchantment.ModEnchantments;
|
||||
import com.lzxnone.terraria.entity.beam.SwordBeam;
|
||||
import com.lzxnone.terraria.entity.projectile.StaticProjectile;
|
||||
import com.lzxnone.terraria.entity.summon.BeeSummon;
|
||||
import com.lzxnone.terraria.entity.summon.StaticSummon;
|
||||
import com.lzxnone.terraria.item.weapon.MagicWeapon;
|
||||
import com.lzxnone.terraria.item.weapon.SummonWeapon;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.damagesource.DamageSource;
|
||||
@@ -17,6 +20,7 @@ import net.minecraft.world.entity.LivingEntity;
|
||||
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.item.enchantment.Enchantment;
|
||||
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
@@ -77,6 +81,8 @@ public class DamageUtil {
|
||||
finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage);
|
||||
}else if(category == DamageCategory.MAGIC && !itemSource.isEmpty()) {
|
||||
finalDamage = MagicWeapon.applyMagicDamageBonus(itemSource, player, finalDamage);
|
||||
}else if(category == DamageCategory.RANGED && !itemSource.isEmpty()) {
|
||||
finalDamage = applyRangedDamageBonus(itemSource, player, finalDamage);
|
||||
}
|
||||
finalDamage = Math.max(0.0F, finalDamage);
|
||||
|
||||
@@ -124,6 +130,22 @@ public class DamageUtil {
|
||||
return Math.max(0.0F, finalDamage);
|
||||
}
|
||||
|
||||
private static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) {
|
||||
double finalDamage = damage;
|
||||
int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER);
|
||||
|
||||
finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel);
|
||||
return (float)Math.max(0.0D, finalDamage);
|
||||
}
|
||||
|
||||
private static int getEnchantmentLevel(LivingEntity entity, ItemStack stack, ResourceKey<Enchantment> enchantment) {
|
||||
return entity.registryAccess()
|
||||
.lookupOrThrow(Registries.ENCHANTMENT)
|
||||
.get(enchantment)
|
||||
.map(stack::getEnchantmentLevel)
|
||||
.orElse(0);
|
||||
}
|
||||
|
||||
private static Player getAttackOwner(Entity attackEntity) {
|
||||
if(attackEntity instanceof Player player) return player;
|
||||
if(attackEntity instanceof StaticProjectile projectile) return getAttackOwner(projectile.getOwner());
|
||||
|
||||
Reference in new issue
Block a user