diff --git a/build.gradle b/build.gradle index 52cb492..403aa18 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,10 @@ sourceSets.main.resources { } repositories { + maven { + name = "Illusive Soulworks" + url = "https://maven.theillusivec4.top/" + } maven { name = "Gegy" url = "https://maven.gegy.dev" @@ -131,6 +135,8 @@ dependencies { jarJar('net.objecthunter:exp4j:0.4.8') additionalRuntimeClasspath 'net.objecthunter:exp4j:0.4.8' implementation("com.lowdragmc.ldlib2:ldlib2-neoforge-${minecraft_version}:${ldlib2_version}:all") + compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}:api") + localRuntime("top.theillusivec4.curios:curios-neoforge:${curios_version}") attributesSchema { attribute(mappingsAttribute) } diff --git a/gradle.properties b/gradle.properties index bcb636d..257d637 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.6.0 +mod_version=1.6.1 ## The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html @@ -42,3 +42,6 @@ mod_group_id=com.lzxnone.terraria # LDLib2 ldlib2_version=2.2.29 + +# Curios +curios_version=9.5.1+1.21.1 diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index 87c17d5..b21e373 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -43,6 +43,10 @@ public class ModSounds { SOUND_EVENTS.register("star_collide", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "star_collide"))); + public static final Supplier SNOW_BREAK = + SOUND_EVENTS.register("snow_break", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "snow_break"))); public static final Supplier SUMMON_TERRAPRISMA = SOUND_EVENTS.register("summon_terraprisma", () -> SoundEvent.createVariableRangeEvent( @@ -79,6 +83,10 @@ public class ModSounds { SOUND_EVENTS.register("shot8", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "shot8"))); + public static final Supplier SHOT9 = + SOUND_EVENTS.register("shot9", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "shot9"))); public static final Supplier BOOM = SOUND_EVENTS.register("boom", () -> SoundEvent.createVariableRangeEvent( diff --git a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java index 8b77f73..351607e 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java +++ b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java @@ -30,4 +30,7 @@ public class ModAttachments { public static final Supplier> SUMMON_ATTACK_MODE = ATTACHMENT_TYPES.register("summon_attack_mode", () -> AttachmentType.builder(() -> 2).serialize(Codec.INT).build()); + public static final Supplier> PLAYER_MANA = + ATTACHMENT_TYPES.register("player_mana", () -> AttachmentType.builder(PlayerMana::new).serialize(PlayerMana.CODEC).copyOnDeath().build()); + } diff --git a/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java new file mode 100644 index 0000000..8a840cd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java @@ -0,0 +1,140 @@ +package com.lzxnone.terraria.attachment; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.util.Mth; + +public class PlayerMana { + public static final int DEFAULT_MAX_MANA = 20; + public static final double DEFAULT_RECOVER_RATE = 1.0D; + + public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + Codec.INT.optionalFieldOf("mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getMana), + Codec.INT.optionalFieldOf("max_mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getMaxMana), + Codec.DOUBLE.optionalFieldOf("consume_progress", 0.0D).forGetter(PlayerMana::getConsumeProgress), + Codec.DOUBLE.optionalFieldOf("recover_progress", 0.0D).forGetter(PlayerMana::getRecoverProgress), + Codec.INT.optionalFieldOf("recover_delay", 0).forGetter(PlayerMana::getRecoverDelay) + ).apply(instance, PlayerMana::new)); + + private int mana; + private int maxMana; + private double consumeProgress; + private double recoverProgress; + private int recoverDelay; + + public PlayerMana() { + this(DEFAULT_MAX_MANA, DEFAULT_MAX_MANA, 0.0D, 0.0D, 0); + } + + public PlayerMana(int mana, int maxMana) { + this(mana, maxMana, 0.0D, 0.0D, 0); + } + + public PlayerMana(int mana, int maxMana, double consumeProgress, double recoverProgress) { + this(mana, maxMana, consumeProgress, recoverProgress, 0); + } + + public PlayerMana(int mana, int maxMana, double consumeProgress, double recoverProgress, int recoverDelay) { + this.maxMana = Math.max(0, maxMana); + this.mana = Mth.clamp(mana, 0, this.maxMana); + this.consumeProgress = Math.max(0.0D, consumeProgress); + this.recoverProgress = Math.max(0.0D, recoverProgress); + this.recoverDelay = Math.max(0, recoverDelay); + } + + public int getMana() { + return mana; + } + + public void setMana(int mana) { + this.mana = Mth.clamp(mana, 0, maxMana); + } + + public int getMaxMana() { + return maxMana; + } + + public void setMaxMana(int maxMana) { + this.maxMana = Math.max(0, maxMana); + this.mana = Math.min(mana, this.maxMana); + } + + public double getConsumeProgress() { + return consumeProgress; + } + + public double getRecoverProgress() { + return recoverProgress; + } + + public int getRecoverDelay() { + return recoverDelay; + } + + public boolean hasMana() { + return mana > 0; + } + + public boolean recoverMana(double amount) { + if(amount <= 0.0D || mana >= maxMana) return false; + + int recoverAmount = addManaProgress(false, amount); + if(recoverAmount <= 0) return true; + + int oldMana = mana; + setMana(mana + recoverAmount); + return mana != oldMana; + } + + public boolean recoverManaImmediately(int amount) { + if(amount <= 0 || mana >= maxMana) return false; + + int oldMana = mana; + setMana(mana + amount); + return mana != oldMana; + } + + public boolean consumeMana(double amount) { + if(amount <= 0.0D) return true; + if(mana <= 0) return false; + + int consumeAmount = addManaProgress(true, amount); + if(consumeAmount <= 0) return mana > 0; + + if(consumeAmount >= mana) { + mana = 0; + return false; + } + + mana -= consumeAmount; + return true; + } + + public void applyRecoverDelay() { + if(maxMana <= 0) return; + + double emptyRatio = 1.0D - (double) mana / maxMana; + recoverDelay = Math.max(recoverDelay, (int) Math.ceil(0.7D * (emptyRatio * 240.0D + 45.0D))); + recoverProgress = 0.0D; + } + + public boolean tickRecoverDelay() { + if(recoverDelay <= 0) return false; + + recoverDelay--; + return true; + } + + private int addManaProgress(boolean consume, double amount) { + double progress = (consume ? consumeProgress : recoverProgress) + amount; + int wholeAmount = (int)Math.floor(progress); + double nextProgress = progress - wholeAmount; + + if(consume) { + consumeProgress = nextProgress; + }else { + recoverProgress = nextProgress; + } + return wholeAmount; + } +} diff --git a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java index c728b9d..d3511af 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/projectile/ClientStaticProjectileRenderBehaviors.java @@ -1,11 +1,12 @@ package com.lzxnone.terraria.client.entity.projectile; -import com.lzxnone.terraria.client.item.ammo.ClientCrystalFragment; import com.lzxnone.terraria.client.item.melee.ClientBladeOfGrass; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientMace; import com.lzxnone.terraria.client.item.melee.ClientMuramasa; import com.lzxnone.terraria.client.item.melee.ClientZenith; +import com.lzxnone.terraria.client.item.ranged.ClientFlamethrower; +import com.lzxnone.terraria.client.item.ranged.ClientSuperStarShooter; import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import java.util.HashMap; @@ -28,7 +29,8 @@ public class ClientStaticProjectileRenderBehaviors { BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE, ClientDevilsDevastation.PROJECTILE_BEHAVIOR); BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE2, ClientDevilsDevastation.PROJECTILE_BEHAVIOR2); BEHAVIORS.put(StaticProjectileBehaviors.DEVILS_DEVASTATION_PROJECTILE3, ClientDevilsDevastation.PROJECTILE_BEHAVIOR3); - BEHAVIORS.put(StaticProjectileBehaviors.CRYSTAL_FRAGMENT, ClientCrystalFragment.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(StaticProjectileBehaviors.CRYSTAL_FRAGMENT, DEFAULT_BEHAVIOR); + BEHAVIORS.put(StaticProjectileBehaviors.SUPER_STAR_PRISMATIC_BOLT, ClientSuperStarShooter.PROJECTILE_BEHAVIOR); } public static IStaticProjectileRenderBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java index bc68e62..b665eab 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java @@ -1,7 +1,6 @@ package com.lzxnone.terraria.client.entity.summon; -import com.lzxnone.terraria.client.item.ammo.ClientBulletAmmo; -import com.lzxnone.terraria.client.item.ammo.ClientCrystalFragment; +import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientFirstFractal; @@ -12,6 +11,9 @@ import com.lzxnone.terraria.client.item.melee.ClientNightsEdge; import com.lzxnone.terraria.client.item.melee.ClientTerraBlade; import com.lzxnone.terraria.client.item.melee.ClientTerragrim; import com.lzxnone.terraria.client.item.melee.ClientTrueNightsEdge; +import com.lzxnone.terraria.client.item.ranged.ClientFlamethrower; +import com.lzxnone.terraria.client.item.ranged.ClientStarCannon; +import com.lzxnone.terraria.client.item.ranged.ClientSuperStarShooter; import com.lzxnone.terraria.client.item.summon.ClientTerraprisma; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; @@ -60,6 +62,12 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.GOLDEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.LUMINITE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.TUNGSTEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + + BEHAVIORS.put(StaticSummonBehaviors.SNOWBALL, DEFAULT_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.FALLEN_STAR, ClientStarCannon.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.FALLEN_STAR_SUPER, ClientSuperStarShooter.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.FLAMETHROWER_FLAME, ClientFlamethrower.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.ELF_MELTER_FLAME, ClientFlamethrower.SUMMON_BEHAVIOR); } public static IStaticSummonRenderBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java b/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java index fee8f1e..cd7a6ef 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java @@ -22,6 +22,8 @@ public class GuiRenderHandler { LocalPlayer player = minecraft.player; if(player == null || minecraft.options.hideGui) return; + ManaHudRenderer.render(event.getGuiGraphics(), player); + ItemStack stack = player.getMainHandItem(); if(stack.is(ModItems.DEVILS_DEVASTATION.get()) && player.getEffect(ModEffects.KILL_MODE) != null) { Component text = Component.translatable("tooltip.lzxnoneterraria.devils_devastation_kill_mode"); diff --git a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java index 691fb44..8c79531 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java @@ -9,7 +9,7 @@ import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.item.weapon.melee.FirstFractal; import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword; import com.lzxnone.terraria.item.weapon.melee.Zenith; -import com.lzxnone.terraria.item.weapon.ranged.SniperRifle; +import com.lzxnone.terraria.item.weapon.ranged.gun.SniperRifle; import com.lzxnone.terraria.network.payload.ClearSummonPayload; import com.lzxnone.terraria.network.payload.DevilsDevastationKillModePayload; import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; diff --git a/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java new file mode 100644 index 0000000..2860bee --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java @@ -0,0 +1,98 @@ +package com.lzxnone.terraria.client.event; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; + +public class ManaHudRenderer { + private static final ResourceLocation MANA_TEXTURE = ResourceLocation.fromNamespaceAndPath( + LzxnoneTerraria.MODID, + "textures/ui/mana.png" + ); + private static final int TEXTURE_WIDTH = 22; + private static final int TEXTURE_HEIGHT = 24; + private static final int MAX_SEGMENT_COUNT = 10; + private static final int SLOT_WIDTH = 8; + private static final int SLOT_HEIGHT = 9; + private static final int SLOT_GAP = 1; + private static final int LEFT_MARGIN = 10; + private static final int TOP_MARGIN = 28; + + public static int manaBarX; + public static int manaBarY = TOP_MARGIN; + + public static void render(GuiGraphics guiGraphics, LocalPlayer player) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int maxMana = Math.max(0, mana.getMaxMana()); + if(maxMana <= 0) return; + + int segmentCount = Math.min(MAX_SEGMENT_COUNT, maxMana); + float segmentMana = maxMana < MAX_SEGMENT_COUNT ? 1.0F : maxMana / (float)MAX_SEGMENT_COUNT; + int currentMana = Mth.clamp(mana.getMana(), 0, maxMana); + if(currentMana >= maxMana) return; + + manaBarX = LEFT_MARGIN; + manaBarY = TOP_MARGIN; + + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + float missingMana = maxMana - currentMana; + for(int i = 0; i < segmentCount; i++) { + int bottomIndex = segmentCount - 1 - i; + float drained = Mth.clamp(missingMana - bottomIndex * segmentMana, 0.0F, segmentMana); + float fill = 1.0F - drained / segmentMana; + int slotY = manaBarY + i * (SLOT_HEIGHT + SLOT_GAP); + renderSegment(guiGraphics, manaBarX, slotY, fill); + } + guiGraphics.setColor(1.0F, 1.0F, 1.0F, 1.0F); + renderManaText(guiGraphics, currentMana, maxMana, segmentCount); + RenderSystem.disableBlend(); + } + + private static void renderSegment(GuiGraphics guiGraphics, int slotX, int slotY, float fill) { + boolean empty = fill <= 0.0F; + float scale = empty ? 0.5F : 0.5F + fill * 0.5F; + int width = Math.max(1, Math.round(SLOT_WIDTH * scale)); + int height = Math.max(1, Math.round(SLOT_HEIGHT * scale)); + int x = slotX + (SLOT_WIDTH - width) / 2; + int y = slotY + (SLOT_HEIGHT - height) / 2; + + if(empty) { + guiGraphics.setColor(0.0F, 0.0F, 0.0F, 0.8F); + } else { + guiGraphics.setColor(1.0F, 1.0F, 1.0F, 1.0F); + } + + guiGraphics.blit( + MANA_TEXTURE, + x, + y, + width, + height, + 0.0F, + 0.0F, + TEXTURE_WIDTH, + TEXTURE_HEIGHT, + TEXTURE_WIDTH, + TEXTURE_HEIGHT + ); + } + + private static void renderManaText(GuiGraphics guiGraphics, int currentMana, int maxMana, int segmentCount) { + Font font = Minecraft.getInstance().font; + String text = currentMana + "/" + maxMana; + int textWidth = font.width(text); + int barCenterX = manaBarX + SLOT_WIDTH / 2; + int textX = Mth.clamp(barCenterX - textWidth / 2, 2, guiGraphics.guiWidth() - textWidth - 2); + int textY = manaBarY + segmentCount * SLOT_HEIGHT + (segmentCount - 1) * SLOT_GAP + 2; + + guiGraphics.drawString(font, text, textX, textY, 0x66CCFF, true); + } +} diff --git a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java index f0270b1..e737db2 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java @@ -64,7 +64,8 @@ public class RangedWeaponGuiHandler { private static void renderAmmoDropHint(GuiGraphics guiGraphics, RangedWeapon rangedWeapon, ItemStack weaponStack, ItemStack carriedStack, Slot slot) { - if(carriedStack.isEmpty() || !carriedStack.is(ModItemTags.BULLET_AMMO)) return; + if(carriedStack.isEmpty()) return; + if(!carriedStack.is(ModItemTags.AMMO)) return; int color = rangedWeapon.canUseAmmo(weaponStack, carriedStack) ? VALID_AMMO_COLOR : INVALID_AMMO_COLOR; guiGraphics.fill(slot.x, slot.y, slot.x + 16, slot.y + 16, color); diff --git a/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java b/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java index 711d8c6..86c33af 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java @@ -2,7 +2,6 @@ package com.lzxnone.terraria.client.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.ModItems; -import com.lzxnone.terraria.item.weapon.ranged.SniperRifle; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java deleted file mode 100644 index 411666a..0000000 --- a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientCrystalFragment.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.lzxnone.terraria.client.item.ammo; - -import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior; - -public class ClientCrystalFragment { - public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() {}; -} diff --git a/src/main/java/com/lzxnone/terraria/client/item/melee/ClientFirstFractal.java b/src/main/java/com/lzxnone/terraria/client/item/melee/ClientFirstFractal.java index 2406701..3b1a541 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/melee/ClientFirstFractal.java +++ b/src/main/java/com/lzxnone/terraria/client/item/melee/ClientFirstFractal.java @@ -29,7 +29,7 @@ public class ClientFirstFractal { public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/beam_sparkle.png"); - public static final ResourceLocation RES2 = ResourceLocation.parse("lzxnoneterraria:textures/vfx/first_fractal_star.png"); + public static final ResourceLocation RES2 = ResourceLocation.parse("lzxnoneterraria:textures/vfx/star_wave.png"); @Override public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { diff --git a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientBulletAmmo.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java rename to src/main/java/com/lzxnone/terraria/client/item/ranged/ClientBulletAmmo.java index c6ebce5..f496401 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientBulletAmmo.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.client.item.ammo; +package com.lzxnone.terraria.client.item.ranged; import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -8,7 +8,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -23,8 +22,6 @@ 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(-summon.getYRot())); poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); @@ -51,9 +48,6 @@ 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(-summon.getYRot())); poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); diff --git a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientFlamethrower.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientFlamethrower.java new file mode 100644 index 0000000..c97c151 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientFlamethrower.java @@ -0,0 +1,94 @@ +package com.lzxnone.terraria.client.item.ranged; + +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; + +public class ClientFlamethrower { + private static final double RENDER_INTERVAL = 2.0D; + private static final float MIN_HALF_SIZE = 0.05f; + private static final float MAX_HALF_SIZE = 3.0f; + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + public static final ResourceLocation[] RES = { + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile0.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile1.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile2.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile3.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile4.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile5.png"), + ResourceLocation.parse("lzxnoneterraria:textures/vfx/flame_projectile6.png") + }; + + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + float lifetime = Math.max(1.0f, summon.getEntityData().get(StaticSummon.LIFETIME)); + Vec3 end = new Vec3( + Mth.lerp(partialTick, summon.xo, summon.getX()), + Mth.lerp(partialTick, summon.yo, summon.getY()), + Mth.lerp(partialTick, summon.zo, summon.getZ()) + ); + Vec3 start = new Vec3( + customData.contains("startX") ? customData.getFloat("startX") : end.x, + customData.contains("startY") ? customData.getFloat("startY") : end.y, + customData.contains("startZ") ? customData.getFloat("startZ") : end.z + ); + + float progress = Mth.clamp(age / lifetime, 0.0f, 1.0f); + int resIndex = Math.min(RES.length - 1, (int) (progress * RES.length)); + float alpha = 1.0f - progress * 0.85f; + float flameRed = customData.contains("flameRed") ? customData.getFloat("flameRed") : 1.0f; + float flameGreen = customData.contains("flameGreen") ? customData.getFloat("flameGreen") : 0.55f; + float flameBlue = customData.contains("flameBlue") ? customData.getFloat("flameBlue") : 0.1f; + Vec3 span = end.subtract(start); + double length = span.length(); + if(length <= 1.0E-4D) return; + Vec3 direction = span.scale(1.0D / length); + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(RES[resIndex])); + int index = 0; + for(double distance = Math.min(RENDER_INTERVAL, length); distance <= length + 1.0E-4D; distance += RENDER_INTERVAL) { + float segmentProgress = (float) (distance / length); + Vec3 localPos = start.add(direction.scale(distance)).subtract(end); + float halfSize = Mth.lerp(segmentProgress, MIN_HALF_SIZE, MAX_HALF_SIZE); + float rotationAge = age + index; + + poseStack.pushPose(); + poseStack.translate(localPos.x, localPos.y, localPos.z); + poseStack.mulPose(Minecraft.getInstance().getEntityRenderDispatcher().cameraOrientation()); + poseStack.mulPose(Axis.ZP.rotationDegrees(rotationAge * 24.0f)); + + consumer.addVertex(poseStack.last().pose(), -halfSize, -halfSize, 0.0f) + .setColor(flameRed, Math.min(1.0f, flameGreen * 1.45f), Math.min(1.0f, flameBlue * 1.45f), alpha).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + consumer.addVertex(poseStack.last().pose(), halfSize, -halfSize, 0.0f) + .setColor(flameRed, flameGreen, flameBlue, alpha).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + consumer.addVertex(poseStack.last().pose(), halfSize, halfSize, 0.0f) + .setColor(flameRed, flameGreen * 0.35f, flameBlue * 0.35f, alpha).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + consumer.addVertex(poseStack.last().pose(), -halfSize, halfSize, 0.0f) + .setColor(flameRed, flameGreen, flameBlue, alpha).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + + poseStack.popPose(); + index++; + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java new file mode 100644 index 0000000..9eb52d9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java @@ -0,0 +1,97 @@ +package com.lzxnone.terraria.client.item.ranged; + +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class ClientStarCannon { + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/star_wave.png"); + + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + ItemStack itemStack = summon.getEntityData().get(StaticSummon.ITEM); + if(itemStack == ItemStack.EMPTY) return; + + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + + poseStack.pushPose(); + + //旋转(方向修正) + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); + + poseStack.mulPose(Axis.XP.rotationDegrees(age * 15)); + poseStack.mulPose(Axis.YP.rotationDegrees(-90)); + + poseStack.scale( + summon.getEntityData().get(StaticSummon.SCALE_X), + summon.getEntityData().get(StaticSummon.SCALE_Y), + summon.getEntityData().get(StaticSummon.SCALE_Z) + ); + + Minecraft.getInstance().getItemRenderer().renderStatic( + itemStack, + ItemDisplayContext.NONE, + LightTexture.FULL_BRIGHT, + OverlayTexture.NO_OVERLAY, + poseStack, + bufferSource, + entity.level(), + 0 + ); + poseStack.popPose(); + + poseStack.pushPose(); + float starHalfWidth = 45 * 0.06f; + float starHalfHeight = 17 * 0.06f; + VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); + + Vec3 dir = summon.getLookAngle().normalize(); + double dist = -0.75; + poseStack.translate(dir.x * dist, dir.y * dist, dir.z * dist); + + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); + + poseStack.mulPose(Axis.YP.rotationDegrees(270)); + + poseStack.scale( + summon.getEntityData().get(StaticSummon.SCALE_X), + summon.getEntityData().get(StaticSummon.SCALE_Y), + summon.getEntityData().get(StaticSummon.SCALE_Z) + ); + + Vector3f color = new Vector3f(0.29f, 0.29f, 0.871f); + float alpha = 0.5f; + for(int i = 0; i < 1; i++) { + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + } + poseStack.popPose(); + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientSuperStarShooter.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientSuperStarShooter.java new file mode 100644 index 0000000..4dd2b0e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientSuperStarShooter.java @@ -0,0 +1,147 @@ +package com.lzxnone.terraria.client.item.ranged; + +import com.lzxnone.terraria.client.entity.projectile.IStaticProjectileRenderBehavior; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.TintedVertexConsumer; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.MathUtil; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class ClientSuperStarShooter { + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/star_wave.png"); + + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + ItemStack itemStack = summon.getEntityData().get(StaticSummon.ITEM); + if(itemStack == ItemStack.EMPTY) return; + + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + + poseStack.pushPose(); + + //旋转(方向修正) + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); + + poseStack.mulPose(Axis.XP.rotationDegrees(age * 15)); + poseStack.mulPose(Axis.YP.rotationDegrees(-90)); + + poseStack.scale( + summon.getEntityData().get(StaticSummon.SCALE_X), + summon.getEntityData().get(StaticSummon.SCALE_Y), + summon.getEntityData().get(StaticSummon.SCALE_Z) + ); + + Minecraft.getInstance().getItemRenderer().renderStatic( + itemStack, + ItemDisplayContext.NONE, + LightTexture.FULL_BRIGHT, + OverlayTexture.NO_OVERLAY, + poseStack, + renderType -> { + VertexConsumer vertexConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(InventoryMenu.BLOCK_ATLAS)); + return new TintedVertexConsumer(vertexConsumer, + 1.0f, + 0.95f, + 0.2f, + 1.0f); + }, + entity.level(), + 0 + ); + poseStack.popPose(); + + poseStack.pushPose(); + float starHalfWidth = 45 * 0.06f; + float starHalfHeight = 17 * 0.06f; + VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); + + Vec3 dir = summon.getLookAngle().normalize(); + double dist = -0.75; + poseStack.translate(dir.x * dist, dir.y * dist, dir.z * dist); + + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); + + poseStack.mulPose(Axis.YP.rotationDegrees(270)); + + poseStack.scale( + summon.getEntityData().get(StaticSummon.SCALE_X), + summon.getEntityData().get(StaticSummon.SCALE_Y), + summon.getEntityData().get(StaticSummon.SCALE_Z) + ); + + Vector3f color = new Vector3f(1.0f, 0.72f, 0.35f); + float alpha = 0.5f; + for(int i = 0; i < 1; i++) { + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, -starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, starHalfHeight, 0f) + .setColor(color.x, color.y, color.z, alpha).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + } + poseStack.popPose(); + } + }; + + public static final IStaticProjectileRenderBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileRenderBehavior() { + public static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/prismatic_bolt.png"); + + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticProjectile projectile)) return; + + poseStack.pushPose(); + float starHalfWidth = 72 * 0.02f; + float starHalfHeight = 72 * 0.02f; + VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(RES)); + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(projectile.getDeltaMovement().toVector3f(), 0); + float[] xyRot = MathUtil.computeXYRot(dirs[0]); + poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); + poseStack.mulPose(Axis.XP.rotationDegrees(xyRot[0])); + + poseStack.mulPose(Axis.XP.rotationDegrees(90)); + + poseStack.scale(1.0f, 2.0f, 1.0f); + + for(int i = 0; i < 3; i++) { + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, -starHalfHeight, 0f) + .setColor(1.0f, 1.0f, 1.0f, 1.0f).setUv(0.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, -starHalfHeight, 0f) + .setColor(1.0f, 1.0f, 1.0f, 1.0f).setUv(1.0f, 1.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), starHalfWidth, starHalfHeight, 0f) + .setColor(1.0f, 1.0f, 1.0f, 1.0f).setUv(1.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + starConsumer.addVertex(poseStack.last().pose(), -starHalfWidth, starHalfHeight, 0f) + .setColor(1.0f, 1.0f, 1.0f, 1.0f).setUv(0.0f, 0.0f) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); + } + poseStack.popPose(); + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java index cef12ad..5cc75d9 100644 --- a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java @@ -55,6 +55,14 @@ public class ModCreativeModeTabs { output.accept(ModItems.LAST_PRISM.get()); }).build()); + public static final DeferredHolder ACCESSORY_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_accessory_0", () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.lzxnoneterraria.accessory")) + .icon(() -> ModItems.MANA_FLOWER.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(ModItems.NATURES_GIFT.get()); + output.accept(ModItems.MANA_FLOWER.get()); + }).build()); + public static final DeferredHolder RANGED_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_ranged_0", () -> CreativeModeTab.builder() .title(Component.translatable("itemGroup.lzxnoneterraria.ranged")) .icon(() -> ModItems.SDMG.get().getDefaultInstance()) @@ -79,6 +87,11 @@ public class ModCreativeModeTabs { output.accept(ModItems.SNIPER_RIFLE.get()); output.accept(ModItems.CHAIN_GUN.get()); output.accept(ModItems.SDMG.get()); + output.accept(ModItems.SNOWBALL_CANNON.get()); + output.accept(ModItems.STAR_CANNON.get()); + output.accept(ModItems.SUPER_STAR_SHOOTER.get()); + output.accept(ModItems.FLAMETHROWER.get()); + output.accept(ModItems.ELF_MELTER.get()); output.accept(ModItems.MUSKET_BALL.get()); output.accept(ModItems.METEOR_SHOT.get()); output.accept(ModItems.SILVER_BULLET.get()); @@ -95,6 +108,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.ENDLESS_MUSKET_POUCH.get()); output.accept(ModItems.LUMINITE_BULLET.get()); output.accept(ModItems.TUNGSTEN_BULLET.get()); + output.accept(ModItems.FALLEN_STAR.get()); }).build()); public static final DeferredHolder SUMMON_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_summon_0", () -> CreativeModeTab.builder() diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 0be4728..6f7c3f3 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -59,7 +59,9 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING, StaticSummonBehaviors.LAST_PRISM_TRI, StaticSummonBehaviors.LAST_PRISM_BEAM, - StaticSummonBehaviors.TERRAPRISMA -> { + StaticSummonBehaviors.TERRAPRISMA, + StaticSummonBehaviors.FLAMETHROWER_FLAME, + StaticSummonBehaviors.ELF_MELTER_FLAME -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java b/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java index aec8ef2..47b3c98 100644 --- a/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java @@ -1,12 +1,11 @@ package com.lzxnone.terraria.effect; import com.lzxnone.terraria.LzxnoneTerraria; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.ParticleUtil; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -15,39 +14,17 @@ 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 AcidVenomEffect extends MobEffect { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PER_LEVEL_PATH = "effect.acid_venom.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 AcidVenomEffect() { - super(MobEffectCategory.HARMFUL, 0x8A2BE2); - } + public static final ConfigFloat DAMAGE_PER_LEVEL = new ConfigFloat("effect.acid_venom.damage_per_level", "acid_venom_damage_per_level", 2.0f, 0.0f, 8388600.0f); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PER_LEVEL_PATH, configText("acid_venom_damage_per_level"), configTooltip("acid_venom_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + ConfigStruct.loadAll(DAMAGE_PER_LEVEL); } }; - 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( "acid_venom", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/acid_venom.png"), @@ -55,6 +32,10 @@ public class AcidVenomEffect extends MobEffect { CONFIG_DATA ); + public AcidVenomEffect() { + super(MobEffectCategory.HARMFUL, 0x8A2BE2); + } + @Override public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { return true; @@ -64,7 +45,7 @@ public class AcidVenomEffect extends MobEffect { 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; + if(entity.hurt(entity.damageSources().magic(), DAMAGE_PER_LEVEL.get() * (amplifier + 1))) entity.invulnerableTime = 10; } ParticleUtil.addParticles( serverLevel, ModParticles.BLACK_DUST_PARTICLE.get(), diff --git a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java index c8768eb..9483640 100644 --- a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java @@ -2,53 +2,29 @@ package com.lzxnone.terraria.effect; import com.lzxnone.terraria.LzxnoneTerraria; 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.MathUtil; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.phys.Vec3; public class BloodButcheredEffect extends MobEffect { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PER_LEVEL_PATH = "effect.blood_butchered.damage_per_level"; - public static final float DAMAGE_PER_LEVEL_DEFAULT = 0.5f; - public static final float DAMAGE_PER_LEVEL_MIN = 0.0f; - public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f; - - public BloodButcheredEffect() { - super(MobEffectCategory.HARMFUL, 0xFF0000); - } + public static final ConfigFloat DAMAGE_PER_LEVEL = new ConfigFloat("effect.blood_butchered.damage_per_level", "blood_butcherer_damage_per_level", 0.5f, 0.0f, 8388600.0f); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PER_LEVEL_PATH, configText("blood_butcherer_damage_per_level"), configTooltip("blood_butcherer_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + ConfigStruct.loadAll(DAMAGE_PER_LEVEL); } }; - 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( "blood_butchered", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/blood_butchered.png"), @@ -56,6 +32,10 @@ public class BloodButcheredEffect extends MobEffect { CONFIG_DATA ); + public BloodButcheredEffect() { + super(MobEffectCategory.HARMFUL, 0xFF0000); + } + @Override public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { return true; @@ -65,7 +45,7 @@ public class BloodButcheredEffect extends MobEffect { public boolean applyEffectTick(LivingEntity entity, int amplifier) { if(entity.level() instanceof ServerLevel serverLevel) { if(entity.tickCount % 20 == 0) { - if(entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1))) entity.invulnerableTime = 10; + if(entity.hurt(entity.damageSources().magic(), (float) DAMAGE_PER_LEVEL.get() * (amplifier + 1))) entity.invulnerableTime = 10; } ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java b/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java index b34949d..1300e4e 100644 --- a/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java @@ -1,13 +1,11 @@ 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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.ParticleUtil; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -19,36 +17,15 @@ 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 ConfigFloat DAMAGE_PER_LEVEL = new ConfigFloat("effect.cursed_inferno.damage_per_level", "cursed_inferno_damage_per_level", 2.0f, 0.0f, 8388600.0f); 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); + ConfigStruct.loadAll(DAMAGE_PER_LEVEL); } }; - 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"), @@ -56,6 +33,10 @@ public class CursedInfernoEffect extends MobEffect { CONFIG_DATA ); + public CursedInfernoEffect() { + super(MobEffectCategory.HARMFUL, 0x66FF00); + } + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(0.5F, 1.0F, 0.5F), @@ -72,7 +53,7 @@ public class CursedInfernoEffect extends MobEffect { 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; + if(entity.hurt(entity.damageSources().magic(), DAMAGE_PER_LEVEL.get() * (amplifier + 1))) entity.invulnerableTime = 10; } ParticleUtil.addParticles( serverLevel, PARTICLE, diff --git a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java index d4cac90..c3917bd 100644 --- a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java @@ -2,10 +2,10 @@ package com.lzxnone.terraria.effect; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.particle.CircleParticleOptions; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.ParticleUtil; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -18,36 +18,15 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class DemonicFlamesEffect extends MobEffect { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PER_LEVEL_PATH = "effect.demonic_flames.damage_per_level"; - public static final float DAMAGE_PER_LEVEL_DEFAULT = 2.5f; - public static final float DAMAGE_PER_LEVEL_MIN = 0.0f; - public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f; - - public DemonicFlamesEffect() { - super(MobEffectCategory.HARMFUL, 0xCC2DC7); - } + public static final ConfigFloat DAMAGE_PER_LEVEL = new ConfigFloat("effect.demonic_flames.damage_per_level", "demonic_flames_damage_per_level", 2.5f, 0.0f, 8388600.0f); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PER_LEVEL_PATH, configText("demonic_flames_damage_per_level"), configTooltip("demonic_flames_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + ConfigStruct.loadAll(DAMAGE_PER_LEVEL); } }; - 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( "demonic_flames", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/demonic_flames.png"), @@ -55,6 +34,10 @@ public class DemonicFlamesEffect extends MobEffect { CONFIG_DATA ); + public DemonicFlamesEffect() { + super(MobEffectCategory.HARMFUL, 0xCC2DC7); + } + public static final CircleParticleOptions PARTICLE = new CircleParticleOptions(0.075f, 20, new Vector3f(0.8f, 0.176f, 0.78f)); @Override @@ -69,7 +52,7 @@ public class DemonicFlamesEffect extends MobEffect { if(instance != null) { if(entity.tickCount % 4 == 0) { entity.invulnerableTime = 5; - entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1)); + entity.hurt(entity.damageSources().magic(), (float) DAMAGE_PER_LEVEL.get() * (amplifier + 1)); } } diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java b/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java index ae2ade5..21cdfaa 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java @@ -3,20 +3,15 @@ package com.lzxnone.terraria.effect; import com.lzxnone.terraria.LzxnoneTerraria; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; -import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderLivingEvent; import org.joml.Matrix4f; -@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) public class EffectIconRenderer { private static final ResourceLocation CONFUSED_ICON = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect_display/confused.png"); diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java index 744cdb1..b62f141 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.effect; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.utils.SoundUtil; @@ -12,10 +11,8 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.MobEffectEvent; -@EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EffectLogicHandler { @SubscribeEvent diff --git a/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java b/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java index ade0a2d..17e0927 100644 --- a/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java @@ -1,44 +1,28 @@ 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 com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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 IchorEffect extends MobEffect { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_BONUS_PER_LEVEL_PATH = "effect.ichor.damage_bonus_per_level"; - public static final float DAMAGE_BONUS_PER_LEVEL_DEFAULT = 0.15f; - public static final float DAMAGE_BONUS_PER_LEVEL_MIN = 0.0f; - public static final float DAMAGE_BONUS_PER_LEVEL_MAX = 10.0f; - - public IchorEffect() { - super(MobEffectCategory.HARMFUL, 0xFFFF00); - } + public static final ConfigFloat DAMAGE_BONUS_PER_LEVEL = new ConfigFloat("effect.ichor.damage_bonus_per_level", "ichor_damage_bonus_per_level", 0.15f, 0.0f, 10.0f); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_BONUS_PER_LEVEL_PATH, configText("ichor_damage_bonus_per_level"), configTooltip("ichor_damage_bonus_per_level"), DAMAGE_BONUS_PER_LEVEL_DEFAULT, DAMAGE_BONUS_PER_LEVEL_MIN, DAMAGE_BONUS_PER_LEVEL_MAX); + ConfigStruct.loadAll(DAMAGE_BONUS_PER_LEVEL); } }; - 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 getDamageBonusPerLevel() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_BONUS_PER_LEVEL_PATH, DAMAGE_BONUS_PER_LEVEL_DEFAULT), DAMAGE_BONUS_PER_LEVEL_MIN, DAMAGE_BONUS_PER_LEVEL_MAX); + return DAMAGE_BONUS_PER_LEVEL.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -47,4 +31,8 @@ public class IchorEffect extends MobEffect { Component.translatable("effect.lzxnoneterraria.ichor"), CONFIG_DATA ); + + public IchorEffect() { + super(MobEffectCategory.HARMFUL, 0xFFFF00); + } } diff --git a/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java b/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java new file mode 100644 index 0000000..d221440 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java @@ -0,0 +1,42 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; + +public class ManaEffect extends MobEffect { + private static final int[] RECOVER_AMOUNTS = {50, 100, 200, 300}; + + public ManaEffect() { + super(MobEffectCategory.BENEFICIAL, 0x00D7FF); + } + + @Override + public boolean isInstantenous() { + return true; + } + + @Override + public void applyInstantenousEffect(Entity source, Entity indirectSource, LivingEntity livingEntity, int amplifier, double health) { + if(!(livingEntity instanceof ServerPlayer player)) return; + + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + mana.recoverManaImmediately(getRecoverAmount(amplifier)); + ManaSicknessEffect.applyTo(player); + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + PlayerManaSyncEventHandler.sync(player); + } + } + + public static int getRecoverAmount(int amplifier) { + int index = Math.clamp(amplifier, 0, RECOVER_AMOUNTS.length - 1); + return RECOVER_AMOUNTS[index]; + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java b/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java new file mode 100644 index 0000000..b094e25 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; + +public class ManaSicknessEffect extends MobEffect { + public static final ConfigInt DURATION_PER_USE = new ConfigInt("effect.mana_sickness.duration_per_use", "mana_sickness_duration_per_use", 100, 0, 1200); + public static final ConfigInt MAX_DURATION = new ConfigInt("effect.mana_sickness.max_duration", "mana_sickness_max_duration", 200, 0, 2400); + public static final ConfigFloat MAX_DAMAGE_REDUCTION = new ConfigFloat("effect.mana_sickness.max_damage_reduction", "mana_sickness_max_damage_reduction", 0.5F, 0.0F, 1.0F); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DURATION_PER_USE, MAX_DURATION, MAX_DAMAGE_REDUCTION); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "mana_sickness", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/mana_sickness.png"), + Component.translatable("effect.lzxnoneterraria.mana_sickness"), + CONFIG_DATA + ); + + public ManaSicknessEffect() { + super(MobEffectCategory.HARMFUL, 0x2BC4D8); + } + + public static void applyTo(LivingEntity entity) { + int durationPerUse = DURATION_PER_USE.get(); + int maxDuration = MAX_DURATION.get(); + if(durationPerUse <= 0 || maxDuration <= 0) return; + + MobEffectInstance current = entity.getEffect(ModEffects.MANA_SICKNESS); + int duration = Math.min(maxDuration, durationPerUse); + if(current != null) { + duration = Math.min(maxDuration, current.getDuration() + durationPerUse); + } + entity.addEffect(new MobEffectInstance(ModEffects.MANA_SICKNESS, duration, 0, false, true, true)); + } + + public static float getMagicDamageMultiplier(LivingEntity entity) { + MobEffectInstance instance = entity.getEffect(ModEffects.MANA_SICKNESS); + if(instance == null) return 1.0F; + + int maxDuration = MAX_DURATION.get(); + if(maxDuration <= 0) return 1.0F; + + float durationRatio = Math.min(1.0F, (float) instance.getDuration() / maxDuration); + float reduction = Math.min(1.0F, MAX_DAMAGE_REDUCTION.get()) * durationRatio; + return Math.max(0.0F, 1.0F - reduction); + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java b/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java index 11ff98f..4d0a67b 100644 --- a/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java @@ -1,44 +1,27 @@ 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 com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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 ConfigFloat DROP_CHANCE = new ConfigFloat("effect.midas.drop_chance", "midas_drop_chance", 0.25f, 0.0f, 1.0f); 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); + ConfigStruct.loadAll(DROP_CHANCE); } }; - 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); + return DROP_CHANCE.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -47,4 +30,9 @@ public class MidasEffect extends MobEffect { Component.translatable("effect.lzxnoneterraria.midas"), CONFIG_DATA ); + + public MidasEffect() { + super(MobEffectCategory.HARMFUL, 0xFFD700); + } + } diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index f909215..565d329 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -28,6 +28,10 @@ public class ModEffects { MOB_EFFECTS.register("acid_venom", AcidVenomEffect::new); public static final DeferredHolder SUMMON = MOB_EFFECTS.register("summon", SummonEffect::new); + public static final DeferredHolder MANA = + MOB_EFFECTS.register("mana", ManaEffect::new); + public static final DeferredHolder MANA_SICKNESS = + MOB_EFFECTS.register("mana_sickness", ManaSicknessEffect::new); public static final DeferredHolder MIDAS = MOB_EFFECTS.register("midas", MidasEffect::new); } diff --git a/src/main/java/com/lzxnone/terraria/effect/ModPotions.java b/src/main/java/com/lzxnone/terraria/effect/ModPotions.java index 0887cf5..4f5d0de 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModPotions.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModPotions.java @@ -41,8 +41,20 @@ public class ModPotions { registerSummonPotion("medium_summon_4", 36000, 4); public static final DeferredHolder LONG_SUMMON_4 = registerSummonPotion("long_summon_4", 216000, 4); + public static final DeferredHolder MANA_0 = + registerManaPotion("mana_0", 0); + public static final DeferredHolder MANA_1 = + registerManaPotion("mana_1", 1); + public static final DeferredHolder MANA_2 = + registerManaPotion("mana_2", 2); + public static final DeferredHolder MANA_3 = + registerManaPotion("mana_3", 3); private static DeferredHolder registerSummonPotion(String name, int duration, int amplifier) { return POTIONS.register(name, () -> new Potion("summon", new MobEffectInstance(ModEffects.SUMMON, duration, amplifier))); } + + private static DeferredHolder registerManaPotion(String name, int amplifier) { + return POTIONS.register(name, () -> new Potion("mana", new MobEffectInstance(ModEffects.MANA, 1, amplifier))); + } } diff --git a/src/main/java/com/lzxnone/terraria/effect/SummonEffect.java b/src/main/java/com/lzxnone/terraria/effect/SummonEffect.java index 8073870..410dd9d 100644 --- a/src/main/java/com/lzxnone/terraria/effect/SummonEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/SummonEffect.java @@ -1,44 +1,27 @@ 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 com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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 SummonEffect extends MobEffect { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String SUMMON_COUNT_PER_LEVEL_PATH = "effect.summon.summon_count_per_level"; - public static final int SUMMON_COUNT_PER_LEVEL_DEFAULT = 1; - public static final int SUMMON_COUNT_PER_LEVEL_MIN = 0; - public static final int SUMMON_COUNT_PER_LEVEL_MAX = 10; - - public SummonEffect() { - super(MobEffectCategory.BENEFICIAL, 0x34D95A); - } + public static final ConfigInt SUMMON_COUNT_PER_LEVEL = new ConfigInt("effect.summon.summon_count_per_level", "summon_summon_count_per_level", 1, 0, 10); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(SUMMON_COUNT_PER_LEVEL_PATH, configText("summon_summon_count_per_level"), configTooltip("summon_summon_count_per_level"), SUMMON_COUNT_PER_LEVEL_DEFAULT, SUMMON_COUNT_PER_LEVEL_MIN, SUMMON_COUNT_PER_LEVEL_MAX); + ConfigStruct.loadAll(SUMMON_COUNT_PER_LEVEL); } }; - 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 int getSummonCountPerLevel() { - return Math.clamp(ConfigUtil.readInt(SUMMON_COUNT_PER_LEVEL_PATH, SUMMON_COUNT_PER_LEVEL_DEFAULT), SUMMON_COUNT_PER_LEVEL_MIN, SUMMON_COUNT_PER_LEVEL_MAX); + return SUMMON_COUNT_PER_LEVEL.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -47,4 +30,8 @@ public class SummonEffect extends MobEffect { Component.translatable("effect.lzxnoneterraria.summon"), CONFIG_DATA ); + + public SummonEffect() { + super(MobEffectCategory.BENEFICIAL, 0x34D95A); + } } diff --git a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantmentConfigs.java b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantmentConfigs.java index 0e8b4d4..566c1c8 100644 --- a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantmentConfigs.java +++ b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantmentConfigs.java @@ -1,165 +1,110 @@ package com.lzxnone.terraria.enchantment; 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 com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; public class ModEnchantmentConfigs { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; private static final ResourceLocation ICON = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/ui/nav_enchantment_icon.png"); - public static final String MANA_LEAK_CONSUME_MULTIPLIER_PATH = "enchantment.mana_leak.consume_multiplier"; - public static final double MANA_LEAK_CONSUME_MULTIPLIER_DEFAULT = 1.25D; - public static final double MANA_LEAK_CONSUME_MULTIPLIER_MIN = 0.0D; - public static final double MANA_LEAK_CONSUME_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble MANA_LEAK_CONSUME_MULTIPLIER = new ConfigDouble("enchantment.mana_leak.consume_multiplier", "mana_leak_consume_multiplier", 1.25D, 0.0D, 10.0D); - public static final String MANA_EFFICIENCY_CONSUME_MULTIPLIER_PATH = "enchantment.mana_efficiency.consume_multiplier"; - public static final double MANA_EFFICIENCY_CONSUME_MULTIPLIER_DEFAULT = 0.85D; - public static final double MANA_EFFICIENCY_CONSUME_MULTIPLIER_MIN = 0.0D; - public static final double MANA_EFFICIENCY_CONSUME_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble MANA_EFFICIENCY_CONSUME_MULTIPLIER = new ConfigDouble("enchantment.mana_efficiency.consume_multiplier", "mana_efficiency_consume_multiplier", 0.85D, 0.0D, 10.0D); - public static final String MANA_GATHERING_RECOVER_MULTIPLIER_PATH = "enchantment.mana_gathering.recover_multiplier"; - public static final double MANA_GATHERING_RECOVER_MULTIPLIER_DEFAULT = 1.25D; - public static final double MANA_GATHERING_RECOVER_MULTIPLIER_MIN = 0.0D; - public static final double MANA_GATHERING_RECOVER_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER = new ConfigDouble("enchantment.arcane_amplification.damage_multiplier", "arcane_amplification_damage_multiplier", 1.15D, 0.0D, 10.0D); - public static final String MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_PATH = "enchantment.mana_gathering_curse.recover_multiplier"; - public static final double MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_DEFAULT = 0.5D; - public static final double MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MIN = 0.0D; - public static final double MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER = new ConfigDouble("enchantment.summon_amplification.damage_multiplier", "summon_amplification_damage_multiplier", 1.15D, 0.0D, 10.0D); - public static final String ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH = "enchantment.arcane_amplification.damage_multiplier"; - public static final double ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT = 1.15D; - public static final double ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN = 0.0D; - public static final double ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX = 10.0D; + public static final ConfigInt AMMO_EXHAUSTION_CONSUME_BONUS = new ConfigInt("enchantment.ammo_exhaustion.consume_bonus", "ammo_exhaustion_consume_bonus", 1, 0, 1024); - public static final String SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH = "enchantment.summon_amplification.damage_multiplier"; - public static final double SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT = 1.15D; - public static final double SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN = 0.0D; - public static final double SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble BULLET_HELL_NOT_CONSUME_CHANCE = new ConfigDouble("enchantment.bullet_hell.not_consume_chance", "bullet_hell_not_consume_chance", 0.5D, 0.0D, 1.0D); - public static final String AMMO_EXHAUSTION_CONSUME_BONUS_PATH = "enchantment.ammo_exhaustion.consume_bonus"; - public static final int AMMO_EXHAUSTION_CONSUME_BONUS_DEFAULT = 1; - public static final int AMMO_EXHAUSTION_CONSUME_BONUS_MIN = 0; - public static final int AMMO_EXHAUSTION_CONSUME_BONUS_MAX = 1024; + public static final ConfigDouble GUNPOWDER_DAMAGE_MULTIPLIER = new ConfigDouble("enchantment.gunpowder.damage_multiplier", "gunpowder_damage_multiplier", 1.15D, 0.0D, 10.0D); - public static final String BULLET_HELL_NOT_CONSUME_CHANCE_PATH = "enchantment.bullet_hell.not_consume_chance"; - public static final double BULLET_HELL_NOT_CONSUME_CHANCE_DEFAULT = 0.5D; - public static final double BULLET_HELL_NOT_CONSUME_CHANCE_MIN = 0.0D; - public static final double BULLET_HELL_NOT_CONSUME_CHANCE_MAX = 1.0D; - - public static final String GUNPOWDER_DAMAGE_MULTIPLIER_PATH = "enchantment.gunpowder.damage_multiplier"; - public static final double GUNPOWDER_DAMAGE_MULTIPLIER_DEFAULT = 1.15D; - public static final double GUNPOWDER_DAMAGE_MULTIPLIER_MIN = 0.0D; - public static final double GUNPOWDER_DAMAGE_MULTIPLIER_MAX = 10.0D; - - public static final String STEADY_BREATH_SPREAD_MULTIPLIER_PATH = "enchantment.steady_breath.spread_multiplier"; - public static final double STEADY_BREATH_SPREAD_MULTIPLIER_DEFAULT = 0.5D; - public static final double STEADY_BREATH_SPREAD_MULTIPLIER_MIN = 0.0D; - public static final double STEADY_BREATH_SPREAD_MULTIPLIER_MAX = 10.0D; + public static final ConfigDouble STEADY_BREATH_SPREAD_MULTIPLIER = new ConfigDouble("enchantment.steady_breath.spread_multiplier", "steady_breath_spread_multiplier", 0.5D, 0.0D, 10.0D); public static final ConfigListItem MANA_LEAK_CONFIG_LIST_ITEM = createConfigListItem( "mana_leak", "enchantment.lzxnoneterraria.mana_leak", - () -> ConfigFactory.loadDoubleConfig(MANA_LEAK_CONSUME_MULTIPLIER_PATH, configText("mana_leak_consume_multiplier"), configTooltip("mana_leak_consume_multiplier"), MANA_LEAK_CONSUME_MULTIPLIER_DEFAULT, MANA_LEAK_CONSUME_MULTIPLIER_MIN, MANA_LEAK_CONSUME_MULTIPLIER_MAX) + () -> MANA_LEAK_CONSUME_MULTIPLIER.load() ); public static final ConfigListItem MANA_EFFICIENCY_CONFIG_LIST_ITEM = createConfigListItem( "mana_efficiency", "enchantment.lzxnoneterraria.mana_efficiency", - () -> ConfigFactory.loadDoubleConfig(MANA_EFFICIENCY_CONSUME_MULTIPLIER_PATH, configText("mana_efficiency_consume_multiplier"), configTooltip("mana_efficiency_consume_multiplier"), MANA_EFFICIENCY_CONSUME_MULTIPLIER_DEFAULT, MANA_EFFICIENCY_CONSUME_MULTIPLIER_MIN, MANA_EFFICIENCY_CONSUME_MULTIPLIER_MAX) - ); - - public static final ConfigListItem MANA_GATHERING_CONFIG_LIST_ITEM = createConfigListItem( - "mana_gathering", - "enchantment.lzxnoneterraria.mana_gathering", - () -> ConfigFactory.loadDoubleConfig(MANA_GATHERING_RECOVER_MULTIPLIER_PATH, configText("mana_gathering_recover_multiplier"), configTooltip("mana_gathering_recover_multiplier"), MANA_GATHERING_RECOVER_MULTIPLIER_DEFAULT, MANA_GATHERING_RECOVER_MULTIPLIER_MIN, MANA_GATHERING_RECOVER_MULTIPLIER_MAX) - ); - - public static final ConfigListItem MANA_GATHERING_CURSE_CONFIG_LIST_ITEM = createConfigListItem( - "mana_gathering_curse", - "enchantment.lzxnoneterraria.mana_gathering_curse", - () -> ConfigFactory.loadDoubleConfig(MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_PATH, configText("mana_gathering_curse_recover_multiplier"), configTooltip("mana_gathering_curse_recover_multiplier"), MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_DEFAULT, MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MIN, MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MAX) + () -> MANA_EFFICIENCY_CONSUME_MULTIPLIER.load() ); public static final ConfigListItem ARCANE_AMPLIFICATION_CONFIG_LIST_ITEM = createConfigListItem( "arcane_amplification", "enchantment.lzxnoneterraria.arcane_amplification", - () -> ConfigFactory.loadDoubleConfig(ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH, configText("arcane_amplification_damage_multiplier"), configTooltip("arcane_amplification_damage_multiplier"), ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT, ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN, ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX) + () -> ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER.load() ); public static final ConfigListItem SUMMON_AMPLIFICATION_CONFIG_LIST_ITEM = createConfigListItem( "summon_amplification", "enchantment.lzxnoneterraria.summon_amplification", - () -> ConfigFactory.loadDoubleConfig(SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH, configText("summon_amplification_damage_multiplier"), configTooltip("summon_amplification_damage_multiplier"), SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT, SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN, SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX) + () -> SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER.load() ); public static final ConfigListItem AMMO_EXHAUSTION_CONFIG_LIST_ITEM = createConfigListItem( "ammo_exhaustion", "enchantment.lzxnoneterraria.ammo_exhaustion", - () -> ConfigFactory.loadIntConfig(AMMO_EXHAUSTION_CONSUME_BONUS_PATH, configText("ammo_exhaustion_consume_bonus"), configTooltip("ammo_exhaustion_consume_bonus"), AMMO_EXHAUSTION_CONSUME_BONUS_DEFAULT, AMMO_EXHAUSTION_CONSUME_BONUS_MIN, AMMO_EXHAUSTION_CONSUME_BONUS_MAX) + () -> AMMO_EXHAUSTION_CONSUME_BONUS.load() ); public static final ConfigListItem BULLET_HELL_CONFIG_LIST_ITEM = createConfigListItem( "bullet_hell", "enchantment.lzxnoneterraria.bullet_hell", - () -> ConfigFactory.loadDoubleConfig(BULLET_HELL_NOT_CONSUME_CHANCE_PATH, configText("bullet_hell_not_consume_chance"), configTooltip("bullet_hell_not_consume_chance"), BULLET_HELL_NOT_CONSUME_CHANCE_DEFAULT, BULLET_HELL_NOT_CONSUME_CHANCE_MIN, BULLET_HELL_NOT_CONSUME_CHANCE_MAX) + () -> BULLET_HELL_NOT_CONSUME_CHANCE.load() ); public static final ConfigListItem GUNPOWDER_CONFIG_LIST_ITEM = createConfigListItem( "gunpowder", "enchantment.lzxnoneterraria.gunpowder", - () -> ConfigFactory.loadDoubleConfig(GUNPOWDER_DAMAGE_MULTIPLIER_PATH, configText("gunpowder_damage_multiplier"), configTooltip("gunpowder_damage_multiplier"), GUNPOWDER_DAMAGE_MULTIPLIER_DEFAULT, GUNPOWDER_DAMAGE_MULTIPLIER_MIN, GUNPOWDER_DAMAGE_MULTIPLIER_MAX) + () -> GUNPOWDER_DAMAGE_MULTIPLIER.load() ); public static final ConfigListItem STEADY_BREATH_CONFIG_LIST_ITEM = createConfigListItem( "steady_breath", "enchantment.lzxnoneterraria.steady_breath", - () -> ConfigFactory.loadDoubleConfig(STEADY_BREATH_SPREAD_MULTIPLIER_PATH, configText("steady_breath_spread_multiplier"), configTooltip("steady_breath_spread_multiplier"), STEADY_BREATH_SPREAD_MULTIPLIER_DEFAULT, STEADY_BREATH_SPREAD_MULTIPLIER_MIN, STEADY_BREATH_SPREAD_MULTIPLIER_MAX) + () -> STEADY_BREATH_SPREAD_MULTIPLIER.load() ); public static double getManaLeakConsumeMultiplier() { - return readDouble(MANA_LEAK_CONSUME_MULTIPLIER_PATH, MANA_LEAK_CONSUME_MULTIPLIER_DEFAULT, MANA_LEAK_CONSUME_MULTIPLIER_MIN, MANA_LEAK_CONSUME_MULTIPLIER_MAX); + return MANA_LEAK_CONSUME_MULTIPLIER.get(); } public static double getManaEfficiencyConsumeMultiplier() { - return readDouble(MANA_EFFICIENCY_CONSUME_MULTIPLIER_PATH, MANA_EFFICIENCY_CONSUME_MULTIPLIER_DEFAULT, MANA_EFFICIENCY_CONSUME_MULTIPLIER_MIN, MANA_EFFICIENCY_CONSUME_MULTIPLIER_MAX); - } - - public static double getManaGatheringRecoverMultiplier() { - return readDouble(MANA_GATHERING_RECOVER_MULTIPLIER_PATH, MANA_GATHERING_RECOVER_MULTIPLIER_DEFAULT, MANA_GATHERING_RECOVER_MULTIPLIER_MIN, MANA_GATHERING_RECOVER_MULTIPLIER_MAX); - } - - public static double getManaGatheringCurseRecoverMultiplier() { - return readDouble(MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_PATH, MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_DEFAULT, MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MIN, MANA_GATHERING_CURSE_RECOVER_MULTIPLIER_MAX); + return MANA_EFFICIENCY_CONSUME_MULTIPLIER.get(); } public static double getArcaneAmplificationDamageMultiplier() { - return readDouble(ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH, ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT, ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN, ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX); + return ARCANE_AMPLIFICATION_DAMAGE_MULTIPLIER.get(); } public static double getSummonAmplificationDamageMultiplier() { - return readDouble(SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_PATH, SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_DEFAULT, SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MIN, SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER_MAX); + return SUMMON_AMPLIFICATION_DAMAGE_MULTIPLIER.get(); } public static int getAmmoExhaustionConsumeBonus() { - return Math.clamp(ConfigUtil.readInt(AMMO_EXHAUSTION_CONSUME_BONUS_PATH, AMMO_EXHAUSTION_CONSUME_BONUS_DEFAULT), AMMO_EXHAUSTION_CONSUME_BONUS_MIN, AMMO_EXHAUSTION_CONSUME_BONUS_MAX); + return AMMO_EXHAUSTION_CONSUME_BONUS.get(); } public static double getBulletHellNotConsumeChance() { - return readDouble(BULLET_HELL_NOT_CONSUME_CHANCE_PATH, BULLET_HELL_NOT_CONSUME_CHANCE_DEFAULT, BULLET_HELL_NOT_CONSUME_CHANCE_MIN, BULLET_HELL_NOT_CONSUME_CHANCE_MAX); + return BULLET_HELL_NOT_CONSUME_CHANCE.get(); } public static double getGunpowderDamageMultiplier() { - return readDouble(GUNPOWDER_DAMAGE_MULTIPLIER_PATH, GUNPOWDER_DAMAGE_MULTIPLIER_DEFAULT, GUNPOWDER_DAMAGE_MULTIPLIER_MIN, GUNPOWDER_DAMAGE_MULTIPLIER_MAX); + return GUNPOWDER_DAMAGE_MULTIPLIER.get(); } public static double getSteadyBreathSpreadMultiplier() { - return readDouble(STEADY_BREATH_SPREAD_MULTIPLIER_PATH, STEADY_BREATH_SPREAD_MULTIPLIER_DEFAULT, STEADY_BREATH_SPREAD_MULTIPLIER_MIN, STEADY_BREATH_SPREAD_MULTIPLIER_MAX); + return STEADY_BREATH_SPREAD_MULTIPLIER.get(); } private static ConfigListItem createConfigListItem(String id, String nameKey, Runnable loader) { @@ -171,15 +116,5 @@ public class ModEnchantmentConfigs { }); } - 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"); - } - - private static double readDouble(String path, double defaultValue, double minValue, double maxValue) { - return Math.clamp(ConfigUtil.readDouble(path, defaultValue), minValue, maxValue); - } } diff --git a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java index db9984a..1df8141 100644 --- a/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java +++ b/src/main/java/com/lzxnone/terraria/enchantment/ModEnchantments.java @@ -9,8 +9,6 @@ import net.minecraft.world.item.enchantment.Enchantment; public class ModEnchantments { public static final ResourceKey MANA_LEAK = create("mana_leak"); public static final ResourceKey MANA_EFFICIENCY = create("mana_efficiency"); - public static final ResourceKey MANA_GATHERING = create("mana_gathering"); - public static final ResourceKey MANA_GATHERING_CURSE = create("mana_gathering_curse"); public static final ResourceKey ARCANE_AMPLIFICATION = create("arcane_amplification"); public static final ResourceKey SUMMON_AMPLIFICATION = create("summon_amplification"); public static final ResourceKey AMMO_EXHAUSTION = create("ammo_exhaustion"); diff --git a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java index 943e376..3864b30 100644 --- a/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/projectile/StaticProjectileBehaviors.java @@ -2,6 +2,8 @@ package com.lzxnone.terraria.entity.projectile; import com.lzxnone.terraria.item.ammo.CrystalBullet; import com.lzxnone.terraria.item.weapon.melee.*; +import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; +import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; @@ -24,6 +26,7 @@ public class StaticProjectileBehaviors { public static final String DEVILS_DEVASTATION_PROJECTILE2 = "devils_devastation_projectile2"; public static final String DEVILS_DEVASTATION_PROJECTILE3 = "devils_devastation_projectile3"; public static final String CRYSTAL_FRAGMENT = "crystal_fragment"; + public static final String SUPER_STAR_PRISMATIC_BOLT = "super_star_prismatic_blot"; static { BEHAVIORS.put(DEFAULT, new IStaticProjectileBehavior() { @@ -52,9 +55,10 @@ public class StaticProjectileBehaviors { BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE2, DevilsDevastation.PROJECTILE_BEHAVIOR2); BEHAVIORS.put(DEVILS_DEVASTATION_PROJECTILE3, DevilsDevastation.PROJECTILE_BEHAVIOR3); BEHAVIORS.put(CRYSTAL_FRAGMENT, CrystalBullet.PROJECTILE_BEHAVIOR); + BEHAVIORS.put(SUPER_STAR_PRISMATIC_BOLT, SuperStarShooter.PROJECTILE_BEHAVIOR); } public static IStaticProjectileBehavior getBehavior(String id) { return BEHAVIORS.getOrDefault(id, BEHAVIORS.get(DEFAULT)); } -} \ No newline at end of file +} diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index 72ff9f9..cd8dd8c 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -1,8 +1,13 @@ package com.lzxnone.terraria.entity.summon; import com.lzxnone.terraria.item.ammo.*; +import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; +import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; +import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; +import com.lzxnone.terraria.item.weapon.ranged.StarCannon; +import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; import com.lzxnone.terraria.item.weapon.summon.Terraprisma; import java.util.HashMap; @@ -34,7 +39,7 @@ public class StaticSummonBehaviors { public static final String LAST_PRISM_BEAM = "last_prism_beam"; public static final String TERRAPRISMA = "terraprisma"; - //弹药实体 + //通用子弹实体 public static final String MUSKET_BALL = "musket_ball"; public static final String METEOR_SHOT = "meteor_shot"; public static final String SILVER_BULLET = "silver_bullet"; @@ -51,6 +56,13 @@ public class StaticSummonBehaviors { public static final String LUMINITE_BULLET = "luminite_bullet"; public static final String TUNGSTEN_BULLET = "tungsten_bullet"; + //特殊子弹实体 + public static final String SNOWBALL = "snowball"; + public static final String FALLEN_STAR = "fallen_star"; + public static final String FALLEN_STAR_SUPER = "fallen_star_super"; + public static final String FLAMETHROWER_FLAME = "flamethrower_flame"; + public static final String ELF_MELTER_FLAME = "elf_melter_flame"; + static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); @@ -89,6 +101,12 @@ public class StaticSummonBehaviors { BEHAVIORS.put(GOLDEN_BULLET, GoldenBullet.SUMMON_BEHAVIOR); BEHAVIORS.put(LUMINITE_BULLET, LuminiteBullet.SUMMON_BEHAVIOR); BEHAVIORS.put(TUNGSTEN_BULLET, TungstenBullet.SUMMON_BEHAVIOR); + + BEHAVIORS.put(SNOWBALL, SnowballCannon.SUMMON_BEHAVIOR); + BEHAVIORS.put(FALLEN_STAR, StarCannon.SUMMON_BEHAVIOR); + BEHAVIORS.put(FALLEN_STAR_SUPER, SuperStarShooter.SUMMON_BEHAVIOR); + BEHAVIORS.put(FLAMETHROWER_FLAME, Flamethrower.SUMMON_BEHAVIOR); + BEHAVIORS.put(ELF_MELTER_FLAME, ElfMelter.SUMMON_BEHAVIOR); } public static IStaticSummonBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java index efe0434..53cdcc0 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java @@ -24,12 +24,14 @@ public class EntityDeathEventHandler { public static void onEntityDeath(LivingDeathEvent event) { LivingEntity livingEntity = event.getEntity(); - //消耗插入的破灭魔王剑 + if(livingEntity.level() instanceof ServerLevel serverLevel) { + //迈达斯生成绿宝石 if(livingEntity.hasEffect(ModEffects.MIDAS) && livingEntity.getRandom().nextFloat() < MidasEffect.getDropChance()) { livingEntity.spawnAtLocation(new ItemStack(Items.EMERALD)); } + //消耗插入的破灭魔王剑 List stuckList = livingEntity.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE); while(!stuckList.isEmpty()) { UUID uuid = stuckList.getLast(); diff --git a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java new file mode 100644 index 0000000..cc64a11 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java @@ -0,0 +1,70 @@ +package com.lzxnone.terraria.event; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.network.payload.ManaSyncPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.ItemStack; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.player.PlayerEvent; +import net.neoforged.neoforge.event.tick.PlayerTickEvent; +import net.neoforged.neoforge.network.PacketDistributor; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID) +public class PlayerManaSyncEventHandler { + @SubscribeEvent + public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + if(event.getEntity() instanceof ServerPlayer player) { + sync(player); + } + } + + @SubscribeEvent + public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { + if(event.getEntity() instanceof ServerPlayer player) { + sync(player); + } + } + + @SubscribeEvent + public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) { + if(event.getEntity() instanceof ServerPlayer player) { + sync(player); + } + } + + @SubscribeEvent + public static void onPlayerTick(PlayerTickEvent.Post event) { + if(!(event.getEntity() instanceof ServerPlayer player)) return; + if(isUsingMagicWeapon(player)) return; + + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + if(mana.tickRecoverDelay()) { + player.setData(ModAttachments.PLAYER_MANA, mana); + return; + } + + int oldMana = mana.getMana(); + if(!mana.recoverMana(PlayerMana.DEFAULT_RECOVER_RATE)) return; + + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + sync(player); + } + } + + public static void sync(ServerPlayer player) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + PacketDistributor.sendToPlayer(player, new ManaSyncPayload(mana.getMana(), mana.getMaxMana())); + } + + private static boolean isUsingMagicWeapon(ServerPlayer player) { + if(!player.isUsingItem()) return false; + + ItemStack stack = player.getUseItem(); + return stack.getItem() instanceof MagicWeapon; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/ModItemTags.java b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java index a4253a9..1ce0813 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItemTags.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java @@ -7,6 +7,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; public class ModItemTags { + public static final TagKey AMMO = create("ammo"); public static final TagKey BULLET_AMMO = create("bullet_ammo"); private static TagKey create(String name) { diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index af8dd68..a0588d2 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -2,11 +2,16 @@ 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.first_fractal.*; +import com.lzxnone.terraria.item.accessory.ManaFlower; +import com.lzxnone.terraria.item.accessory.NaturesGift; +import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.*; -import com.lzxnone.terraria.item.weapon.ranged.*; +import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; +import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; +import com.lzxnone.terraria.item.weapon.ranged.StarCannon; +import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; +import com.lzxnone.terraria.item.weapon.ranged.gun.*; import com.lzxnone.terraria.item.weapon.summon.*; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; @@ -65,6 +70,11 @@ public class ModItems { public static final DeferredItem SNIPER_RIFLE = ITEMS.register("sniper_rifle", SniperRifle::new); public static final DeferredItem CHAIN_GUN = ITEMS.register("chain_gun", ChainGun::new); public static final DeferredItem SDMG = ITEMS.register("sdmg", SDMG::new); + public static final DeferredItem SNOWBALL_CANNON = ITEMS.register("snowball_cannon", SnowballCannon::new); + public static final DeferredItem STAR_CANNON = ITEMS.register("star_cannon", StarCannon::new); + public static final DeferredItem SUPER_STAR_SHOOTER = ITEMS.register("super_star_shooter", SuperStarShooter::new); + public static final DeferredItem FLAMETHROWER = ITEMS.register("flamethrower", Flamethrower::new); + public static final DeferredItem ELF_MELTER = ITEMS.register("elf_melter", ElfMelter::new); //召唤武器 public static final DeferredItem TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new); @@ -89,6 +99,11 @@ public class ModItems { public static final DeferredItem ENDLESS_MUSKET_POUCH = ITEMS.register("endless_musket_pouch", EndlessMusketPouch::new); public static final DeferredItem LUMINITE_BULLET = ITEMS.register("luminite_bullet", LuminiteBullet::new); public static final DeferredItem TUNGSTEN_BULLET = ITEMS.register("tungsten_bullet", TungstenBullet::new); + public static final DeferredItem FALLEN_STAR = ITEMS.register("fallen_star", FallenStar::new); + + //饰品 + public static final DeferredItem NATURES_GIFT = ITEMS.register("natures_gift", NaturesGift::new); + public static final DeferredItem MANA_FLOWER = ITEMS.register("mana_flower", ManaFlower::new); //弹射物 public static final DeferredItem BULLET_PROJECTILE = ITEMS.register("bullet_projectile", () -> new Item(new Item.Properties())); @@ -106,6 +121,7 @@ public class ModItems { public static final DeferredItem EXPLODING_BULLET_PROJECTILE = ITEMS.register("exploding_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem GOLDEN_BULLET_PROJECTILE = ITEMS.register("golden_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem LUMINITE_BULLET_PROJECTILE = ITEMS.register("luminite_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem WHITE_STAR = ITEMS.register("white_star", () -> new Item(new Item.Properties())); public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", () -> new Item(new Item.Properties())); public static final DeferredItem STARFURY_STAR = ITEMS.register("starfury_star", () -> new Item(new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryItem.java b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryItem.java new file mode 100644 index 0000000..97ea85f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryItem.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.accessory; + +import net.minecraft.world.item.Item; +import top.theillusivec4.curios.api.type.capability.ICurioItem; + +public class AccessoryItem extends Item implements ICurioItem { + public AccessoryItem(Properties properties) { + super(properties); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java new file mode 100644 index 0000000..21cff96 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -0,0 +1,26 @@ +package com.lzxnone.terraria.item.accessory; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.type.inventory.IDynamicStackHandler; + +import java.util.function.BiConsumer; + +public class AccessoryUtil { + public static final String TERRARIA_ACCESSORY_SLOT = "terraria_accessory"; + + public static void forEachAccessory(LivingEntity entity, BiConsumer consumer) { + CuriosApi.getCuriosInventory(entity) + .flatMap(handler -> handler.getStacksHandler(TERRARIA_ACCESSORY_SLOT)) + .ifPresent(stacksHandler -> { + IDynamicStackHandler stacks = stacksHandler.getStacks(); + for(int i = 0; i < stacks.getSlots(); i++) { + ItemStack stack = stacks.getStackInSlot(i); + if(stack.getItem() instanceof AccessoryItem accessory) { + consumer.accept(accessory, stack); + } + } + }); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java new file mode 100644 index 0000000..30e0fa4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.accessory.effect.AutoManaPotionUser; +import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoManaPotionUser { + private static final double MANA_COST_MULTIPLIER = 0.92D; + + public ManaFlower() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + + @Override + public double getManaCostMultiplier(ItemStack stack, LivingEntity entity) { + return MANA_COST_MULTIPLIER; + } + + @Override + public boolean canAutoUseManaPotion(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mana_flower.0").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mana_flower.1").withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java new file mode 100644 index 0000000..39b76ef --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java @@ -0,0 +1,31 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class NaturesGift extends AccessoryItem implements ManaCostModifier { + private static final double MANA_COST_MULTIPLIER = 0.94D; + + public NaturesGift() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + @Override + public double getManaCostMultiplier(ItemStack stack, LivingEntity entity) { + return MANA_COST_MULTIPLIER; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.natures_gift.0").withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java b/src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java new file mode 100644 index 0000000..aeac9f3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.accessory.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface AutoManaPotionUser { + boolean canAutoUseManaPotion(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java b/src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java new file mode 100644 index 0000000..5b6f4ca --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.accessory.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface ManaCostModifier { + double getManaCostMultiplier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/AmmoConfig.java b/src/main/java/com/lzxnone/terraria/item/ammo/AmmoConfig.java deleted file mode 100644 index e607984..0000000 --- a/src/main/java/com/lzxnone/terraria/item/ammo/AmmoConfig.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.lzxnone.terraria.item.ammo; - -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; - -public class AmmoConfig { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - private AmmoConfig() { - } - - public static String path(String id, String key) { - return "ammo." + id + "." + key; - } - - public static String translationKey(String id, String key) { - return id + "_" + key; - } - - public static void loadFloat(String id, String key, float defaultValue, float minValue, float maxValue) { - ConfigFactory.loadFloatConfig( - path(id, key), - configText(translationKey(id, key)), - configTooltip(translationKey(id, key)), - defaultValue, - minValue, - maxValue - ); - } - - public static void loadDouble(String id, String key, double defaultValue, double minValue, double maxValue) { - ConfigFactory.loadDoubleConfig( - path(id, key), - configText(translationKey(id, key)), - configTooltip(translationKey(id, key)), - defaultValue, - minValue, - maxValue - ); - } - - public static void loadInt(String id, String key, int defaultValue, int minValue, int maxValue) { - ConfigFactory.loadIntConfig( - path(id, key), - configText(translationKey(id, key)), - configTooltip(translationKey(id, key)), - defaultValue, - minValue, - maxValue - ); - } - - public static float readFloat(String id, String key, float defaultValue, float minValue, float maxValue) { - return Math.clamp(ConfigUtil.readFloat(path(id, key), defaultValue), minValue, maxValue); - } - - public static double readDouble(String id, String key, double defaultValue, double minValue, double maxValue) { - return Math.clamp(ConfigUtil.readDouble(path(id, key), defaultValue), minValue, maxValue); - } - - public static int readInt(String id, String key, int defaultValue, int minValue, int maxValue) { - return Math.clamp(ConfigUtil.readInt(path(id, key), defaultValue), minValue, maxValue); - } - - public static ConfigListItem createListItem(String id, IConfigData configData) { - return new ConfigListItem( - id, - ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + id + ".png"), - Component.translatable("item.lzxnoneterraria." + id), - configData - ); - } - - 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"); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java index 60f57a4..4f75870 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java @@ -1,13 +1,19 @@ 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.particle.DustParticleOptions; -import com.lzxnone.terraria.particle.ModParticles; 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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; + 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.level.ClipContext; @@ -16,15 +22,13 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import org.joml.Vector3f; import java.util.List; public class ChlorophyteBullet extends BulletAmmo { public static final String ID = "chlorophyte_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 1.5f; - public static final double SPEED_DEFAULT = 3.0D; - public static final double TARGET_RANGE_DEFAULT = 24.0D; public static final double AVOID_CHECK_DISTANCE = 3.0D; public static final double TURN_RATE = 0.35D; @@ -33,28 +37,23 @@ public class ChlorophyteBullet extends BulletAmmo { public static final double TARGET_WEIGHT = 1.0D; public static final double AVOID_WEIGHT = 0.8D; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.chlorophyte_bullet.base_damage", "chlorophyte_bullet_base_damage", 1.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.chlorophyte_bullet.speed", "chlorophyte_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble("ammo.chlorophyte_bullet.target_range", "chlorophyte_bullet_target_range", 24.0D, 0.0D, 128.0D); + public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadDouble(ID, "target_range", TARGET_RANGE_DEFAULT, 0.0D, 128.0D); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, TARGET_RANGE); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static double getTargetRange() { - return AmmoConfig.readDouble(ID, "target_range", TARGET_RANGE_DEFAULT, 0.0D, 128.0D); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); private static final double[][] CANDIDATE_OFFSETS = new double[][]{ {0.0D, 0.0D}, @@ -85,7 +84,7 @@ public class ChlorophyteBullet extends BulletAmmo { this.checkBeforeTick(summon); Vec3 currentDir = getCurrentDirection(summon); - Vec3 oldMotion = currentDir.normalize().scale(getSpeed()); + Vec3 oldMotion = currentDir.normalize().scale(SPEED.get()); Entity target = findTarget(summon); Vec3 nextDir = currentDir; @@ -102,7 +101,7 @@ public class ChlorophyteBullet extends BulletAmmo { nextDir = steer(currentDir, findBestClearDirection(summon, currentDir, currentDir)); } - Vec3 motion = nextDir.normalize().scale(getSpeed()); + Vec3 motion = nextDir.normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -145,7 +144,7 @@ public class ChlorophyteBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity hitTarget = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, hitTarget, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, hitTarget, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { hitTarget.invulnerableTime = invulnerableTime; this.onDied(summon); return; @@ -162,7 +161,7 @@ public class ChlorophyteBullet extends BulletAmmo { }; private static Entity findTarget(StaticSummon summon) { - AABB searchBox = summon.getBoundingBox().inflate(getTargetRange()); + AABB searchBox = summon.getBoundingBox().inflate(TARGET_RANGE.get()); List targets = CollisionUtil.searchEnemies(summon.level(), searchBox, summon, summon.getOwner()); Entity bestTarget = null; double bestDistance = Double.MAX_VALUE; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java index 7b536cc..ce2022b 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.ammo; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -10,76 +11,55 @@ import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.ModParticles; 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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; + import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.*; + import org.joml.Vector3f; import java.util.List; public class CrystalBullet extends BulletAmmo { public static final String ID = "crystal_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 1.2f; - public static final double SPEED_DEFAULT = 3.0D; - public static final float FRAGMENT_DAMAGE_MUL_DEFAULT = 0.5f; - public static final double FRAGMENT_SPEED_DEFAULT = 1.0; - public static final int FRAGMENT_TIME_DEFAULT = 60; - public static final int FRAGMENT_COUNT_DEFAULT = 3; - public static final int PARTICLE_COUNT_DEFAULT = 5; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.crystal_bullet.base_damage", "crystal_bullet_base_damage", 1.2f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.crystal_bullet.speed", "crystal_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigFloat FRAGMENT_DAMAGE_MULTIPLIER = new ConfigFloat("ammo.crystal_bullet.fragment_damage_multiplier", "crystal_bullet_fragment_damage_multiplier", 0.5f, 0.0f, 100.0f); + public static final ConfigDouble FRAGMENT_SPEED = new ConfigDouble("ammo.crystal_bullet.fragment_speed", "crystal_bullet_fragment_speed", 1.0, 0.0D, 24.0D); + public static final ConfigInt FRAGMENT_TIME = new ConfigInt("ammo.crystal_bullet.fragment_time", "crystal_bullet_fragment_time", 60, 0, 72000); + public static final ConfigInt FRAGMENT_COUNT = new ConfigInt("ammo.crystal_bullet.fragment_count", "crystal_bullet_fragment_count", 3, 0, 100); + public static final ConfigInt PARTICLE_COUNT = new ConfigInt("ammo.crystal_bullet.particle_count", "crystal_bullet_particle_count", 5, 0, 1000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadFloat(ID, "fragment_damage_multiplier", FRAGMENT_DAMAGE_MUL_DEFAULT, 0.0f, 100.0f); - AmmoConfig.loadDouble(ID, "fragment_speed", FRAGMENT_SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadInt(ID, "fragment_time", FRAGMENT_TIME_DEFAULT, 0, 72000); - AmmoConfig.loadInt(ID, "fragment_count", FRAGMENT_COUNT_DEFAULT, 0, 100); - AmmoConfig.loadInt(ID, "particle_count", PARTICLE_COUNT_DEFAULT, 0, 1000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, FRAGMENT_DAMAGE_MULTIPLIER, FRAGMENT_SPEED, FRAGMENT_TIME, FRAGMENT_COUNT, PARTICLE_COUNT); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static float getFragmentDamageMultiplier() { - return AmmoConfig.readFloat(ID, "fragment_damage_multiplier", FRAGMENT_DAMAGE_MUL_DEFAULT, 0.0f, 100.0f); - } - - public static double getFragmentSpeed() { - return AmmoConfig.readDouble(ID, "fragment_speed", FRAGMENT_SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static int getFragmentTime() { - return AmmoConfig.readInt(ID, "fragment_time", FRAGMENT_TIME_DEFAULT, 0, 72000); - } - - public static int getFragmentCount() { - return AmmoConfig.readInt(ID, "fragment_count", FRAGMENT_COUNT_DEFAULT, 0, 100); - } - - public static int getParticleCount() { - return AmmoConfig.readInt(ID, "particle_count", PARTICLE_COUNT_DEFAULT, 0, 1000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -103,16 +83,16 @@ public class CrystalBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; summon.setPos(end); - for(int i = 0;i < getFragmentCount();i++) { - summonProjectile(summon, (getBaseDamage() + damage) * getFragmentDamageMultiplier()); + for(int i = 0;i < FRAGMENT_COUNT.get();i++) { + summonProjectile(summon, (BASE_DAMAGE.get() + damage) * FRAGMENT_DAMAGE_MULTIPLIER.get()); } ParticleUtil.addParticles( (ServerLevel) summon.level(), ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), summon.position(), new Vec3(0.2, 0.2, 0.2), - 0.2, getParticleCount() + 0.2, PARTICLE_COUNT.get() ); this.onDied(summon); return; @@ -125,13 +105,13 @@ public class CrystalBullet extends BulletAmmo { summon.setPos(blockHitResult.getLocation()); CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; - for(int i = 0;i < getFragmentCount();i++) { - summonProjectile(summon, (getBaseDamage() + damage) * getFragmentDamageMultiplier()); + for(int i = 0;i < FRAGMENT_COUNT.get();i++) { + summonProjectile(summon, (BASE_DAMAGE.get() + damage) * FRAGMENT_DAMAGE_MULTIPLIER.get()); } ParticleUtil.addParticles( (ServerLevel) summon.level(), ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), summon.position(), new Vec3(0.2, 0.2, 0.2), - 0.2, getParticleCount() + 0.2, PARTICLE_COUNT.get() ); this.onDied(summon); return; @@ -188,8 +168,8 @@ public class CrystalBullet extends BulletAmmo { projectile.getEntityData().set(StaticProjectile.SCALE_Y, 0.5f); projectile.getEntityData().set(StaticProjectile.SCALE_Z, 0.5f); projectile.getEntityData().set(StaticProjectile.RXPS, 10); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getFragmentTime()); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getFragmentSpeed())); + projectile.getEntityData().set(StaticProjectile.LIFETIME, FRAGMENT_TIME.get()); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", FRAGMENT_SPEED.get())); CompoundTag customData = new CompoundTag(); customData.putFloat("damage", damage); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java index ba8f69a..1a042b0 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -1,14 +1,22 @@ 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.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -22,38 +30,30 @@ import java.util.List; public class CursedBullet extends BulletAmmo { public static final String ID = "cursed_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 2.0f; - public static final double SPEED_DEFAULT = 3.0D; - public static final int EFFECT_TIME_DEFAULT = 140; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.cursed_bullet.base_damage", "cursed_bullet_base_damage", 2.0f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.cursed_bullet.speed", "cursed_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigInt EFFECT_TIME = new ConfigInt("ammo.cursed_bullet.effect_time", "cursed_bullet_effect_time", 140, 0, 72000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, EFFECT_TIME); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static int getEffectTime() { - return AmmoConfig.readInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -77,10 +77,10 @@ public class CursedBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(target instanceof LivingEntity livingEntity) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CURSED_INFERNO, getEffectTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CURSED_INFERNO, EFFECT_TIME.get(), 0); livingEntity.addEffect(effectInstance); } this.onDied(summon); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java index dcc2aed..e379e91 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.ammo; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -7,8 +8,15 @@ import com.lzxnone.terraria.particle.DustParticleOptions; import com.lzxnone.terraria.particle.ModParticles; 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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; + import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; @@ -16,44 +24,32 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import org.joml.Vector3f; import java.util.List; public class ExplodingBullet extends BulletAmmo { public static final String ID = "exploding_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 1.5f; - public static final double SPEED_DEFAULT = 3.0D; - public static final float KNOCKBACK_MULTIPLIER_DEFAULT = 2.0f; - public static final int DUST_COUNT_DEFAULT = 10; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.exploding_bullet.base_damage", "exploding_bullet_base_damage", 1.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.exploding_bullet.speed", "exploding_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigFloat KNOCKBACK_MULTIPLIER = new ConfigFloat("ammo.exploding_bullet.knockback_multiplier", "exploding_bullet_knockback_multiplier", 2.0f, 0.0f, 100.0f); + public static final ConfigInt DUST_COUNT = new ConfigInt("ammo.exploding_bullet.dust_count", "exploding_bullet_dust_count", 10, 0, 1000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadFloat(ID, "knockback_multiplier", KNOCKBACK_MULTIPLIER_DEFAULT, 0.0f, 100.0f); - AmmoConfig.loadInt(ID, "dust_count", DUST_COUNT_DEFAULT, 0, 1000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, KNOCKBACK_MULTIPLIER, DUST_COUNT); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static float getKnockbackMultiplier() { - return AmmoConfig.readFloat(ID, "knockback_multiplier", KNOCKBACK_MULTIPLIER_DEFAULT, 0.0f, 100.0f); - } - - public static int getDustCount() { - return AmmoConfig.readInt(ID, "dust_count", DUST_COUNT_DEFAULT, 0, 1000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ @@ -67,7 +63,7 @@ public class ExplodingBullet extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -92,7 +88,7 @@ public class ExplodingBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); boolean dead = false; for(Entity target : targets) { - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale * getKnockbackMultiplier())) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale * KNOCKBACK_MULTIPLIER.get())) { dead = true; target.invulnerableTime = invulnerableTime; SoundUtil.playServerSound(summon.level(), ModSounds.BOOM.get(), summon.position()); @@ -109,7 +105,7 @@ public class ExplodingBullet extends BulletAmmo { ParticleUtil.addParticles( (ServerLevel) summon.level(), PARTICLE, summon.position(), new Vec3(0, 0, 0), - 0.2, getDustCount() + 0.2, DUST_COUNT.get() ); this.onDied(summon); return; @@ -129,7 +125,7 @@ public class ExplodingBullet extends BulletAmmo { ParticleUtil.addParticles( (ServerLevel) summon.level(), PARTICLE, summon.position(), new Vec3(0, 0, 0), - 0.2, getDustCount() + 0.2, DUST_COUNT.get() ); this.onDied(summon); return; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java b/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java new file mode 100644 index 0000000..fd3204e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java @@ -0,0 +1,4 @@ +package com.lzxnone.terraria.item.ammo; + +public class FallenStar extends BulletAmmo { +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java index 66719b6..e60b1ad 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -4,13 +4,16 @@ 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -26,52 +29,19 @@ import net.minecraft.world.phys.Vec3; import java.util.List; public class GoldenBullet extends BulletAmmo { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.golden_bullet.base_damage", "golden_bullet_base_damage", 1.5f, 0.0f, 8388600.0f); - 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 ConfigDouble SPEED = new ConfigDouble("ammo.golden_bullet.speed", "golden_bullet_speed", 3.0D, 0.0D, 24.0D); - 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 ConfigInt EFFECT_TIME = new ConfigInt("ammo.golden_bullet.effect_time", "golden_bullet_effect_time", 40, 0, 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); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, EFFECT_TIME); } }; - 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"), @@ -83,7 +53,7 @@ public class GoldenBullet extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -107,10 +77,10 @@ public class GoldenBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(target instanceof LivingEntity livingEntity) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.MIDAS, getEffectTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.MIDAS, EFFECT_TIME.get(), 0); livingEntity.addEffect(effectInstance); } this.onDied(summon); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java index 4553daa..ef76370 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -1,13 +1,21 @@ 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.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -19,44 +27,31 @@ import java.util.List; public class HighVelocityBullet extends BulletAmmo { public static final String ID = "high_velocity_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 1.5f; - public static final double SPEED_DEFAULT = 4.0D; - public static final float DAMAGE_DECAY_DEFAULT = 0.85f; - public static final int MAX_HIT_DEFAULT = 3; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.high_velocity_bullet.base_damage", "high_velocity_bullet_base_damage", 1.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.high_velocity_bullet.speed", "high_velocity_bullet_speed", 4.0D, 0.0D, 24.0D); + public static final ConfigFloat DAMAGE_DECAY = new ConfigFloat("ammo.high_velocity_bullet.damage_decay", "high_velocity_bullet_damage_decay", 0.85f, 0.0f, 1.0f); + public static final ConfigInt MAX_HIT = new ConfigInt("ammo.high_velocity_bullet.max_hit", "high_velocity_bullet_max_hit", 3, 1, 100); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); - AmmoConfig.loadInt(ID, "max_hit", MAX_HIT_DEFAULT, 1, 100); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, DAMAGE_DECAY, MAX_HIT); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static float getDamageDecay() { - return AmmoConfig.readFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); - } - - public static int getMaxHit() { - return AmmoConfig.readInt(ID, "max_hit", MAX_HIT_DEFAULT, 1, 100); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -82,9 +77,9 @@ public class HighVelocityBullet extends BulletAmmo { for(Entity target : targets) { int hit = customData.getInt("hit"); - if(DamageUtil.rangedAttack(summon, target, sourceStack, (getBaseDamage() + damage) * (float) Math.pow(getDamageDecay(), hit), knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, (BASE_DAMAGE.get() + damage) * (float) Math.pow(DAMAGE_DECAY.get(), hit), knockbackScale)) { target.invulnerableTime = invulnerableTime; - if(incrementHit(summon) >= getMaxHit()) { + if(incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java index 39cf906..c0803b2 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java @@ -1,14 +1,22 @@ 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.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -22,38 +30,30 @@ import java.util.List; public class IchorBullet extends BulletAmmo { public static final String ID = "ichor_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 2.25f; - public static final double SPEED_DEFAULT = 3.0D; - public static final int EFFECT_TIME_DEFAULT = 200; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.ichor_bullet.base_damage", "ichor_bullet_base_damage", 2.25f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.ichor_bullet.speed", "ichor_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigInt EFFECT_TIME = new ConfigInt("ammo.ichor_bullet.effect_time", "ichor_bullet_effect_time", 200, 0, 72000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, EFFECT_TIME); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static int getEffectTime() { - return AmmoConfig.readInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -77,10 +77,10 @@ public class IchorBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(target instanceof LivingEntity livingEntity) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.ICHOR, getEffectTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.ICHOR, EFFECT_TIME.get(), 0); livingEntity.addEffect(effectInstance); } this.onDied(summon); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java index 2107e76..4f2da71 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java @@ -1,15 +1,22 @@ 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.particle.DustParticleOptions; 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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; + import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; @@ -17,38 +24,31 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import org.joml.Vector3f; import java.util.List; public class LuminiteBullet extends BulletAmmo { public static final String ID = "luminite_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 3.0f; - public static final double SPEED_DEFAULT = 3.5D; - public static final float DAMAGE_DECAY_DEFAULT = 0.96f; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.luminite_bullet.base_damage", "luminite_bullet_base_damage", 3.0f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.luminite_bullet.speed", "luminite_bullet_speed", 3.5D, 0.0D, 24.0D); + public static final ConfigFloat DAMAGE_DECAY = new ConfigFloat("ammo.luminite_bullet.damage_decay", "luminite_bullet_damage_decay", 0.96f, 0.0f, 1.0f); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, DAMAGE_DECAY); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static float getDamageDecay() { - return AmmoConfig.readFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.025f, 0.5f, 40, true, new Vector3f[]{ @@ -61,7 +61,7 @@ public class LuminiteBullet extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -87,7 +87,7 @@ public class LuminiteBullet extends BulletAmmo { for(Entity target : targets) { int hit = customData.getInt("hit"); - if(DamageUtil.rangedAttack(summon, target, sourceStack, (getBaseDamage() + damage) * (float) Math.pow(getDamageDecay(), hit), knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, (BASE_DAMAGE.get() + damage) * (float) Math.pow(DAMAGE_DECAY.get(), hit), knockbackScale)) { target.invulnerableTime = invulnerableTime; hit++; customData.putInt("hit", hit); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java index e8db29f..2b4c5ea 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -3,14 +3,17 @@ 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; + import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -25,52 +28,19 @@ import net.minecraft.world.phys.Vec3; import java.util.List; public class MeteorShot extends BulletAmmo { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.meteor_shot.base_damage", "meteor_shot_base_damage", 1.0f, 0.0f, 8388600.0f); - public static final String BASE_DAMAGE_PATH = "ammo.meteor_shot.base_damage"; - public static final float BASE_DAMAGE_DEFAULT = 1.0f; - public static final float BASE_DAMAGE_MIN = 0.0f; - public static final float BASE_DAMAGE_MAX = 8388600.0f; + public static final ConfigDouble SPEED = new ConfigDouble("ammo.meteor_shot.speed", "meteor_shot_speed", 3.0D, 0.0D, 24.0D); - public static final String SPEED_PATH = "ammo.meteor_shot.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 MAX_HIT_PATH = "ammo.meteor_shot.max_hit"; - public static final int MAX_HIT_DEFAULT = 2; - public static final int MAX_HIT_MIN = 1; - public static final int MAX_HIT_MAX = 256; + public static final ConfigInt MAX_HIT = new ConfigInt("ammo.meteor_shot.max_hit", "meteor_shot_max_hit", 2, 1, 256); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("meteor_shot_base_damage"), configTooltip("meteor_shot_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("meteor_shot_speed"), configTooltip("meteor_shot_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); - ConfigFactory.loadIntConfig(MAX_HIT_PATH, configText("meteor_shot_max_hit"), configTooltip("meteor_shot_max_hit"), MAX_HIT_DEFAULT, MAX_HIT_MIN, MAX_HIT_MAX); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, MAX_HIT); } }; - 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 getMaxHit() { - return Math.clamp(ConfigUtil.readInt(MAX_HIT_PATH, MAX_HIT_DEFAULT), MAX_HIT_MIN, MAX_HIT_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "meteor_shot", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/meteor_shot.png"), @@ -84,7 +54,7 @@ public class MeteorShot extends BulletAmmo { this.checkBeforeTick(summon); if(summon.isRemoved()) return; - double speed = getSpeed(); + double speed = SPEED.get(); Vec3 motion = summon.getLookAngle().normalize().scale(speed); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -109,9 +79,9 @@ public class MeteorShot extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); for(Entity target : targets) { - if(DamageUtil.rangedAttack(summon, target, sourceStack, (getBaseDamage() + damage), knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, (BASE_DAMAGE.get() + damage), knockbackScale)) { target.invulnerableTime = invulnerableTime; - if(incrementHit(summon) >= getMaxHit()) { + if(incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; } @@ -122,7 +92,7 @@ public class MeteorShot extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { - if(MeteorShot.incrementHit(summon) >= getMaxHit()) { + if(MeteorShot.incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java index 8d6dd18..bd39dc6 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -3,13 +3,15 @@ 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -23,42 +25,17 @@ import net.minecraft.world.phys.Vec3; import java.util.List; public class MusketBall extends BulletAmmo { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.musket_ball.base_damage", "musket_ball_base_damage", 0.8f, 0.0f, 8388600.0f); - public static final String BASE_DAMAGE_PATH = "ammo.musket_ball.base_damage"; - public static final float BASE_DAMAGE_DEFAULT = 0.8f; - 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.musket_ball.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 ConfigDouble SPEED = new ConfigDouble("ammo.musket_ball.speed", "musket_ball_speed", 3.0D, 0.0D, 24.0D); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("musket_ball_base_damage"), configTooltip("musket_ball_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("musket_ball_speed"), configTooltip("musket_ball_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED); } }; - 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( "musket_ball", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/musket_ball.png"), @@ -70,7 +47,7 @@ public class MusketBall extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -94,7 +71,7 @@ public class MusketBall extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; this.onDied(summon); return; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java index 0bea2fb..8716506 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java @@ -1,16 +1,24 @@ 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.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; + import net.minecraft.core.Direction; 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; @@ -24,44 +32,26 @@ import java.util.List; public class NanoBullet extends BulletAmmo { public static final String ID = "nano_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 2.5f; - public static final double SPEED_DEFAULT = 3.0D; - public static final float DAMAGE_DECAY_DEFAULT = 0.67f; - public static final int MAX_HIT_DEFAULT = 2; - public static final int EFFECT_TIME_DEFAULT = 40; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.nano_bullet.base_damage", "nano_bullet_base_damage", 2.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.nano_bullet.speed", "nano_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigFloat DAMAGE_DECAY = new ConfigFloat("ammo.nano_bullet.damage_decay", "nano_bullet_damage_decay", 0.67f, 0.0f, 1.0f); + public static final ConfigInt MAX_HIT = new ConfigInt("ammo.nano_bullet.max_hit", "nano_bullet_max_hit", 2, 1, 100); + public static final ConfigInt EFFECT_TIME = new ConfigInt("ammo.nano_bullet.effect_time", "nano_bullet_effect_time", 40, 0, 72000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); - AmmoConfig.loadInt(ID, "max_hit", MAX_HIT_DEFAULT, 1, 100); - AmmoConfig.loadInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, DAMAGE_DECAY, MAX_HIT, EFFECT_TIME); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static float getDamageDecay() { - return AmmoConfig.readFloat(ID, "damage_decay", DAMAGE_DECAY_DEFAULT, 0.0f, 1.0f); - } - - public static int getMaxHit() { - return AmmoConfig.readInt(ID, "max_hit", MAX_HIT_DEFAULT, 1, 100); - } - - public static int getEffectTime() { - return AmmoConfig.readInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { @Override @@ -69,7 +59,7 @@ public class NanoBullet extends BulletAmmo { this.checkBeforeTick(summon); if(summon.isRemoved()) return; - double speed = getSpeed(); + double speed = SPEED.get(); Vec3 motion = summon.getLookAngle().normalize().scale(speed); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -95,10 +85,10 @@ public class NanoBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); int hit = customData.getInt("hit"); - if(DamageUtil.rangedAttack(summon, target, sourceStack, hit > 0 ? (getBaseDamage() + damage) * getDamageDecay() : getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, hit > 0 ? (BASE_DAMAGE.get() + damage) * DAMAGE_DECAY.get() : BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(target instanceof LivingEntity livingEntity) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CONFUSED, getEffectTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CONFUSED, EFFECT_TIME.get(), 0); livingEntity.addEffect(effectInstance); } onDied(summon); @@ -109,7 +99,7 @@ public class NanoBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { - if(incrementHit(summon) >= getMaxHit()) { + if(incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java index f892425..58a84e0 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -1,15 +1,22 @@ 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.particle.ModParticles; 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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; + import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; @@ -22,32 +29,29 @@ import java.util.List; public class PartyBullet extends BulletAmmo { public static final String ID = "party_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 1.5f; - public static final double SPEED_DEFAULT = 3.0D; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.party_bullet.base_damage", "party_bullet_base_damage", 1.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.party_bullet.speed", "party_bullet_speed", 3.0D, 0.0D, 24.0D); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -71,7 +75,7 @@ public class PartyBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; summon.setPos(end); ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java index bbcf935..7d5759a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -3,13 +3,15 @@ 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -26,52 +28,19 @@ import net.minecraft.world.phys.Vec3; import java.util.List; public class SilverBullet extends BulletAmmo { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.silver_bullet.base_damage", "silver_bullet_base_damage", 1.2f, 0.0f, 8388600.0f); - 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 ConfigDouble SPEED = new ConfigDouble("ammo.silver_bullet.speed", "silver_bullet_speed", 3.0D, 0.0D, 24.0D); - 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 ConfigFloat PIGLIN_DAMAGE_MULTIPLIER = new ConfigFloat("ammo.silver_bullet.piglin_damage_multiplier", "silver_bullet_piglin_damage_multiplier", 3.0f, 0.0f, 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); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, PIGLIN_DAMAGE_MULTIPLIER); } }; - 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"), @@ -83,7 +52,7 @@ public class SilverBullet extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -107,9 +76,9 @@ public class SilverBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - float finalDamage = getBaseDamage() + damage; + float finalDamage = BASE_DAMAGE.get() + damage; if(target instanceof Piglin || target instanceof PiglinBrute || target instanceof ZombifiedPiglin) { - finalDamage *= getPiglinDamageMultiplier(); + finalDamage *= PIGLIN_DAMAGE_MULTIPLIER.get(); } if(DamageUtil.rangedAttack(summon, target, sourceStack, finalDamage, knockbackScale)) { target.invulnerableTime = invulnerableTime; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java index 6b7fce3..7193c05 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -3,13 +3,15 @@ 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -23,42 +25,17 @@ import net.minecraft.world.phys.Vec3; import java.util.List; public class TungstenBullet extends BulletAmmo { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.tungsten_bullet.base_damage", "tungsten_bullet_base_damage", 1.2f, 0.0f, 8388600.0f); - 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 ConfigDouble SPEED = new ConfigDouble("ammo.tungsten_bullet.speed", "tungsten_bullet_speed", 3.0D, 0.0D, 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); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED); } }; - 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"), @@ -70,7 +47,7 @@ public class TungstenBullet extends BulletAmmo { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -94,7 +71,7 @@ public class TungstenBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; this.onDied(summon); return; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java index 19bf634..ef4e02c 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java @@ -1,14 +1,22 @@ 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.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -22,38 +30,30 @@ import java.util.List; public class VenomBullet extends BulletAmmo { public static final String ID = "venom_bullet"; - public static final float BASE_DAMAGE_DEFAULT = 2.5f; - public static final double SPEED_DEFAULT = 3.0D; - public static final int EFFECT_TIME_DEFAULT = 200; + + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.venom_bullet.base_damage", "venom_bullet_base_damage", 2.5f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.venom_bullet.speed", "venom_bullet_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigInt EFFECT_TIME = new ConfigInt("ammo.venom_bullet.effect_time", "venom_bullet_effect_time", 200, 0, 72000); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - AmmoConfig.loadFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - AmmoConfig.loadDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - AmmoConfig.loadInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, EFFECT_TIME); } }; - public static final ConfigListItem CONFIG_LIST_ITEM = AmmoConfig.createListItem(ID, CONFIG_DATA); - - public static float getBaseDamage() { - return AmmoConfig.readFloat(ID, "base_damage", BASE_DAMAGE_DEFAULT, 0.0f, 8388600.0f); - } - - public static double getSpeed() { - return AmmoConfig.readDouble(ID, "speed", SPEED_DEFAULT, 0.0D, 24.0D); - } - - public static int getEffectTime() { - return AmmoConfig.readInt(ID, "effect_time", EFFECT_TIME_DEFAULT, 0, 72000); - } + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + 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()); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); Vec3 start = summon.position(); Vec3 end = start.add(motion); @@ -77,10 +77,10 @@ public class VenomBullet extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE.get() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(target instanceof LivingEntity livingEntity) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.ACID_VENOM, getEffectTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.ACID_VENOM, EFFECT_TIME.get(), 0); livingEntity.addEffect(effectInstance); } this.onDied(summon); diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/EnchantedSwordBeam.java b/src/main/java/com/lzxnone/terraria/item/projectile/EnchantedSwordBeam.java deleted file mode 100644 index a94e08d..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/EnchantedSwordBeam.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class EnchantedSwordBeam extends Item { - public EnchantedSwordBeam() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/InfluxWaverBeam.java b/src/main/java/com/lzxnone/terraria/item/projectile/InfluxWaverBeam.java deleted file mode 100644 index 2a2d3ba..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/InfluxWaverBeam.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class InfluxWaverBeam extends Item { - public InfluxWaverBeam() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/LeafProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/LeafProjectile.java deleted file mode 100644 index 275f991..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/LeafProjectile.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class LeafProjectile extends Item { - public LeafProjectile() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/MaceProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/MaceProjectile.java deleted file mode 100644 index 23e356f..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/MaceProjectile.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class MaceProjectile extends Item { - public MaceProjectile() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/MeowmereProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/MeowmereProjectile.java deleted file mode 100644 index 1bc97fb..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/MeowmereProjectile.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class MeowmereProjectile extends Item { - public MeowmereProjectile() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerNut.java b/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerNut.java deleted file mode 100644 index 852fd75..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerNut.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class SeedlerNut extends Item{ - public SeedlerNut() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerThorn.java b/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerThorn.java deleted file mode 100644 index db89c38..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/SeedlerThorn.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class SeedlerThorn extends Item { - public SeedlerThorn() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/StarWrathStar.java b/src/main/java/com/lzxnone/terraria/item/projectile/StarWrathStar.java deleted file mode 100644 index 03977ab..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/StarWrathStar.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class StarWrathStar extends Item { - public StarWrathStar() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/StarfuryStar.java b/src/main/java/com/lzxnone/terraria/item/projectile/StarfuryStar.java deleted file mode 100644 index 0eaf3be..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/StarfuryStar.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class StarfuryStar extends Item { - public StarfuryStar() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/TerraprismaSummon.java b/src/main/java/com/lzxnone/terraria/item/projectile/TerraprismaSummon.java deleted file mode 100644 index 9a78437..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/TerraprismaSummon.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile; - -import net.minecraft.world.item.Item; - -public class TerraprismaSummon extends Item { - public TerraprismaSummon() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java deleted file mode 100644 index 31d0e41..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile0.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile0 extends Item { - public FirstFractalProjectile0() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java deleted file mode 100644 index 4f2e7a9..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile1.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile1 extends Item { - public FirstFractalProjectile1() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java deleted file mode 100644 index f4f655a..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile10.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile10 extends Item { - public FirstFractalProjectile10() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java deleted file mode 100644 index 4831aa1..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile11.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile11 extends Item { - public FirstFractalProjectile11() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java deleted file mode 100644 index 0aa8b3f..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile12.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile12 extends Item { - public FirstFractalProjectile12() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java deleted file mode 100644 index 750c14c..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile13.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile13 extends Item { - public FirstFractalProjectile13() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java deleted file mode 100644 index a30b34b..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile14.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile14 extends Item { - public FirstFractalProjectile14() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java deleted file mode 100644 index c1463e1..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile2.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile2 extends Item { - public FirstFractalProjectile2() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java deleted file mode 100644 index 617937e..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile3.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile3 extends Item { - public FirstFractalProjectile3() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java deleted file mode 100644 index 351d647..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile4.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile4 extends Item { - public FirstFractalProjectile4() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java deleted file mode 100644 index d598584..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile5.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile5 extends Item { - public FirstFractalProjectile5() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java deleted file mode 100644 index fd1fc46..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile6.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile6 extends Item { - public FirstFractalProjectile6() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java deleted file mode 100644 index b29f2ce..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile7.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile7 extends Item { - public FirstFractalProjectile7() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java deleted file mode 100644 index 4328c72..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile8.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile8 extends Item { - public FirstFractalProjectile8() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java b/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java deleted file mode 100644 index c245bde..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/first_fractal/FirstFractalProjectile9.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.first_fractal; - -import net.minecraft.world.item.Item; - -public class FirstFractalProjectile9 extends Item { - public FirstFractalProjectile9() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index 351647b..0d7b0b5 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -1,33 +1,28 @@ package com.lzxnone.terraria.item.weapon; +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; -import net.minecraft.core.component.DataComponents; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import com.lzxnone.terraria.effect.ManaSicknessEffect; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.accessory.effect.AutoManaPotionUser; +import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; +import com.lzxnone.terraria.utils.ManaPotionUtil; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; -import java.util.function.IntSupplier; - public class MagicWeapon extends Weapon { - private static final String MANA_CONSUME_PROGRESS_KEY = "magicManaConsumeProgress"; - private static final String MANA_RECOVER_PROGRESS_KEY = "magicManaRecoverProgress"; - - private final IntSupplier manaConsumeRate; - private final IntSupplier manaRecoverRate; - - public MagicWeapon(Tier tier, Properties properties, IntSupplier manaConsumeRate, IntSupplier manaRecoverRate) { + public MagicWeapon(Tier tier, Properties properties) { super(tier, properties); - this.manaConsumeRate = manaConsumeRate; - this.manaRecoverRate = manaRecoverRate; } @Override @@ -47,24 +42,11 @@ public class MagicWeapon extends Weapon { onMagicUseTick(level, entity, stack, count); } - @Override - public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) { - super.inventoryTick(stack, level, entity, slotId, isSelected); - if(level.isClientSide() || !(entity instanceof LivingEntity livingEntity)) return; - if(livingEntity.getUseItem() == stack) return; - - recoverMana(stack, getFinalManaRecoverRate(stack, livingEntity)); - } - protected void onMagicUseTick(Level level, LivingEntity entity, ItemStack stack, int count) { } - protected int getManaConsumeRate(ItemStack stack, LivingEntity entity) { - return Math.max(0, manaConsumeRate.getAsInt()); - } - - protected int getManaRecoverRate(ItemStack stack, LivingEntity entity) { - return Math.max(0, manaRecoverRate.getAsInt()); + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + return 0.0D; } protected double getFinalManaConsumeRate(ItemStack stack, LivingEntity entity) { @@ -74,16 +56,7 @@ public class MagicWeapon extends Weapon { rate *= Math.pow(ModEnchantmentConfigs.getManaLeakConsumeMultiplier(), leakLevel); rate *= Math.pow(ModEnchantmentConfigs.getManaEfficiencyConsumeMultiplier(), efficiencyLevel); - return Math.max(0.0D, rate); - } - - protected double getFinalManaRecoverRate(ItemStack stack, LivingEntity entity) { - double rate = getManaRecoverRate(stack, entity); - int gatheringLevel = getEnchantmentLevel(entity, stack, ModEnchantments.MANA_GATHERING); - int curseLevel = getEnchantmentLevel(entity, stack, ModEnchantments.MANA_GATHERING_CURSE); - - rate *= Math.pow(ModEnchantmentConfigs.getManaGatheringRecoverMultiplier(), gatheringLevel); - rate *= Math.pow(ModEnchantmentConfigs.getManaGatheringCurseRecoverMultiplier(), curseLevel); + rate *= getAccessoryManaCostMultiplier(entity); return Math.max(0.0D, rate); } @@ -92,51 +65,63 @@ public class MagicWeapon extends Weapon { int amplificationLevel = getEnchantmentLevel(entity, stack, ModEnchantments.ARCANE_AMPLIFICATION); finalDamage *= Math.pow(ModEnchantmentConfigs.getArcaneAmplificationDamageMultiplier(), amplificationLevel); + finalDamage *= ManaSicknessEffect.getMagicDamageMultiplier(entity); return (float) Math.max(0.0D, finalDamage); } protected boolean canUseMagic(ItemStack stack, LivingEntity entity) { - return !isManaEmpty(stack); + if(entity.hasInfiniteMaterials()) return true; + if(!isManaEmpty(entity)) return true; + if(entity instanceof ServerPlayer player) { + return tryAutoUseManaPotion(player); + } + return entity instanceof Player player && canAutoUseManaPotion(player) && ManaPotionUtil.hasManaPotion(player); } - protected boolean isManaEmpty(ItemStack stack) { - return stack.isDamageableItem() && stack.getDamageValue() >= stack.getMaxDamage(); + protected boolean isManaEmpty(LivingEntity entity) { + if(!(entity instanceof Player player)) return false; + return !player.getData(ModAttachments.PLAYER_MANA).hasMana(); } protected boolean tryConsumeMana(Level level, LivingEntity entity, ItemStack stack, double amount) { if(amount <= 0.0D || entity.hasInfiniteMaterials()) return true; - if(!stack.isDamageableItem() || isManaEmpty(stack)) return false; + if(!(entity instanceof ServerPlayer player)) return true; - int pendingDamage = addManaProgress(stack, MANA_CONSUME_PROGRESS_KEY, amount); - if(pendingDamage <= 0) return true; - - int damage = pendingDamage; - if(level instanceof ServerLevel serverLevel) { - damage = EnchantmentHelper.processDurabilityChange(serverLevel, stack, damage); + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + boolean canContinue = mana.consumeMana(amount); + mana.applyRecoverDelay(); + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + PlayerManaSyncEventHandler.sync(player); } - if(damage <= 0) return true; - - int nextDamage = Math.min(stack.getDamageValue() + damage, stack.getMaxDamage()); - stack.setDamageValue(nextDamage); - return nextDamage < stack.getMaxDamage(); + if(canContinue) return true; + return tryAutoUseManaPotion(player); } - protected void recoverMana(ItemStack stack, double amount) { - if(amount <= 0.0D || !stack.isDamageableItem() || stack.getDamageValue() <= 0) return; - int recoverAmount = addManaProgress(stack, MANA_RECOVER_PROGRESS_KEY, amount); - if(recoverAmount <= 0) return; - - stack.setDamageValue(Math.max(0, stack.getDamageValue() - recoverAmount)); + private static double getAccessoryManaCostMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ManaCostModifier modifier) { + multiplier[0] *= modifier.getManaCostMultiplier(stack, entity); + } + }); + return multiplier[0]; } - private int addManaProgress(ItemStack stack, String key, double amount) { - double progress = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag() - .getDouble(key) + amount; - int wholeAmount = (int) Math.floor(progress); - double nextProgress = progress - wholeAmount; - CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putDouble(key, nextProgress)); - return wholeAmount; + private static boolean canAutoUseManaPotion(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof AutoManaPotionUser autoUser && autoUser.canAutoUseManaPotion(stack, entity)) { + result[0] = true; + } + }); + return result[0]; + } + + private static boolean tryAutoUseManaPotion(ServerPlayer player) { + if(!canAutoUseManaPotion(player)) return false; + return ManaPotionUtil.tryUseManaPotion(player); } private static int getEnchantmentLevel(LivingEntity entity, ItemStack stack, ResourceKey enchantment) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java index ebb50b3..93459f5 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -10,6 +10,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceKey; import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.SlotAccess; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -45,6 +46,10 @@ public class RangedWeapon extends Weapon { return 1; } + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return null; + } + public int getFinalAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity, int amount) { if(amount <= 0) return 0; int exhaustionLevel = getEnchantmentLevel(entity, weaponStack, ModEnchantments.AMMO_EXHAUSTION); @@ -138,6 +143,15 @@ public class RangedWeapon extends Weapon { protected void shoot(Level level, Player player, InteractionHand hand, ItemStack weaponStack) {} + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if(player.getCooldowns().isOnCooldown(stack.getItem()) || !tryShoot(level, player, hand, stack)) return InteractionResultHolder.fail(stack); + player.startUsingItem(hand); + player.getCooldowns().addCooldown(stack.getItem(), Math.max(1, getUseTime(stack, player) / 3)); + return InteractionResultHolder.consume(stack); + } + @Override public void onUseTick(Level level, LivingEntity entity, ItemStack stack, int remainingUseTicks) { if(!(entity instanceof Player player)) return; @@ -157,7 +171,11 @@ public class RangedWeapon extends Weapon { String ammo = weaponStack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag() .getString(AMMO_KEY); - return ammo.isEmpty() ? null : ResourceLocation.parse(ammo); + if(!ammo.isEmpty()) return ResourceLocation.parse(ammo); + if(weaponStack.getItem() instanceof RangedWeapon rangedWeapon) { + return rangedWeapon.getDefaultAmmo(weaponStack); + } + return null; } public static ItemStack getAmmoStack(ItemStack weaponStack) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java index 8766950..5d089cc 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java @@ -10,10 +10,12 @@ import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.item.weapon.melee.Mace; import com.lzxnone.terraria.particle.DustParticleOptions; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; @@ -22,6 +24,7 @@ import com.lzxnone.terraria.utils.SoundUtil; import com.mojang.math.Axis; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; @@ -32,6 +35,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.item.UseAnim; @@ -49,89 +53,79 @@ import java.util.List; import java.util.Optional; public class LastPrism extends MagicWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.last_prism.damage"; - public static final float DAMAGE_DEFAULT = 1.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String CHARGE_TIME_PATH = "weapon.last_prism.charge_time"; - public static final int CHARGE_TIME_DEFAULT = 67; - public static final int CHARGE_TIME_MIN = 1; - public static final int CHARGE_TIME_MAX = 72000; - - public static final String MAX_USE_TIME_PATH = "weapon.last_prism.max_use_time"; - public static final int MAX_USE_TIME_DEFAULT = 1200; - public static final int MAX_USE_TIME_MIN = 1; - public static final int MAX_USE_TIME_MAX = 72000; - - public static final String MAX_RANGE_PATH = "weapon.last_prism.max_range"; - public static final double MAX_RANGE_DEFAULT = 64.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 512.0; - - public static final String MANA_CONSUME_RATE_PATH = "weapon.last_prism.mana_consume_rate"; - public static final int MANA_CONSUME_RATE_DEFAULT = 20; - public static final int MANA_CONSUME_RATE_MIN = 0; - public static final int MANA_CONSUME_RATE_MAX = 72000; - - public static final String MANA_RECOVER_RATE_PATH = "weapon.last_prism.mana_recover_rate"; - public static final int MANA_RECOVER_RATE_DEFAULT = 20; - public static final int MANA_RECOVER_RATE_MIN = 0; - public static final int MANA_RECOVER_RATE_MAX = 72000; + private static final String USE_START_GAME_TIME_KEY = "lastPrismUseStartGameTime"; + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.last_prism.damage", + "last_prism_damage", + 1.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt CHARGE_TIME = new ConfigInt( + "weapon.last_prism.charge_time", + "last_prism_charge_time", + 67, + 1, + 72000 + ); + public static final ConfigInt MAX_USE_TIME = new ConfigInt( + "weapon.last_prism.max_use_time", + "last_prism_max_use_time", + 1200, + 1, + 72000 + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.last_prism.max_range", + "last_prism_max_range", + 64.0, + 1.0, + 512.0 + ); + public static final ConfigInt MANA_CONSUME_RATE = new ConfigInt( + "weapon.last_prism.mana_consume_rate", + "last_prism_mana_consume_rate", + 7, + 0, + 72000 + ); public LastPrism() { super( Tiers.NETHERITE, - new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC), - LastPrism::getManaConsumeRate, - LastPrism::getManaRecoverRate + new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC) ); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("last_prism_damage"), configTooltip("last_prism_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadIntConfig(CHARGE_TIME_PATH, configText("last_prism_charge_time"), configTooltip("last_prism_charge_time"), CHARGE_TIME_DEFAULT, CHARGE_TIME_MIN, CHARGE_TIME_MAX); - ConfigFactory.loadIntConfig(MAX_USE_TIME_PATH, configText("last_prism_max_use_time"), configTooltip("last_prism_max_use_time"), MAX_USE_TIME_DEFAULT, MAX_USE_TIME_MIN, MAX_USE_TIME_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("last_prism_max_range"), configTooltip("last_prism_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); - ConfigFactory.loadIntConfig(MANA_CONSUME_RATE_PATH, configText("last_prism_mana_consume_rate"), configTooltip("last_prism_mana_consume_rate"), MANA_CONSUME_RATE_DEFAULT, MANA_CONSUME_RATE_MIN, MANA_CONSUME_RATE_MAX); - ConfigFactory.loadIntConfig(MANA_RECOVER_RATE_PATH, configText("last_prism_mana_recover_rate"), configTooltip("last_prism_mana_recover_rate"), MANA_RECOVER_RATE_DEFAULT, MANA_RECOVER_RATE_MIN, MANA_RECOVER_RATE_MAX); + ConfigStruct.loadAll( + DAMAGE, + CHARGE_TIME, + MAX_USE_TIME, + MAX_RANGE, + MANA_CONSUME_RATE + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - public static int getChargeTime() { - return Math.clamp(ConfigUtil.readInt(CHARGE_TIME_PATH, CHARGE_TIME_DEFAULT), CHARGE_TIME_MIN, CHARGE_TIME_MAX); - } - - public static int getMaxUseTime() { - return Math.clamp(ConfigUtil.readInt(MAX_USE_TIME_PATH, MAX_USE_TIME_DEFAULT), MAX_USE_TIME_MIN, MAX_USE_TIME_MAX); + return CHARGE_TIME.get(); } public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + return MAX_RANGE.get(); } - public static int getManaConsumeRate() { - return Math.clamp(ConfigUtil.readInt(MANA_CONSUME_RATE_PATH, MANA_CONSUME_RATE_DEFAULT), MANA_CONSUME_RATE_MIN, MANA_CONSUME_RATE_MAX); - } - - public static int getManaRecoverRate() { - return Math.clamp(ConfigUtil.readInt(MANA_RECOVER_RATE_PATH, MANA_RECOVER_RATE_DEFAULT), MANA_RECOVER_RATE_MIN, MANA_RECOVER_RATE_MAX); + @Override + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + long startGameTime = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag() + .getLong(USE_START_GAME_TIME_KEY); + long elapsedTime = Math.max(0L, entity.level().getGameTime() - startGameTime); + double useRatio = Mth.clamp(elapsedTime / (double)MAX_USE_TIME.get(), 0.0D, 1.0D); + return MANA_CONSUME_RATE.get() * useRatio; } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -239,7 +233,7 @@ public class LastPrism extends MagicWeapon { AABB entityBox = hitEntity.getBoundingBox().inflate(beamData.radius()); Optional clipResult = entityBox.clip(beamData.start(), beamData.end()); if(entityBox.contains(beamData.start()) || clipResult.isPresent()) { - if(DamageUtil.magicAttack(beam, hitEntity, beam.getEntityData().get(StaticSummon.STACK_SOURCE), getDamage() * beamData.ratio(), 0.1f)) { + if(DamageUtil.magicAttack(beam, hitEntity, beam.getEntityData().get(StaticSummon.STACK_SOURCE), DAMAGE.get() * beamData.ratio(), 0.1f)) { hitEntity.invulnerableTime = 5; } } @@ -269,8 +263,8 @@ public class LastPrism extends MagicWeapon { Vector3f[] dirs = MathUtil.computeCoordinateSystem(owner); float time = tri.getEntityData().get(StaticSummon.AGE) + partialTick; float angle = computePrismAngle(time); - float ratio = Math.min(1.0f, time / getChargeTime()); - double maxRange = getMaxRange(); + float ratio = Math.min(1.0f, time / CHARGE_TIME.get()); + double maxRange = MAX_RANGE.get(); double dy = maxRange / 2; Vec3 basePos = tri.position().add(MathUtil.toVec3(dirs[0]).scale(0.5f)); @@ -304,7 +298,7 @@ public class LastPrism extends MagicWeapon { } private static float computePrismAngle(float time) { - int chargeTime = getChargeTime(); + int chargeTime = CHARGE_TIME.get(); float a = MAX_ROTATE / chargeTime; float v = Math.min(a * time, MAX_ROTATE); if(v < MAX_ROTATE) { @@ -319,6 +313,7 @@ public class LastPrism extends MagicWeapon { if(!canUseMagic(stack, player)) return InteractionResultHolder.fail(stack); if(stack.is(ModItems.LAST_PRISM.get()) && !player.level().isClientSide()) { + CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putLong(USE_START_GAME_TIME_KEY, level.getGameTime())); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); @@ -348,7 +343,7 @@ public class LastPrism extends MagicWeapon { beam.setPos(pos); beam.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LAST_PRISM_BEAM); beam.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - beam.getEntityData().set(StaticSummon.LIFETIME, getMaxUseTime()); + beam.getEntityData().set(StaticSummon.LIFETIME, MAX_USE_TIME.get()); beam.getEntityData().set(StaticSummon.GLOW, true); beam.getEntityData().set(StaticSummon.COLOR_R, color.x); beam.getEntityData().set(StaticSummon.COLOR_G, color.y); @@ -388,29 +383,4 @@ public class LastPrism extends MagicWeapon { public int getUseDuration(ItemStack stack, LivingEntity entity) { return 72000; } - - - - - - private static float[] computeSoftPrismColor(float hue) { - float normalizedHue = Math.floorMod((int)(hue * 1000.0F), 1000) / 1000.0F; - int color = Mth.hsvToRgb(normalizedHue, 0.85F, 1.0F); - float rainbowR = ((color >> 16) & 255) / 255.0F; - float rainbowG = ((color >> 8) & 255) / 255.0F; - float rainbowB = (color & 255) / 255.0F; - float tint = 0.75F; - - return new float[]{ - 1.0F * (1.0F - tint) + rainbowR * tint, - 1.0F * (1.0F - tint) + rainbowG * tint, - 1.0F * (1.0F - tint) + rainbowB * tint - }; - } - - - public static Vec3 computeRingDir(Vec3 n, Vec3 b, float ang) { - return n.scale(Math.cos(ang)).add(b.scale(Math.sin(ang))); - } - } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java index f5d1e9b..d677cdf 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java @@ -6,10 +6,11 @@ import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.item.IItemWaveBehavior; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; import net.minecraft.network.chat.Component; @@ -29,23 +30,27 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; public class BeeKeeper extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String MAX_BEES_PATH = "weapon.bee_keeper.max_bees"; - public static final int MAX_BEES_DEFAULT = 3; - public static final int MAX_BEES_MIN = 0; - public static final int MAX_BEES_MAX = 10; - - public static final String CONFUSION_DURATION_PATH = "weapon.bee_keeper.confusion_duration"; - public static final int CONFUSION_DURATION_DEFAULT = 40; - public static final int CONFUSION_DURATION_MIN = 0; - public static final int CONFUSION_DURATION_MAX = 1200; - - public static final String BEE_DAMAGE_PATH = "weapon.bee_keeper.bee_damage"; - public static final float BEE_DAMAGE_DEFAULT = 2.0f; - public static final float BEE_DAMAGE_MIN = 0.0f; - public static final float BEE_DAMAGE_MAX = 8388600.0f; - + public static final ConfigInt MAX_BEES = new ConfigInt( + "weapon.bee_keeper.max_bees", + "bee_keeper_max_bees", + 3, + 0, + 10 + ); + public static final ConfigInt CONFUSION_DURATION = new ConfigInt( + "weapon.bee_keeper.confusion_duration", + "bee_keeper_confusion_duration", + 40, + 0, + 1200 + ); + public static final ConfigFloat BEE_DAMAGE = new ConfigFloat( + "weapon.bee_keeper.bee_damage", + "bee_keeper_bee_damage", + 2.0f, + 0.0f, + 8388600.0f + ); public BeeKeeper() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -61,30 +66,16 @@ public class BeeKeeper extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(MAX_BEES_PATH, configText("bee_keeper_max_bees"), configTooltip("bee_keeper_max_bees"), MAX_BEES_DEFAULT, MAX_BEES_MIN, MAX_BEES_MAX); - ConfigFactory.loadIntConfig(CONFUSION_DURATION_PATH, configText("bee_keeper_confusion_duration"), configTooltip("bee_keeper_confusion_duration"), CONFUSION_DURATION_DEFAULT, CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX); - ConfigFactory.loadFloatConfig(BEE_DAMAGE_PATH, configText("bee_keeper_bee_damage"), configTooltip("bee_keeper_bee_damage"), BEE_DAMAGE_DEFAULT, BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); + ConfigStruct.loadAll( + MAX_BEES, + CONFUSION_DURATION, + BEE_DAMAGE + ); } }; - 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 int getMaxBees() { - return Math.clamp(ConfigUtil.readInt(MAX_BEES_PATH, MAX_BEES_DEFAULT), MAX_BEES_MIN, MAX_BEES_MAX); - } - - public static int getConfusionDuration() { - return Math.clamp(ConfigUtil.readInt(CONFUSION_DURATION_PATH, CONFUSION_DURATION_DEFAULT), CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX); - } - public static float getBeeDamage() { - return Math.clamp(ConfigUtil.readFloat(BEE_DAMAGE_PATH, BEE_DAMAGE_DEFAULT), BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); + return BEE_DAMAGE.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -107,12 +98,12 @@ public class BeeKeeper extends MeleeWeapon { if(target instanceof LivingEntity livingTarget && FilterUtil.createLivingTargetFilter(player).test(livingTarget)) { livingTarget.addEffect(new MobEffectInstance( ModEffects.CONFUSED, - getConfusionDuration(), + CONFUSION_DURATION.get(), 0 )); } - int maxBees = getMaxBees(); + int maxBees = MAX_BEES.get(); int count = maxBees > 0 ? player.level().random.nextInt(maxBees) + 1 : 0; while(count-- > 0) { BeeSummon bee = ModEntities.BEE_SUMMON.get().create(player.level()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java index cb482e1..aed8aee 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java @@ -35,102 +35,82 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class BladeOfGrass extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.blade_of_grass.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 2.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String EFFECT_DURATION_PATH = "weapon.blade_of_grass.effect_duration"; - public static final int EFFECT_DURATION_DEFAULT = 140; - public static final int EFFECT_DURATION_MIN = 0; - public static final int EFFECT_DURATION_MAX = 72000; - - public static final String TARGET_RANGE_PATH = "weapon.blade_of_grass.target_range"; - public static final double TARGET_RANGE_DEFAULT = 8.0; - public static final double TARGET_RANGE_MIN = 1.0; - public static final double TARGET_RANGE_MAX = 64.0; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.blade_of_grass.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 60; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 600; - - public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.blade_of_grass.projectile_max_hit_count"; - public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 2; - public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; - public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; - - public static final String RADIUS_GROWTH_PATH = "weapon.blade_of_grass.radius_growth"; - public static final double RADIUS_GROWTH_DEFAULT = 0.05; - public static final double RADIUS_GROWTH_MIN = 0.0; - public static final double RADIUS_GROWTH_MAX = 1.0; - - public static final String ROTATION_SPEED_PATH = "weapon.blade_of_grass.rotation_speed"; - public static final double ROTATION_SPEED_DEFAULT = 0.2; - public static final double ROTATION_SPEED_MIN = 0.0; - public static final double ROTATION_SPEED_MAX = 1.0; - + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.blade_of_grass.projectile_damage", + "blade_of_grass_projectile_damage", + 2.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt EFFECT_DURATION = new ConfigInt( + "weapon.blade_of_grass.effect_duration", + "blade_of_grass_effect_duration", + 140, + 0, + 72000 + ); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble( + "weapon.blade_of_grass.target_range", + "blade_of_grass_target_range", + 8.0, + 1.0, + 64.0 + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.blade_of_grass.projectile_lifetime", + "blade_of_grass_projectile_lifetime", + 60, + 1, + 600 + ); + public static final ConfigInt PROJECTILE_MAX_HIT_COUNT = new ConfigInt( + "weapon.blade_of_grass.projectile_max_hit_count", + "blade_of_grass_projectile_max_hit_count", + 2, + 0, + 100 + ); + public static final ConfigDouble RADIUS_GROWTH = new ConfigDouble( + "weapon.blade_of_grass.radius_growth", + "blade_of_grass_radius_growth", + 0.05, + 0.0, + 1.0 + ); + public static final ConfigDouble ROTATION_SPEED = new ConfigDouble( + "weapon.blade_of_grass.rotation_speed", + "blade_of_grass_rotation_speed", + 0.2, + 0.0, + 1.0 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("blade_of_grass_projectile_damage"), configTooltip("blade_of_grass_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadIntConfig(EFFECT_DURATION_PATH, configText("blade_of_grass_effect_duration"), configTooltip("blade_of_grass_effect_duration"), EFFECT_DURATION_DEFAULT, EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); - ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("blade_of_grass_target_range"), configTooltip("blade_of_grass_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("blade_of_grass_projectile_lifetime"), configTooltip("blade_of_grass_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("blade_of_grass_projectile_max_hit_count"), configTooltip("blade_of_grass_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - ConfigFactory.loadDoubleConfig(RADIUS_GROWTH_PATH, configText("blade_of_grass_radius_growth"), configTooltip("blade_of_grass_radius_growth"), RADIUS_GROWTH_DEFAULT, RADIUS_GROWTH_MIN, RADIUS_GROWTH_MAX); - ConfigFactory.loadDoubleConfig(ROTATION_SPEED_PATH, configText("blade_of_grass_rotation_speed"), configTooltip("blade_of_grass_rotation_speed"), ROTATION_SPEED_DEFAULT, ROTATION_SPEED_MIN, ROTATION_SPEED_MAX); + ConfigStruct.loadAll( + PROJECTILE_DAMAGE, + EFFECT_DURATION, + TARGET_RANGE, + PROJECTILE_LIFETIME, + PROJECTILE_MAX_HIT_COUNT, + RADIUS_GROWTH, + ROTATION_SPEED + ); } }; - 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 getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static int getEffectDuration() { - return Math.clamp(ConfigUtil.readInt(EFFECT_DURATION_PATH, EFFECT_DURATION_DEFAULT), EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); - } - - public static double getTargetRange() { - return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - - public static int getProjectileMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - } - - public static double getRadiusGrowth() { - return Math.clamp(ConfigUtil.readDouble(RADIUS_GROWTH_PATH, RADIUS_GROWTH_DEFAULT), RADIUS_GROWTH_MIN, RADIUS_GROWTH_MAX); - } - - public static double getRotationSpeed() { - return Math.clamp(ConfigUtil.readDouble(ROTATION_SPEED_PATH, ROTATION_SPEED_DEFAULT), ROTATION_SPEED_MIN, ROTATION_SPEED_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "blade_of_grass", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/blade_of_grass.png"), @@ -173,19 +153,19 @@ public class BladeOfGrass extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); - if(!customData.contains("hitCount") || customData.getInt("hitCount") >= getProjectileMaxHitCount()) return; + if(!customData.contains("hitCount") || customData.getInt("hitCount") >= PROJECTILE_MAX_HIT_COUNT.get()) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getProjectileDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) PROJECTILE_DAMAGE.get(), 1.0f)) { int count = customData.getInt("hitCount"); count++; if(target instanceof LivingEntity livingEntity && projectile.getRandom().nextInt(4) == 0) { livingEntity.addEffect(new MobEffectInstance( MobEffects.POISON, - getEffectDuration(), + EFFECT_DURATION.get(), 0 )); } - if(count >= getProjectileMaxHitCount()) onDied(projectile); + if(count >= PROJECTILE_MAX_HIT_COUNT.get()) onDied(projectile); else customData.putInt("hitCount", count); } } @@ -211,7 +191,7 @@ public class BladeOfGrass extends MeleeWeapon { if(!level.isClientSide()) { List targets = CollisionUtil.searchEnemies( player.level(), - AABB.ofSize(player.getBoundingBox().getCenter(), getTargetRange() * 2, getTargetRange() * 2, getTargetRange() * 2), + AABB.ofSize(player.getBoundingBox().getCenter(), TARGET_RANGE.get() * 2, TARGET_RANGE.get() * 2, TARGET_RANGE.get() * 2), player, player ); @@ -248,9 +228,9 @@ public class BladeOfGrass extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.RXP, -90); projectile.getEntityData().set(StaticProjectile.RZP, -90); projectile.getEntityData().set(StaticProjectile.RYPS, 10); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getProjectileLifetime()); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("(%.3f+%.3f*t)*cos(%.3f*t+%.3f)", radius, getRadiusGrowth(), getRotationSpeed(), angleRad)); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Y, String.format("(%.3f+%.3f*t)*sin(%.3f*t+%.3f)", radius, getRadiusGrowth(), getRotationSpeed(), angleRad)); + projectile.getEntityData().set(StaticProjectile.LIFETIME, PROJECTILE_LIFETIME.get()); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("(%.3f+%.3f*t)*cos(%.3f*t+%.3f)", radius, RADIUS_GROWTH.get(), ROTATION_SPEED.get(), angleRad)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Y, String.format("(%.3f+%.3f*t)*sin(%.3f*t+%.3f)", radius, RADIUS_GROWTH.get(), ROTATION_SPEED.get(), angleRad)); CompoundTag customData = new CompoundTag(); customData.putInt("hitCount", 0); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java index 93b7d04..014bc0a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java @@ -5,10 +5,10 @@ import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.IItemWaveBehavior; 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.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; import net.minecraft.network.chat.Component; @@ -29,18 +29,20 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; public class BloodButcherer extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String EFFECT_DURATION_PATH = "weapon.blood_butcherer.effect_duration"; - public static final int EFFECT_DURATION_DEFAULT = 180; - public static final int EFFECT_DURATION_MIN = 0; - public static final int EFFECT_DURATION_MAX = 72000; - - public static final String MAX_LEVEL_PATH = "weapon.blood_butcherer.max_level"; - public static final int MAX_LEVEL_DEFAULT = 4; - public static final int MAX_LEVEL_MIN = 0; - public static final int MAX_LEVEL_MAX = 255; - + public static final ConfigInt EFFECT_DURATION = new ConfigInt( + "weapon.blood_butcherer.effect_duration", + "blood_butcherer_effect_duration", + 180, + 0, + 72000 + ); + public static final ConfigInt MAX_LEVEL = new ConfigInt( + "weapon.blood_butcherer.max_level", + "blood_butcherer_max_level", + 4, + 0, + 255 + ); public BloodButcherer() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -56,27 +58,13 @@ public class BloodButcherer extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(EFFECT_DURATION_PATH, configText("blood_butcherer_effect_duration"), configTooltip("blood_butcherer_effect_duration"), EFFECT_DURATION_DEFAULT, EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); - ConfigFactory.loadIntConfig(MAX_LEVEL_PATH, configText("blood_butcherer_max_level"), configTooltip("blood_butcherer_max_level"), MAX_LEVEL_DEFAULT, MAX_LEVEL_MIN, MAX_LEVEL_MAX); + ConfigStruct.loadAll( + EFFECT_DURATION, + MAX_LEVEL + ); } }; - 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 int getEffectDuration() { - return Math.clamp(ConfigUtil.readInt(EFFECT_DURATION_PATH, EFFECT_DURATION_DEFAULT), EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); - } - - public static int getMaxLevel() { - return Math.clamp(ConfigUtil.readInt(MAX_LEVEL_PATH, MAX_LEVEL_DEFAULT), MAX_LEVEL_MIN, MAX_LEVEL_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "blood_butcherer", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/blood_butcherer.png"), @@ -139,12 +127,12 @@ public class BloodButcherer extends MeleeWeapon { currentLevel = instance.getAmplifier(); } } - int maxLevel = getMaxLevel(); + int maxLevel = MAX_LEVEL.get(); if(maxLevel > 0) { if(currentLevel >= maxLevel) currentLevel = maxLevel - 1; livingTarget.addEffect(new MobEffectInstance( ModEffects.BLOOD_BUTCHERED, - getEffectDuration(), + EFFECT_DURATION.get(), currentLevel + 1 )); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java index 967d867..7a4cf13 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java @@ -46,200 +46,171 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Quaternionf; import org.joml.Vector3f; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import java.util.*; public class DevilsDevastation extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String KILL_MODE_TIME_PATH = "weapon.devils_devastation.kill_mode_time"; - public static final int KILL_MODE_TIME_DEFAULT = 100; - public static final int KILL_MODE_TIME_MIN = 0; - public static final int KILL_MODE_TIME_MAX = 72000; - - public static final String KILL_MODE_COOLDOWN_TIME_PATH = "weapon.devils_devastation.kill_mode_cooldown_time"; - public static final int KILL_MODE_COOLDOWN_TIME_DEFAULT = 100; - public static final int KILL_MODE_COOLDOWN_TIME_MIN = 0; - public static final int KILL_MODE_COOLDOWN_TIME_MAX = 72000; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 30.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 40; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 1200; - - public static final String PROJECTILE_SPEED_PATH = "weapon.devils_devastation.projectile_speed"; - public static final double PROJECTILE_SPEED_DEFAULT = 3.0; - public static final double PROJECTILE_SPEED_MIN = 0.0; - public static final double PROJECTILE_SPEED_MAX = 10.0; - - public static final String STUCK_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.stuck_projectile_damage"; - public static final float STUCK_PROJECTILE_DAMAGE_DEFAULT = 30.0f; - public static final float STUCK_PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float STUCK_PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String STUCK_PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.stuck_projectile_lifetime"; - public static final int STUCK_PROJECTILE_LIFETIME_DEFAULT = 40; - public static final int STUCK_PROJECTILE_LIFETIME_MIN = 1; - public static final int STUCK_PROJECTILE_LIFETIME_MAX = 1200; - - public static final String STUCK_PROJECTILE_SPEED_PATH = "weapon.devils_devastation.stuck_projectile_speed"; - public static final double STUCK_PROJECTILE_SPEED_DEFAULT = 3.0; - public static final double STUCK_PROJECTILE_SPEED_MIN = 0.0; - public static final double STUCK_PROJECTILE_SPEED_MAX = 10.0; - - public static final String KILL_MODE_PROJECTILE_CYCLE_PATH = "weapon.devils_devastation.kill_mode_projectile_cycle"; - public static final int KILL_MODE_PROJECTILE_CYCLE_DEFAULT = 8; - public static final int KILL_MODE_PROJECTILE_CYCLE_MIN = 1; - public static final int KILL_MODE_PROJECTILE_CYCLE_MAX = 200; - - public static final String KILL_MODE_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.kill_mode_projectile_damage"; - public static final float KILL_MODE_PROJECTILE_DAMAGE_DEFAULT = 200.0f; - public static final float KILL_MODE_PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float KILL_MODE_PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String KILL_MODE_PROJECTILE_ROTATE_PATH = "weapon.devils_devastation.kill_mode_projectile_rotate"; - public static final int KILL_MODE_PROJECTILE_ROTATE_DEFAULT = 30; - public static final int KILL_MODE_PROJECTILE_ROTATE_MIN = 0; - public static final int KILL_MODE_PROJECTILE_ROTATE_MAX = 90; - - public static final String STUCK_LIFETIME_PATH = "weapon.devils_devastation.stuck_lifetime"; - public static final int STUCK_LIFETIME_DEFAULT = 200; - public static final int STUCK_LIFETIME_MIN = 1; - public static final int STUCK_LIFETIME_MAX = 72000; - - public static final String MAX_STUCK_COUNT_PATH = "weapon.devils_devastation.max_stuck_count"; - public static final int MAX_STUCK_COUNT_DEFAULT = 5; - public static final int MAX_STUCK_COUNT_MIN = 1; - public static final int MAX_STUCK_COUNT_MAX = 50; - - public static final String MARK_LIGHTNING_DAMAGE_PATH = "weapon.devils_devastation.mark_lightning_damage"; - public static final float MARK_LIGHTNING_DAMAGE_DEFAULT = 100.0f; - public static final float MARK_LIGHTNING_DAMAGE_MIN = 0.0f; - public static final float MARK_LIGHTNING_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.projectile_effect_duration"; - public static final int PROJECTILE_EFFECT_DURATION_DEFAULT = 40; - public static final int PROJECTILE_EFFECT_DURATION_MIN = 0; - public static final int PROJECTILE_EFFECT_DURATION_MAX = 72000; - - public static final String STUCK_PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.stuck_projectile_effect_duration"; - public static final int STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT = 60; - public static final int STUCK_PROJECTILE_EFFECT_DURATION_MIN = 0; - public static final int STUCK_PROJECTILE_EFFECT_DURATION_MAX = 72000; - - public static final String KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.kill_mode_projectile_effect_duration"; - public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT = 70; - public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN = 0; - public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX = 72000; - + public static final ConfigInt KILL_MODE_TIME = new ConfigInt( + "weapon.devils_devastation.kill_mode_time", + "devils_devastation_kill_mode_time", + 100, + 0, + 72000 + ); + public static final ConfigInt KILL_MODE_COOLDOWN_TIME = new ConfigInt( + "weapon.devils_devastation.kill_mode_cooldown_time", + "devils_devastation_kill_mode_cooldown_time", + 100, + 0, + 72000 + ); + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.devils_devastation.projectile_damage", + "devils_devastation_projectile_damage", + 30.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.devils_devastation.projectile_lifetime", + "devils_devastation_projectile_lifetime", + 40, + 1, + 1200 + ); + public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( + "weapon.devils_devastation.projectile_speed", + "devils_devastation_projectile_speed", + 3.0, + 0.0, + 10.0 + ); + public static final ConfigFloat STUCK_PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.devils_devastation.stuck_projectile_damage", + "devils_devastation_stuck_projectile_damage", + 30.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt STUCK_PROJECTILE_LIFETIME = new ConfigInt( + "weapon.devils_devastation.stuck_projectile_lifetime", + "devils_devastation_stuck_projectile_lifetime", + 40, + 1, + 1200 + ); + public static final ConfigDouble STUCK_PROJECTILE_SPEED = new ConfigDouble( + "weapon.devils_devastation.stuck_projectile_speed", + "devils_devastation_stuck_projectile_speed", + 3.0, + 0.0, + 10.0 + ); + public static final ConfigInt KILL_MODE_PROJECTILE_CYCLE = new ConfigInt( + "weapon.devils_devastation.kill_mode_projectile_cycle", + "devils_devastation_kill_mode_projectile_cycle", + 8, + 1, + 200 + ); + public static final ConfigFloat KILL_MODE_PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.devils_devastation.kill_mode_projectile_damage", + "devils_devastation_kill_mode_projectile_damage", + 200.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt KILL_MODE_PROJECTILE_ROTATE = new ConfigInt( + "weapon.devils_devastation.kill_mode_projectile_rotate", + "devils_devastation_kill_mode_projectile_rotate", + 30, + 0, + 90 + ); + public static final ConfigInt STUCK_LIFETIME = new ConfigInt( + "weapon.devils_devastation.stuck_lifetime", + "devils_devastation_stuck_lifetime", + 200, + 1, + 72000 + ); + public static final ConfigInt MAX_STUCK_COUNT = new ConfigInt( + "weapon.devils_devastation.max_stuck_count", + "devils_devastation_max_stuck_count", + 5, + 1, + 50 + ); + public static final ConfigFloat MARK_LIGHTNING_DAMAGE = new ConfigFloat( + "weapon.devils_devastation.mark_lightning_damage", + "devils_devastation_mark_lightning_damage", + 100.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt PROJECTILE_EFFECT_DURATION = new ConfigInt( + "weapon.devils_devastation.projectile_effect_duration", + "devils_devastation_projectile_effect_duration", + 40, + 0, + 72000 + ); + public static final ConfigInt STUCK_PROJECTILE_EFFECT_DURATION = new ConfigInt( + "weapon.devils_devastation.stuck_projectile_effect_duration", + "devils_devastation_stuck_projectile_effect_duration", + 60, + 0, + 72000 + ); + public static final ConfigInt KILL_MODE_PROJECTILE_EFFECT_DURATION = new ConfigInt( + "weapon.devils_devastation.kill_mode_projectile_effect_duration", + "devils_devastation_kill_mode_projectile_effect_duration", + 70, + 0, + 72000 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(KILL_MODE_TIME_PATH, configText("devils_devastation_kill_mode_time"), configTooltip("devils_devastation_kill_mode_time"), KILL_MODE_TIME_DEFAULT, KILL_MODE_TIME_MIN, KILL_MODE_TIME_MAX); - ConfigFactory.loadIntConfig(KILL_MODE_COOLDOWN_TIME_PATH, configText("devils_devastation_kill_mode_cooldown_time"), configTooltip("devils_devastation_kill_mode_cooldown_time"), KILL_MODE_COOLDOWN_TIME_DEFAULT, KILL_MODE_COOLDOWN_TIME_MIN, KILL_MODE_COOLDOWN_TIME_MAX); - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("devils_devastation_projectile_damage"), configTooltip("devils_devastation_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("devils_devastation_projectile_lifetime"), configTooltip("devils_devastation_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("devils_devastation_projectile_speed"), configTooltip("devils_devastation_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - ConfigFactory.loadFloatConfig(STUCK_PROJECTILE_DAMAGE_PATH, configText("devils_devastation_stuck_projectile_damage"), configTooltip("devils_devastation_stuck_projectile_damage"), STUCK_PROJECTILE_DAMAGE_DEFAULT, STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadIntConfig(STUCK_PROJECTILE_LIFETIME_PATH, configText("devils_devastation_stuck_projectile_lifetime"), configTooltip("devils_devastation_stuck_projectile_lifetime"), STUCK_PROJECTILE_LIFETIME_DEFAULT, STUCK_PROJECTILE_LIFETIME_MIN, STUCK_PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadDoubleConfig(STUCK_PROJECTILE_SPEED_PATH, configText("devils_devastation_stuck_projectile_speed"), configTooltip("devils_devastation_stuck_projectile_speed"), STUCK_PROJECTILE_SPEED_DEFAULT, STUCK_PROJECTILE_SPEED_MIN, STUCK_PROJECTILE_SPEED_MAX); - ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_CYCLE_PATH, configText("devils_devastation_kill_mode_projectile_cycle"), configTooltip("devils_devastation_kill_mode_projectile_cycle"), KILL_MODE_PROJECTILE_CYCLE_DEFAULT, KILL_MODE_PROJECTILE_CYCLE_MIN, KILL_MODE_PROJECTILE_CYCLE_MAX); - ConfigFactory.loadFloatConfig(KILL_MODE_PROJECTILE_DAMAGE_PATH, configText("devils_devastation_kill_mode_projectile_damage"), configTooltip("devils_devastation_kill_mode_projectile_damage"), KILL_MODE_PROJECTILE_DAMAGE_DEFAULT, KILL_MODE_PROJECTILE_DAMAGE_MIN, KILL_MODE_PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_ROTATE_PATH, configText("devils_devastation_kill_mode_projectile_rotate"), configTooltip("devils_devastation_kill_mode_projectile_rotate"), KILL_MODE_PROJECTILE_ROTATE_DEFAULT, KILL_MODE_PROJECTILE_ROTATE_MIN, KILL_MODE_PROJECTILE_ROTATE_MAX); - ConfigFactory.loadIntConfig(STUCK_LIFETIME_PATH, configText("devils_devastation_stuck_lifetime"), configTooltip("devils_devastation_stuck_lifetime"), STUCK_LIFETIME_DEFAULT, STUCK_LIFETIME_MIN, STUCK_LIFETIME_MAX); - ConfigFactory.loadIntConfig(MAX_STUCK_COUNT_PATH, configText("devils_devastation_max_stuck_count"), configTooltip("devils_devastation_max_stuck_count"), MAX_STUCK_COUNT_DEFAULT, MAX_STUCK_COUNT_MIN, MAX_STUCK_COUNT_MAX); - ConfigFactory.loadFloatConfig(MARK_LIGHTNING_DAMAGE_PATH, configText("devils_devastation_mark_lightning_damage"), configTooltip("devils_devastation_mark_lightning_damage"), MARK_LIGHTNING_DAMAGE_DEFAULT, MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_projectile_effect_duration"), configTooltip("devils_devastation_projectile_effect_duration"), PROJECTILE_EFFECT_DURATION_DEFAULT, PROJECTILE_EFFECT_DURATION_MIN, PROJECTILE_EFFECT_DURATION_MAX); - ConfigFactory.loadIntConfig(STUCK_PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_stuck_projectile_effect_duration"), configTooltip("devils_devastation_stuck_projectile_effect_duration"), STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT, STUCK_PROJECTILE_EFFECT_DURATION_MIN, STUCK_PROJECTILE_EFFECT_DURATION_MAX); - ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_kill_mode_projectile_effect_duration"), configTooltip("devils_devastation_kill_mode_projectile_effect_duration"), KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT, KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN, KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX); + ConfigStruct.loadAll( + KILL_MODE_TIME, + KILL_MODE_COOLDOWN_TIME, + PROJECTILE_DAMAGE, + PROJECTILE_LIFETIME, + PROJECTILE_SPEED, + STUCK_PROJECTILE_DAMAGE, + STUCK_PROJECTILE_LIFETIME, + STUCK_PROJECTILE_SPEED, + KILL_MODE_PROJECTILE_CYCLE, + KILL_MODE_PROJECTILE_DAMAGE, + KILL_MODE_PROJECTILE_ROTATE, + STUCK_LIFETIME, + MAX_STUCK_COUNT, + MARK_LIGHTNING_DAMAGE, + PROJECTILE_EFFECT_DURATION, + STUCK_PROJECTILE_EFFECT_DURATION, + KILL_MODE_PROJECTILE_EFFECT_DURATION + ); } }; - - 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 int getKillModeTime() { - return Math.clamp(ConfigUtil.readInt(KILL_MODE_TIME_PATH, KILL_MODE_TIME_DEFAULT), KILL_MODE_TIME_MIN, KILL_MODE_TIME_MAX); + return KILL_MODE_TIME.get(); } public static int getKillModeCooldownTime() { - return Math.clamp(ConfigUtil.readInt(KILL_MODE_COOLDOWN_TIME_PATH, KILL_MODE_COOLDOWN_TIME_DEFAULT), KILL_MODE_COOLDOWN_TIME_MIN, KILL_MODE_COOLDOWN_TIME_MAX); - } - - public static float getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - - public static double getProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - } - - public static float getStuckProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(STUCK_PROJECTILE_DAMAGE_PATH, STUCK_PROJECTILE_DAMAGE_DEFAULT), STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_MAX); - } - - public static int getStuckProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(STUCK_PROJECTILE_LIFETIME_PATH, STUCK_PROJECTILE_LIFETIME_DEFAULT), STUCK_PROJECTILE_LIFETIME_MIN, STUCK_PROJECTILE_LIFETIME_MAX); - } - - public static double getStuckProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(STUCK_PROJECTILE_SPEED_PATH, STUCK_PROJECTILE_SPEED_DEFAULT), STUCK_PROJECTILE_SPEED_MIN, STUCK_PROJECTILE_SPEED_MAX); + return KILL_MODE_COOLDOWN_TIME.get(); } public static int getKillModeProjectileCycle() { - return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_CYCLE_PATH, KILL_MODE_PROJECTILE_CYCLE_DEFAULT), KILL_MODE_PROJECTILE_CYCLE_MIN, KILL_MODE_PROJECTILE_CYCLE_MAX); - } - - public static float getKillModeProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(KILL_MODE_PROJECTILE_DAMAGE_PATH, KILL_MODE_PROJECTILE_DAMAGE_DEFAULT), KILL_MODE_PROJECTILE_DAMAGE_MIN, KILL_MODE_PROJECTILE_DAMAGE_MAX); - } - - public static int getKillModeProjectileRotate() { - return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_ROTATE_PATH, KILL_MODE_PROJECTILE_ROTATE_DEFAULT), KILL_MODE_PROJECTILE_ROTATE_MIN, KILL_MODE_PROJECTILE_ROTATE_MAX); - } - - public static int getStuckLifetime() { - return Math.clamp(ConfigUtil.readInt(STUCK_LIFETIME_PATH, STUCK_LIFETIME_DEFAULT), STUCK_LIFETIME_MIN, STUCK_LIFETIME_MAX); - } - - public static int getMaxStuckCount() { - return Math.clamp(ConfigUtil.readInt(MAX_STUCK_COUNT_PATH, MAX_STUCK_COUNT_DEFAULT), MAX_STUCK_COUNT_MIN, MAX_STUCK_COUNT_MAX); - } - - public static float getMarkLightningDamage() { - return Math.clamp(ConfigUtil.readFloat(MARK_LIGHTNING_DAMAGE_PATH, MARK_LIGHTNING_DAMAGE_DEFAULT), MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_MAX); - } - - public static int getProjectileEffectDuration() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_EFFECT_DURATION_PATH, PROJECTILE_EFFECT_DURATION_DEFAULT), PROJECTILE_EFFECT_DURATION_MIN, PROJECTILE_EFFECT_DURATION_MAX); - } - - public static int getStuckProjectileEffectDuration() { - return Math.clamp(ConfigUtil.readInt(STUCK_PROJECTILE_EFFECT_DURATION_PATH, STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT), STUCK_PROJECTILE_EFFECT_DURATION_MIN, STUCK_PROJECTILE_EFFECT_DURATION_MAX); - } - - public static int getKillModeProjectileEffectDuration() { - return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH, KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT), KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN, KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX); + return KILL_MODE_PROJECTILE_CYCLE.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -352,9 +323,9 @@ public class DevilsDevastation extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getProjectileDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) PROJECTILE_DAMAGE.get(), 1.0f)) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getProjectileEffectDuration(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, PROJECTILE_EFFECT_DURATION.get(), 0); le.addEffect(effectInstance); } target.invulnerableTime = 5; @@ -372,7 +343,7 @@ public class DevilsDevastation extends MeleeWeapon { summon.getEntityData().set(StaticSummon.SCALE_Z, 4.0f); summon.getEntityData().set(StaticSummon.RXP, -90); summon.getEntityData().set(StaticSummon.RZP, -135); - summon.getEntityData().set(StaticSummon.LIFETIME, getStuckLifetime()); + summon.getEntityData().set(StaticSummon.LIFETIME, STUCK_LIFETIME.get()); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag customData = new CompoundTag(); @@ -396,7 +367,7 @@ public class DevilsDevastation extends MeleeWeapon { } if(target.isAlive()) { List uuids = new ArrayList<>(target.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE)); - if (uuids.size() >= getMaxStuckCount()) { + if (uuids.size() >= MAX_STUCK_COUNT.get()) { Entity stuckProjectile = ((ServerLevel) projectile.level()).getEntity(uuids.getFirst()); if (stuckProjectile != null && stuckProjectile.isAlive() && stuckProjectile instanceof StaticSummon stuckStaticProjectile) summonStuckProjectile(stuckStaticProjectile); @@ -536,9 +507,9 @@ public class DevilsDevastation extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getStuckProjectileDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) STUCK_PROJECTILE_DAMAGE.get(), 1.0f)) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getStuckProjectileEffectDuration(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, STUCK_PROJECTILE_EFFECT_DURATION.get(), 0); le.addEffect(effectInstance); } } @@ -646,9 +617,9 @@ public class DevilsDevastation extends MeleeWeapon { Entity target = result.getEntity(); List tempStuckList = target.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE); boolean valid = !tempStuckList.isEmpty(); - if(projectile.getOwner() instanceof Player player && DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getKillModeProjectileDamage(), 4.0f)) { + if(projectile.getOwner() instanceof Player player && DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) KILL_MODE_PROJECTILE_DAMAGE.get(), 4.0f)) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getKillModeProjectileEffectDuration(), 1); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, KILL_MODE_PROJECTILE_EFFECT_DURATION.get(), 1); le.addEffect(effectInstance); } @@ -668,7 +639,7 @@ public class DevilsDevastation extends MeleeWeapon { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, getKillModeProjectileCycle() + 20); + summon.getEntityData().set(StaticSummon.LIFETIME, KILL_MODE_PROJECTILE_CYCLE.get() + 20); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonCustomData = new CompoundTag(); @@ -728,13 +699,13 @@ public class DevilsDevastation extends MeleeWeapon { CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); if(projectile.getOwner() instanceof LivingEntity livingEntity) { if(customData.contains("validHit")) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, getKillModeTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, KILL_MODE_TIME.get(), 0); livingEntity.addEffect(effectInstance); MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE_COOLDOWN); if(effectInstance2 != null) livingEntity.removeEffect(effectInstance2.getEffect()); }else { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, getKillModeCooldownTime(), 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, KILL_MODE_COOLDOWN_TIME.get(), 0); livingEntity.addEffect(effectInstance); MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE); @@ -833,7 +804,7 @@ public class DevilsDevastation extends MeleeWeapon { UUID uuid = customData.getUUID("uuid"); Entity entity = serverLevel.getEntity(uuid); if(entity instanceof Player player) { - DamageUtil.meleeAttack(player, owner, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getMarkLightningDamage(), 1.0f); + DamageUtil.meleeAttack(player, owner, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) MARK_LIGHTNING_DAMAGE.get(), 1.0f); StaticSummon newSummon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), serverLevel); newSummon.setOwner(player); newSummon.getEntityData().set(StaticSummon.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE).copy()); @@ -888,9 +859,9 @@ public class DevilsDevastation extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); projectile.getEntityData().set(StaticProjectile.ITEM, new ItemStack(ModItems.DEVILS_DEVASTATION.get())); projectile.getEntityData().set(StaticProjectile.RZP, rotate); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getStuckProjectileLifetime()); + projectile.getEntityData().set(StaticProjectile.LIFETIME, STUCK_PROJECTILE_LIFETIME.get()); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getStuckProjectileSpeed())); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", STUCK_PROJECTILE_SPEED.get())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); serverLevel.addFreshEntity(projectile); @@ -903,12 +874,12 @@ public class DevilsDevastation extends MeleeWeapon { ItemStack itemStack = player.getMainHandItem(); if(!itemStack.is(ModItems.DEVILS_DEVASTATION.get())) return; if(player.getCooldowns().isOnCooldown(itemStack.getItem())) return; - player.getCooldowns().addCooldown(itemStack.getItem(), getKillModeProjectileCycle() + 5); + player.getCooldowns().addCooldown(itemStack.getItem(), KILL_MODE_PROJECTILE_CYCLE.get() + 5); if(!player.level().isClientSide()) { float radius = 4.0f; - float w = (float) Math.PI * 1.5f / getKillModeProjectileCycle(); + float w = (float) Math.PI * 1.5f / KILL_MODE_PROJECTILE_CYCLE.get(); if(player.getRandom().nextInt(2) == 0) w = -w; - int rotate = (int) ((Math.random() * 2 - 1) * getKillModeProjectileRotate()); + int rotate = (int) ((Math.random() * 2 - 1) * KILL_MODE_PROJECTILE_ROTATE.get()); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], rotate); @@ -924,7 +895,7 @@ public class DevilsDevastation extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.UP, dirs[1]); projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); projectile.getEntityData().set(StaticProjectile.ITEM, new ItemStack(ModItems.DEVILS_DEVASTATION.get())); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getKillModeProjectileCycle()); + projectile.getEntityData().set(StaticProjectile.LIFETIME, KILL_MODE_PROJECTILE_CYCLE.get()); projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RZP, rotate); projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, w > 0 ? String.format("%.3f*cos(%.3f*t - 0.25 * 3.1415926)", radius, w) : String.format("%.3f*cos(%.3f*t - 0.75 * 3.1415926)", radius, w)); @@ -1063,8 +1034,8 @@ public class DevilsDevastation extends MeleeWeapon { summonKilModeProjectile(player); player.setData(ModAttachments.DEVILS_DEVASTATION_HIT_COUNT, player.getData(ModAttachments.DEVILS_DEVASTATION_HIT_COUNT) + 1); MobEffectInstance instance = player.getEffect(ModEffects.KILL_MODE); - if(instance != null && instance.getDuration() < DevilsDevastation.getKillModeProjectileCycle()) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, DevilsDevastation.getKillModeProjectileCycle(), 0); + if(instance != null && instance.getDuration() < DevilsDevastation.KILL_MODE_PROJECTILE_CYCLE.get()) { + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, DevilsDevastation.KILL_MODE_PROJECTILE_CYCLE.get(), 0); player.addEffect(effectInstance); } event.setCanceled(true); @@ -1096,9 +1067,9 @@ public class DevilsDevastation extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.SCALE_Z, 4.0f); projectile.getEntityData().set(StaticProjectile.RXP, -90); projectile.getEntityData().set(StaticProjectile.RZP, -135); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getProjectileLifetime()); + projectile.getEntityData().set(StaticProjectile.LIFETIME, PROJECTILE_LIFETIME.get()); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getProjectileSpeed())); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", PROJECTILE_SPEED.get())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); level.addFreshEntity(projectile); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java index 9b10b35..4857a8d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java @@ -9,10 +9,12 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.item.ModItems; 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; import net.minecraft.network.chat.Component; @@ -40,23 +42,27 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class EnchantedSword extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.enchanted_sword.damage"; - public static final float DAMAGE_DEFAULT = 4.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String LIFETIME_PATH = "weapon.enchanted_sword.lifetime"; - public static final int LIFETIME_DEFAULT = 60; - public static final int LIFETIME_MIN = 1; - public static final int LIFETIME_MAX = 1200; - - public static final String SPEED_PATH = "weapon.enchanted_sword.speed"; - public static final double SPEED_DEFAULT = 1.0; - public static final double SPEED_MIN = 0.0; - public static final double SPEED_MAX = 10.0; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.enchanted_sword.damage", + "enchanted_sword_damage", + 4.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt LIFETIME = new ConfigInt( + "weapon.enchanted_sword.lifetime", + "enchanted_sword_lifetime", + 60, + 1, + 1200 + ); + public static final ConfigDouble SPEED = new ConfigDouble( + "weapon.enchanted_sword.speed", + "enchanted_sword_speed", + 1.0, + 0.0, + 10.0 + ); public EnchantedSword() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -74,32 +80,14 @@ public class EnchantedSword extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("enchanted_sword_damage"), configTooltip("enchanted_sword_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadIntConfig(LIFETIME_PATH, configText("enchanted_sword_lifetime"), configTooltip("enchanted_sword_lifetime"), LIFETIME_DEFAULT, LIFETIME_MIN, LIFETIME_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("enchanted_sword_speed"), configTooltip("enchanted_sword_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigStruct.loadAll( + DAMAGE, + LIFETIME, + SPEED + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static int getLifetime() { - return Math.clamp(ConfigUtil.readInt(LIFETIME_PATH, LIFETIME_DEFAULT), LIFETIME_MIN, LIFETIME_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( "enchanted_sword", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/enchanted_sword.png"), @@ -123,7 +111,7 @@ public class EnchantedSword extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE),(float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE),(float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 5; ParticleUtil.addParticles( (ServerLevel) projectile.level(), ModParticles.COLORFUL_PARTICLE, @@ -167,8 +155,8 @@ public class EnchantedSword extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.RZP, 45); projectile.getEntityData().set(StaticProjectile.RYPS, 10); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.LIFETIME, getLifetime()); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); + projectile.getEntityData().set(StaticProjectile.LIFETIME, LIFETIME.get()); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", SPEED.get())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); level.addFreshEntity(projectile); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java index c1a1618..319b257 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java @@ -34,59 +34,46 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; public class Excalibur extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String ROTATE_RANGE_PATH = "weapon.excalibur.rotate_range"; - public static final int ROTATE_RANGE_DEFAULT = 45; - public static final int ROTATE_RANGE_MIN = 0; - public static final int ROTATE_RANGE_MAX = 90; - - public static final String MAX_HIT_COUNT_PATH = "weapon.excalibur.max_hit_count"; - public static final int MAX_HIT_COUNT_DEFAULT = 3; - public static final int MAX_HIT_COUNT_MIN = 0; - public static final int MAX_HIT_COUNT_MAX = 100; - - public static final String DAMAGE_PATH = "weapon.excalibur.damage"; - public static final float DAMAGE_DEFAULT = 8.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - + public static final ConfigInt ROTATE_RANGE = new ConfigInt( + "weapon.excalibur.rotate_range", + "excalibur_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt MAX_HIT_COUNT = new ConfigInt( + "weapon.excalibur.max_hit_count", + "excalibur_max_hit_count", + 3, + 0, + 100 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.excalibur.damage", + "excalibur_damage", + 8.0f, + 0.0f, + 8388600.0f + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("excalibur_rotate_range"), configTooltip("excalibur_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("excalibur_max_hit_count"), configTooltip("excalibur_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("excalibur_damage"), configTooltip("excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigStruct.loadAll( + ROTATE_RANGE, + MAX_HIT_COUNT, + DAMAGE + ); } }; - 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 int getRotateRange() { - return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - } - - public static int getMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "excalibur", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/excalibur.png"), @@ -151,8 +138,8 @@ public class Excalibur extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(count < MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -171,7 +158,7 @@ public class Excalibur extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (getRotateRange() * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (ROTATE_RANGE.get() * (Math.random() * 2 - 1))); ISwordBeamBehavior.super.generate(entity, beamData); } }; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java index 0d653d0..5b4f510 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java @@ -28,108 +28,99 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; -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.ui.config.struct.ConfigBoolean; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.List; import java.util.UUID; public class FirstFractal extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.first_fractal.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 10.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String BOUNDING_BOX_SIZE_PATH = "weapon.first_fractal.bounding_box_size"; - public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5; - public static final double BOUNDING_BOX_SIZE_MIN = 0.5; - public static final double BOUNDING_BOX_SIZE_MAX = 10.0; - - public static final String PROJECTILE_SPEED_PATH = "weapon.first_fractal.projectile_speed"; - public static final double PROJECTILE_SPEED_DEFAULT = 1.5; - public static final double PROJECTILE_SPEED_MIN = 0.0; - public static final double PROJECTILE_SPEED_MAX = 10.0; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.first_fractal.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 30; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 1200; - - public static final String DISTANCE_MODE_PATH = "weapon.first_fractal.distance_mode"; - public static final boolean DISTANCE_MODE_DEFAULT = true; - - public static final String SCROLL_SPEED_PATH = "weapon.first_fractal.scroll_speed"; - public static final int SCROLL_SPEED_DEFAULT = 4; - public static final int SCROLL_SPEED_MIN = 0; - public static final int SCROLL_SPEED_MAX = 128; - - public static final String MAX_RANGE_PATH = "weapon.first_fractal.max_range"; - public static final double MAX_RANGE_DEFAULT = 64.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 1024.0; - - public static final String SPAWN_RANGE_PATH = "weapon.first_fractal.spawn_range"; - public static final double SPAWN_RANGE_DEFAULT = 16.0; - public static final double SPAWN_RANGE_MIN = 1.0; - public static final double SPAWN_RANGE_MAX = 64.0; - + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.first_fractal.projectile_damage", + "first_fractal_projectile_damage", + 10.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble BOUNDING_BOX_SIZE = new ConfigDouble( + "weapon.first_fractal.bounding_box_size", + "first_fractal_bounding_box_size", + 1.5, + 0.5, + 10.0 + ); + public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( + "weapon.first_fractal.projectile_speed", + "first_fractal_projectile_speed", + 1.5, + 0.0, + 10.0 + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.first_fractal.projectile_lifetime", + "first_fractal_projectile_lifetime", + 30, + 1, + 1200 + ); + public static final ConfigBoolean DISTANCE_MODE = new ConfigBoolean( + "weapon.first_fractal.distance_mode", + "first_fractal_distance_mode", + true + ); + public static final ConfigInt SCROLL_SPEED = new ConfigInt( + "weapon.first_fractal.scroll_speed", + "first_fractal_scroll_speed", + 4, + 0, + 128 + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.first_fractal.max_range", + "first_fractal_max_range", + 64.0, + 1.0, + 1024.0 + ); + public static final ConfigDouble SPAWN_RANGE = new ConfigDouble( + "weapon.first_fractal.spawn_range", + "first_fractal_spawn_range", + 16.0, + 1.0, + 64.0 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("first_fractal_projectile_damage"), configTooltip("first_fractal_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(BOUNDING_BOX_SIZE_PATH, configText("first_fractal_bounding_box_size"), configTooltip("first_fractal_bounding_box_size"), BOUNDING_BOX_SIZE_DEFAULT, BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("first_fractal_projectile_speed"), configTooltip("first_fractal_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("first_fractal_projectile_lifetime"), configTooltip("first_fractal_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadBooleanConfig(DISTANCE_MODE_PATH, configText("first_fractal_distance_mode"), configTooltip("first_fractal_distance_mode"), DISTANCE_MODE_DEFAULT); - ConfigFactory.loadIntConfig(SCROLL_SPEED_PATH, configText("first_fractal_scroll_speed"), configTooltip("first_fractal_scroll_speed"), SCROLL_SPEED_DEFAULT, SCROLL_SPEED_MIN, SCROLL_SPEED_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("first_fractal_max_range"), configTooltip("first_fractal_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); - ConfigFactory.loadDoubleConfig(SPAWN_RANGE_PATH, configText("first_fractal_spawn_range"), configTooltip("first_fractal_spawn_range"), SPAWN_RANGE_DEFAULT, SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + ConfigStruct.loadAll( + PROJECTILE_DAMAGE, + BOUNDING_BOX_SIZE, + PROJECTILE_SPEED, + PROJECTILE_LIFETIME, + DISTANCE_MODE, + SCROLL_SPEED, + MAX_RANGE, + SPAWN_RANGE + ); } }; - 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 getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static double getBoundingBoxSize() { - return Math.clamp(ConfigUtil.readDouble(BOUNDING_BOX_SIZE_PATH, BOUNDING_BOX_SIZE_DEFAULT), BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); - } - - public static double getProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - public static boolean isDistanceMode() { - return ConfigUtil.readBoolean(DISTANCE_MODE_PATH, DISTANCE_MODE_DEFAULT); + return DISTANCE_MODE.get(); } public static int getScrollSpeed() { - return Math.clamp(ConfigUtil.readInt(SCROLL_SPEED_PATH, SCROLL_SPEED_DEFAULT), SCROLL_SPEED_MIN, SCROLL_SPEED_MAX); + return SCROLL_SPEED.get(); } public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); - } - - public static double getSpawnRange() { - return Math.clamp(ConfigUtil.readDouble(SPAWN_RANGE_PATH, SPAWN_RANGE_DEFAULT), SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + return MAX_RANGE.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -194,11 +185,11 @@ public class FirstFractal extends MeleeWeapon { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(PROJECTILE_SPEED.get())); summon.setBoundingBox(new AABB( - summon.getX() - getBoundingBoxSize(), summon.getY() - getBoundingBoxSize(), summon.getZ() - getBoundingBoxSize(), - summon.getX() + getBoundingBoxSize(), summon.getY() + getBoundingBoxSize(), summon.getZ() + getBoundingBoxSize() + summon.getX() - BOUNDING_BOX_SIZE.get(), summon.getY() - BOUNDING_BOX_SIZE.get(), summon.getZ() - BOUNDING_BOX_SIZE.get(), + summon.getX() + BOUNDING_BOX_SIZE.get(), summon.getY() + BOUNDING_BOX_SIZE.get(), summon.getZ() + BOUNDING_BOX_SIZE.get() )); if(!summon.level().isClientSide()) { @@ -209,7 +200,7 @@ public class FirstFractal extends MeleeWeapon { FilterUtil.createTargetFilter(summon, summon.getOwner()) ); for(Entity target : targets) { - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getProjectileDamage(), 0.2f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) PROJECTILE_DAMAGE.get(), 0.2f)) { target.invulnerableTime = 10; } } @@ -223,7 +214,7 @@ public class FirstFractal extends MeleeWeapon { Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon.getLookAngle().toVector3f(), 0); ZenithTrailParticleOptions options = new ZenithTrailParticleOptions(0.05f, 40, true, color, dirs[1], dirs[2], 90); Vec3 pos = MathUtil.toVec3(dirs[1]).scale(Math.random() * 2).add(summon.position()); - Vec3 speed = MathUtil.toVec3(dirs[0]).scale(getProjectileSpeed()); + Vec3 speed = MathUtil.toVec3(dirs[0]).scale(PROJECTILE_SPEED.get()); ParticleUtil.addParticle( summon.level(), options, pos, 0, @@ -236,19 +227,19 @@ public class FirstFractal extends MeleeWeapon { public static void summon(Player player, double deltaDist) { if(!player.level().isClientSide()) { Vec3 targetPos; - if(isDistanceMode()) { - Vec3 origin = MathUtil.getCrosshairPos(player, player.level(), getMaxRange()); + if(DISTANCE_MODE.get()) { + Vec3 origin = MathUtil.getCrosshairPos(player, player.level(), MAX_RANGE.get()); double dist = origin.subtract(player.getEyePosition()).length(); - double maxScale = getMaxRange() - dist; + double maxScale = MAX_RANGE.get() - dist; double minScale = -dist; double scale = Math.min(deltaDist, maxScale); if(deltaDist < minScale) scale = -minScale; targetPos = origin.add(player.getLookAngle().normalize().scale(scale)); }else { - targetPos = player.getEyePosition().add(player.getLookAngle().normalize().scale(Math.min(deltaDist, getMaxRange()))); + targetPos = player.getEyePosition().add(player.getLookAngle().normalize().scale(Math.min(deltaDist, MAX_RANGE.get()))); } - Vec3 summonPos = MathUtil.getRandomPosInRadius(targetPos, getSpawnRange()); + Vec3 summonPos = MathUtil.getRandomPosInRadius(targetPos, SPAWN_RANGE.get()); Vector3f color = COLORS[player.getRandom().nextInt(COLORS.length)]; StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), player.level()); @@ -262,7 +253,7 @@ public class FirstFractal extends MeleeWeapon { summon.getEntityData().set(StaticSummon.COLOR_G, color.y); summon.getEntityData().set(StaticSummon.COLOR_B, color.z); summon.getEntityData().set(StaticSummon.GLOW, true); - summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); + summon.getEntityData().set(StaticSummon.LIFETIME, PROJECTILE_LIFETIME.get()); Vector3f[] dirs = MathUtil.computeCoordinateSystem(targetPos.subtract(summonPos).toVector3f(), 0); float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java index 4ec27bb..54d3bae 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java @@ -35,10 +35,12 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.*; import net.objecthunter.exp4j.ExpressionBuilder; import org.joml.Vector3f; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.Comparator; @@ -46,72 +48,54 @@ import java.util.List; import java.util.Locale; public class InfluxWaver extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.influx_waver.damage"; - public static final float DAMAGE_DEFAULT = 12.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String MAX_COUNT_PATH = "weapon.influx_waver.max_count"; - public static final int MAX_COUNT_DEFAULT = 2; - public static final int MAX_COUNT_MIN = 0; - public static final int MAX_COUNT_MAX = 10; - - public static final String SPEED_PATH = "weapon.influx_waver.speed"; - public static final double SPEED_DEFAULT = 1.0; - public static final double SPEED_MIN = 0.0; - public static final double SPEED_MAX = 10.0; - - public static final String SPAWN_RANGE_PATH = "weapon.influx_waver.spawn_range"; - public static final double SPAWN_RANGE_DEFAULT = 8.0; - public static final double SPAWN_RANGE_MIN = 1.0; - public static final double SPAWN_RANGE_MAX = 64.0; - - public static final String TARGET_RANGE_PATH = "weapon.influx_waver.target_range"; - public static final double TARGET_RANGE_DEFAULT = 24.0; - public static final double TARGET_RANGE_MIN = 1.0; - public static final double TARGET_RANGE_MAX = 64.0; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.influx_waver.damage", + "influx_waver_damage", + 12.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt MAX_COUNT = new ConfigInt( + "weapon.influx_waver.max_count", + "influx_waver_max_count", + 2, + 0, + 10 + ); + public static final ConfigDouble SPEED = new ConfigDouble( + "weapon.influx_waver.speed", + "influx_waver_speed", + 1.0, + 0.0, + 10.0 + ); + public static final ConfigDouble SPAWN_RANGE = new ConfigDouble( + "weapon.influx_waver.spawn_range", + "influx_waver_spawn_range", + 8.0, + 1.0, + 64.0 + ); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble( + "weapon.influx_waver.target_range", + "influx_waver_target_range", + 24.0, + 1.0, + 64.0 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("influx_waver_damage"), configTooltip("influx_waver_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadIntConfig(MAX_COUNT_PATH, configText("influx_waver_max_count"), configTooltip("influx_waver_max_count"), MAX_COUNT_DEFAULT, MAX_COUNT_MIN, MAX_COUNT_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("influx_waver_speed"), configTooltip("influx_waver_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); - ConfigFactory.loadDoubleConfig(SPAWN_RANGE_PATH, configText("influx_waver_spawn_range"), configTooltip("influx_waver_spawn_range"), SPAWN_RANGE_DEFAULT, SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); - ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("influx_waver_target_range"), configTooltip("influx_waver_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); + ConfigStruct.loadAll( + DAMAGE, + MAX_COUNT, + SPEED, + SPAWN_RANGE, + TARGET_RANGE + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static int getMaxCount() { - return Math.clamp(ConfigUtil.readInt(MAX_COUNT_PATH, MAX_COUNT_DEFAULT), MAX_COUNT_MIN, MAX_COUNT_MAX); - } - - public static double getSpeed() { - return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); - } - - public static double getSpawnRange() { - return Math.clamp(ConfigUtil.readDouble(SPAWN_RANGE_PATH, SPAWN_RANGE_DEFAULT), SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); - } - - public static double getTargetRange() { - return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "influx_waver", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/influx_waver.png"), @@ -178,23 +162,23 @@ public class InfluxWaver extends MeleeWeapon { checkEntity = false; }else { if(idx == 0) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(SPEED.get())); }else { checkBlock = false; if(customData.contains("target")) { Entity target = summon.level().getEntity(customData.getInt("target")); if(target == null || !target.isAlive()) { - //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(SPEED.get())); checkEntity = false; }else { //Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); - //summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(getSpeed())); + //summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(SPEED.get())); } }else { - //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(SPEED.get())); checkEntity = false; } - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(SPEED.get())); } } @@ -224,7 +208,7 @@ public class InfluxWaver extends MeleeWeapon { Entity target = customData.contains("target") ? summon.level().getEntity(customData.getInt("target")) : null; if(target != null && !hitTarget.getUUID().equals(target.getUUID())) return; if(summon.getOwner() instanceof Player player && FilterUtil.createTargetFilter(player).test(hitTarget)) { - if(DamageUtil.meleeAttack(summon, hitTarget, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, hitTarget, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { hitTarget.invulnerableTime = 2; } customData.putBoolean("dead", false); @@ -240,12 +224,12 @@ public class InfluxWaver extends MeleeWeapon { public void onDied(StaticSummon summon) { if(!summon.level().isClientSide()) { CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - if(customData.contains("dead") && !customData.getBoolean("dead") && customData.contains("idx") && customData.getInt("idx") < getMaxCount()) { + if(customData.contains("dead") && !customData.getBoolean("dead") && customData.contains("idx") && customData.getInt("idx") < MAX_COUNT.get()) { if(summon.getOwner() instanceof Player player) { Entity target = InfluxWaver.search(player, summon.position()); if(target != null) { Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); - Vec3 summonPos = MathUtil.getRandomPosOnRadius(targetPos, getSpawnRange()); + Vec3 summonPos = MathUtil.getRandomPosOnRadius(targetPos, SPAWN_RANGE.get()); InfluxWaver.summon(player, summonPos, targetPos.subtract(summonPos).normalize(), target, customData.getInt("idx") + 1); } } @@ -292,8 +276,8 @@ public class InfluxWaver extends MeleeWeapon { public static Entity search(Player player, Vec3 pos) { AABB searchBox = new AABB( - pos.x - getTargetRange(), pos.y - getTargetRange(), pos.z - getTargetRange(), - pos.x + getTargetRange(), pos.y + getTargetRange(), pos.z + getTargetRange() + pos.x - TARGET_RANGE.get(), pos.y - TARGET_RANGE.get(), pos.z - TARGET_RANGE.get(), + pos.x + TARGET_RANGE.get(), pos.y + TARGET_RANGE.get(), pos.z + TARGET_RANGE.get() ); List entities = CollisionUtil.searchEnemies(player.level(), searchBox, player, player); Entity target = null; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java index 1fe2b7e..f7227f1 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java @@ -10,10 +10,11 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.particle.DustParticleOptions; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; @@ -42,23 +43,27 @@ import java.util.Comparator; import java.util.List; public class LightsBane extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String BIG_DAMAGE_PATH = "weapon.lights_bane.big_damage"; - public static final float BIG_DAMAGE_DEFAULT = 4.0f; - public static final float BIG_DAMAGE_MIN = 0.0f; - public static final float BIG_DAMAGE_MAX = 8388600.0f; - - public static final String SMALL_DAMAGE_PATH = "weapon.lights_bane.small_damage"; - public static final float SMALL_DAMAGE_DEFAULT = 2.0f; - public static final float SMALL_DAMAGE_MIN = 0.0f; - public static final float SMALL_DAMAGE_MAX = 8388600.0f; - - public static final String TARGET_RANGE_PATH = "weapon.lights_bane.target_range"; - public static final double TARGET_RANGE_DEFAULT = 2.0; - public static final double TARGET_RANGE_MIN = 1.0; - public static final double TARGET_RANGE_MAX = 64.0; - + public static final ConfigFloat BIG_DAMAGE = new ConfigFloat( + "weapon.lights_bane.big_damage", + "lights_bane_big_damage", + 4.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigFloat SMALL_DAMAGE = new ConfigFloat( + "weapon.lights_bane.small_damage", + "lights_bane_small_damage", + 2.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble TARGET_RANGE = new ConfigDouble( + "weapon.lights_bane.target_range", + "lights_bane_target_range", + 2.0, + 1.0, + 64.0 + ); public LightsBane() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -74,32 +79,14 @@ public class LightsBane extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(BIG_DAMAGE_PATH, configText("lights_bane_big_damage"), configTooltip("lights_bane_big_damage"), BIG_DAMAGE_DEFAULT, BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); - ConfigFactory.loadFloatConfig(SMALL_DAMAGE_PATH, configText("lights_bane_small_damage"), configTooltip("lights_bane_small_damage"), SMALL_DAMAGE_DEFAULT, SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("lights_bane_target_range"), configTooltip("lights_bane_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); + ConfigStruct.loadAll( + BIG_DAMAGE, + SMALL_DAMAGE, + TARGET_RANGE + ); } }; - 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 getBigDamage() { - return Math.clamp(ConfigUtil.readFloat(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); - } - - public static float getSmallDamage() { - return Math.clamp(ConfigUtil.readFloat(SMALL_DAMAGE_PATH, SMALL_DAMAGE_DEFAULT), SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX); - } - - public static double getTargetRange() { - return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "lights_bane", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/lights_bane.png"), @@ -156,7 +143,7 @@ public class LightsBane extends MeleeWeapon { if(!summon.level().isClientSide() && summon.getOwner() instanceof Player player) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - float damage = customData.contains("big") && customData.getBoolean("big") ? (float) getBigDamage() : (float) getSmallDamage(); + float damage = customData.contains("big") && customData.getBoolean("big") ? (float) BIG_DAMAGE.get() : (float) SMALL_DAMAGE.get(); if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), damage, 1.0f)) { } @@ -177,7 +164,7 @@ public class LightsBane extends MeleeWeapon { if(!player.getCooldowns().isOnCooldown(item)) { Entity target = event.getTarget(); Vec3 pos = target.position(); - double targetRange = getTargetRange(); + double targetRange = TARGET_RANGE.get(); AABB searchBox = new AABB( pos.x - targetRange, pos.y - targetRange, pos.z - targetRange, pos.x + targetRange, pos.y + targetRange, pos.z + targetRange diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java index 002e5cd..c005765 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java @@ -36,81 +36,65 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.*; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.List; public class Mace extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_SPEED_PATH = "weapon.mace.projectile_speed"; - public static final double PROJECTILE_SPEED_DEFAULT = 2.0; - public static final double PROJECTILE_SPEED_MIN = 0.0; - public static final double PROJECTILE_SPEED_MAX = 10.0; - - public static final String GRAVITY_PATH = "weapon.mace.gravity"; - public static final double GRAVITY_DEFAULT = 0.75; - public static final double GRAVITY_MIN = 0.0; - public static final double GRAVITY_MAX = 5.0; - - public static final String DAMAGE_PATH = "weapon.mace.damage"; - public static final float DAMAGE_DEFAULT = 4.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String FLY_TIME_PATH = "weapon.mace.fly_time"; - public static final int FLY_TIME_DEFAULT = 10; - public static final int FLY_TIME_MIN = 1; - public static final int FLY_TIME_MAX = 100; - - public static final String MAX_RANGE_PATH = "weapon.mace.max_range"; - public static final double MAX_RANGE_DEFAULT = 32.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 512.0; - + public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( + "weapon.mace.projectile_speed", + "mace_projectile_speed", + 2.0, + 0.0, + 10.0 + ); + public static final ConfigDouble GRAVITY = new ConfigDouble( + "weapon.mace.gravity", + "mace_gravity", + 0.75, + 0.0, + 5.0 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.mace.damage", + "mace_damage", + 4.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt FLY_TIME = new ConfigInt( + "weapon.mace.fly_time", + "mace_fly_time", + 10, + 1, + 100 + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.mace.max_range", + "mace_max_range", + 32.0, + 1.0, + 512.0 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("mace_projectile_speed"), configTooltip("mace_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - ConfigFactory.loadDoubleConfig(GRAVITY_PATH, configText("mace_gravity"), configTooltip("mace_gravity"), GRAVITY_DEFAULT, GRAVITY_MIN, GRAVITY_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("mace_damage"), configTooltip("mace_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadIntConfig(FLY_TIME_PATH, configText("mace_fly_time"), configTooltip("mace_fly_time"), FLY_TIME_DEFAULT, FLY_TIME_MIN, FLY_TIME_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("mace_max_range"), configTooltip("mace_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + ConfigStruct.loadAll( + PROJECTILE_SPEED, + GRAVITY, + DAMAGE, + FLY_TIME, + MAX_RANGE + ); } }; - 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 double getProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - } - - public static double getGravity() { - return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static int getFlyTime() { - return Math.clamp(ConfigUtil.readInt(FLY_TIME_PATH, FLY_TIME_DEFAULT), FLY_TIME_MIN, FLY_TIME_MAX); - } - - public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "mace", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/mace.png"), @@ -184,7 +168,7 @@ public class Mace extends MeleeWeapon { FilterUtil.createTargetFilter(projectile, player) ); for(Entity target : targets) { - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 15; } } @@ -243,7 +227,7 @@ public class Mace extends MeleeWeapon { int flyTime = customData.contains("flyTime") ? customData.getInt("flyTime") : 0; int age = summon.getEntityData().get(StaticSummon.AGE); if(age < flyTime) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(PROJECTILE_SPEED.get())); BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(summon.getDeltaMovement())); if(blockHitResult.getType() != HitResult.Type.MISS) { summon.getEntityData().set(StaticSummon.AGE, flyTime); @@ -260,7 +244,7 @@ public class Mace extends MeleeWeapon { }else { Vec3 moveDir = player.getEyePosition().subtract(summon.position()); double dist = moveDir.length(); - summon.setDeltaMovement(moveDir.normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(moveDir.normalize().scale(PROJECTILE_SPEED.get())); if(dist < 2.0f) { onDied(summon); return; @@ -288,7 +272,7 @@ public class Mace extends MeleeWeapon { } } double dist = summon.position().subtract(player.position()).length(); - if(dist > getMaxRange()) { + if(dist > MAX_RANGE.get()) { CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putInt("state", State.THROWING_BACK.ordinal())); } @@ -296,16 +280,16 @@ public class Mace extends MeleeWeapon { EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(summon.getDeltaMovement()), 1.0); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 10; } } } }else if(state == State.DROPPING.ordinal()) { Vec3 g = new Vec3(0, -1, 0); - summon.setDeltaMovement(g.scale(getGravity())); + summon.setDeltaMovement(g.scale(GRAVITY.get())); double dist = summon.position().subtract(player.position()).length(); - if(dist > getMaxRange()) { + if(dist > MAX_RANGE.get()) { CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putInt("state", State.THROWING_BACK.ordinal())); } @@ -315,12 +299,12 @@ public class Mace extends MeleeWeapon { FilterUtil.createTargetFilter(summon, summon.getOwner()) ); for(Entity target : targets) { - DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 1.0f); + DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 1.0f); } }else if(state == State.THROWING_BACK.ordinal()){ Vec3 moveDir = player.getEyePosition().subtract(summon.position()); double dist = moveDir.length(); - summon.setDeltaMovement(moveDir.normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(moveDir.normalize().scale(PROJECTILE_SPEED.get())); if(!summon.noPhysics) { CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(summon.getDeltaMovement())); @@ -346,7 +330,7 @@ public class Mace extends MeleeWeapon { EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(summon.getDeltaMovement()), 1.0); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 10; } } @@ -442,7 +426,7 @@ public class Mace extends MeleeWeapon { summon.yRotO = xyRot[1]; CompoundTag customData = new CompoundTag(); - customData.putInt("flyTime", getFlyTime()); + customData.putInt("flyTime", FLY_TIME.get()); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); summon.setNoGravity(true); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java index 5424330..88bf597 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java @@ -9,10 +9,11 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.DustParticleOptions; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -36,23 +37,27 @@ import org.joml.Vector3f; import java.util.List; public class Meowmere extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.meowmere.damage"; - public static final float DAMAGE_DEFAULT = 20.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String GRAVITY_PATH = "weapon.meowmere.gravity"; - public static final double GRAVITY_DEFAULT = 0.025; - public static final double GRAVITY_MIN = 0.0; - public static final double GRAVITY_MAX = 1.0; - - public static final String INITIAL_SPEED_PATH = "weapon.meowmere.initial_speed"; - public static final double INITIAL_SPEED_DEFAULT = 1.5; - public static final double INITIAL_SPEED_MIN = 0.0; - public static final double INITIAL_SPEED_MAX = 10.0; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.meowmere.damage", + "meowmere_damage", + 20.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble GRAVITY = new ConfigDouble( + "weapon.meowmere.gravity", + "meowmere_gravity", + 0.025, + 0.0, + 1.0 + ); + public static final ConfigDouble INITIAL_SPEED = new ConfigDouble( + "weapon.meowmere.initial_speed", + "meowmere_initial_speed", + 1.5, + 0.0, + 10.0 + ); public Meowmere() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -68,32 +73,14 @@ public class Meowmere extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("meowmere_damage"), configTooltip("meowmere_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(GRAVITY_PATH, configText("meowmere_gravity"), configTooltip("meowmere_gravity"), GRAVITY_DEFAULT, GRAVITY_MIN, GRAVITY_MAX); - ConfigFactory.loadDoubleConfig(INITIAL_SPEED_PATH, configText("meowmere_initial_speed"), configTooltip("meowmere_initial_speed"), INITIAL_SPEED_DEFAULT, INITIAL_SPEED_MIN, INITIAL_SPEED_MAX); + ConfigStruct.loadAll( + DAMAGE, + GRAVITY, + INITIAL_SPEED + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static double getGravity() { - return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX); - } - - public static double getInitialSpeed() { - return Math.clamp(ConfigUtil.readDouble(INITIAL_SPEED_PATH, INITIAL_SPEED_DEFAULT), INITIAL_SPEED_MIN, INITIAL_SPEED_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "meowmere", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/meowmere.png"), @@ -134,7 +121,7 @@ public class Meowmere extends MeleeWeapon { public void tick(StaticSummon summon) { this.checkBeforeTick(summon); Vec3 motion = summon.getDeltaMovement(); - motion = motion.add(0, -getGravity(), 0); + motion = motion.add(0, -GRAVITY.get(), 0); Vec3 up = MathUtil.toVec3(MathUtil.computeCoordinateSystem(motion.toVector3f(), 0)[1]).normalize(); summon.trailPositions.addFirst(summon.position().add(up.scale(0.5))); @@ -147,7 +134,7 @@ public class Meowmere extends MeleeWeapon { if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); if(summon.getOwner() instanceof Player player) { - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { if(customData.contains("hitEntity") && customData.getInt("hitEntity") < 4) { customData.putInt("hitEntity", customData.getInt("hitEntity") + 1); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); @@ -200,7 +187,7 @@ public class Meowmere extends MeleeWeapon { ), FilterUtil.createLivingTargetFilter(summon.getOwner()) ); - for(LivingEntity livingEntity : hitEntities) livingEntity.hurt(summon.damageSources().playerAttack(player), (float) getDamage()); + for(LivingEntity livingEntity : hitEntities) livingEntity.hurt(summon.damageSources().playerAttack(player), (float) DAMAGE.get()); } } @@ -301,7 +288,7 @@ public class Meowmere extends MeleeWeapon { float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(getInitialSpeed())); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(INITIAL_SPEED.get())); level.addFreshEntity(summon); }else { ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java index 474e322..3eae85a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java @@ -29,39 +29,29 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import org.joml.Vector3f; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; public class Muramasa extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String BEAM_DAMAGE_PATH = "weapon.muramasa.beam_damage"; - public static final float BEAM_DAMAGE_DEFAULT = 2.5f; - public static final float BEAM_DAMAGE_MIN = 0.0f; - public static final float BEAM_DAMAGE_MAX = 8388600.0f; - + public static final ConfigFloat BEAM_DAMAGE = new ConfigFloat( + "weapon.muramasa.beam_damage", + "muramasa_beam_damage", + 2.5f, + 0.0f, + 8388600.0f + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(BEAM_DAMAGE_PATH, configText("muramasa_beam_damage"), configTooltip("muramasa_beam_damage"), BEAM_DAMAGE_DEFAULT, BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); + ConfigStruct.loadAll( + BEAM_DAMAGE + ); } }; - 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 getBeamDamage() { - return Math.clamp(ConfigUtil.readFloat(BEAM_DAMAGE_PATH, BEAM_DAMAGE_DEFAULT), BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "muramasa", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/muramasa.png"), @@ -206,7 +196,7 @@ public class Muramasa extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getBeamDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) BEAM_DAMAGE.get(), 1.0f)) { } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java index 2a0d77c..3ffd59b 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java @@ -38,129 +38,104 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Quaternionf; import org.joml.Vector3f; -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.ui.config.struct.ConfigBoolean; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.List; public class NightsEdge extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_ALIGN_TO_BLADE_PATH = "weapon.nights_edge.projectile_align_to_blade"; - public static final boolean PROJECTILE_ALIGN_TO_BLADE_DEFAULT = true; - - public static final String ROTATE_RANGE_PATH = "weapon.nights_edge.rotate_range"; - public static final int ROTATE_RANGE_DEFAULT = 45; - public static final int ROTATE_RANGE_MIN = 0; - public static final int ROTATE_RANGE_MAX = 90; - - public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.nights_edge.projectile_rotate_range"; - public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 40; - public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; - public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; - - public static final String MAX_HIT_COUNT_PATH = "weapon.nights_edge.max_hit_count"; - public static final int MAX_HIT_COUNT_DEFAULT = 2; - public static final int MAX_HIT_COUNT_MIN = 0; - public static final int MAX_HIT_COUNT_MAX = 100; - - public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.nights_edge.projectile_max_hit_count"; - public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 2; - public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; - public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; - - public static final String DAMAGE_PATH = "weapon.nights_edge.damage"; - public static final float DAMAGE_DEFAULT = 7.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.nights_edge.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 7.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_SPEED_PATH = "weapon.nights_edge.projectile_speed"; - public static final double PROJECTILE_SPEED_DEFAULT = 0.25; - public static final double PROJECTILE_SPEED_MIN = 0.0; - public static final double PROJECTILE_SPEED_MAX = 10.0; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.nights_edge.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 10; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 1200; - - public static final String PROJECTILE_ROTATION_SPEED_PATH = "weapon.nights_edge.projectile_rotation_speed"; - public static final int PROJECTILE_ROTATION_SPEED_DEFAULT = 36; - public static final int PROJECTILE_ROTATION_SPEED_MIN = 0; - public static final int PROJECTILE_ROTATION_SPEED_MAX = 360; - + public static final ConfigBoolean PROJECTILE_ALIGN_TO_BLADE = new ConfigBoolean( + "weapon.nights_edge.projectile_align_to_blade", + "nights_edge_projectile_align_to_blade", + true + ); + public static final ConfigInt ROTATE_RANGE = new ConfigInt( + "weapon.nights_edge.rotate_range", + "nights_edge_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt PROJECTILE_ROTATE_RANGE = new ConfigInt( + "weapon.nights_edge.projectile_rotate_range", + "nights_edge_projectile_rotate_range", + 40, + 0, + 90 + ); + public static final ConfigInt MAX_HIT_COUNT = new ConfigInt( + "weapon.nights_edge.max_hit_count", + "nights_edge_max_hit_count", + 2, + 0, + 100 + ); + public static final ConfigInt PROJECTILE_MAX_HIT_COUNT = new ConfigInt( + "weapon.nights_edge.projectile_max_hit_count", + "nights_edge_projectile_max_hit_count", + 2, + 0, + 100 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.nights_edge.damage", + "nights_edge_damage", + 7.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.nights_edge.projectile_damage", + "nights_edge_projectile_damage", + 7.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( + "weapon.nights_edge.projectile_speed", + "nights_edge_projectile_speed", + 0.25, + 0.0, + 10.0 + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.nights_edge.projectile_lifetime", + "nights_edge_projectile_lifetime", + 10, + 1, + 1200 + ); + public static final ConfigInt PROJECTILE_ROTATION_SPEED = new ConfigInt( + "weapon.nights_edge.projectile_rotation_speed", + "nights_edge_projectile_rotation_speed", + 36, + 0, + 360 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_BLADE_PATH, configText("nights_edge_projectile_align_to_blade"), configTooltip("nights_edge_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_BLADE_DEFAULT); - ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("nights_edge_rotate_range"), configTooltip("nights_edge_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("nights_edge_projectile_rotate_range"), configTooltip("nights_edge_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("nights_edge_max_hit_count"), configTooltip("nights_edge_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("nights_edge_projectile_max_hit_count"), configTooltip("nights_edge_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("nights_edge_damage"), configTooltip("nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("nights_edge_projectile_damage"), configTooltip("nights_edge_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("nights_edge_projectile_speed"), configTooltip("nights_edge_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("nights_edge_projectile_lifetime"), configTooltip("nights_edge_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_ROTATION_SPEED_PATH, configText("nights_edge_projectile_rotation_speed"), configTooltip("nights_edge_projectile_rotation_speed"), PROJECTILE_ROTATION_SPEED_DEFAULT, PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + ConfigStruct.loadAll( + PROJECTILE_ALIGN_TO_BLADE, + ROTATE_RANGE, + PROJECTILE_ROTATE_RANGE, + MAX_HIT_COUNT, + PROJECTILE_MAX_HIT_COUNT, + DAMAGE, + PROJECTILE_DAMAGE, + PROJECTILE_SPEED, + PROJECTILE_LIFETIME, + PROJECTILE_ROTATION_SPEED + ); } }; - 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 boolean isProjectileAlignToBlade() { - return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_BLADE_PATH, PROJECTILE_ALIGN_TO_BLADE_DEFAULT); - } - - public static int getRotateRange() { - return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - } - - public static int getProjectileRotateRange() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - } - - public static int getMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - } - - public static int getProjectileMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static float getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static double getProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - - public static int getProjectileRotationSpeed() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATION_SPEED_PATH, PROJECTILE_ROTATION_SPEED_DEFAULT), PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "nights_edge", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/nights_edge.png"), @@ -226,8 +201,8 @@ public class NightsEdge extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(count < MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2.0, target.getZ()), new Vec3(0, 0, 0), @@ -246,7 +221,7 @@ public class NightsEdge extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (getRotateRange() * (Math.random() * 2 - 1)); + int randomAngle = (int) (ROTATE_RANGE.get() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -281,11 +256,11 @@ public class NightsEdge extends MeleeWeapon { //碰撞计算 if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); - if(count < getProjectileMaxHitCount()) { + if(count < PROJECTILE_MAX_HIT_COUNT.get()) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(count >= getProjectileMaxHitCount()) break; - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getProjectileDamage(), 1.0f)) { + if(count >= PROJECTILE_MAX_HIT_COUNT.get()) break; + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) PROJECTILE_DAMAGE.get(), 1.0f)) { count++; ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), @@ -297,7 +272,7 @@ public class NightsEdge extends MeleeWeapon { } if(!targets.isEmpty()) customData.putInt("hitCount", count); } - if(count >= getProjectileMaxHitCount()) this.onDied(summon); + if(count >= PROJECTILE_MAX_HIT_COUNT.get()) this.onDied(summon); } ClipContext context = new ClipContext( @@ -330,7 +305,7 @@ public class NightsEdge extends MeleeWeapon { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!isProjectileAlignToBlade()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); + if(!PROJECTILE_ALIGN_TO_BLADE.get()) randomAngle = (int) (PROJECTILE_ROTATE_RANGE.get() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -342,9 +317,9 @@ public class NightsEdge extends MeleeWeapon { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NIGHTS_EDGE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); + summon.getEntityData().set(StaticSummon.LIFETIME, PROJECTILE_LIFETIME.get()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); - summon.getEntityData().set(StaticSummon.RZPS, getProjectileRotationSpeed()); + summon.getEntityData().set(StaticSummon.RZPS, PROJECTILE_ROTATION_SPEED.get()); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; @@ -381,7 +356,7 @@ public class NightsEdge extends MeleeWeapon { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(PROJECTILE_SPEED.get())); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java index 759631e..1935dc4 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java @@ -13,10 +13,12 @@ import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; @@ -40,38 +42,48 @@ import java.util.Comparator; import java.util.List; public class Seedler extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String NUT_GRAVITY_PATH = "weapon.seedler.nut_gravity"; - public static final double NUT_GRAVITY_DEFAULT = 0.075; - public static final double NUT_GRAVITY_MIN = 0.0; - public static final double NUT_GRAVITY_MAX = 1.0; - - public static final String NUT_BOUNCE_PATH = "weapon.seedler.nut_bounce"; - public static final double NUT_BOUNCE_DEFAULT = 0.5; - public static final double NUT_BOUNCE_MIN = 0.0; - public static final double NUT_BOUNCE_MAX = 1.0; - - public static final String NUT_INITIAL_SPEED_PATH = "weapon.seedler.nut_initial_speed"; - public static final double NUT_INITIAL_SPEED_DEFAULT = 0.75; - public static final double NUT_INITIAL_SPEED_MIN = 0.0; - public static final double NUT_INITIAL_SPEED_MAX = 10.0; - - public static final String THORN_DAMAGE_PATH = "weapon.seedler.thorn_damage"; - public static final float THORN_DAMAGE_DEFAULT = 2.0f; - public static final float THORN_DAMAGE_MIN = 0.0f; - public static final float THORN_DAMAGE_MAX = 8388600.0f; - - public static final String THORN_LIFETIME_PATH = "weapon.seedler.thorn_lifetime"; - public static final int THORN_LIFETIME_DEFAULT = 30; - public static final int THORN_LIFETIME_MIN = 1; - public static final int THORN_LIFETIME_MAX = 1200; - - public static final String THORN_SPEED_PATH = "weapon.seedler.thorn_speed"; - public static final double THORN_SPEED_DEFAULT = 2.0; - public static final double THORN_SPEED_MIN = 0.0; - public static final double THORN_SPEED_MAX = 10.0; - + public static final ConfigDouble NUT_GRAVITY = new ConfigDouble( + "weapon.seedler.nut_gravity", + "seedler_nut_gravity", + 0.075, + 0.0, + 1.0 + ); + public static final ConfigDouble NUT_BOUNCE = new ConfigDouble( + "weapon.seedler.nut_bounce", + "seedler_nut_bounce", + 0.5, + 0.0, + 1.0 + ); + public static final ConfigDouble NUT_INITIAL_SPEED = new ConfigDouble( + "weapon.seedler.nut_initial_speed", + "seedler_nut_initial_speed", + 0.75, + 0.0, + 10.0 + ); + public static final ConfigFloat THORN_DAMAGE = new ConfigFloat( + "weapon.seedler.thorn_damage", + "seedler_thorn_damage", + 2.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt THORN_LIFETIME = new ConfigInt( + "weapon.seedler.thorn_lifetime", + "seedler_thorn_lifetime", + 30, + 1, + 1200 + ); + public static final ConfigDouble THORN_SPEED = new ConfigDouble( + "weapon.seedler.thorn_speed", + "seedler_thorn_speed", + 2.0, + 0.0, + 10.0 + ); public Seedler() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -87,47 +99,17 @@ public class Seedler extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(NUT_GRAVITY_PATH, configText("seedler_nut_gravity"), configTooltip("seedler_nut_gravity"), NUT_GRAVITY_DEFAULT, NUT_GRAVITY_MIN, NUT_GRAVITY_MAX); - ConfigFactory.loadDoubleConfig(NUT_BOUNCE_PATH, configText("seedler_nut_bounce"), configTooltip("seedler_nut_bounce"), NUT_BOUNCE_DEFAULT, NUT_BOUNCE_MIN, NUT_BOUNCE_MAX); - ConfigFactory.loadDoubleConfig(NUT_INITIAL_SPEED_PATH, configText("seedler_nut_initial_speed"), configTooltip("seedler_nut_initial_speed"), NUT_INITIAL_SPEED_DEFAULT, NUT_INITIAL_SPEED_MIN, NUT_INITIAL_SPEED_MAX); - ConfigFactory.loadFloatConfig(THORN_DAMAGE_PATH, configText("seedler_thorn_damage"), configTooltip("seedler_thorn_damage"), THORN_DAMAGE_DEFAULT, THORN_DAMAGE_MIN, THORN_DAMAGE_MAX); - ConfigFactory.loadIntConfig(THORN_LIFETIME_PATH, configText("seedler_thorn_lifetime"), configTooltip("seedler_thorn_lifetime"), THORN_LIFETIME_DEFAULT, THORN_LIFETIME_MIN, THORN_LIFETIME_MAX); - ConfigFactory.loadDoubleConfig(THORN_SPEED_PATH, configText("seedler_thorn_speed"), configTooltip("seedler_thorn_speed"), THORN_SPEED_DEFAULT, THORN_SPEED_MIN, THORN_SPEED_MAX); + ConfigStruct.loadAll( + NUT_GRAVITY, + NUT_BOUNCE, + NUT_INITIAL_SPEED, + THORN_DAMAGE, + THORN_LIFETIME, + THORN_SPEED + ); } }; - 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 double getNutGravity() { - return Math.clamp(ConfigUtil.readDouble(NUT_GRAVITY_PATH, NUT_GRAVITY_DEFAULT), NUT_GRAVITY_MIN, NUT_GRAVITY_MAX); - } - - public static double getNutBounce() { - return Math.clamp(ConfigUtil.readDouble(NUT_BOUNCE_PATH, NUT_BOUNCE_DEFAULT), NUT_BOUNCE_MIN, NUT_BOUNCE_MAX); - } - - public static double getNutInitialSpeed() { - return Math.clamp(ConfigUtil.readDouble(NUT_INITIAL_SPEED_PATH, NUT_INITIAL_SPEED_DEFAULT), NUT_INITIAL_SPEED_MIN, NUT_INITIAL_SPEED_MAX); - } - - public static float getThornDamage() { - return Math.clamp(ConfigUtil.readFloat(THORN_DAMAGE_PATH, THORN_DAMAGE_DEFAULT), THORN_DAMAGE_MIN, THORN_DAMAGE_MAX); - } - - public static int getThornLifetime() { - return Math.clamp(ConfigUtil.readInt(THORN_LIFETIME_PATH, THORN_LIFETIME_DEFAULT), THORN_LIFETIME_MIN, THORN_LIFETIME_MAX); - } - - public static double getThornSpeed() { - return Math.clamp(ConfigUtil.readDouble(THORN_SPEED_PATH, THORN_SPEED_DEFAULT), THORN_SPEED_MIN, THORN_SPEED_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "seedler", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/seedler.png"), @@ -154,13 +136,13 @@ public class Seedler extends MeleeWeapon { public void tick(StaticSummon summon) { this.checkBeforeTick(summon); Vec3 motion = summon.getDeltaMovement(); - motion = motion.add(0, -getNutGravity(), 0); + motion = motion.add(0, -NUT_GRAVITY.get(), 0); EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(motion), 1.0); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); if(summon.getOwner() instanceof Player player) { - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getThornDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) THORN_DAMAGE.get(), 1.0f)) { target.invulnerableTime = 2; } } @@ -177,15 +159,15 @@ public class Seedler extends MeleeWeapon { double mz = motion.z; switch(face.getAxis()) { - case X -> mx = -mx * getNutBounce(); - case Y -> my = -my * getNutBounce(); - case Z -> mz = -mz * getNutBounce(); + case X -> mx = -mx * NUT_BOUNCE.get(); + case Y -> my = -my * NUT_BOUNCE.get(); + case Z -> mz = -mz * NUT_BOUNCE.get(); } if(face == Direction.UP && Math.abs(my) < 0.1) { my = 0; - mx *= getNutBounce(); - mz *= getNutBounce(); + mx *= NUT_BOUNCE.get(); + mz *= NUT_BOUNCE.get(); } motion = new Vec3(mx, my, mz); @@ -233,8 +215,8 @@ public class Seedler extends MeleeWeapon { proj.getEntityData().set(StaticProjectile.SCALE_X, 0.5f); proj.getEntityData().set(StaticProjectile.SCALE_Y, 0.5f); proj.getEntityData().set(StaticProjectile.RXP, 90); - proj.getEntityData().set(StaticProjectile.LIFETIME, getThornLifetime()); - proj.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getThornSpeed())); + proj.getEntityData().set(StaticProjectile.LIFETIME, THORN_LIFETIME.get()); + proj.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", THORN_SPEED.get())); proj.setDeltaMovement(MathUtil.toVec3(dirs[0])); summon.level().addFreshEntity(proj); @@ -278,7 +260,7 @@ public class Seedler extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getThornDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) THORN_DAMAGE.get(), 1.0f)) { target.invulnerableTime = 2; onDied(projectile); } @@ -318,7 +300,7 @@ public class Seedler extends MeleeWeapon { float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(getNutInitialSpeed())); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(NUT_INITIAL_SPEED.get())); level.addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java index a8b1e89..45daaff 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java @@ -10,10 +10,11 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.item.ModItems; 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; @@ -36,23 +37,27 @@ import net.minecraft.world.phys.*; import org.joml.Vector3f; public class StarWrath extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.star_wrath.damage"; - public static final float DAMAGE_DEFAULT = 16.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String SPEED_PATH = "weapon.star_wrath.speed"; - public static final double SPEED_DEFAULT = 2.0; - public static final double SPEED_MIN = 0.0; - public static final double SPEED_MAX = 10.0; - - public static final String MAX_RANGE_PATH = "weapon.star_wrath.max_range"; - public static final double MAX_RANGE_DEFAULT = 48.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 1024.0; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.star_wrath.damage", + "star_wrath_damage", + 16.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble SPEED = new ConfigDouble( + "weapon.star_wrath.speed", + "star_wrath_speed", + 2.0, + 0.0, + 10.0 + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.star_wrath.max_range", + "star_wrath_max_range", + 48.0, + 1.0, + 1024.0 + ); public StarWrath() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -68,32 +73,14 @@ public class StarWrath extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("star_wrath_damage"), configTooltip("star_wrath_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("star_wrath_speed"), configTooltip("star_wrath_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("star_wrath_max_range"), configTooltip("star_wrath_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + ConfigStruct.loadAll( + DAMAGE, + SPEED, + MAX_RANGE + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static double getSpeed() { - return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); - } - - public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "star_wrath", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/star_wrath.png"), @@ -140,7 +127,7 @@ public class StarWrath extends MeleeWeapon { Entity target = result.getEntity(); Entity owner = projectile.getOwner(); if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getDamage(), 0.2f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) DAMAGE.get(), 0.2f)) { target.invulnerableTime = 2; } } @@ -202,7 +189,7 @@ public class StarWrath extends MeleeWeapon { ItemStack itemstack = player.getItemInHand(hand); if(!level.isClientSide()) { for(int i = 0;i < SPAWN_COUNT;i++) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, level, getMaxRange()); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, MAX_RANGE.get()); Vec3 spawnPos = new Vec3( targetPos.x + SPAWN_OFFSET * (Math.random() * 2 - 1), @@ -235,10 +222,10 @@ public class StarWrath extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RXP, 90); projectile.getEntityData().set(StaticProjectile.RZP, 90); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", SPEED.get())); CompoundTag customData = new CompoundTag(); - customData.putInt("targetLifetime", (int) Math.round(targetPos.distanceTo(spawnPos) / getSpeed())); + customData.putInt("targetLifetime", (int) Math.round(targetPos.distanceTo(spawnPos) / SPEED.get())); projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java index 24628c5..df71f8e 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java @@ -9,10 +9,11 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.item.ModItems; 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; @@ -39,23 +40,27 @@ import net.minecraft.world.phys.*; import org.joml.Vector3f; public class Starfury extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.starfury.damage"; - public static final float DAMAGE_DEFAULT = 6.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String MAX_RANGE_PATH = "weapon.starfury.max_range"; - public static final double MAX_RANGE_DEFAULT = 24.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 1024.0; - - public static final String SPEED_PATH = "weapon.starfury.speed"; - public static final double SPEED_DEFAULT = 2.0; - public static final double SPEED_MIN = 0.0; - public static final double SPEED_MAX = 10.0; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.starfury.damage", + "starfury_damage", + 6.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.starfury.max_range", + "starfury_max_range", + 24.0, + 1.0, + 1024.0 + ); + public static final ConfigDouble SPEED = new ConfigDouble( + "weapon.starfury.speed", + "starfury_speed", + 2.0, + 0.0, + 10.0 + ); public Starfury() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -71,32 +76,14 @@ public class Starfury extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("starfury_damage"), configTooltip("starfury_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("starfury_max_range"), configTooltip("starfury_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); - ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("starfury_speed"), configTooltip("starfury_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigStruct.loadAll( + DAMAGE, + MAX_RANGE, + SPEED + ); } }; - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_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( "starfury", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/starfury.png"), @@ -120,7 +107,7 @@ public class Starfury extends MeleeWeapon { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 5; } } @@ -167,7 +154,7 @@ public class Starfury extends MeleeWeapon { public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack itemstack = player.getItemInHand(hand); if(!level.isClientSide()) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, level, getMaxRange()); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, MAX_RANGE.get()); Vec3 spawnPos = new Vec3( targetPos.x + SPAWN_OFFSET * (Math.random() * 2 - 1), @@ -194,10 +181,10 @@ public class Starfury extends MeleeWeapon { projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RXP, 90); projectile.getEntityData().set(StaticProjectile.RZP, 90); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", SPEED.get())); CompoundTag customData = new CompoundTag(); - customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / getSpeed())); + customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / SPEED.get())); projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java index df13b98..a226ce4 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java @@ -14,10 +14,13 @@ import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.network.payload.SwordBeamPayload; 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.ui.config.struct.ConfigBoolean; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; import com.mojang.math.Axis; import net.minecraft.Util; @@ -46,50 +49,67 @@ import org.joml.Vector3f; import java.util.List; public class TerraBlade extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH = "weapon.terra_blade.projectile_align_to_sword_beam"; - public static final boolean PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT = true; - - public static final String SWORD_BEAM_ROTATE_RANGE_PATH = "weapon.terra_blade.sword_beam_rotate_range"; - public static final int SWORD_BEAM_ROTATE_RANGE_DEFAULT = 45; - public static final int SWORD_BEAM_ROTATE_RANGE_MIN = 0; - public static final int SWORD_BEAM_ROTATE_RANGE_MAX = 90; - - public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.terra_blade.projectile_rotate_range"; - public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 45; - public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; - public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; - - public static final String SWORD_BEAM_MAX_HIT_COUNT_PATH = "weapon.terra_blade.sword_beam_max_hit_count"; - public static final int SWORD_BEAM_MAX_HIT_COUNT_DEFAULT = 3; - public static final int SWORD_BEAM_MAX_HIT_COUNT_MIN = 0; - public static final int SWORD_BEAM_MAX_HIT_COUNT_MAX = 100; - - public static final String SWORD_BEAM_DAMAGE_PATH = "weapon.terra_blade.sword_beam_damage"; - public static final float SWORD_BEAM_DAMAGE_DEFAULT = 11.0f; - public static final float SWORD_BEAM_DAMAGE_MIN = 0.0f; - public static final float SWORD_BEAM_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.terra_blade.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 11.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_SPEED_PATH = "weapon.terra_blade.projectile_speed"; - public static final double PROJECTILE_SPEED_DEFAULT = 2.0; - public static final double PROJECTILE_SPEED_MIN = 0.0; - public static final double PROJECTILE_SPEED_MAX = 10.0; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.terra_blade.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 60; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 1200; - - public static final String PROJECTILE_DAMAGE_DECAY_PATH = "weapon.terra_blade.projectile_damage_decay"; - public static final float PROJECTILE_DAMAGE_DECAY_DEFAULT = 0.75f; - public static final float PROJECTILE_DAMAGE_DECAY_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_DECAY_MAX = 1.0f; + public static final ConfigBoolean PROJECTILE_ALIGN_TO_SWORD_BEAM = new ConfigBoolean( + "weapon.terra_blade.projectile_align_to_sword_beam", + "terra_projectile_align_to_blade", + true + ); + public static final ConfigInt SWORD_BEAM_ROTATE_RANGE = new ConfigInt( + "weapon.terra_blade.sword_beam_rotate_range", + "terra_blade_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt PROJECTILE_ROTATE_RANGE = new ConfigInt( + "weapon.terra_blade.projectile_rotate_range", + "terra_projectile_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt SWORD_BEAM_MAX_HIT_COUNT = new ConfigInt( + "weapon.terra_blade.sword_beam_max_hit_count", + "terra_blade_max_hit_count", + 3, + 0, + 100 + ); + public static final ConfigFloat SWORD_BEAM_DAMAGE = new ConfigFloat( + "weapon.terra_blade.sword_beam_damage", + "terra_blade_damage", + 11.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.terra_blade.projectile_damage", + "terra_projectile_damage", + 11.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( + "weapon.terra_blade.projectile_speed", + "terra_projectile_speed", + 2.0, + 0.0, + 10.0 + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.terra_blade.projectile_lifetime", + "terra_projectile_lifetime", + 60, + 1, + 1200 + ); + public static final ConfigFloat PROJECTILE_DAMAGE_DECAY = new ConfigFloat( + "weapon.terra_blade.projectile_damage_decay", + "terra_projectile_damage_decay", + 0.75f, + 0.0f, + 1.0f + ); public TerraBlade() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() @@ -106,62 +126,20 @@ public class TerraBlade extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH, configText("terra_projectile_align_to_blade"), configTooltip("terra_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT); - ConfigFactory.loadIntConfig(SWORD_BEAM_ROTATE_RANGE_PATH, configText("terra_blade_rotate_range"), configTooltip("terra_blade_rotate_range"), SWORD_BEAM_ROTATE_RANGE_DEFAULT, SWORD_BEAM_ROTATE_RANGE_MIN, SWORD_BEAM_ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("terra_projectile_rotate_range"), configTooltip("terra_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(SWORD_BEAM_MAX_HIT_COUNT_PATH, configText("terra_blade_max_hit_count"), configTooltip("terra_blade_max_hit_count"), SWORD_BEAM_MAX_HIT_COUNT_DEFAULT, SWORD_BEAM_MAX_HIT_COUNT_MIN, SWORD_BEAM_MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(SWORD_BEAM_DAMAGE_PATH, configText("terra_blade_damage"), configTooltip("terra_blade_damage"), SWORD_BEAM_DAMAGE_DEFAULT, SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_MAX); - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("terra_projectile_damage"), configTooltip("terra_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("terra_projectile_speed"), configTooltip("terra_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("terra_projectile_lifetime"), configTooltip("terra_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_DECAY_PATH, configText("terra_projectile_damage_decay"), configTooltip("terra_projectile_damage_decay"), PROJECTILE_DAMAGE_DECAY_DEFAULT, PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_MAX); + ConfigStruct.loadAll( + PROJECTILE_ALIGN_TO_SWORD_BEAM, + SWORD_BEAM_ROTATE_RANGE, + PROJECTILE_ROTATE_RANGE, + SWORD_BEAM_MAX_HIT_COUNT, + SWORD_BEAM_DAMAGE, + PROJECTILE_DAMAGE, + PROJECTILE_SPEED, + PROJECTILE_LIFETIME, + PROJECTILE_DAMAGE_DECAY + ); } }; - 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 boolean isProjectileAlignToSwordBeam() { - return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH, PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT); - } - - public static int getSwordBeamRotateRange() { - return Math.clamp(ConfigUtil.readInt(SWORD_BEAM_ROTATE_RANGE_PATH, SWORD_BEAM_ROTATE_RANGE_DEFAULT), SWORD_BEAM_ROTATE_RANGE_MIN, SWORD_BEAM_ROTATE_RANGE_MAX); - } - - public static int getProjectileRotateRange() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - } - - public static int getSwordBeamMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(SWORD_BEAM_MAX_HIT_COUNT_PATH, SWORD_BEAM_MAX_HIT_COUNT_DEFAULT), SWORD_BEAM_MAX_HIT_COUNT_MIN, SWORD_BEAM_MAX_HIT_COUNT_MAX); - } - - public static float getSwordBeamDamage() { - return Math.clamp(ConfigUtil.readFloat(SWORD_BEAM_DAMAGE_PATH, SWORD_BEAM_DAMAGE_DEFAULT), SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_MAX); - } - - public static float getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static double getProjectileSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - - public static float getProjectileDamageDecay() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_DECAY_PATH, PROJECTILE_DAMAGE_DECAY_DEFAULT), PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "terra_blade", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/terra_blade.png"), @@ -215,8 +193,8 @@ public class TerraBlade extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getSwordBeamMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float)getSwordBeamDamage(), 0.1f)) { + if(count < SWORD_BEAM_MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), SWORD_BEAM_DAMAGE.get(), 0.1f)) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -230,7 +208,7 @@ public class TerraBlade extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (getSwordBeamRotateRange() * (Math.random() * 2 - 1)); + int randomAngle = (int) (SWORD_BEAM_ROTATE_RANGE.get() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -260,10 +238,10 @@ public class TerraBlade extends MeleeWeapon { if(!customData.contains("dead")) { float progress = summon.getEntityData().get(StaticSummon.AGE) / (float) summon.getEntityData().get(StaticSummon.LIFETIME); if(progress > FADE_IN) { - double projectileSpeed = getProjectileSpeed(); + double projectileSpeed = PROJECTILE_SPEED.get(); summon.setDeltaMovement(summon.getLookAngle().normalize().scale(projectileSpeed - projectileSpeed * (progress - FADE_IN) / (1.0f - FADE_IN))); }else { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(PROJECTILE_SPEED.get())); } }else { summon.setDeltaMovement(summon.getLookAngle().normalize().scale(0.1)); @@ -284,7 +262,7 @@ public class TerraBlade extends MeleeWeapon { int count = customData.getInt("hitCount"); List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float)getProjectileDamage() * (float)Math.pow(getProjectileDamageDecay(), count), 0.1f)) { + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), PROJECTILE_DAMAGE.get() * (float)Math.pow(PROJECTILE_DAMAGE_DECAY.get(), count), 0.1f)) { count++; ParticleUtil.addParticles( (ServerLevel) summon.level(), ModParticles.TERRA_BEAM_HIT_PARTICLE.get(), @@ -343,7 +321,7 @@ public class TerraBlade extends MeleeWeapon { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!isProjectileAlignToSwordBeam()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); + if(!PROJECTILE_ALIGN_TO_SWORD_BEAM.get()) randomAngle = (int) (PROJECTILE_ROTATE_RANGE.get() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -355,7 +333,7 @@ public class TerraBlade extends MeleeWeapon { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TERRA_BLADE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); + summon.getEntityData().set(StaticSummon.LIFETIME, PROJECTILE_LIFETIME.get()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); @@ -393,7 +371,7 @@ public class TerraBlade extends MeleeWeapon { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileSpeed())); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(PROJECTILE_SPEED.get())); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java index 68c1dab..a67f806 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java @@ -7,10 +7,12 @@ import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; -import com.lzxnone.terraria.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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; @@ -42,23 +44,27 @@ import org.jspecify.annotations.NonNull; import java.util.List; public class Terragrim extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String HIT_RANGE_PATH = "weapon.terragrim.hit_range"; - public static final double HIT_RANGE_DEFAULT = 2.5; - public static final double HIT_RANGE_MIN = 0.5; - public static final double HIT_RANGE_MAX = 10.0; - - public static final String DAMAGE_PATH = "weapon.terragrim.damage"; - public static final float DAMAGE_DEFAULT = 0.25f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String ROTATE_RANGE_PATH = "weapon.terragrim.rotate_range"; - public static final int ROTATE_RANGE_DEFAULT = 45; - public static final int ROTATE_RANGE_MIN = 0; - public static final int ROTATE_RANGE_MAX = 90; - + public static final ConfigDouble HIT_RANGE = new ConfigDouble( + "weapon.terragrim.hit_range", + "terragrim_hit_range", + 2.5, + 0.5, + 10.0 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.terragrim.damage", + "terragrim_damage", + 0.25f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt ROTATE_RANGE = new ConfigInt( + "weapon.terragrim.rotate_range", + "terragrim_rotate_range", + 45, + 0, + 90 + ); public Terragrim() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -74,32 +80,14 @@ public class Terragrim extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(HIT_RANGE_PATH, configText("terragrim_hit_range"), configTooltip("terragrim_hit_range"), HIT_RANGE_DEFAULT, HIT_RANGE_MIN, HIT_RANGE_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("terragrim_damage"), configTooltip("terragrim_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("terragrim_rotate_range"), configTooltip("terragrim_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + ConfigStruct.loadAll( + HIT_RANGE, + DAMAGE, + ROTATE_RANGE + ); } }; - 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 double getHitRange() { - return Math.clamp(ConfigUtil.readDouble(HIT_RANGE_PATH, HIT_RANGE_DEFAULT), HIT_RANGE_MIN, HIT_RANGE_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static int getRotateRange() { - return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "terragrim", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/terragrim.png"), @@ -150,7 +138,7 @@ public class Terragrim extends MeleeWeapon { if(summon.getOwner() != null) { summon.setPos(summon.getOwner().getX(), summon.getOwner().getY() + summon.getOwner().getBbHeight() * 0.5, summon.getOwner().getZ()); } - double hitRange = getHitRange(); + double hitRange = HIT_RANGE.get(); summon.setBoundingBox(new AABB( summon.getX() - hitRange, summon.getY() - hitRange, summon.getZ() - hitRange, summon.getX() + hitRange, summon.getY() + hitRange, summon.getZ() + hitRange @@ -164,7 +152,7 @@ public class Terragrim extends MeleeWeapon { ); for(Entity target : targets) { if(target instanceof LivingEntity livingEntity) { - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getDamage(), 0.05f)) target.invulnerableTime = 0; + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) DAMAGE.get(), 0.05f)) target.invulnerableTime = 0; } } } @@ -194,7 +182,7 @@ public class Terragrim extends MeleeWeapon { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TERRAGRIM_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * getRotateRange())); + summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * ROTATE_RANGE.get())); summon.getEntityData().set(StaticSummon.LIFETIME, 1); summon.getEntityData().set(StaticSummon.GLOW, true); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java index 4a2f9f6..4bc6903 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java @@ -41,102 +41,82 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class TheHorsemansBlade extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String BLADE_ROTATE_RANGE_PATH = "weapon.the_horsemans_blade.blade_rotate_range"; - public static final int BLADE_ROTATE_RANGE_DEFAULT = 45; - public static final int BLADE_ROTATE_RANGE_MIN = 0; - public static final int BLADE_ROTATE_RANGE_MAX = 90; - - public static final String BLADE_MAX_HIT_COUNT_PATH = "weapon.the_horsemans_blade.blade_max_hit_count"; - public static final int BLADE_MAX_HIT_COUNT_DEFAULT = 3; - public static final int BLADE_MAX_HIT_COUNT_MIN = 0; - public static final int BLADE_MAX_HIT_COUNT_MAX = 100; - - public static final String BLADE_DAMAGE_PATH = "weapon.the_horsemans_blade.blade_damage"; - public static final float BLADE_DAMAGE_DEFAULT = 15.0f; - public static final float BLADE_DAMAGE_MIN = 0.0f; - public static final float BLADE_DAMAGE_MAX = 8388600.0f; - - public static final String PUMPKIN_SPAWN_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_spawn_range"; - public static final double PUMPKIN_SPAWN_RANGE_DEFAULT = 16.0; - public static final double PUMPKIN_SPAWN_RANGE_MIN = 1.0; - public static final double PUMPKIN_SPAWN_RANGE_MAX = 64.0; - - public static final String PUMPKIN_SPEED_PATH = "weapon.the_horsemans_blade.pumpkin_speed"; - public static final double PUMPKIN_SPEED_DEFAULT = 0.5; - public static final double PUMPKIN_SPEED_MIN = 0.0; - public static final double PUMPKIN_SPEED_MAX = 10.0; - - public static final String PUMPKIN_DAMAGE_PATH = "weapon.the_horsemans_blade.pumpkin_damage"; - public static final float PUMPKIN_DAMAGE_DEFAULT = 15.0f; - public static final float PUMPKIN_DAMAGE_MIN = 0.0f; - public static final float PUMPKIN_DAMAGE_MAX = 8388600.0f; - - public static final String PUMPKIN_MAX_TARGET_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_max_target_range"; - public static final double PUMPKIN_MAX_TARGET_RANGE_DEFAULT = 32.0; - public static final double PUMPKIN_MAX_TARGET_RANGE_MIN = 1.0; - public static final double PUMPKIN_MAX_TARGET_RANGE_MAX = 64.0; - + public static final ConfigInt BLADE_ROTATE_RANGE = new ConfigInt( + "weapon.the_horsemans_blade.blade_rotate_range", + "horsemans_blade_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt BLADE_MAX_HIT_COUNT = new ConfigInt( + "weapon.the_horsemans_blade.blade_max_hit_count", + "horsemans_blade_max_hit_count", + 3, + 0, + 100 + ); + public static final ConfigFloat BLADE_DAMAGE = new ConfigFloat( + "weapon.the_horsemans_blade.blade_damage", + "horsemans_blade_damage", + 15.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble PUMPKIN_SPAWN_RANGE = new ConfigDouble( + "weapon.the_horsemans_blade.pumpkin_spawn_range", + "horsemans_pumpkin_spawn_range", + 16.0, + 1.0, + 64.0 + ); + public static final ConfigDouble PUMPKIN_SPEED = new ConfigDouble( + "weapon.the_horsemans_blade.pumpkin_speed", + "horsemans_pumpkin_speed", + 0.5, + 0.0, + 10.0 + ); + public static final ConfigFloat PUMPKIN_DAMAGE = new ConfigFloat( + "weapon.the_horsemans_blade.pumpkin_damage", + "horsemans_pumpkin_damage", + 15.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble PUMPKIN_MAX_TARGET_RANGE = new ConfigDouble( + "weapon.the_horsemans_blade.pumpkin_max_target_range", + "horsemans_pumpkin_max_target_range", + 32.0, + 1.0, + 64.0 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(BLADE_ROTATE_RANGE_PATH, configText("horsemans_blade_rotate_range"), configTooltip("horsemans_blade_rotate_range"), BLADE_ROTATE_RANGE_DEFAULT, BLADE_ROTATE_RANGE_MIN, BLADE_ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(BLADE_MAX_HIT_COUNT_PATH, configText("horsemans_blade_max_hit_count"), configTooltip("horsemans_blade_max_hit_count"), BLADE_MAX_HIT_COUNT_DEFAULT, BLADE_MAX_HIT_COUNT_MIN, BLADE_MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(BLADE_DAMAGE_PATH, configText("horsemans_blade_damage"), configTooltip("horsemans_blade_damage"), BLADE_DAMAGE_DEFAULT, BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PUMPKIN_SPAWN_RANGE_PATH, configText("horsemans_pumpkin_spawn_range"), configTooltip("horsemans_pumpkin_spawn_range"), PUMPKIN_SPAWN_RANGE_DEFAULT, PUMPKIN_SPAWN_RANGE_MIN, PUMPKIN_SPAWN_RANGE_MAX); - ConfigFactory.loadDoubleConfig(PUMPKIN_SPEED_PATH, configText("horsemans_pumpkin_speed"), configTooltip("horsemans_pumpkin_speed"), PUMPKIN_SPEED_DEFAULT, PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX); - ConfigFactory.loadFloatConfig(PUMPKIN_DAMAGE_PATH, configText("horsemans_pumpkin_damage"), configTooltip("horsemans_pumpkin_damage"), PUMPKIN_DAMAGE_DEFAULT, PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PUMPKIN_MAX_TARGET_RANGE_PATH, configText("horsemans_pumpkin_max_target_range"), configTooltip("horsemans_pumpkin_max_target_range"), PUMPKIN_MAX_TARGET_RANGE_DEFAULT, PUMPKIN_MAX_TARGET_RANGE_MIN, PUMPKIN_MAX_TARGET_RANGE_MAX); + ConfigStruct.loadAll( + BLADE_ROTATE_RANGE, + BLADE_MAX_HIT_COUNT, + BLADE_DAMAGE, + PUMPKIN_SPAWN_RANGE, + PUMPKIN_SPEED, + PUMPKIN_DAMAGE, + PUMPKIN_MAX_TARGET_RANGE + ); } }; - 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 int getBladeRotateRange() { - return Math.clamp(ConfigUtil.readInt(BLADE_ROTATE_RANGE_PATH, BLADE_ROTATE_RANGE_DEFAULT), BLADE_ROTATE_RANGE_MIN, BLADE_ROTATE_RANGE_MAX); - } - - public static int getBladeMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(BLADE_MAX_HIT_COUNT_PATH, BLADE_MAX_HIT_COUNT_DEFAULT), BLADE_MAX_HIT_COUNT_MIN, BLADE_MAX_HIT_COUNT_MAX); - } - - public static float getBladeDamage() { - return Math.clamp(ConfigUtil.readFloat(BLADE_DAMAGE_PATH, BLADE_DAMAGE_DEFAULT), BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX); - } - - public static double getPumpkinSpawnRange() { - return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPAWN_RANGE_PATH, PUMPKIN_SPAWN_RANGE_DEFAULT), PUMPKIN_SPAWN_RANGE_MIN, PUMPKIN_SPAWN_RANGE_MAX); - } - - public static double getPumpkinSpeed() { - return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPEED_PATH, PUMPKIN_SPEED_DEFAULT), PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX); - } - - public static float getPumpkinDamage() { - return Math.clamp(ConfigUtil.readFloat(PUMPKIN_DAMAGE_PATH, PUMPKIN_DAMAGE_DEFAULT), PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX); - } - - public static double getPumpkinMaxTargetRange() { - return Math.clamp(ConfigUtil.readDouble(PUMPKIN_MAX_TARGET_RANGE_PATH, PUMPKIN_MAX_TARGET_RANGE_DEFAULT), PUMPKIN_MAX_TARGET_RANGE_MIN, PUMPKIN_MAX_TARGET_RANGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "the_horsemans_blade", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/the_horsemans_blade.png"), @@ -201,8 +181,8 @@ public class TheHorsemansBlade extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getBladeMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) getBladeDamage(), 1.0f)) { + if(count < BLADE_MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) BLADE_DAMAGE.get(), 1.0f)) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -213,7 +193,7 @@ public class TheHorsemansBlade extends MeleeWeapon { if(entity == null) return; summon.setOwner(entity); summon.getEntityData().set(StaticSummon.STACK_SOURCE, beam.getEntityData().get(SwordBeam.STACK_SOURCE).copy()); - Vec3 pos = MathUtil.getRandomPosInRadius(entity.position(), getPumpkinSpawnRange()); + Vec3 pos = MathUtil.getRandomPosInRadius(entity.position(), PUMPKIN_SPAWN_RANGE.get()); summon.setPos(pos); float[] xyRot = MathUtil.computeXYRot(MathUtil.toVector3f(target.position().subtract(pos))); @@ -248,7 +228,7 @@ public class TheHorsemansBlade extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (getBladeRotateRange() * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (BLADE_ROTATE_RANGE.get() * (Math.random() * 2 - 1))); //beamData.putBoolean("right", entity.getRandom().nextInt(2) == 0); ISwordBeamBehavior.super.generate(entity, beamData); } @@ -311,7 +291,7 @@ public class TheHorsemansBlade extends MeleeWeapon { if(target == null) { List targets = CollisionUtil.searchEnemies( summon.level(), - AABB.ofSize(summon.position(), getPumpkinMaxTargetRange() * 2, getPumpkinMaxTargetRange() * 2, getPumpkinMaxTargetRange() * 2), + AABB.ofSize(summon.position(), PUMPKIN_MAX_TARGET_RANGE.get() * 2, PUMPKIN_MAX_TARGET_RANGE.get() * 2, PUMPKIN_MAX_TARGET_RANGE.get() * 2), summon, summon.getOwner() ); @@ -329,18 +309,18 @@ public class TheHorsemansBlade extends MeleeWeapon { Vec3 selfPos = summon.position(); Vec3 dir = targetPos.subtract(selfPos).normalize(); - summon.setDeltaMovement(dir.scale(getPumpkinSpeed())); + summon.setDeltaMovement(dir.scale(PUMPKIN_SPEED.get())); float[] xyRot = MathUtil.computeXYRot(MathUtil.toVector3f(dir)); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); if(selfPos.distanceToSqr(targetPos) < 2.0D) { - if(summon.getOwner() instanceof Player player && FilterUtil.createTargetFilter(player).test(target) && DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getPumpkinDamage(), 1.0f)) onDied(summon); + if(summon.getOwner() instanceof Player player && FilterUtil.createTargetFilter(player).test(target) && DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) PUMPKIN_DAMAGE.get(), 1.0f)) onDied(summon); } }else { Vec3 dir = summon.getLookAngle().normalize(); - summon.setDeltaMovement(dir.scale(getPumpkinSpeed())); + summon.setDeltaMovement(dir.scale(PUMPKIN_SPEED.get())); } if(!summon.level().isClientSide()) { @@ -361,7 +341,7 @@ public class TheHorsemansBlade extends MeleeWeapon { for(Entity hitEntity : hitEntities) { if(target != null && hitEntity.getUUID() == target.getUUID()) continue; if(summon.getOwner() instanceof Player player) { - if(DamageUtil.meleeAttack(summon, hitEntity, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getPumpkinDamage(), 1.0f)) { + if(DamageUtil.meleeAttack(summon, hitEntity, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) PUMPKIN_DAMAGE.get(), 1.0f)) { hitEntity.invulnerableTime = 2; } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java index 4db00ca..90d48a7 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java @@ -32,59 +32,46 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; public class TrueExcalibur extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String ROTATE_RANGE_PATH = "weapon.true_excalibur.rotate_range"; - public static final int ROTATE_RANGE_DEFAULT = 45; - public static final int ROTATE_RANGE_MIN = 0; - public static final int ROTATE_RANGE_MAX = 90; - - public static final String MAX_HIT_COUNT_PATH = "weapon.true_excalibur.max_hit_count"; - public static final int MAX_HIT_COUNT_DEFAULT = 6; - public static final int MAX_HIT_COUNT_MIN = 0; - public static final int MAX_HIT_COUNT_MAX = 100; - - public static final String DAMAGE_PATH = "weapon.true_excalibur.damage"; - public static final float DAMAGE_DEFAULT = 8.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - + public static final ConfigInt ROTATE_RANGE = new ConfigInt( + "weapon.true_excalibur.rotate_range", + "true_excalibur_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt MAX_HIT_COUNT = new ConfigInt( + "weapon.true_excalibur.max_hit_count", + "true_excalibur_max_hit_count", + 6, + 0, + 100 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.true_excalibur.damage", + "true_excalibur_damage", + 8.0f, + 0.0f, + 8388600.0f + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("true_excalibur_rotate_range"), configTooltip("true_excalibur_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("true_excalibur_max_hit_count"), configTooltip("true_excalibur_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("true_excalibur_damage"), configTooltip("true_excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigStruct.loadAll( + ROTATE_RANGE, + MAX_HIT_COUNT, + DAMAGE + ); } }; - 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 int getRotateRange() { - return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - } - - public static int getMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "true_excalibur", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/true_excalibur.png"), @@ -152,8 +139,8 @@ public class TrueExcalibur extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(count < MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -177,7 +164,7 @@ public class TrueExcalibur extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (getRotateRange() * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (ROTATE_RANGE.get() * (Math.random() * 2 - 1))); ISwordBeamBehavior.super.generate(entity, beamData); } }; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java index 16b7dc0..4d17482 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java @@ -38,139 +38,112 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Quaternionf; import org.joml.Vector3f; -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.ui.config.struct.ConfigBoolean; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.List; public class TrueNightsEdge extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String PROJECTILE_ALIGN_TO_BLADE_PATH = "weapon.true_nights_edge.projectile_align_to_blade"; - public static final boolean PROJECTILE_ALIGN_TO_BLADE_DEFAULT = true; - - public static final String ROTATE_RANGE_PATH = "weapon.true_nights_edge.rotate_range"; - public static final int ROTATE_RANGE_DEFAULT = 45; - public static final int ROTATE_RANGE_MIN = 0; - public static final int ROTATE_RANGE_MAX = 90; - - public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.true_nights_edge.projectile_rotate_range"; - public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 45; - public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; - public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; - - public static final String MAX_HIT_COUNT_PATH = "weapon.true_nights_edge.max_hit_count"; - public static final int MAX_HIT_COUNT_DEFAULT = 2; - public static final int MAX_HIT_COUNT_MIN = 0; - public static final int MAX_HIT_COUNT_MAX = 100; - - public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.true_nights_edge.projectile_max_hit_count"; - public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 3; - public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; - public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; - - public static final String DAMAGE_PATH = "weapon.true_nights_edge.damage"; - public static final float DAMAGE_DEFAULT = 8.0f; - public static final float DAMAGE_MIN = 0.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_DAMAGE_PATH = "weapon.true_nights_edge.projectile_damage"; - public static final float PROJECTILE_DAMAGE_DEFAULT = 4.0f; - public static final float PROJECTILE_DAMAGE_MIN = 0.0f; - public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f; - - public static final String PROJECTILE_MAX_SPEED_PATH = "weapon.true_nights_edge.projectile_max_speed"; - public static final double PROJECTILE_MAX_SPEED_DEFAULT = 2.0; - public static final double PROJECTILE_MAX_SPEED_MIN = 0.0; - public static final double PROJECTILE_MAX_SPEED_MAX = 10.0; - - public static final String PROJECTILE_ACCELERATION_PATH = "weapon.true_nights_edge.projectile_acceleration"; - public static final double PROJECTILE_ACCELERATION_DEFAULT = 0.03; - public static final double PROJECTILE_ACCELERATION_MIN = 0.0; - public static final double PROJECTILE_ACCELERATION_MAX = 10.0; - - public static final String PROJECTILE_LIFETIME_PATH = "weapon.true_nights_edge.projectile_lifetime"; - public static final int PROJECTILE_LIFETIME_DEFAULT = 60; - public static final int PROJECTILE_LIFETIME_MIN = 1; - public static final int PROJECTILE_LIFETIME_MAX = 1200; - - public static final String PROJECTILE_ROTATION_SPEED_PATH = "weapon.true_nights_edge.projectile_rotation_speed"; - public static final int PROJECTILE_ROTATION_SPEED_DEFAULT = 30; - public static final int PROJECTILE_ROTATION_SPEED_MIN = 0; - public static final int PROJECTILE_ROTATION_SPEED_MAX = 360; - + public static final ConfigBoolean PROJECTILE_ALIGN_TO_BLADE = new ConfigBoolean( + "weapon.true_nights_edge.projectile_align_to_blade", + "true_nights_edge_projectile_align_to_blade", + true + ); + public static final ConfigInt ROTATE_RANGE = new ConfigInt( + "weapon.true_nights_edge.rotate_range", + "true_nights_edge_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt PROJECTILE_ROTATE_RANGE = new ConfigInt( + "weapon.true_nights_edge.projectile_rotate_range", + "true_nights_edge_projectile_rotate_range", + 45, + 0, + 90 + ); + public static final ConfigInt MAX_HIT_COUNT = new ConfigInt( + "weapon.true_nights_edge.max_hit_count", + "true_nights_edge_max_hit_count", + 2, + 0, + 100 + ); + public static final ConfigInt PROJECTILE_MAX_HIT_COUNT = new ConfigInt( + "weapon.true_nights_edge.projectile_max_hit_count", + "true_nights_edge_projectile_max_hit_count", + 3, + 0, + 100 + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.true_nights_edge.damage", + "true_nights_edge_damage", + 8.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( + "weapon.true_nights_edge.projectile_damage", + "true_nights_edge_projectile_damage", + 4.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigDouble PROJECTILE_MAX_SPEED = new ConfigDouble( + "weapon.true_nights_edge.projectile_max_speed", + "true_nights_edge_projectile_max_speed", + 2.0, + 0.0, + 10.0 + ); + public static final ConfigDouble PROJECTILE_ACCELERATION = new ConfigDouble( + "weapon.true_nights_edge.projectile_acceleration", + "true_nights_edge_projectile_acceleration", + 0.03, + 0.0, + 10.0 + ); + public static final ConfigInt PROJECTILE_LIFETIME = new ConfigInt( + "weapon.true_nights_edge.projectile_lifetime", + "true_nights_edge_projectile_lifetime", + 60, + 1, + 1200 + ); + public static final ConfigInt PROJECTILE_ROTATION_SPEED = new ConfigInt( + "weapon.true_nights_edge.projectile_rotation_speed", + "true_nights_edge_projectile_rotation_speed", + 30, + 0, + 360 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_BLADE_PATH, configText("true_nights_edge_projectile_align_to_blade"), configTooltip("true_nights_edge_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_BLADE_DEFAULT); - ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("true_nights_edge_rotate_range"), configTooltip("true_nights_edge_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("true_nights_edge_projectile_rotate_range"), configTooltip("true_nights_edge_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("true_nights_edge_max_hit_count"), configTooltip("true_nights_edge_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("true_nights_edge_projectile_max_hit_count"), configTooltip("true_nights_edge_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("true_nights_edge_damage"), configTooltip("true_nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadFloatConfig(PROJECTILE_DAMAGE_PATH, configText("true_nights_edge_projectile_damage"), configTooltip("true_nights_edge_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_MAX_SPEED_PATH, configText("true_nights_edge_projectile_max_speed"), configTooltip("true_nights_edge_projectile_max_speed"), PROJECTILE_MAX_SPEED_DEFAULT, PROJECTILE_MAX_SPEED_MIN, PROJECTILE_MAX_SPEED_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_ACCELERATION_PATH, configText("true_nights_edge_projectile_acceleration"), configTooltip("true_nights_edge_projectile_acceleration"), PROJECTILE_ACCELERATION_DEFAULT, PROJECTILE_ACCELERATION_MIN, PROJECTILE_ACCELERATION_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("true_nights_edge_projectile_lifetime"), configTooltip("true_nights_edge_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - ConfigFactory.loadIntConfig(PROJECTILE_ROTATION_SPEED_PATH, configText("true_nights_edge_projectile_rotation_speed"), configTooltip("true_nights_edge_projectile_rotation_speed"), PROJECTILE_ROTATION_SPEED_DEFAULT, PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + ConfigStruct.loadAll( + PROJECTILE_ALIGN_TO_BLADE, + ROTATE_RANGE, + PROJECTILE_ROTATE_RANGE, + MAX_HIT_COUNT, + PROJECTILE_MAX_HIT_COUNT, + DAMAGE, + PROJECTILE_DAMAGE, + PROJECTILE_MAX_SPEED, + PROJECTILE_ACCELERATION, + PROJECTILE_LIFETIME, + PROJECTILE_ROTATION_SPEED + ); } }; - 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 boolean isProjectileAlignToBlade() { - return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_BLADE_PATH, PROJECTILE_ALIGN_TO_BLADE_DEFAULT); - } - - public static int getRotateRange() { - return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); - } - - public static int getProjectileRotateRange() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); - } - - public static int getMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); - } - - public static int getProjectileMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - - public static float getProjectileDamage() { - return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); - } - - public static double getProjectileMaxSpeed() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_MAX_SPEED_PATH, PROJECTILE_MAX_SPEED_DEFAULT), PROJECTILE_MAX_SPEED_MIN, PROJECTILE_MAX_SPEED_MAX); - } - - public static double getProjectileAcceleration() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_ACCELERATION_PATH, PROJECTILE_ACCELERATION_DEFAULT), PROJECTILE_ACCELERATION_MIN, PROJECTILE_ACCELERATION_MAX); - } - - public static int getProjectileLifetime() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); - } - - public static int getProjectileRotationSpeed() { - return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATION_SPEED_PATH, PROJECTILE_ROTATION_SPEED_DEFAULT), PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "true_nights_edge", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/true_nights_edge.png"), @@ -242,8 +215,8 @@ public class TrueNightsEdge extends MeleeWeapon { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < getMaxHitCount()) { - if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) getDamage(), 1.0f)) { + if(count < MAX_HIT_COUNT.get()) { + if(DamageUtil.meleeAttack(beam, target, beam.getEntityData().get(SwordBeam.STACK_SOURCE), (float) DAMAGE.get(), 1.0f)) { ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2.0, target.getZ()), new Vec3(0, 0, 0), @@ -262,7 +235,7 @@ public class TrueNightsEdge extends MeleeWeapon { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (getRotateRange() * (Math.random() * 2 - 1)); + int randomAngle = (int) (ROTATE_RANGE.get() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -290,8 +263,8 @@ public class TrueNightsEdge extends MeleeWeapon { //运动逻辑 Vec3 motion = summon.getDeltaMovement(); double currentSpeed = motion.length(); - double maxSpeed = getProjectileMaxSpeed(); - double acceleration = getProjectileAcceleration(); + double maxSpeed = PROJECTILE_MAX_SPEED.get(); + double acceleration = PROJECTILE_ACCELERATION.get(); if(currentSpeed < maxSpeed && currentSpeed > 0) { Vec3 dir = motion.normalize(); double newSpeed = Math.min(currentSpeed + acceleration, maxSpeed); @@ -312,11 +285,11 @@ public class TrueNightsEdge extends MeleeWeapon { //碰撞计算 if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); - if(count < getProjectileMaxHitCount()) { + if(count < PROJECTILE_MAX_HIT_COUNT.get()) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(count >= getProjectileMaxHitCount()) break; - if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) getProjectileDamage(), 1.0f)) { + if(count >= PROJECTILE_MAX_HIT_COUNT.get()) break; + if(DamageUtil.meleeAttack(summon, target, summon.getEntityData().get(StaticSummon.STACK_SOURCE), (float) PROJECTILE_DAMAGE.get(), 1.0f)) { count++; ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.TRUE_NIGHTS_EDGE_HIT_PARTICLE.get(), @@ -328,7 +301,7 @@ public class TrueNightsEdge extends MeleeWeapon { } if(!targets.isEmpty()) customData.putInt("hitCount", count); } - if(count >= getProjectileMaxHitCount()) this.onDied(summon); + if(count >= PROJECTILE_MAX_HIT_COUNT.get()) this.onDied(summon); } ClipContext context = new ClipContext( @@ -361,7 +334,7 @@ public class TrueNightsEdge extends MeleeWeapon { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!isProjectileAlignToBlade()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); + if(!PROJECTILE_ALIGN_TO_BLADE.get()) randomAngle = (int) (PROJECTILE_ROTATE_RANGE.get() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -373,9 +346,9 @@ public class TrueNightsEdge extends MeleeWeapon { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TRUE_NIGHTS_EDGE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); + summon.getEntityData().set(StaticSummon.LIFETIME, PROJECTILE_LIFETIME.get()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); - summon.getEntityData().set(StaticSummon.RZPS, getProjectileRotationSpeed()); + summon.getEntityData().set(StaticSummon.RZPS, PROJECTILE_ROTATION_SPEED.get()); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; @@ -412,7 +385,7 @@ public class TrueNightsEdge extends MeleeWeapon { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileMaxSpeed() * 0.1)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(PROJECTILE_MAX_SPEED.get() * 0.1)); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java index c256bf1..275b3a3 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java @@ -10,10 +10,12 @@ import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.IItemWaveBehavior; 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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; @@ -41,28 +43,34 @@ import java.util.Comparator; import java.util.List; public class Volcano extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String EXPLOSION_RANGE_PATH = "weapon.volcano.explosion_range"; - public static final double EXPLOSION_RANGE_DEFAULT = 4.0; - public static final double EXPLOSION_RANGE_MIN = 1.0; - public static final double EXPLOSION_RANGE_MAX = 64.0; - - public static final String EXPLOSION_DAMAGE_PATH = "weapon.volcano.explosion_damage"; - public static final float EXPLOSION_DAMAGE_DEFAULT = 6.0f; - public static final float EXPLOSION_DAMAGE_MIN = 0.0f; - public static final float EXPLOSION_DAMAGE_MAX = 8388600.0f; - - public static final String EXPLOSION_MAX_HIT_COUNT_PATH = "weapon.volcano.explosion_max_hit_count"; - public static final int EXPLOSION_MAX_HIT_COUNT_DEFAULT = 2; - public static final int EXPLOSION_MAX_HIT_COUNT_MIN = 0; - public static final int EXPLOSION_MAX_HIT_COUNT_MAX = 100; - - public static final String IGNITE_SECONDS_PATH = "weapon.volcano.ignite_seconds"; - public static final int IGNITE_SECONDS_DEFAULT = 3; - public static final int IGNITE_SECONDS_MIN = 0; - public static final int IGNITE_SECONDS_MAX = 60; - + public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble( + "weapon.volcano.explosion_range", + "volcano_explosion_range", + 4.0, + 1.0, + 64.0 + ); + public static final ConfigFloat EXPLOSION_DAMAGE = new ConfigFloat( + "weapon.volcano.explosion_damage", + "volcano_explosion_damage", + 6.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt EXPLOSION_MAX_HIT_COUNT = new ConfigInt( + "weapon.volcano.explosion_max_hit_count", + "volcano_explosion_max_hit_count", + 2, + 0, + 100 + ); + public static final ConfigInt IGNITE_SECONDS = new ConfigInt( + "weapon.volcano.ignite_seconds", + "volcano_ignite_seconds", + 3, + 0, + 60 + ); public Volcano() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -78,37 +86,15 @@ public class Volcano extends MeleeWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(EXPLOSION_RANGE_PATH, configText("volcano_explosion_range"), configTooltip("volcano_explosion_range"), EXPLOSION_RANGE_DEFAULT, EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX); - ConfigFactory.loadFloatConfig(EXPLOSION_DAMAGE_PATH, configText("volcano_explosion_damage"), configTooltip("volcano_explosion_damage"), EXPLOSION_DAMAGE_DEFAULT, EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX); - ConfigFactory.loadIntConfig(EXPLOSION_MAX_HIT_COUNT_PATH, configText("volcano_explosion_max_hit_count"), configTooltip("volcano_explosion_max_hit_count"), EXPLOSION_MAX_HIT_COUNT_DEFAULT, EXPLOSION_MAX_HIT_COUNT_MIN, EXPLOSION_MAX_HIT_COUNT_MAX); - ConfigFactory.loadIntConfig(IGNITE_SECONDS_PATH, configText("volcano_ignite_seconds"), configTooltip("volcano_ignite_seconds"), IGNITE_SECONDS_DEFAULT, IGNITE_SECONDS_MIN, IGNITE_SECONDS_MAX); + ConfigStruct.loadAll( + EXPLOSION_RANGE, + EXPLOSION_DAMAGE, + EXPLOSION_MAX_HIT_COUNT, + IGNITE_SECONDS + ); } }; - 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 double getExplosionRange() { - return Math.clamp(ConfigUtil.readDouble(EXPLOSION_RANGE_PATH, EXPLOSION_RANGE_DEFAULT), EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX); - } - - public static float getExplosionDamage() { - return Math.clamp(ConfigUtil.readFloat(EXPLOSION_DAMAGE_PATH, EXPLOSION_DAMAGE_DEFAULT), EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX); - } - - public static int getExplosionMaxHitCount() { - return Math.clamp(ConfigUtil.readInt(EXPLOSION_MAX_HIT_COUNT_PATH, EXPLOSION_MAX_HIT_COUNT_DEFAULT), EXPLOSION_MAX_HIT_COUNT_MIN, EXPLOSION_MAX_HIT_COUNT_MAX); - } - - public static int getIgniteSeconds() { - return Math.clamp(ConfigUtil.readInt(IGNITE_SECONDS_PATH, IGNITE_SECONDS_DEFAULT), IGNITE_SECONDS_MIN, IGNITE_SECONDS_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "volcano", ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/volcano.png"), @@ -176,16 +162,16 @@ public class Volcano extends MeleeWeapon { if(!player.getCooldowns().isOnCooldown(item)) { List targets = player.level().getEntitiesOfClass( LivingEntity.class, - AABB.ofSize(player.getBoundingBox().getCenter(), getExplosionRange() * 2, getExplosionRange() * 2, getExplosionRange() * 2), + AABB.ofSize(player.getBoundingBox().getCenter(), EXPLOSION_RANGE.get() * 2, EXPLOSION_RANGE.get() * 2, EXPLOSION_RANGE.get() * 2), FilterUtil.createLivingTargetFilter(player) ); targets.sort(Comparator.comparingDouble(e -> e.distanceToSqr(target.position()))); int hitCount = 0; for(LivingEntity livingEntity : targets) { if(livingEntity.getUUID() == target.getUUID()) continue; - if(hitCount >= getExplosionMaxHitCount()) break; - if(DamageUtil.meleeAttack(player, livingEntity, player.getWeaponItem(), (float) getExplosionDamage(), 1.0f)) { - livingTarget.igniteForSeconds(getIgniteSeconds()); + if(hitCount >= EXPLOSION_MAX_HIT_COUNT.get()) break; + if(DamageUtil.meleeAttack(player, livingEntity, player.getWeaponItem(), (float) EXPLOSION_DAMAGE.get(), 1.0f)) { + livingTarget.igniteForSeconds(IGNITE_SECONDS.get()); hitCount++; } } @@ -227,7 +213,7 @@ public class Volcano extends MeleeWeapon { ); player.getCooldowns().addCooldown(item, 10); } - if(player.getRandom().nextInt(2) == 0) livingTarget.igniteForSeconds(getIgniteSeconds()); + if(player.getRandom().nextInt(2) == 0) livingTarget.igniteForSeconds(IGNITE_SECONDS.get()); } }else { ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java index 970ed7b..baf2f01 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java @@ -32,147 +32,157 @@ import net.minecraft.world.phys.Vec3; import org.joml.Quaternionf; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; -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.ui.config.struct.ConfigBoolean; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import net.minecraft.network.chat.Component; import java.util.List; public class Zenith extends MeleeWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String DAMAGE_PATH = "weapon.zenith.damage"; - public static final float DAMAGE_DEFAULT = 4.0f; - public static final float DAMAGE_MIN = 1.0f; - public static final float DAMAGE_MAX = 8388600.0f; - - public static final String MAX_RANGE_PATH = "weapon.zenith.max_range"; - public static final double MAX_RANGE_DEFAULT = 64.0; - public static final double MAX_RANGE_MIN = 1.0; - public static final double MAX_RANGE_MAX = 1024.0; - - public static final String DISTANCE_MODE_PATH = "weapon.zenith.distance_mode"; - public static final boolean DISTANCE_MODE_DEFAULT = true; - - public static final String MOUSE_SPEED_PATH = "weapon.zenith.mouse_speed"; - public static final int MOUSE_SPEED_DEFAULT = 4; - public static final int MOUSE_SPEED_MIN = 0; - public static final int MOUSE_SPEED_MAX = 128; - - public static final String TRAIL_B_PATH = "weapon.zenith.trail_b"; - public static final double TRAIL_B_DEFAULT = 4.0; - public static final double TRAIL_B_MIN = 0.1; - public static final double TRAIL_B_MAX = 512.0; - - public static final String TRAIL_OFFSET_PATH = "weapon.zenith.trail_offset"; - public static final int TRAIL_OFFSET_DEFAULT = 30; - public static final int TRAIL_OFFSET_MIN = 0; - public static final int TRAIL_OFFSET_MAX = 90; - - public static final String WEAPON_COUNT_PATH = "weapon.zenith.weapon_count"; - public static final int WEAPON_COUNT_DEFAULT = 3; - public static final int WEAPON_COUNT_MIN = 1; - public static final int WEAPON_COUNT_MAX = 3; - - public static final String BOUNDING_BOX_SIZE_PATH = "weapon.zenith.bounding_box_size"; - public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5; - public static final double BOUNDING_BOX_SIZE_MIN = 0.1; - public static final double BOUNDING_BOX_SIZE_MAX = 4.0; - - public static final String CYCLE_PATH = "weapon.zenith.cycle"; - public static final int CYCLE_DEFAULT = 20; - public static final int CYCLE_MIN = 10; - public static final int CYCLE_MAX = 100; - - public static final String SCALE_PATH = "weapon.zenith.scale"; - public static final double SCALE_DEFAULT = 2.0; - public static final double SCALE_MIN = 0.1; - public static final double SCALE_MAX = 10.0; - - public static final String TRAIL_ALPHA_PATH = "weapon.zenith.trail_alpha"; - public static final double TRAIL_ALPHA_DEFAULT = 0.15; - public static final double TRAIL_ALPHA_MIN = 0.0; - public static final double TRAIL_ALPHA_MAX = 1.0; - - public static final String TRAIL_MAX_LENGTH_PATH = "weapon.zenith.trail_max_length"; - public static final int TRAIL_MAX_LENGTH_DEFAULT = 10; - public static final int TRAIL_MAX_LENGTH_MIN = 0; - public static final int TRAIL_MAX_LENGTH_MAX = 100; - + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.zenith.damage", + "zenith_damage", + 4.0f, + 1.0f, + 8388600.0f + ); + public static final ConfigDouble MAX_RANGE = new ConfigDouble( + "weapon.zenith.max_range", + "zenith_max_range", + 64.0, + 1.0, + 1024.0 + ); + public static final ConfigBoolean DISTANCE_MODE = new ConfigBoolean( + "weapon.zenith.distance_mode", + "zenith_distance_mode", + true + ); + public static final ConfigInt MOUSE_SPEED = new ConfigInt( + "weapon.zenith.mouse_speed", + "zenith_mouse_speed", + 4, + 0, + 128 + ); + public static final ConfigDouble TRAIL_B = new ConfigDouble( + "weapon.zenith.trail_b", + "zenith_trail_b", + 4.0, + 0.1, + 512.0 + ); + public static final ConfigInt TRAIL_OFFSET = new ConfigInt( + "weapon.zenith.trail_offset", + "zenith_trail_offset", + 30, + 0, + 90 + ); + public static final ConfigInt WEAPON_COUNT = new ConfigInt( + "weapon.zenith.weapon_count", + "zenith_weapon_count", + 3, + 1, + 3 + ); + public static final ConfigDouble BOUNDING_BOX_SIZE = new ConfigDouble( + "weapon.zenith.bounding_box_size", + "zenith_bounding_box_size", + 1.5, + 0.1, + 4.0 + ); + public static final ConfigInt CYCLE = new ConfigInt( + "weapon.zenith.cycle", + "zenith_cycle", + 20, + 10, + 100 + ); + public static final ConfigDouble SCALE = new ConfigDouble( + "weapon.zenith.scale", + "zenith_scale", + 2.0, + 0.1, + 10.0 + ); + public static final ConfigDouble TRAIL_ALPHA = new ConfigDouble( + "weapon.zenith.trail_alpha", + "zenith_trail_alpha", + 0.15, + 0.0, + 1.0 + ); + public static final ConfigInt TRAIL_MAX_LENGTH = new ConfigInt( + "weapon.zenith.trail_max_length", + "zenith_trail_max_length", + 10, + 0, + 100 + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("zenith_damage"), configTooltip("zenith_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("zenith_max_range"), configTooltip("zenith_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); - ConfigFactory.loadBooleanConfig(DISTANCE_MODE_PATH, configText("zenith_distance_mode"), configTooltip("zenith_distance_mode"), DISTANCE_MODE_DEFAULT); - ConfigFactory.loadIntConfig(MOUSE_SPEED_PATH, configText("zenith_mouse_speed"), configTooltip("zenith_mouse_speed"), MOUSE_SPEED_DEFAULT, MOUSE_SPEED_MIN, MOUSE_SPEED_MAX); - ConfigFactory.loadDoubleConfig(TRAIL_B_PATH, configText("zenith_trail_b"), configTooltip("zenith_trail_b"), TRAIL_B_DEFAULT, TRAIL_B_MIN, TRAIL_B_MAX); - ConfigFactory.loadIntConfig(TRAIL_OFFSET_PATH, configText("zenith_trail_offset"), configTooltip("zenith_trail_offset"), TRAIL_OFFSET_DEFAULT, TRAIL_OFFSET_MIN, TRAIL_OFFSET_MAX); - ConfigFactory.loadIntConfig(WEAPON_COUNT_PATH, configText("zenith_weapon_count"), configTooltip("zenith_weapon_count"), WEAPON_COUNT_DEFAULT, WEAPON_COUNT_MIN, WEAPON_COUNT_MAX); - ConfigFactory.loadDoubleConfig(BOUNDING_BOX_SIZE_PATH, configText("zenith_bounding_box_size"), configTooltip("zenith_bounding_box_size"), BOUNDING_BOX_SIZE_DEFAULT, BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); - ConfigFactory.loadIntConfig(CYCLE_PATH, configText("zenith_cycle"), configTooltip("zenith_cycle"), CYCLE_DEFAULT, CYCLE_MIN, CYCLE_MAX); - ConfigFactory.loadDoubleConfig(SCALE_PATH, configText("zenith_scale"), configTooltip("zenith_scale"), SCALE_DEFAULT, SCALE_MIN, SCALE_MAX); - ConfigFactory.loadDoubleConfig(TRAIL_ALPHA_PATH, configText("zenith_trail_alpha"), configTooltip("zenith_trail_alpha"), TRAIL_ALPHA_DEFAULT, TRAIL_ALPHA_MIN, TRAIL_ALPHA_MAX); - ConfigFactory.loadIntConfig(TRAIL_MAX_LENGTH_PATH, configText("zenith_trail_max_length"), configTooltip("zenith_trail_max_length"), TRAIL_MAX_LENGTH_DEFAULT, TRAIL_MAX_LENGTH_MIN, TRAIL_MAX_LENGTH_MAX); + ConfigStruct.loadAll( + DAMAGE, + MAX_RANGE, + DISTANCE_MODE, + MOUSE_SPEED, + TRAIL_B, + TRAIL_OFFSET, + WEAPON_COUNT, + BOUNDING_BOX_SIZE, + CYCLE, + SCALE, + TRAIL_ALPHA, + TRAIL_MAX_LENGTH + ); } }; - - 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 getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + return DAMAGE.get(); } public static double getMaxRange() { - return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + return MAX_RANGE.get(); } public static boolean isDistanceMode() { - return ConfigUtil.readBoolean(DISTANCE_MODE_PATH, DISTANCE_MODE_DEFAULT); + return DISTANCE_MODE.get(); } public static int getMouseSpeed() { - return Math.clamp(ConfigUtil.readInt(MOUSE_SPEED_PATH, MOUSE_SPEED_DEFAULT), MOUSE_SPEED_MIN, MOUSE_SPEED_MAX); + return MOUSE_SPEED.get(); } public static double getTrailB() { - return Math.clamp(ConfigUtil.readDouble(TRAIL_B_PATH, TRAIL_B_DEFAULT), TRAIL_B_MIN, TRAIL_B_MAX); + return TRAIL_B.get(); } public static int getTrailOffset() { - return Math.clamp(ConfigUtil.readInt(TRAIL_OFFSET_PATH, TRAIL_OFFSET_DEFAULT), TRAIL_OFFSET_MIN, TRAIL_OFFSET_MAX); + return TRAIL_OFFSET.get(); } public static int getWeaponCount() { - return Math.clamp(ConfigUtil.readInt(WEAPON_COUNT_PATH, WEAPON_COUNT_DEFAULT), WEAPON_COUNT_MIN, WEAPON_COUNT_MAX); - } - - public static double getBoundingBoxSize() { - return Math.clamp(ConfigUtil.readDouble(BOUNDING_BOX_SIZE_PATH, BOUNDING_BOX_SIZE_DEFAULT), BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); + return WEAPON_COUNT.get(); } public static int getCycle() { - return Math.clamp(ConfigUtil.readInt(CYCLE_PATH, CYCLE_DEFAULT), CYCLE_MIN, CYCLE_MAX); + return CYCLE.get(); } public static double getScale() { - return Math.clamp(ConfigUtil.readDouble(SCALE_PATH, SCALE_DEFAULT), SCALE_MIN, SCALE_MAX); + return SCALE.get(); } public static double getTrailAlpha() { - return Math.clamp(ConfigUtil.readDouble(TRAIL_ALPHA_PATH, TRAIL_ALPHA_DEFAULT), TRAIL_ALPHA_MIN, TRAIL_ALPHA_MAX); - } - - public static int getTrailMaxLength() { - return Math.clamp(ConfigUtil.readInt(TRAIL_MAX_LENGTH_PATH, TRAIL_MAX_LENGTH_DEFAULT), TRAIL_MAX_LENGTH_MIN, TRAIL_MAX_LENGTH_MAX); + return TRAIL_ALPHA.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -285,11 +295,11 @@ public class Zenith extends MeleeWeapon { projectile.trailPositions.addFirst(projectile.position().add(right.scale(-1.2))); projectile.trailPositions.addFirst(projectile.position().add(right.scale(1.5))); - while(projectile.trailPositions.size() > getTrailMaxLength()) projectile.trailPositions.removeLast(); + while(projectile.trailPositions.size() > TRAIL_MAX_LENGTH.get()) projectile.trailPositions.removeLast(); projectile.setBoundingBox(new AABB( - projectile.getX() - getBoundingBoxSize(), projectile.getY() - getBoundingBoxSize(), projectile.getZ() - getBoundingBoxSize(), - projectile.getX() + getBoundingBoxSize(), projectile.getY() + getBoundingBoxSize(), projectile.getZ() + getBoundingBoxSize() + projectile.getX() - BOUNDING_BOX_SIZE.get(), projectile.getY() - BOUNDING_BOX_SIZE.get(), projectile.getZ() - BOUNDING_BOX_SIZE.get(), + projectile.getX() + BOUNDING_BOX_SIZE.get(), projectile.getY() + BOUNDING_BOX_SIZE.get(), projectile.getZ() + BOUNDING_BOX_SIZE.get() )); if(!projectile.level().isClientSide()) { @@ -326,7 +336,7 @@ public class Zenith extends MeleeWeapon { if(!projectile.level().isClientSide()) { Entity target = result.getEntity(); if(projectile.getOwner() instanceof Player player && FilterUtil.createTargetFilter(projectile, projectile.getOwner()).test(target)) { - if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) (getDamage() + Math.random() * getDamage()), 0.2f)) { + if(DamageUtil.meleeAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), (float) (DAMAGE.get() + Math.random() * DAMAGE.get()), 0.2f)) { target.invulnerableTime = 2; } } @@ -336,26 +346,26 @@ public class Zenith extends MeleeWeapon { public static void summon(Player player, double deltaDist, boolean isFirst) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - int randomAngle = (int) ((Math.random() * 2 - 1) * getTrailOffset()); + int randomAngle = (int) ((Math.random() * 2 - 1) * TRAIL_OFFSET.get()); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); Vec3 pos = (player.getBoundingBox().getCenter()).add(MathUtil.toVec3(dirs[0]).scale(-2)); double dist; - if(isDistanceMode()) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), getMaxRange()); - dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, getMaxRange())); + if(DISTANCE_MODE.get()) { + Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), MAX_RANGE.get()); + dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, MAX_RANGE.get())); }else { dist = deltaDist; } - int cycle = (int) Math.max(10, dist / getMaxRange() * getCycle()); + int cycle = (int) Math.max(10, dist / MAX_RANGE.get() * CYCLE.get()); double a = Math.max(dist / 2, 2); - double b = Math.min(Math.random() * getTrailB() + getTrailB(), a / 2); + double b = Math.min(Math.random() * TRAIL_B.get() + TRAIL_B.get(), a / 2); double w = Math.PI * 2 / (double) cycle; if(player.getRandom().nextInt(2) == 0) w = -w; int randomIndex = isFirst ? getWeapons().length - 1 : player.getRandom().nextInt(getWeapons().length); - for(int i = 0;i < getWeaponCount();i++) { + for(int i = 0;i < WEAPON_COUNT.get();i++) { StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), player.level()); projectile.setOwner(player); projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, player.getWeaponItem().copy()); @@ -382,16 +392,16 @@ public class Zenith extends MeleeWeapon { customData.putInt("angle", randomAngle); if(i == 0) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 1.0f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale()); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale()); + projectile.getEntityData().set(StaticProjectile.SCALE_X, SCALE.get().floatValue()); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, SCALE.get().floatValue()); projectile.getEntityData().set(StaticProjectile.LIFETIME, cycle); projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-1.571)", b, w)); projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*sin(%.3ft-1.571)+%.3f", a, w, a)); customData.putInt("start", 0); }else if(i == 1) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale() * 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale() * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, SCALE.get().floatValue() * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, SCALE.get().floatValue() * 0.75f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.25)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-3.142)", b, w)); @@ -403,8 +413,8 @@ public class Zenith extends MeleeWeapon { customData.putInt("start", (int) (cycle * 0.25)); }else if(i == 2) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale() * 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale() * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, SCALE.get().floatValue() * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, SCALE.get().floatValue() * 0.5f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.5)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-4.713)", b, w)); @@ -461,4 +471,3 @@ public class Zenith extends MeleeWeapon { return UseAnim.BLOCK; } } - diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java new file mode 100644 index 0000000..9619658 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java @@ -0,0 +1,164 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.item.weapon.ranged.gun.Gun; +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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +import java.util.List; + +public class ElfMelter extends RangedWeapon { + public static final String ID = "elf_melter"; + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.elf_melter.damage", "elf_melter_damage", 4.0f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.elf_melter.speed", "elf_melter_speed", 4.0D, 0.1D, 24.0D); + public static final ConfigDouble RANGE = new ConfigDouble("weapon.elf_melter.range", "elf_melter_range", 32.0D, 1.0D, 128.0D); + public static final ConfigInt FREEZE_TICKS = new ConfigInt("weapon.elf_melter.freeze_ticks", "elf_melter_freeze_ticks", 400, 0, 72000); + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); + public static final float FLAME_RED = 0.35f; + public static final float FLAME_GREEN = 0.85f; + public static final float FLAME_BLUE = 1.0f; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE, SPEED, RANGE, FREEZE_TICKS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = Gun.createConfigListItem(ID, CONFIG_DATA); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + double a = customData.contains("a") ? customData.getDouble("a") : 1; + boolean dead = customData.contains("dead"); + int t = summon.getEntityData().get(StaticSummon.AGE); + double v = dead ? 0 : SPEED.get() - a * t; + + Vec3 motion = summon.getLookAngle().normalize().scale(v); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + if(summon.level().isClientSide()) { + summon.setPos(end); + return; + } + + //碰撞检测 + Vec3 collisionStart = new Vec3( + customData.contains("startX") ? customData.getFloat("startX") : summon.getX(), + customData.contains("startY") ? customData.getFloat("startY") : summon.getY(), + customData.contains("startZ") ? customData.getFloat("startZ") : summon.getZ() + ); + AABB hitBox = new AABB(collisionStart, end).inflate(1.0); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + for(Entity target : targets) { + if(target.getBoundingBox().inflate(1.0).clip(collisionStart, end).isEmpty()) continue; + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.25f)) { + target.invulnerableTime = 12; + if(target instanceof LivingEntity livingTarget) { + livingTarget.setTicksFrozen(Math.max(livingTarget.getTicksFrozen(), FREEZE_TICKS.get())); + } + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + customData.putBoolean("dead", true); + int left = Math.min(10, summon.getEntityData().get(StaticSummon.LIFETIME) - t); + summon.getEntityData().set(StaticSummon.AGE, left); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + return; + } + + summon.setPos(end); + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vec3 start = new Vec3( + customData.contains("startX") ? customData.getFloat("startX") : summon.getX(), + customData.contains("startY") ? customData.getFloat("startY") : summon.getY(), + customData.contains("startZ") ? customData.getFloat("startZ") : summon.getZ() + ); + return new AABB(start, summon.position()).inflate(4); + } + }; + + public ElfMelter() { + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(Items.SLIME_BALL); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.withDefaultNamespace("slime_ball"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 15; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.SHOT9.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.ELF_MELTER_FLAME); + double projectileSpeed = SPEED.get(); + double projectileRange = RANGE.get(); + double a = projectileSpeed * projectileSpeed / (2 * projectileRange); + CompoundTag customData = new CompoundTag(); + customData.putDouble("a", a); + customData.putFloat("startX", (float) summon.getX()); + customData.putFloat("startY", (float) summon.getY()); + customData.putFloat("startZ", (float) summon.getZ()); + customData.putFloat("flameRed", FLAME_RED); + customData.putFloat("flameGreen", FLAME_GREEN); + customData.putFloat("flameBlue", FLAME_BLUE); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + summon.getEntityData().set(StaticSummon.LIFETIME, (int) (projectileSpeed / a)); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java new file mode 100644 index 0000000..fc530ee --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java @@ -0,0 +1,186 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.item.weapon.ranged.gun.Gun; +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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.*; +import org.joml.Vector3f; + +import java.util.List; + +public class Flamethrower extends RangedWeapon { + public static final String ID = "flamethrower"; + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.flamethrower.damage", + "flamethrower_damage", + 3.0f, + 0.0f, + 8388600.0f + ); + public static final ConfigInt IGNITE_TICKS = new ConfigInt( + "weapon.flamethrower.ignite_ticks", + "flamethrower_ignite_ticks", + 400, + 0, + 72000 + ); + public static final ConfigDouble SPEED = new ConfigDouble( + "weapon.flamethrower.speed", + "flamethrower_speed", + 4.0D, + 0.1D, + 24.0D + ); + public static final ConfigDouble RANGE = new ConfigDouble( + "weapon.flamethrower.range", + "flamethrower_range", + 32.0D, + 1.0D, + 128.0D + ); + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); + public static final float FLAME_RED = 1.0f; + public static final float FLAME_GREEN = 0.55f; + public static final float FLAME_BLUE = 0.1f; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll( + DAMAGE, + IGNITE_TICKS, + SPEED, + RANGE + ); + } + }; + public static final ConfigListItem CONFIG_LIST_ITEM = Gun.createConfigListItem(ID, CONFIG_DATA); + + public Flamethrower() { + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + double a = customData.contains("a") ? customData.getDouble("a") : 1; + boolean dead = customData.contains("dead"); + int t = summon.getEntityData().get(StaticSummon.AGE); + double v = dead ? 0 : SPEED.get() - a * t; + + Vec3 motion = summon.getLookAngle().normalize().scale(v); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + if(summon.level().isClientSide()) { + summon.setPos(end); + return; + } + + //碰撞检测 + Vec3 collisionStart = new Vec3( + customData.contains("startX") ? customData.getFloat("startX") : summon.getX(), + customData.contains("startY") ? customData.getFloat("startY") : summon.getY(), + customData.contains("startZ") ? customData.getFloat("startZ") : summon.getZ() + ); + AABB hitBox = new AABB(collisionStart, end).inflate(1.0); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + for(Entity target : targets) { + if(target.getBoundingBox().inflate(1.0).clip(collisionStart, end).isEmpty()) continue; + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.25f)) { + target.invulnerableTime = 12; + if(target instanceof LivingEntity livingTarget) { + livingTarget.igniteForTicks(IGNITE_TICKS.get()); + } + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + customData.putBoolean("dead", true); + int left = Math.min(10, summon.getEntityData().get(StaticSummon.LIFETIME) - t); + summon.getEntityData().set(StaticSummon.AGE, left); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + return; + } + + summon.setPos(end); + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vec3 start = new Vec3( + customData.contains("startX") ? customData.getFloat("startX") : summon.getX(), + customData.contains("startY") ? customData.getFloat("startY") : summon.getY(), + customData.contains("startZ") ? customData.getFloat("startZ") : summon.getZ() + ); + return new AABB(start, summon.position()).inflate(4); + } + }; + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(Items.SLIME_BALL); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.withDefaultNamespace("slime_ball"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 15; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.SHOT9.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.FLAMETHROWER_FLAME); + double projectileSpeed = SPEED.get(); + double projectileRange = RANGE.get(); + double a = projectileSpeed * projectileSpeed / (2 * projectileRange); + CompoundTag customData = new CompoundTag(); + customData.putDouble("a", a); + customData.putFloat("startX", (float) summon.getX()); + customData.putFloat("startY", (float) summon.getY()); + customData.putFloat("startZ", (float) summon.getZ()); + customData.putFloat("flameRed", FLAME_RED); + customData.putFloat("flameGreen", FLAME_GREEN); + customData.putFloat("flameBlue", FLAME_BLUE); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + summon.getEntityData().set(StaticSummon.LIFETIME, (int) (projectileSpeed / a)); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java new file mode 100644 index 0000000..7c0eab3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java @@ -0,0 +1,139 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.*; +import net.minecraft.core.particles.ItemParticleOption; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +import java.util.List; + +public class SnowballCannon extends RangedWeapon { + public static final String ID = "snowball_cannon"; + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.snowball_cannon.speed", "snowball_cannon_speed", 1.5D, 0.0D, 24.0D); + public static final ConfigDouble GRAVITY = new ConfigDouble("weapon.snowball_cannon.gravity", "snowball_cannon_gravity", 0.05D, 0.0D, 10.0D); + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.snowball_cannon.damage", "snowball_cannon_damage", 2.5f, 0.0f, 8388600.0f); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SPEED, GRAVITY, DAMAGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); + + public SnowballCannon() { + super(Tiers.STONE, new Item.Properties().stacksTo(1)); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getDeltaMovement().add(0, -GRAVITY.get(), 0); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + if(summon.level().isClientSide()) { + summon.setDeltaMovement(motion); + return; + } + + //碰撞检测 + AABB hitBox = new AABB(start, end).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.5f)) { + target.invulnerableTime = 10; + this.onDied(summon); + return; + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + return; + } + + summon.setDeltaMovement(motion); + } + + @Override + public void onDied(StaticSummon summon) { + if(summon.level() instanceof ServerLevel serverLevel) { + ParticleUtil.addParticles( + serverLevel, + new ItemParticleOption(ParticleTypes.ITEM, Items.SNOWBALL.getDefaultInstance()), + summon.position(), + new Vec3(0.08, 0.08, 0.08), + 0.05, + 8 + ); + SoundUtil.playServerSound(summon.level(), ModSounds.SNOW_BREAK.get(), summon.position()); + summon.discard(); + } + } + }; + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(Items.SNOWBALL); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.withDefaultNamespace("snowball"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 19; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.SHOT2.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(SPEED.get())); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java new file mode 100644 index 0000000..5a9dcec --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java @@ -0,0 +1,126 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.particle.ModParticles; +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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.*; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +import java.util.List; + +public class StarCannon extends RangedWeapon { + public static final String ID = "star_cannon"; + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.star_cannon.speed", "star_cannon_speed", 2.0D, 0.0D, 24.0D); + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.star_cannon.damage", "star_cannon_damage", 8.0f, 0.0f, 8388600.0f); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SPEED, DAMAGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); + + public StarCannon() { + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + if(summon.level().isClientSide()) { + ParticleUtil.addParticle( + summon.level(), ModParticles.STAR_PARTICLE.get(), + summon.position(), 0.0, + new Vec3(0, 0, 0), 0.2 + ); + summon.setPos(end); + return; + } + + //碰撞检测 + AABB hitBox = new AABB(start, end).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + for(Entity target : targets) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.25f)) { + target.invulnerableTime = 5; + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + SoundUtil.playServerSound(summon.level(), ModSounds.STAR_COLLIDE.get(), summon.position()); + this.onDied(summon); + return; + } + + summon.setPos(end); + } + }; + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(ModItems.FALLEN_STAR.get()); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "fallen_star"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 12; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.STAR_FALL.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.FALLEN_STAR); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.FALLEN_STAR.get())); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java new file mode 100644 index 0000000..069bbc7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java @@ -0,0 +1,165 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.particle.ModParticles; +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.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.*; +import org.joml.Vector3f; + +import java.util.List; + +public class SuperStarShooter extends RangedWeapon { + public static final String ID = "super_star_shooter"; + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.super_star_shooter.speed", "super_star_shooter_speed", 2.5D, 0.0D, 24.0D); + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.super_star_shooter.damage", "super_star_shooter_damage", 9.0f, 0.0f, 8388600.0f); + public static final ConfigDouble BOLT_SPEED = new ConfigDouble("weapon.super_star_shooter.bolt_speed", "super_star_shooter_bolt_speed", 2.0D, 0.0D, 24.0D); + public static final ConfigFloat BOLT_DAMAGE = new ConfigFloat("weapon.super_star_shooter.bolt_damage", "super_star_shooter_bolt_damage", 9.0f, 0.0f, 8388600.0f); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SPEED, DAMAGE, BOLT_SPEED, BOLT_DAMAGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); + + public SuperStarShooter() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED.get()); + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + if(summon.level().isClientSide()) { + ParticleUtil.addParticle( + summon.level(), ModParticles.STAR_PARTICLE.get(), + summon.position(), 0.0, + new Vec3(0, 0, 0), 0.2 + ); + summon.setPos(end); + return; + } + + //碰撞检测 + AABB hitBox = new AABB(start, end).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + + for(Entity target : targets) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.3f)) { + target.invulnerableTime = 10; + + StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), summon.level()); + projectile.setOwner(summon.getOwner()); + Vec3 pos = MathUtil.getRandomPosOnRadius(summon.position(), 4); + Vector3f dir = summon.position().subtract(pos).toVector3f(); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(dir, 0); + projectile.setPos(pos); + projectile.getEntityData().set(StaticProjectile.BEHAVIOR, StaticProjectileBehaviors.SUPER_STAR_PRISMATIC_BOLT); + projectile.getEntityData().set(StaticProjectile.RENDER_MODE, "custom"); + projectile.getEntityData().set(StaticProjectile.STACK_SOURCE, summon.getEntityData().get(StaticSummon.STACK_SOURCE).copy()); + projectile.getEntityData().set(StaticProjectile.ORIGIN, MathUtil.toVector3f(pos)); + projectile.getEntityData().set(StaticProjectile.DIRECTION, dirs[0]); + projectile.getEntityData().set(StaticProjectile.UP, dirs[1]); + projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); + projectile.getEntityData().set(StaticProjectile.GLOW, true); + projectile.getEntityData().set(StaticProjectile.LIFETIME, 5); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", BOLT_SPEED.get())); + + projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); + summon.level().addFreshEntity(projectile); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + SoundUtil.playServerSound(summon.level(), ModSounds.STAR_COLLIDE.get(), summon.position()); + this.onDied(summon); + return; + } + + summon.setPos(end); + } + }; + + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { + public void onHitEntity(StaticProjectile projectile, EntityHitResult result) { + if(!projectile.level().isClientSide()) { + Entity target = result.getEntity(); + if(DamageUtil.rangedAttack(projectile, target, projectile.getEntityData().get(StaticProjectile.STACK_SOURCE), BOLT_DAMAGE.get(), 0.3f)) { + target.invulnerableTime = 5; + } + } + } + }; + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(ModItems.FALLEN_STAR.get()); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "fallen_star"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 18; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.STAR_FALL.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.FALLEN_STAR_SUPER); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.WHITE_STAR.get())); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Boomstick.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java similarity index 95% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Boomstick.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java index c019d6c..f5e5436 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Boomstick.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -12,13 +12,12 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class Boomstick extends BasicGun { +public class Boomstick extends Gun { public static final String ID = "boomstick"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 2.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ChainGun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java similarity index 97% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/ChainGun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java index d70cde5..e26ef76 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ChainGun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -19,7 +19,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class ChainGun extends BasicGun { +public class ChainGun extends Gun { public static final String ID = "chain_gun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 6.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ClockworkAssaultRifle.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java similarity index 95% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/ClockworkAssaultRifle.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java index 87beddf..227b7c6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ClockworkAssaultRifle.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -18,7 +18,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class ClockworkAssaultRifle extends BasicGun { +public class ClockworkAssaultRifle extends Gun { public static final String ID = "clockwork_assault_rifle"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 2.4f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/FlintlockPistol.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/FlintlockPistol.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java index 96ff280..b767d5f 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/FlintlockPistol.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class FlintlockPistol extends BasicGun { +public class FlintlockPistol extends Gun { public static final String ID = "flintlock_pistol"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 2.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Gatligator.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java similarity index 97% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Gatligator.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java index 04e81f8..4c60ce9 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Gatligator.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -19,7 +19,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class Gatligator extends BasicGun { +public class Gatligator extends Gun { public static final String ID = "gatligator"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 2.4f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/BasicGun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java similarity index 64% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/BasicGun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java index 8baebcc..d7ae4d4 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/BasicGun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; @@ -6,10 +6,10 @@ import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItemTags; import com.lzxnone.terraria.item.weapon.RangedWeapon; -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.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.AmmoUtil; import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.nbt.CompoundTag; @@ -17,10 +17,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; import net.minecraft.world.level.Level; @@ -28,8 +26,7 @@ import org.joml.Vector3f; import java.util.function.Supplier; -public class BasicGun extends RangedWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; +public class Gun extends RangedWeapon { private static final float DAMAGE_MIN = 0.0f; private static final float DAMAGE_MAX = 8388600.0f; private static final float AMMO_NOT_CONSUME_CHANCE_MIN = 0.0f; @@ -40,33 +37,33 @@ public class BasicGun extends RangedWeapon { private final String id; private final Vector3f offset; - private final float damageDefault; + private final ConfigFloat damage; private final boolean hasAmmoNotConsumeChance; - private final float ammoNotConsumeChanceDefault; + private final ConfigFloat ammoNotConsumeChance; private final int useTime; private final Supplier sound; private final float knockbackScale; private final int invulnerableTime; - public BasicGun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, int useTime, - Supplier sound, float knockbackScale, int invulnerableTime) { + public Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, int useTime, + Supplier sound, float knockbackScale, int invulnerableTime) { this(tier, properties, id, offset, damageDefault, false, 0.0f, useTime, sound, knockbackScale, invulnerableTime); } - public BasicGun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, float ammoNotConsumeChanceDefault, - int useTime, Supplier sound, float knockbackScale, int invulnerableTime) { + public Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, float ammoNotConsumeChanceDefault, + int useTime, Supplier sound, float knockbackScale, int invulnerableTime) { this(tier, properties, id, offset, damageDefault, true, ammoNotConsumeChanceDefault, useTime, sound, knockbackScale, invulnerableTime); } - private BasicGun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, boolean hasAmmoNotConsumeChance, - float ammoNotConsumeChanceDefault, int useTime, Supplier sound, - float knockbackScale, int invulnerableTime) { + private Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, boolean hasAmmoNotConsumeChance, + float ammoNotConsumeChanceDefault, int useTime, Supplier sound, + float knockbackScale, int invulnerableTime) { super(tier, properties); this.id = id; this.offset = offset; - this.damageDefault = damageDefault; + this.damage = createDamageConfig(id, damageDefault); this.hasAmmoNotConsumeChance = hasAmmoNotConsumeChance; - this.ammoNotConsumeChanceDefault = ammoNotConsumeChanceDefault; + this.ammoNotConsumeChance = createAmmoNotConsumeChanceConfig(id, ammoNotConsumeChanceDefault); this.useTime = useTime; this.sound = sound; this.knockbackScale = knockbackScale; @@ -77,7 +74,7 @@ public class BasicGun extends RangedWeapon { return new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(damagePath(id), configText(id + "_damage"), configTooltip(id + "_damage"), damageDefault, DAMAGE_MIN, DAMAGE_MAX); + createDamageConfig(id, damageDefault).load(); } }; } @@ -86,12 +83,22 @@ public class BasicGun extends RangedWeapon { return new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadFloatConfig(ammoNotConsumeChancePath(id), configText(id + "_ammo_not_consume_chance"), configTooltip(id + "_ammo_not_consume_chance"), ammoNotConsumeChanceDefault, AMMO_NOT_CONSUME_CHANCE_MIN, AMMO_NOT_CONSUME_CHANCE_MAX); - ConfigFactory.loadFloatConfig(damagePath(id), configText(id + "_damage"), configTooltip(id + "_damage"), damageDefault, DAMAGE_MIN, DAMAGE_MAX); + ConfigStruct.loadAll( + createAmmoNotConsumeChanceConfig(id, ammoNotConsumeChanceDefault), + createDamageConfig(id, damageDefault) + ); } }; } + public static ConfigFloat createDamageConfig(String id, float damageDefault) { + return new ConfigFloat(damagePath(id), id + "_damage", damageDefault, DAMAGE_MIN, DAMAGE_MAX); + } + + public static ConfigFloat createAmmoNotConsumeChanceConfig(String id, float ammoNotConsumeChanceDefault) { + return new ConfigFloat(ammoNotConsumeChancePath(id), id + "_ammo_not_consume_chance", ammoNotConsumeChanceDefault, AMMO_NOT_CONSUME_CHANCE_MIN, AMMO_NOT_CONSUME_CHANCE_MAX); + } + public static ConfigListItem createConfigListItem(String id, IConfigData configData) { return new ConfigListItem( id, @@ -109,34 +116,13 @@ public class BasicGun extends RangedWeapon { return "weapon." + id + ".ammo_not_consume_chance"; } - 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 float getDamage() { - return Math.clamp(ConfigUtil.readFloat(damagePath(id), damageDefault), DAMAGE_MIN, DAMAGE_MAX); + return damage.get(); } public float getAmmoNotConsumeChance() { if(!hasAmmoNotConsumeChance) return 0.0f; - return Math.clamp( - ConfigUtil.readFloat(ammoNotConsumeChancePath(id), ammoNotConsumeChanceDefault), - AMMO_NOT_CONSUME_CHANCE_MIN, - AMMO_NOT_CONSUME_CHANCE_MAX - ); - } - - @Override - public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { - ItemStack stack = player.getItemInHand(hand); - if(player.getCooldowns().isOnCooldown(stack.getItem()) || !tryShoot(level, player, hand, stack)) return InteractionResultHolder.fail(stack); - player.startUsingItem(hand); - player.getCooldowns().addCooldown(stack.getItem(), Math.max(1, getUseTime(stack, player) / 3)); - return InteractionResultHolder.consume(stack); + return ammoNotConsumeChance.get(); } @Override @@ -144,6 +130,11 @@ public class BasicGun extends RangedWeapon { return ammoStack.is(ModItemTags.BULLET_AMMO); } + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "musket_ball"); + } + @Override public int getUseTime(ItemStack weaponStack, LivingEntity entity) { return useTime; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Handgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Handgun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java index a20e668..a9f77a3 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Handgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class Handgun extends BasicGun { +public class Handgun extends Gun { public static final String ID = "handgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 4.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Megashark.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java similarity index 91% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Megashark.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java index 79c8c9a..c47b238 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Megashark.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; @@ -8,7 +8,7 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class Megashark extends BasicGun { +public class Megashark extends Gun { public static final String ID = "megashark"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 3.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Minishark.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java similarity index 91% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Minishark.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java index 5f91b5c..08530b0 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Minishark.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; @@ -8,7 +8,7 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class Minishark extends BasicGun { +public class Minishark extends Gun { public static final String ID = "minishark"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 1.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Musket.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java similarity index 78% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Musket.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java index 7ebd2b0..2a16ec0 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Musket.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java @@ -1,16 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class Musket extends BasicGun { +public class Musket extends Gun { public static final String ID = "musket"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/PhoenixBlaster.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/PhoenixBlaster.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java index ad0b713..503e38e 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/PhoenixBlaster.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class PhoenixBlaster extends BasicGun { +public class PhoenixBlaster extends Gun { public static final String ID = "phoenix_blaster"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 5.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/QuadBarrelShotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java similarity index 95% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/QuadBarrelShotgun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java index fbc768b..f43a6dd 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/QuadBarrelShotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -12,13 +12,12 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class QuadBarrelShotgun extends BasicGun { +public class QuadBarrelShotgun extends Gun { public static final String ID = "quad_barrel_shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 2.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/RedRyder.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/RedRyder.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java index 074360d..9afbfa6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/RedRyder.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class RedRyder extends BasicGun { +public class RedRyder extends Gun { public static final String ID = "red_ryder"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Revolver.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Revolver.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java index b754924..f56c286 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Revolver.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class Revolver extends BasicGun { +public class Revolver extends Gun { public static final String ID = "revolver"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 2.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java similarity index 91% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java index a26633b..ff0636e 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; @@ -8,7 +8,7 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class SDMG extends BasicGun { +public class SDMG extends Gun { public static final String ID = "sdmg"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 10.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Shotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java similarity index 97% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Shotgun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java index 970a33a..e76359d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Shotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -18,7 +18,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class Shotgun extends BasicGun { +public class Shotgun extends Gun { public static final String ID = "shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 4.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SniperRifle.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java similarity index 63% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/SniperRifle.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java index 56881e5..061af78 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SniperRifle.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java @@ -1,52 +1,45 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.AmmoUtil; import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.CustomData; import net.minecraft.world.level.Level; import org.joml.Vector3f; -public class SniperRifle extends BasicGun { +public class SniperRifle extends Gun { public static final String ID = "sniper_rifle"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 35.0f; public static final double MAX_ZOOM = 10.0D; - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - public static final String ZOOM_SCROLL_SPEED_PATH = "weapon.sniper_rifle.zoom_scroll_speed"; - public static final double ZOOM_SCROLL_SPEED_DEFAULT = 0.5D; - public static final double ZOOM_SCROLL_SPEED_MIN = 0.0D; - public static final double ZOOM_SCROLL_SPEED_MAX = 10.0D; + public static final ConfigDouble ZOOM_SCROLL_SPEED = new ConfigDouble( + "weapon.sniper_rifle.zoom_scroll_speed", + "sniper_rifle_zoom_scroll_speed", + 0.5D, + 0.0D, + 10.0D + ); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - createConfigData(ID, DAMAGE_DEFAULT).onConfigLoad(); - ConfigFactory.loadDoubleConfig( - ZOOM_SCROLL_SPEED_PATH, - Component.translatable(CONFIG_TRANSLATION_PREFIX + "sniper_rifle_zoom_scroll_speed"), - Component.translatable(CONFIG_TRANSLATION_PREFIX + "sniper_rifle_zoom_scroll_speed.tooltip"), - ZOOM_SCROLL_SPEED_DEFAULT, - ZOOM_SCROLL_SPEED_MIN, - ZOOM_SCROLL_SPEED_MAX + ConfigStruct.loadAll( + createDamageConfig(ID, DAMAGE_DEFAULT), + ZOOM_SCROLL_SPEED ); } }; @@ -57,7 +50,7 @@ public class SniperRifle extends BasicGun { } public static double getZoomScrollSpeed() { - return Math.clamp(ConfigUtil.readDouble(ZOOM_SCROLL_SPEED_PATH, ZOOM_SCROLL_SPEED_DEFAULT), ZOOM_SCROLL_SPEED_MIN, ZOOM_SCROLL_SPEED_MAX); + return ZOOM_SCROLL_SPEED.get(); } @Override diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/TacticalShotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java similarity index 96% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/TacticalShotgun.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java index f35c666..c801b79 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/TacticalShotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -18,7 +18,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -public class TacticalShotgun extends BasicGun { +public class TacticalShotgun extends Gun { public static final String ID = "tactical_shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 6.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/TheUndertaker.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/TheUndertaker.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java index 7daf10d..3dfdc7f 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/TheUndertaker.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java @@ -1,14 +1,13 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; -public class TheUndertaker extends BasicGun { +public class TheUndertaker extends Gun { public static final String ID = "the_undertaker"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Uzi.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java similarity index 96% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/Uzi.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java index 000d62a..48a6553 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Uzi.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -18,7 +18,7 @@ import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import org.joml.Vector3f; -public class Uzi extends BasicGun { +public class Uzi extends Gun { public static final String ID = "uzi"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/VenusMagnum.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java similarity index 96% rename from src/main/java/com/lzxnone/terraria/item/weapon/ranged/VenusMagnum.java rename to src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java index 8c7fb44..483105f 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/VenusMagnum.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.weapon.ranged; +package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -18,7 +18,7 @@ import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import org.joml.Vector3f; -public class VenusMagnum extends BasicGun { +public class VenusMagnum extends Gun { public static final String ID = "venus_magnum"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 5.0f; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java index 8cd3ade..d078d41 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java @@ -8,10 +8,11 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.SummonWeapon; -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.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; @@ -36,50 +37,64 @@ import java.util.List; import java.util.UUID; public class Terraprisma extends SummonWeapon { - private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; - - public static final String TARGET_RANGE_PATH = "weapon.terraprisma.target_range"; - public static final double TARGET_RANGE_DEFAULT = 64.0D; - public static final double TARGET_RANGE_MIN = 1.0D; - public static final double TARGET_RANGE_MAX = 256.0D; - - public static final String FOLLOW_SPEED_PATH = "weapon.terraprisma.follow_speed"; - public static final double FOLLOW_SPEED_DEFAULT = 4.0D; - public static final double FOLLOW_SPEED_MIN = 0.0D; - public static final double FOLLOW_SPEED_MAX = 32.0D; - - public static final String DASH_PRE_SPEED_PATH = "weapon.terraprisma.dash_pre_speed"; - public static final double DASH_PRE_SPEED_DEFAULT = -0.75D; - public static final double DASH_PRE_SPEED_MIN = -10.0D; - public static final double DASH_PRE_SPEED_MAX = 10.0D; - - public static final String DASH_PRE_FRICTION_PATH = "weapon.terraprisma.dash_pre_friction"; - public static final double DASH_PRE_FRICTION_DEFAULT = 0.78D; - public static final double DASH_PRE_FRICTION_MIN = 0.0D; - public static final double DASH_PRE_FRICTION_MAX = 1.0D; - - public static final String DASH_SPEED_PATH = "weapon.terraprisma.dash_speed"; - public static final double DASH_SPEED_DEFAULT = 3.2D; - public static final double DASH_SPEED_MIN = 0.01D; - public static final double DASH_SPEED_MAX = 32.0D; - - public static final String DASH_FRICTION_PATH = "weapon.terraprisma.dash_friction"; - public static final double DASH_FRICTION_DEFAULT = 0.66D; - public static final double DASH_FRICTION_MIN = 0.0D; - public static final double DASH_FRICTION_MAX = 1.0D; - + public static final ConfigDouble TARGET_RANGE = new ConfigDouble( + "weapon.terraprisma.target_range", + "terraprisma_target_range", + 64.0D, + 1.0D, + 256.0D + ); + public static final ConfigDouble FOLLOW_SPEED = new ConfigDouble( + "weapon.terraprisma.follow_speed", + "terraprisma_follow_speed", + 4.0D, + 0.0D, + 32.0D + ); + public static final ConfigDouble DASH_PRE_SPEED = new ConfigDouble( + "weapon.terraprisma.dash_pre_speed", + "terraprisma_dash_pre_speed", + -0.75D, + -10.0D, + 10.0D + ); + public static final ConfigDouble DASH_PRE_FRICTION = new ConfigDouble( + "weapon.terraprisma.dash_pre_friction", + "terraprisma_dash_pre_friction", + 0.78D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DASH_SPEED = new ConfigDouble( + "weapon.terraprisma.dash_speed", + "terraprisma_dash_speed", + 3.2D, + 0.01D, + 32.0D + ); + public static final ConfigDouble DASH_FRICTION = new ConfigDouble( + "weapon.terraprisma.dash_friction", + "terraprisma_dash_friction", + 0.66D, + 0.0D, + 1.0D + ); public static final int DASH_MORE_TIME = 1; - public static final String ROTATE_SPEED_PATH = "weapon.terraprisma.rotate_speed"; - public static final double ROTATE_SPEED_DEFAULT = 1.0D; - public static final double ROTATE_SPEED_MIN = 0.01D; - public static final double ROTATE_SPEED_MAX = 32.0D; - - public static final String DAMAGE_PATH = "weapon.terraprisma.damage"; - public static final float DAMAGE_DEFAULT = 20.0F; - public static final float DAMAGE_MIN = 0.0F; - public static final float DAMAGE_MAX = 8388600.0F; - + public static final ConfigDouble ROTATE_SPEED = new ConfigDouble( + "weapon.terraprisma.rotate_speed", + "terraprisma_rotate_speed", + 1.0D, + 0.01D, + 32.0D + ); + public static final ConfigFloat DAMAGE = new ConfigFloat( + "weapon.terraprisma.damage", + "terraprisma_damage", + 20.0F, + 0.0F, + 8388600.0F + ); public static final float ROTATION_LERP = 0.25f; public static final float ROTATION_LERP2 = 0.5f; public static final float ROTATION_LERP3 = 1.0f; @@ -107,57 +122,19 @@ public class Terraprisma extends SummonWeapon { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("terraprisma_target_range"), configTooltip("terraprisma_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); - ConfigFactory.loadDoubleConfig(FOLLOW_SPEED_PATH, configText("terraprisma_follow_speed"), configTooltip("terraprisma_follow_speed"), FOLLOW_SPEED_DEFAULT, FOLLOW_SPEED_MIN, FOLLOW_SPEED_MAX); - ConfigFactory.loadDoubleConfig(DASH_PRE_SPEED_PATH, configText("terraprisma_dash_pre_speed"), configTooltip("terraprisma_dash_pre_speed"), DASH_PRE_SPEED_DEFAULT, DASH_PRE_SPEED_MIN, DASH_PRE_SPEED_MAX); - ConfigFactory.loadDoubleConfig(DASH_PRE_FRICTION_PATH, configText("terraprisma_dash_pre_friction"), configTooltip("terraprisma_dash_pre_friction"), DASH_PRE_FRICTION_DEFAULT, DASH_PRE_FRICTION_MIN, DASH_PRE_FRICTION_MAX); - ConfigFactory.loadDoubleConfig(DASH_SPEED_PATH, configText("terraprisma_dash_speed"), configTooltip("terraprisma_dash_speed"), DASH_SPEED_DEFAULT, DASH_SPEED_MIN, DASH_SPEED_MAX); - ConfigFactory.loadDoubleConfig(DASH_FRICTION_PATH, configText("terraprisma_dash_friction"), configTooltip("terraprisma_dash_friction"), DASH_FRICTION_DEFAULT, DASH_FRICTION_MIN, DASH_FRICTION_MAX); - ConfigFactory.loadDoubleConfig(ROTATE_SPEED_PATH, configText("terraprisma_rotate_speed"), configTooltip("terraprisma_rotate_speed"), ROTATE_SPEED_DEFAULT, ROTATE_SPEED_MIN, ROTATE_SPEED_MAX); - ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("terraprisma_damage"), configTooltip("terraprisma_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigStruct.loadAll( + TARGET_RANGE, + FOLLOW_SPEED, + DASH_PRE_SPEED, + DASH_PRE_FRICTION, + DASH_SPEED, + DASH_FRICTION, + ROTATE_SPEED, + DAMAGE + ); } }; - 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 double getTargetRange() { - return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); - } - - public static double getFollowSpeed() { - return Math.clamp(ConfigUtil.readDouble(FOLLOW_SPEED_PATH, FOLLOW_SPEED_DEFAULT), FOLLOW_SPEED_MIN, FOLLOW_SPEED_MAX); - } - - public static double getDashPreSpeed() { - return Math.clamp(ConfigUtil.readDouble(DASH_PRE_SPEED_PATH, DASH_PRE_SPEED_DEFAULT), DASH_PRE_SPEED_MIN, DASH_PRE_SPEED_MAX); - } - - public static double getDashPreFriction() { - return Math.clamp(ConfigUtil.readDouble(DASH_PRE_FRICTION_PATH, DASH_PRE_FRICTION_DEFAULT), DASH_PRE_FRICTION_MIN, DASH_PRE_FRICTION_MAX); - } - - public static double getDashSpeed() { - return Math.clamp(ConfigUtil.readDouble(DASH_SPEED_PATH, DASH_SPEED_DEFAULT), DASH_SPEED_MIN, DASH_SPEED_MAX); - } - - public static double getDashFriction() { - return Math.clamp(ConfigUtil.readDouble(DASH_FRICTION_PATH, DASH_FRICTION_DEFAULT), DASH_FRICTION_MIN, DASH_FRICTION_MAX); - } - - public static double getRotateSpeed() { - return Math.clamp(ConfigUtil.readDouble(ROTATE_SPEED_PATH, ROTATE_SPEED_DEFAULT), ROTATE_SPEED_MIN, ROTATE_SPEED_MAX); - } - - public static float getDamage() { - return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); - } - public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( "terraprisma", ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "textures/item/terraprisma.png"), @@ -211,10 +188,10 @@ public class Terraprisma extends SummonWeapon { int state = customData.contains("state") ? customData.getInt("state") : 0; if(state == State.IDLE.ordinal()) { - storeSummonTarget(summon, findSummonTarget(summon, player, getTargetRange())); + storeSummonTarget(summon, findSummonTarget(summon, player, TARGET_RANGE.get())); tickFollowOwner(summon); }else if(state == State.FIGHT.ordinal()) { - storeSummonTarget(summon, findSummonTarget(summon, player, getTargetRange())); + storeSummonTarget(summon, findSummonTarget(summon, player, TARGET_RANGE.get())); }else if(state == State.DASH_PRE.ordinal()) { Entity target = getStoredSummonTarget(summon); if(target != null) { @@ -229,14 +206,14 @@ public class Terraprisma extends SummonWeapon { summon.setYRot(Mth.rotLerp(ROTATION_LERP, summon.getYRot(), targetXYRot[1])); } } - summon.setDeltaMovement(summon.getDeltaMovement().scale(getDashPreFriction())); + summon.setDeltaMovement(summon.getDeltaMovement().scale(DASH_PRE_FRICTION.get())); }else if(state == State.DASH.ordinal()) { int dashTime = customData.contains("dashTime") ? customData.getInt("dashTime") : 0; customData.putInt("dashTime", dashTime - 1); if(dashTime > 0) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getDashSpeed())); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(DASH_SPEED.get())); }else { - summon.setDeltaMovement(summon.getDeltaMovement().scale(getDashFriction())); + summon.setDeltaMovement(summon.getDeltaMovement().scale(DASH_FRICTION.get())); } AABB hitBox = new AABB(summon.position(), summon.position().add(summon.getDeltaMovement().normalize())).inflate(HITBOX_INFLATE); List targets = summon.level().getEntitiesOfClass( @@ -246,7 +223,7 @@ public class Terraprisma extends SummonWeapon { ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : getDamage(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; } }else if(state == State.ROTATE.ordinal()) { int time = customData.contains("rotateTime") ? customData.getInt("rotateTime") : 0; @@ -297,7 +274,7 @@ public class Terraprisma extends SummonWeapon { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : getDamage(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; } customData.putInt("rotateTime", time + 1); @@ -361,7 +338,7 @@ public class Terraprisma extends SummonWeapon { if(to == State.DASH_PRE.ordinal()) { Entity target = getStoredSummonTarget(summon); if(target != null) { - summon.setDeltaMovement(target.getBoundingBox().getCenter().subtract(summon.position()).normalize().scale(getDashPreSpeed())); + summon.setDeltaMovement(target.getBoundingBox().getCenter().subtract(summon.position()).normalize().scale(DASH_PRE_SPEED.get())); } }else if(to == State.DASH.ordinal()) { Entity target = getStoredSummonTarget(summon); @@ -369,7 +346,7 @@ public class Terraprisma extends SummonWeapon { summon.setDeltaMovement(Vec3.ZERO); Vec3 distV = target.getBoundingBox().getCenter().subtract(summon.position()); double dist = distV.length(); - int dashTime = (int) (dist / getDashSpeed()) + DASH_MORE_TIME; + int dashTime = (int) (dist / DASH_SPEED.get()) + DASH_MORE_TIME; if(summon.getRandom().nextInt(2) == 0) dashTime++; customData.putInt("dashTime", dashTime); } @@ -399,7 +376,7 @@ public class Terraprisma extends SummonWeapon { double circumference = Math.PI * (a + b) * (1 + (3 * h) / (10 + Math.sqrt(4 - 3 * h))); double range = 0.5 + Math.random() * 0.5; double arcLength = circumference * range; - int duration = (int)Math.ceil(arcLength / getRotateSpeed()); + int duration = (int)Math.ceil(arcLength / ROTATE_SPEED.get()); duration = Mth.clamp(duration, 8, 18); double w = Math.PI * 2 * range / duration; if(summon.getRandom().nextInt(2) == 0) w = -w; @@ -451,7 +428,7 @@ public class Terraprisma extends SummonWeapon { Vec3 basePos = summon.getOwner().getBoundingBox().getCenter(); Vec3 pos = basePos.add(hDir.scale(-(idx + 1) * 0.25 - 1)); Vec3 dist = pos.subtract(summon.position()); - double followSpeed = getFollowSpeed(); + double followSpeed = FOLLOW_SPEED.get(); if(dist.length() > followSpeed) { summon.setDeltaMovement(dist.normalize().scale(Math.min(followSpeed, dist.length()))); }else { @@ -493,7 +470,7 @@ public class Terraprisma extends SummonWeapon { summon.getEntityData().set(StaticSummon.LIFETIME, 72000); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy(); - summonData.putFloat("damage", getDamage()); + summonData.putFloat("damage", DAMAGE.get()); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, summonData); summon.setNoGravity(true); diff --git a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java index a5c7278..4a3b334 100644 --- a/src/main/java/com/lzxnone/terraria/network/ModNetwork.java +++ b/src/main/java/com/lzxnone/terraria/network/ModNetwork.java @@ -53,5 +53,10 @@ public class ModNetwork { ScreenShakePayload.CODEC, ScreenShakeHandler::handle ); + registrar.playToClient( + ManaSyncPayload.TYPE, + ManaSyncPayload.CODEC, + ManaSyncHandler::handle + ); } } diff --git a/src/main/java/com/lzxnone/terraria/network/handler/ManaSyncHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/ManaSyncHandler.java new file mode 100644 index 0000000..cc9e825 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/handler/ManaSyncHandler.java @@ -0,0 +1,17 @@ +package com.lzxnone.terraria.network.handler; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.network.payload.ManaSyncPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public class ManaSyncHandler { + public static void handle(final ManaSyncPayload payload, final IPayloadContext context) { + context.enqueueWork(() -> { + PlayerMana mana = context.player().getData(ModAttachments.PLAYER_MANA); + mana.setMaxMana(payload.maxMana()); + mana.setMana(payload.mana()); + context.player().setData(ModAttachments.PLAYER_MANA, mana); + }); + } +} diff --git a/src/main/java/com/lzxnone/terraria/network/payload/ManaSyncPayload.java b/src/main/java/com/lzxnone/terraria/network/payload/ManaSyncPayload.java new file mode 100644 index 0000000..5cf4dbd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/network/payload/ManaSyncPayload.java @@ -0,0 +1,24 @@ +package com.lzxnone.terraria.network.payload; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +public record ManaSyncPayload(int mana, int maxMana) implements CustomPacketPayload { + public static final Type TYPE = new Type<>( + ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "mana_sync_payload") + ); + + public static final StreamCodec CODEC = StreamCodec.composite( + ByteBufCodecs.INT, ManaSyncPayload::mana, + ByteBufCodecs.INT, ManaSyncPayload::maxMana, + ManaSyncPayload::new + ); + + @Override + public Type type() { + return TYPE; + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index f3ff65a..f110f8a 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.effect.AcidVenomEffect; import com.lzxnone.terraria.effect.CursedInfernoEffect; import com.lzxnone.terraria.effect.DemonicFlamesEffect; import com.lzxnone.terraria.effect.IchorEffect; +import com.lzxnone.terraria.effect.ManaSicknessEffect; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; @@ -33,7 +34,12 @@ import com.lzxnone.terraria.item.weapon.melee.TrueExcalibur; import com.lzxnone.terraria.item.weapon.melee.TrueNightsEdge; import com.lzxnone.terraria.item.weapon.melee.Volcano; import com.lzxnone.terraria.item.weapon.melee.Zenith; -import com.lzxnone.terraria.item.weapon.ranged.*; +import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; +import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; +import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; +import com.lzxnone.terraria.item.weapon.ranged.StarCannon; +import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; +import com.lzxnone.terraria.item.weapon.ranged.gun.*; import com.lzxnone.terraria.item.weapon.summon.Terraprisma; import java.util.HashMap; @@ -93,7 +99,12 @@ public class ConfigList { TacticalShotgun.CONFIG_LIST_ITEM, SniperRifle.CONFIG_LIST_ITEM, ChainGun.CONFIG_LIST_ITEM, - SDMG.CONFIG_LIST_ITEM + SDMG.CONFIG_LIST_ITEM, + SnowballCannon.CONFIG_LIST_ITEM, + StarCannon.CONFIG_LIST_ITEM, + SuperStarShooter.CONFIG_LIST_ITEM, + Flamethrower.CONFIG_LIST_ITEM, + ElfMelter.CONFIG_LIST_ITEM }); ITEMS.put(EFFECT, new ConfigListItem[]{ BloodButcheredEffect.CONFIG_LIST_ITEM, @@ -102,6 +113,7 @@ public class ConfigList { IchorEffect.CONFIG_LIST_ITEM, AcidVenomEffect.CONFIG_LIST_ITEM, MidasEffect.CONFIG_LIST_ITEM, + ManaSicknessEffect.CONFIG_LIST_ITEM, SummonEffect.CONFIG_LIST_ITEM }); ITEMS.put(AMMO, new ConfigListItem[]{ @@ -124,8 +136,6 @@ public class ConfigList { ITEMS.put(ENCHANTMENT, new ConfigListItem[]{ ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM, ModEnchantmentConfigs.MANA_EFFICIENCY_CONFIG_LIST_ITEM, - ModEnchantmentConfigs.MANA_GATHERING_CONFIG_LIST_ITEM, - ModEnchantmentConfigs.MANA_GATHERING_CURSE_CONFIG_LIST_ITEM, ModEnchantmentConfigs.ARCANE_AMPLIFICATION_CONFIG_LIST_ITEM, ModEnchantmentConfigs.SUMMON_AMPLIFICATION_CONFIG_LIST_ITEM, ModEnchantmentConfigs.AMMO_EXHAUSTION_CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigBoolean.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigBoolean.java new file mode 100644 index 0000000..8736cd4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigBoolean.java @@ -0,0 +1,28 @@ +package com.lzxnone.terraria.ui.config.struct; + +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigUtil; + +public class ConfigBoolean extends ConfigStruct { + public final boolean defaultValue; + + public ConfigBoolean(String path, boolean defaultValue) { + super(path); + this.defaultValue = defaultValue; + } + + public ConfigBoolean(String path, String translationKey, boolean defaultValue) { + super(path, translationKey); + this.defaultValue = defaultValue; + } + + @Override + public Boolean get() { + return ConfigUtil.readBoolean(path, defaultValue); + } + + @Override + public void load() { + ConfigFactory.loadBooleanConfig(path, configText(), configTooltip(), defaultValue); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigDouble.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigDouble.java new file mode 100644 index 0000000..a4d6f17 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigDouble.java @@ -0,0 +1,24 @@ +package com.lzxnone.terraria.ui.config.struct; + +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigUtil; + +public class ConfigDouble extends ConfigValue { + public ConfigDouble(String path, double defaultValue, double minValue, double maxValue) { + super(path, defaultValue, minValue, maxValue); + } + + public ConfigDouble(String path, String translationKey, double defaultValue, double minValue, double maxValue) { + super(path, translationKey, defaultValue, minValue, maxValue); + } + + @Override + public Double get() { + return Math.clamp(ConfigUtil.readDouble(path, defaultValue), minValue, maxValue); + } + + @Override + public void load() { + ConfigFactory.loadDoubleConfig(path, configText(), configTooltip(), defaultValue, minValue, maxValue); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigFloat.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigFloat.java new file mode 100644 index 0000000..dff022d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigFloat.java @@ -0,0 +1,24 @@ +package com.lzxnone.terraria.ui.config.struct; + +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigUtil; + +public class ConfigFloat extends ConfigValue { + public ConfigFloat(String path, float defaultValue, float minValue, float maxValue) { + super(path, defaultValue, minValue, maxValue); + } + + public ConfigFloat(String path, String translationKey, float defaultValue, float minValue, float maxValue) { + super(path, translationKey, defaultValue, minValue, maxValue); + } + + @Override + public Float get() { + return Math.clamp(ConfigUtil.readFloat(path, defaultValue), minValue, maxValue); + } + + @Override + public void load() { + ConfigFactory.loadFloatConfig(path, configText(), configTooltip(), defaultValue, minValue, maxValue); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigInt.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigInt.java new file mode 100644 index 0000000..6a373c0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigInt.java @@ -0,0 +1,24 @@ +package com.lzxnone.terraria.ui.config.struct; + +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigUtil; + +public class ConfigInt extends ConfigValue { + public ConfigInt(String path, int defaultValue, int minValue, int maxValue) { + super(path, defaultValue, minValue, maxValue); + } + + public ConfigInt(String path, String translationKey, int defaultValue, int minValue, int maxValue) { + super(path, translationKey, defaultValue, minValue, maxValue); + } + + @Override + public Integer get() { + return Math.clamp(ConfigUtil.readInt(path, defaultValue), minValue, maxValue); + } + + @Override + public void load() { + ConfigFactory.loadIntConfig(path, configText(), configTooltip(), defaultValue, minValue, maxValue); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigString.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigString.java new file mode 100644 index 0000000..635b368 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigString.java @@ -0,0 +1,28 @@ +package com.lzxnone.terraria.ui.config.struct; + +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigUtil; + +public class ConfigString extends ConfigStruct { + public final String defaultValue; + + public ConfigString(String path, String defaultValue) { + super(path); + this.defaultValue = defaultValue; + } + + public ConfigString(String path, String translationKey, String defaultValue) { + super(path, translationKey); + this.defaultValue = defaultValue; + } + + @Override + public String get() { + return ConfigUtil.readString(path, defaultValue); + } + + @Override + public void load() { + ConfigFactory.loadStringConfig(path, configText(), configTooltip(), defaultValue); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigStruct.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigStruct.java new file mode 100644 index 0000000..e676b18 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigStruct.java @@ -0,0 +1,52 @@ +package com.lzxnone.terraria.ui.config.struct; + +import net.minecraft.network.chat.Component; + +public abstract class ConfigStruct { + public static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public final String path; + public final String translationKey; + + protected ConfigStruct(String path) { + this(path, defaultTranslationKey(path)); + } + + protected ConfigStruct(String path, String translationKey) { + if(path == null || path.isBlank()) { + throw new IllegalArgumentException("Config path cannot be blank."); + } + if(translationKey == null || translationKey.isBlank()) { + throw new IllegalArgumentException("Config translation key cannot be blank."); + } + this.path = path; + this.translationKey = translationKey; + } + + public Component configText() { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + translationKey); + } + + public Component configTooltip() { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + translationKey + ".tooltip"); + } + + public abstract T get(); + + public abstract void load(); + + public static void loadAll(ConfigStruct... configs) { + for(ConfigStruct config : configs) { + config.load(); + } + } + + protected static String defaultTranslationKey(String path) { + String key = path; + int firstDotIndex = path.indexOf('.'); + if(firstDotIndex >= 0 && firstDotIndex < path.length() - 1) { + key = path.substring(firstDotIndex + 1); + } + return key.replace('.', '_'); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigValue.java b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigValue.java new file mode 100644 index 0000000..72f1c57 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/struct/ConfigValue.java @@ -0,0 +1,21 @@ +package com.lzxnone.terraria.ui.config.struct; + +public abstract class ConfigValue extends ConfigStruct { + public final T defaultValue; + public final T minValue; + public final T maxValue; + + protected ConfigValue(String path, T defaultValue, T minValue, T maxValue) { + super(path); + this.defaultValue = defaultValue; + this.minValue = minValue; + this.maxValue = maxValue; + } + + protected ConfigValue(String path, String translationKey, T defaultValue, T minValue, T maxValue) { + super(path, translationKey); + this.defaultValue = defaultValue; + this.minValue = minValue; + this.maxValue = maxValue; + } +} diff --git a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java index 51ffb01..a8fdb6a 100644 --- a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java @@ -5,12 +5,12 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; -import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; @@ -32,7 +32,6 @@ public class AmmoUtil { summon.setOwner(player); summon.setPos(pos); summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); - summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); @@ -41,7 +40,8 @@ public class AmmoUtil { summon.yRotO = xyRot[1]; summon.noPhysics = true; - String ammo = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getString(RangedWeapon.AMMO_KEY); + ResourceLocation ammoId = RangedWeapon.getAmmo(stack); + String ammo = ammoId == null ? "" : ammoId.toString(); 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); @@ -58,6 +58,9 @@ public class AmmoUtil { 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); + else if(ammo.equals("minecraft:snowball")) setSnowball(summon); + else if(ammo.equals("lzxnoneterraria:fallen_star")) setFallenStar(summon); + else if(ammo.equals("minecraft:slime_ball")) setSlimeBall(summon); return summon; } @@ -71,6 +74,7 @@ public class AmmoUtil { public static void setMusketBall(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MUSKET_BALL); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -81,6 +85,7 @@ public class AmmoUtil { public static void setSilverBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.SILVER_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -91,6 +96,7 @@ public class AmmoUtil { public static void setCrystalBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CRYSTAL_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -101,6 +107,7 @@ public class AmmoUtil { public static void setCursedBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CURSED_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -111,6 +118,7 @@ public class AmmoUtil { public static void setChlorophyteBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CHLOROPHYTE_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -122,6 +130,7 @@ public class AmmoUtil { public static void setHighVelocityBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.HIGH_VELOCITY_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -135,6 +144,7 @@ public class AmmoUtil { public static void setIchorBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.ICHOR_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -146,6 +156,7 @@ public class AmmoUtil { public static void setVenomBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.VENOM_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -156,6 +167,7 @@ public class AmmoUtil { public static void setPartyBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.PARTY_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -166,6 +178,7 @@ public class AmmoUtil { public static void setNanoBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NANO_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -180,6 +193,7 @@ public class AmmoUtil { public static void setExplodingBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.EXPLODING_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -190,6 +204,7 @@ public class AmmoUtil { public static void setGoldenBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.GOLDEN_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -200,6 +215,7 @@ public class AmmoUtil { public static void setLuminiteBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LUMINITE_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -214,6 +230,7 @@ public class AmmoUtil { public static void setTungstenBullet(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TUNGSTEN_BULLET); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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); @@ -224,6 +241,7 @@ public class AmmoUtil { public static void setMeteorShot(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.METEOR_SHOT); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.METEOR_SHOT_PROJECTILE.get())); summon.getEntityData().set(StaticSummon.LIFETIME, 100); summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); @@ -234,4 +252,28 @@ public class AmmoUtil { summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); summon.setNoGravity(true); } + + public static void setSnowball(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.SNOWBALL); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "item"); + summon.getEntityData().set(StaticSummon.ITEM, Items.SNOWBALL.getDefaultInstance()); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.setNoGravity(true); + } + + public static void setFallenStar(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 0.5f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.5f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.5f); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + } + + public static void setSlimeBall(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + } } diff --git a/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java b/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java new file mode 100644 index 0000000..5948b4c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java @@ -0,0 +1,71 @@ +package com.lzxnone.terraria.utils; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.effect.ManaEffect; +import com.lzxnone.terraria.effect.ManaSicknessEffect; +import com.lzxnone.terraria.effect.ModEffects; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import net.minecraft.core.component.DataComponents; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.PotionContents; + +public class ManaPotionUtil { + public static boolean hasManaPotion(Player player) { + return findManaPotionSlot(player) >= 0; + } + + public static boolean tryUseManaPotion(ServerPlayer player) { + int slot = findManaPotionSlot(player); + if(slot < 0) return false; + + ItemStack stack = player.getInventory().getItem(slot); + int recoverAmount = getManaRecoverAmount(stack); + if(recoverAmount <= 0) return false; + + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + if(!mana.recoverManaImmediately(recoverAmount)) return false; + ManaSicknessEffect.applyTo(player); + + stack.shrink(1); + ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); + if(stack.isEmpty()) { + player.getInventory().setItem(slot, bottle); + }else if(!player.getInventory().add(bottle)) { + player.drop(bottle, false); + } + + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + PlayerManaSyncEventHandler.sync(player); + } + return true; + } + + private static int findManaPotionSlot(Player player) { + for(int i = 0; i < player.getInventory().getContainerSize(); i++) { + ItemStack stack = player.getInventory().getItem(i); + if(getManaRecoverAmount(stack) > 0) { + return i; + } + } + return -1; + } + + private static int getManaRecoverAmount(ItemStack stack) { + if(!stack.is(Items.POTION)) return 0; + + PotionContents contents = stack.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY); + for(MobEffectInstance effect : contents.getAllEffects()) { + if(effect.getEffect().is(ModEffects.MANA)) { + return ManaEffect.getRecoverAmount(effect.getAmplifier()); + } + } + return 0; + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index d296324..94c6bac 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -3,6 +3,7 @@ "itemGroup.lzxnoneterraria.magic": "Terraria Magic", "itemGroup.lzxnoneterraria.ranged": "Terraria Ranged", "itemGroup.lzxnoneterraria.summon": "Terraria Summon", + "itemGroup.lzxnoneterraria.accessory": "Terraria Accessories", "itemGroup.lzxnoneterraria.block": "Terraria Block", "itemGroup.lzxnoneterraria.calamity_melee": "Terraria Calamity Melee", @@ -53,6 +54,11 @@ "item.lzxnoneterraria.sniper_rifle": "Sniper Rifle", "item.lzxnoneterraria.chain_gun": "Chain Gun", "item.lzxnoneterraria.sdmg": "S.D.M.G.", + "item.lzxnoneterraria.snowball_cannon": "Snowball Cannon", + "item.lzxnoneterraria.star_cannon": "Star Cannon", + "item.lzxnoneterraria.super_star_shooter": "Super Star Shooter", + "item.lzxnoneterraria.flamethrower": "Flamethrower", + "item.lzxnoneterraria.elf_melter": "Elf Melter", "item.lzxnoneterraria.musket_ball": "Musket Ball", "item.lzxnoneterraria.meteor_shot": "Meteor Shot", "item.lzxnoneterraria.silver_bullet": "Silver Bullet", @@ -69,11 +75,12 @@ "item.lzxnoneterraria.endless_musket_pouch": "Endless Musket Pouch", "item.lzxnoneterraria.luminite_bullet": "Luminite Bullet", "item.lzxnoneterraria.tungsten_bullet": "Tungsten Bullet", + "item.lzxnoneterraria.fallen_star": "Fallen Star", + "item.lzxnoneterraria.natures_gift": "Nature's Gift", + "item.lzxnoneterraria.mana_flower": "Mana Flower", "enchantment.lzxnoneterraria.mana_leak": "Mana Leak", "enchantment.lzxnoneterraria.mana_efficiency": "Mana Efficiency", - "enchantment.lzxnoneterraria.mana_gathering": "Mana Gathering", - "enchantment.lzxnoneterraria.mana_gathering_curse": "Mana Gathering Curse", "enchantment.lzxnoneterraria.arcane_amplification": "Arcane Amplification", "enchantment.lzxnoneterraria.summon_amplification": "Summon Amplification", "enchantment.lzxnoneterraria.ammo_exhaustion": "Ammo Exhaustion", @@ -95,6 +102,9 @@ "tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.", "tooltip.lzxnoneterraria.devils_devastation.1": "Humans understand this force as Havoc, the inevitable sundering of all order in fire.", "tooltip.lzxnoneterraria.devils_devastation.2": "Perhaps this is why the Brimstone Elemental had strength unrivaled by her sisters.", + "tooltip.lzxnoneterraria.natures_gift.0": "6% reduced mana cost", + "tooltip.lzxnoneterraria.mana_flower.0": "8% reduced mana cost", + "tooltip.lzxnoneterraria.mana_flower.1": "Automatically uses mana potions when mana runs out", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", @@ -110,10 +120,16 @@ "effect.lzxnoneterraria.acid_venom": "Acid Venom", "effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.summon": "Summon", + "effect.lzxnoneterraria.mana": "Mana", + "effect.lzxnoneterraria.mana_sickness": "Mana Sickness", "item.minecraft.potion.effect.summon": "Potion of Summon", "item.minecraft.splash_potion.effect.summon": "Splash Potion of Summon", "item.minecraft.lingering_potion.effect.summon": "Lingering Potion of Summon", "item.minecraft.tipped_arrow.effect.summon": "Arrow of Summon", + "item.minecraft.potion.effect.mana": "Mana Potion", + "item.minecraft.splash_potion.effect.mana": "Splash Mana Potion", + "item.minecraft.lingering_potion.effect.mana": "Lingering Mana Potion", + "item.minecraft.tipped_arrow.effect.mana": "Arrow of Mana", "key.categories.lzxnoneterraria": "lzxnoneterraria", "key.lzxnoneterraria.kill_mode": "Kill Mode", @@ -141,10 +157,6 @@ "lzxnoneterraria.configuration.mana_leak_consume_multiplier.tooltip": "Mana consume rate multiplier per Mana Leak level", "lzxnoneterraria.configuration.mana_efficiency_consume_multiplier": "Mana Consume Multiplier", "lzxnoneterraria.configuration.mana_efficiency_consume_multiplier.tooltip": "Mana consume rate multiplier per Mana Efficiency level", - "lzxnoneterraria.configuration.mana_gathering_recover_multiplier": "Mana Recover Multiplier", - "lzxnoneterraria.configuration.mana_gathering_recover_multiplier.tooltip": "Mana recover rate multiplier per Mana Gathering level", - "lzxnoneterraria.configuration.mana_gathering_curse_recover_multiplier": "Mana Recover Multiplier", - "lzxnoneterraria.configuration.mana_gathering_curse_recover_multiplier.tooltip": "Mana recover rate multiplier per Mana Gathering Curse level", "lzxnoneterraria.configuration.arcane_amplification_damage_multiplier": "Magic Damage Multiplier", "lzxnoneterraria.configuration.arcane_amplification_damage_multiplier.tooltip": "Magic damage multiplier per Arcane Amplification level", "lzxnoneterraria.configuration.summon_amplification_damage_multiplier": "Summon Damage Multiplier", @@ -174,6 +186,13 @@ "lzxnoneterraria.configuration.midas_settings": "Midas Settings", "lzxnoneterraria.configuration.midas_drop_chance": "Emerald Drop Chance", "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "Chance for an entity with Midas to drop one emerald on death, from 0 to 1", + "lzxnoneterraria.configuration.mana_sickness_settings": "Mana Sickness Settings", + "lzxnoneterraria.configuration.mana_sickness_duration_per_use": "Duration Added Per Use", + "lzxnoneterraria.configuration.mana_sickness_duration_per_use.tooltip": "Mana Sickness duration added by each mana potion use, in ticks", + "lzxnoneterraria.configuration.mana_sickness_max_duration": "Max Duration", + "lzxnoneterraria.configuration.mana_sickness_max_duration.tooltip": "Maximum Mana Sickness duration that can be stacked, in ticks", + "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "Max Magic Damage Reduction", + "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "Magic damage reduction at maximum duration, from 0 to 1", "lzxnoneterraria.configuration.summon_settings": "Summon Settings", "lzxnoneterraria.configuration.summon_summon_count_per_level": "Summon Count Per Level", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra summon count granted by each level of the summon effect", @@ -454,8 +473,6 @@ "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "Maximum beam range", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "Mana Consume Rate", "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "Mana consumed per tick while using", - "lzxnoneterraria.configuration.last_prism_mana_recover_rate": "Mana Recover Rate", - "lzxnoneterraria.configuration.last_prism_mana_recover_rate.tooltip": "Mana recovered per tick while not using", "lzxnoneterraria.configuration.musket_ball_settings": "Musket Ball Settings", "lzxnoneterraria.configuration.musket_ball_base_damage": "Base Damage", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "Base damage provided by the ammo", @@ -639,6 +656,45 @@ "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "Chance for each shot to avoid consuming ammo, from 0 to 1", "lzxnoneterraria.configuration.sdmg_damage": "Damage", "lzxnoneterraria.configuration.sdmg_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.snowball_cannon_settings": "Snowball Cannon Settings", + "lzxnoneterraria.configuration.snowball_cannon_speed": "Speed", + "lzxnoneterraria.configuration.snowball_cannon_speed.tooltip": "Snowball projectile speed", + "lzxnoneterraria.configuration.snowball_cannon_gravity": "Gravity", + "lzxnoneterraria.configuration.snowball_cannon_gravity.tooltip": "Downward acceleration applied each tick", + "lzxnoneterraria.configuration.snowball_cannon_damage": "Damage", + "lzxnoneterraria.configuration.snowball_cannon_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.star_cannon_settings": "Star Cannon Settings", + "lzxnoneterraria.configuration.star_cannon_damage": "Damage", + "lzxnoneterraria.configuration.star_cannon_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.star_cannon_speed": "Speed", + "lzxnoneterraria.configuration.star_cannon_speed.tooltip": "Fallen star projectile speed", + "lzxnoneterraria.configuration.super_star_shooter_settings": "Super Star Shooter Settings", + "lzxnoneterraria.configuration.super_star_shooter_damage": "Damage", + "lzxnoneterraria.configuration.super_star_shooter_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.super_star_shooter_speed": "Speed", + "lzxnoneterraria.configuration.super_star_shooter_speed.tooltip": "Fallen star projectile speed", + "lzxnoneterraria.configuration.super_star_shooter_bolt_damage": "Bolt Damage", + "lzxnoneterraria.configuration.super_star_shooter_bolt_damage.tooltip": "Prismatic bolt damage per hit", + "lzxnoneterraria.configuration.super_star_shooter_bolt_speed": "Bolt Speed", + "lzxnoneterraria.configuration.super_star_shooter_bolt_speed.tooltip": "Prismatic bolt projectile speed", + "lzxnoneterraria.configuration.flamethrower_settings": "Flamethrower Settings", + "lzxnoneterraria.configuration.flamethrower_damage": "Damage", + "lzxnoneterraria.configuration.flamethrower_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.flamethrower_ignite_ticks": "Ignite Duration", + "lzxnoneterraria.configuration.flamethrower_ignite_ticks.tooltip": "Duration of the fire effect in ticks", + "lzxnoneterraria.configuration.flamethrower_speed": "Speed", + "lzxnoneterraria.configuration.flamethrower_speed.tooltip": "Flame stream initial speed", + "lzxnoneterraria.configuration.flamethrower_range": "Range", + "lzxnoneterraria.configuration.flamethrower_range.tooltip": "Flame stream travel range", + "lzxnoneterraria.configuration.elf_melter_settings": "Elf Melter Settings", + "lzxnoneterraria.configuration.elf_melter_damage": "Damage", + "lzxnoneterraria.configuration.elf_melter_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.elf_melter_speed": "Speed", + "lzxnoneterraria.configuration.elf_melter_speed.tooltip": "Frost stream initial speed", + "lzxnoneterraria.configuration.elf_melter_range": "Range", + "lzxnoneterraria.configuration.elf_melter_range.tooltip": "Frost stream travel range", + "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "Freeze Duration", + "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "Frozen time applied on hit, in ticks", "lzxnoneterraria.configuration.devils_devastation_settings": "Devil's Devastation Settings", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 7da67a3..6186e3f 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -3,6 +3,7 @@ "itemGroup.lzxnoneterraria.magic": "泰拉瑞亚 魔法武器", "itemGroup.lzxnoneterraria.ranged": "泰拉瑞亚 远程武器", "itemGroup.lzxnoneterraria.summon": "泰拉瑞亚 召唤武器", + "itemGroup.lzxnoneterraria.accessory": "泰拉瑞亚 饰品", "itemGroup.lzxnoneterraria.block": "泰拉瑞亚 方块", "itemGroup.lzxnoneterraria.calamity_melee": "泰拉瑞亚灾厄 近战武器", @@ -53,6 +54,11 @@ "item.lzxnoneterraria.sniper_rifle": "狙击步枪", "item.lzxnoneterraria.chain_gun": "链式机枪", "item.lzxnoneterraria.sdmg": "太空海豚机枪", + "item.lzxnoneterraria.snowball_cannon": "雪球炮", + "item.lzxnoneterraria.star_cannon": "星星炮", + "item.lzxnoneterraria.super_star_shooter": "超级星星炮", + "item.lzxnoneterraria.flamethrower": "火焰喷射器", + "item.lzxnoneterraria.elf_melter": "精灵熔枪", "item.lzxnoneterraria.musket_ball": "火枪子弹", "item.lzxnoneterraria.meteor_shot": "流星弹", "item.lzxnoneterraria.silver_bullet": "银子弹", @@ -69,11 +75,12 @@ "item.lzxnoneterraria.endless_musket_pouch": "无尽火枪袋", "item.lzxnoneterraria.luminite_bullet": "夜明弹", "item.lzxnoneterraria.tungsten_bullet": "钨子弹", + "item.lzxnoneterraria.fallen_star": "坠落之星", + "item.lzxnoneterraria.natures_gift": "大自然的恩赐", + "item.lzxnoneterraria.mana_flower": "魔力花", "enchantment.lzxnoneterraria.mana_leak": "魔力泄漏", "enchantment.lzxnoneterraria.mana_efficiency": "魔力效率", - "enchantment.lzxnoneterraria.mana_gathering": "魔力聚集", - "enchantment.lzxnoneterraria.mana_gathering_curse": "聚魔诅咒", "enchantment.lzxnoneterraria.arcane_amplification": "奥术增幅", "enchantment.lzxnoneterraria.summon_amplification": "召唤增幅", "enchantment.lzxnoneterraria.ammo_exhaustion": "弹尽粮绝", @@ -95,6 +102,9 @@ "tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。", "tooltip.lzxnoneterraria.devils_devastation.1": "人类将这种力量理解为浩劫,即一切秩序在火焰之中的必然毁灭。", "tooltip.lzxnoneterraria.devils_devastation.2": "或许这就是硫磺火元素掌握着她的姐妹所不能匹敌之力量的原因。", + "tooltip.lzxnoneterraria.natures_gift.0": "魔力花费降低 6%", + "tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 8%", + "tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", @@ -109,10 +119,16 @@ "effect.lzxnoneterraria.acid_venom": "酸性毒液", "effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.summon": "召唤", + "effect.lzxnoneterraria.mana": "魔力", + "effect.lzxnoneterraria.mana_sickness": "耐魔性", "item.minecraft.potion.effect.summon": "召唤药水", "item.minecraft.splash_potion.effect.summon": "喷溅型召唤药水", "item.minecraft.lingering_potion.effect.summon": "滞留型召唤药水", "item.minecraft.tipped_arrow.effect.summon": "召唤之箭", + "item.minecraft.potion.effect.mana": "魔力药水", + "item.minecraft.splash_potion.effect.mana": "喷溅型魔力药水", + "item.minecraft.lingering_potion.effect.mana": "滞留型魔力药水", + "item.minecraft.tipped_arrow.effect.mana": "魔力之箭", "key.categories.lzxnoneterraria": "lzxnoneterraria", "key.lzxnoneterraria.kill_mode": "进入杀戮模式", @@ -140,10 +156,6 @@ "lzxnoneterraria.configuration.mana_leak_consume_multiplier.tooltip": "每级魔力泄露对魔力消耗速率的倍率", "lzxnoneterraria.configuration.mana_efficiency_consume_multiplier": "魔力消耗倍率", "lzxnoneterraria.configuration.mana_efficiency_consume_multiplier.tooltip": "每级魔力效率对魔力消耗速率的倍率", - "lzxnoneterraria.configuration.mana_gathering_recover_multiplier": "魔力恢复倍率", - "lzxnoneterraria.configuration.mana_gathering_recover_multiplier.tooltip": "每级魔力聚集对魔力恢复速率的倍率", - "lzxnoneterraria.configuration.mana_gathering_curse_recover_multiplier": "魔力恢复倍率", - "lzxnoneterraria.configuration.mana_gathering_curse_recover_multiplier.tooltip": "每级聚魔诅咒对魔力恢复速率的倍率", "lzxnoneterraria.configuration.arcane_amplification_damage_multiplier": "魔法伤害倍率", "lzxnoneterraria.configuration.arcane_amplification_damage_multiplier.tooltip": "每级奥术增幅对魔法伤害的倍率", "lzxnoneterraria.configuration.summon_amplification_damage_multiplier": "召唤伤害倍率", @@ -173,6 +185,13 @@ "lzxnoneterraria.configuration.midas_settings": "迈达斯 设置", "lzxnoneterraria.configuration.midas_drop_chance": "绿宝石掉落概率", "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "拥有迈达斯效果的生物死亡时掉落一颗绿宝石的概率,范围 0~1", + "lzxnoneterraria.configuration.mana_sickness_settings": "耐魔性 设置", + "lzxnoneterraria.configuration.mana_sickness_duration_per_use": "每次增加时间", + "lzxnoneterraria.configuration.mana_sickness_duration_per_use.tooltip": "每次使用魔力药水增加的耐魔性持续时间(刻)", + "lzxnoneterraria.configuration.mana_sickness_max_duration": "最大持续时间", + "lzxnoneterraria.configuration.mana_sickness_max_duration.tooltip": "耐魔性可以叠加到的最大持续时间(刻)", + "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "最大魔法伤害降低", + "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "达到最大持续时间时降低的魔法伤害比例,范围 0~1", "lzxnoneterraria.configuration.summon_settings": "召唤 设置", "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级召唤数量", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的召唤物数量", @@ -453,8 +472,6 @@ "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "激光最大射程", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "魔力消耗速率", "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "使用时每刻消耗的魔力值", - "lzxnoneterraria.configuration.last_prism_mana_recover_rate": "魔力恢复速率", - "lzxnoneterraria.configuration.last_prism_mana_recover_rate.tooltip": "未使用时每刻恢复的魔力值", "lzxnoneterraria.configuration.musket_ball_settings": "火枪子弹 设置", "lzxnoneterraria.configuration.musket_ball_base_damage": "基础伤害", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "子弹自身提供的基础伤害", @@ -638,6 +655,45 @@ "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "每次射击不消耗弹药的概率,范围 0~1", "lzxnoneterraria.configuration.sdmg_damage": "伤害", "lzxnoneterraria.configuration.sdmg_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.snowball_cannon_settings": "雪球炮 设置", + "lzxnoneterraria.configuration.snowball_cannon_speed": "速度", + "lzxnoneterraria.configuration.snowball_cannon_speed.tooltip": "雪球弹射物速度", + "lzxnoneterraria.configuration.snowball_cannon_gravity": "重力", + "lzxnoneterraria.configuration.snowball_cannon_gravity.tooltip": "每刻向下施加的加速度", + "lzxnoneterraria.configuration.snowball_cannon_damage": "伤害", + "lzxnoneterraria.configuration.snowball_cannon_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.star_cannon_settings": "星星炮 设置", + "lzxnoneterraria.configuration.star_cannon_damage": "伤害", + "lzxnoneterraria.configuration.star_cannon_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.star_cannon_speed": "速度", + "lzxnoneterraria.configuration.star_cannon_speed.tooltip": "坠落之星弹射物速度", + "lzxnoneterraria.configuration.super_star_shooter_settings": "超级星星炮 设置", + "lzxnoneterraria.configuration.super_star_shooter_damage": "伤害", + "lzxnoneterraria.configuration.super_star_shooter_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.super_star_shooter_speed": "速度", + "lzxnoneterraria.configuration.super_star_shooter_speed.tooltip": "坠落之星弹射物速度", + "lzxnoneterraria.configuration.super_star_shooter_bolt_damage": "棱彩弹伤害", + "lzxnoneterraria.configuration.super_star_shooter_bolt_damage.tooltip": "棱彩弹每次命中伤害", + "lzxnoneterraria.configuration.super_star_shooter_bolt_speed": "棱彩弹速度", + "lzxnoneterraria.configuration.super_star_shooter_bolt_speed.tooltip": "棱彩弹弹射物速度", + "lzxnoneterraria.configuration.flamethrower_settings": "火焰喷射器 设置", + "lzxnoneterraria.configuration.flamethrower_damage": "伤害", + "lzxnoneterraria.configuration.flamethrower_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.flamethrower_ignite_ticks": "着火时间", + "lzxnoneterraria.configuration.flamethrower_ignite_ticks.tooltip": "着火效果持续时间(刻)", + "lzxnoneterraria.configuration.flamethrower_speed": "速度", + "lzxnoneterraria.configuration.flamethrower_speed.tooltip": "火焰流初始速度", + "lzxnoneterraria.configuration.flamethrower_range": "射程", + "lzxnoneterraria.configuration.flamethrower_range.tooltip": "火焰流飞行距离", + "lzxnoneterraria.configuration.elf_melter_settings": "精灵熔枪 设置", + "lzxnoneterraria.configuration.elf_melter_damage": "伤害", + "lzxnoneterraria.configuration.elf_melter_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.elf_melter_speed": "速度", + "lzxnoneterraria.configuration.elf_melter_speed.tooltip": "冰霜流初始速度", + "lzxnoneterraria.configuration.elf_melter_range": "射程", + "lzxnoneterraria.configuration.elf_melter_range.tooltip": "冰霜流飞行距离", + "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "冻结时间", + "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "命中后施加的冻结时间(刻)", "lzxnoneterraria.configuration.devils_devastation_settings": "破灭魔王剑 设置", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/elf_melter.json b/src/main/resources/assets/lzxnoneterraria/models/item/elf_melter.json new file mode 100644 index 0000000..eb0b663 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/elf_melter.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun2", + "textures": { + "layer0": "lzxnoneterraria:item/elf_melter" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/fallen_star.json b/src/main/resources/assets/lzxnoneterraria/models/item/fallen_star.json new file mode 100644 index 0000000..bface4a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/fallen_star.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/fallen_star" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/flamethrower.json b/src/main/resources/assets/lzxnoneterraria/models/item/flamethrower.json new file mode 100644 index 0000000..dc23102 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/flamethrower.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun3", + "textures": { + "layer0": "lzxnoneterraria:item/flamethrower" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/item.json b/src/main/resources/assets/lzxnoneterraria/models/item/item.json new file mode 100644 index 0000000..510a8f0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/item.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:item/generated", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13, 7 ], + "scale": [ 1, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 1, 1 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 1 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13 ], + "scale": [ 0.68, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/item2.json b/src/main/resources/assets/lzxnoneterraria/models/item/item2.json new file mode 100644 index 0000000..cbf0f1a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/item2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:item/generated", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 1, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2, 0 ], + "scale": [ 0.25, 0.5, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13, 7 ], + "scale": [ 0.5, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 1, 1 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 1 ], + "scale": [ 0.275, 0.55, 0.55 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13 ], + "scale": [ 0.34, 0.68, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/item3.json b/src/main/resources/assets/lzxnoneterraria/models/item/item3.json new file mode 100644 index 0000000..869cbe9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/item3.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:item/generated", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 0.5, 1 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2, 0 ], + "scale": [ 0.5, 0.25, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13, 7 ], + "scale": [ 1, 0.5, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 0.5, 1 ] + }, + "thirdperson_righthand": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 1 ], + "scale": [ 0.55, 0.275, 0.55 ] + }, + "firstperson_righthand": { + "rotation": [ 0, -90, 25 ], + "translation": [ 1.13, 3.2, 1.13 ], + "scale": [ 0.68, 0.34, 0.68 ] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mana_flower.json b/src/main/resources/assets/lzxnoneterraria/models/item/mana_flower.json new file mode 100644 index 0000000..71b8e48 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mana_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item2", + "textures": { + "layer0": "lzxnoneterraria:item/mana_flower" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/natures_gift.json b/src/main/resources/assets/lzxnoneterraria/models/item/natures_gift.json new file mode 100644 index 0000000..2a8a51b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/natures_gift.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/natures_gift" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/snowball_cannon.json b/src/main/resources/assets/lzxnoneterraria/models/item/snowball_cannon.json new file mode 100644 index 0000000..ed4b3ab --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/snowball_cannon.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun", + "textures": { + "layer0": "lzxnoneterraria:item/snowball_cannon" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/star_cannon.json b/src/main/resources/assets/lzxnoneterraria/models/item/star_cannon.json new file mode 100644 index 0000000..298bea4 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/star_cannon.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun3", + "textures": { + "layer0": "lzxnoneterraria:item/star_cannon" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/super_star_shooter.json b/src/main/resources/assets/lzxnoneterraria/models/item/super_star_shooter.json new file mode 100644 index 0000000..e46e08a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/super_star_shooter.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun2", + "textures": { + "layer0": "lzxnoneterraria:item/super_star_shooter" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/white_star.json b/src/main/resources/assets/lzxnoneterraria/models/item/white_star.json new file mode 100644 index 0000000..0a38178 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/white_star.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/white_star" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 75c904d..76c632d 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -23,6 +23,9 @@ "star_collide": { "sounds": ["lzxnoneterraria:star_collide"] }, + "snow_break": { + "sounds": ["lzxnoneterraria:snow_break"] + }, "summon_terraprisma": { "sounds": ["lzxnoneterraria:summon_terraprisma"] }, @@ -50,6 +53,9 @@ "shot8": { "sounds": ["lzxnoneterraria:shot8"] }, + "shot9": { + "sounds": ["lzxnoneterraria:shot9"] + }, "boom": { "sounds": ["lzxnoneterraria:boom"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/shot9.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/shot9.ogg new file mode 100644 index 0000000..44720e2 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/sounds/shot9.ogg differ diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/snow_break.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/snow_break.ogg new file mode 100644 index 0000000..ef7fc71 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/sounds/snow_break.ogg differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/elf_melter.png b/src/main/resources/assets/lzxnoneterraria/textures/item/elf_melter.png new file mode 100644 index 0000000..8fc6fb5 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/elf_melter.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/fallen_star.png b/src/main/resources/assets/lzxnoneterraria/textures/item/fallen_star.png new file mode 100644 index 0000000..5a29278 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/fallen_star.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/flamethrower.png b/src/main/resources/assets/lzxnoneterraria/textures/item/flamethrower.png new file mode 100644 index 0000000..cceb54e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/flamethrower.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mana_flower.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_flower.png new file mode 100644 index 0000000..8236da5 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_flower.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/natures_gift.png b/src/main/resources/assets/lzxnoneterraria/textures/item/natures_gift.png new file mode 100644 index 0000000..5508e27 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/natures_gift.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/snowball_cannon.png b/src/main/resources/assets/lzxnoneterraria/textures/item/snowball_cannon.png new file mode 100644 index 0000000..429491a Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/snowball_cannon.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/star_cannon.png b/src/main/resources/assets/lzxnoneterraria/textures/item/star_cannon.png new file mode 100644 index 0000000..9e38ee1 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/star_cannon.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/super_star_shooter.png b/src/main/resources/assets/lzxnoneterraria/textures/item/super_star_shooter.png new file mode 100644 index 0000000..c3737a2 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/super_star_shooter.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/white_star.png b/src/main/resources/assets/lzxnoneterraria/textures/item/white_star.png new file mode 100644 index 0000000..9642a10 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/white_star.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/mana_sickness.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/mana_sickness.png new file mode 100644 index 0000000..aad2196 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/mana_sickness.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/ui/Enchanted_Book.gif b/src/main/resources/assets/lzxnoneterraria/textures/ui/Enchanted_Book.gif deleted file mode 100644 index 5a3bda8..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/ui/Enchanted_Book.gif and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/ui/mana.png b/src/main/resources/assets/lzxnoneterraria/textures/ui/mana.png new file mode 100644 index 0000000..26f938c Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/ui/mana.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/ui/rounded_square_border.png b/src/main/resources/assets/lzxnoneterraria/textures/ui/rounded_square_border.png deleted file mode 100644 index aee64e6..0000000 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/ui/rounded_square_border.png and /dev/null differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile0.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile0.png new file mode 100644 index 0000000..d637a99 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile0.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile1.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile1.png new file mode 100644 index 0000000..c004083 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile2.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile2.png new file mode 100644 index 0000000..7bc8efb Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile2.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile3.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile3.png new file mode 100644 index 0000000..fef9d3d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile3.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile4.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile4.png new file mode 100644 index 0000000..09d14d4 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile4.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile5.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile5.png new file mode 100644 index 0000000..283d459 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile5.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile6.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile6.png new file mode 100644 index 0000000..2f7aa74 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/flame_projectile6.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/prismatic_bolt.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/prismatic_bolt.png new file mode 100644 index 0000000..bb2093d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/vfx/prismatic_bolt.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/vfx/first_fractal_star.png b/src/main/resources/assets/lzxnoneterraria/textures/vfx/star_wave.png similarity index 100% rename from src/main/resources/assets/lzxnoneterraria/textures/vfx/first_fractal_star.png rename to src/main/resources/assets/lzxnoneterraria/textures/vfx/star_wave.png diff --git a/src/main/resources/data/curios/tags/item/terraria_accessory.json b/src/main/resources/data/curios/tags/item/terraria_accessory.json new file mode 100644 index 0000000..857a541 --- /dev/null +++ b/src/main/resources/data/curios/tags/item/terraria_accessory.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "lzxnoneterraria:natures_gift", + "lzxnoneterraria:mana_flower" + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/curios/entities/player.json b/src/main/resources/data/lzxnoneterraria/curios/entities/player.json new file mode 100644 index 0000000..0543007 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/curios/entities/player.json @@ -0,0 +1,8 @@ +{ + "entities": [ + "minecraft:player" + ], + "slots": [ + "terraria_accessory" + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/curios/slots/terraria_accessory.json b/src/main/resources/data/lzxnoneterraria/curios/slots/terraria_accessory.json new file mode 100644 index 0000000..9491de4 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/curios/slots/terraria_accessory.json @@ -0,0 +1,8 @@ +{ + "size": 5, + "order": 100, + "icon": "curios:slot/empty_curio_slot", + "validators": [ + "curios:tag" + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering.json b/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering.json deleted file mode 100644 index 87db5bd..0000000 --- a/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "anvil_cost": 2, - "description": { - "translate": "enchantment.lzxnoneterraria.mana_gathering" - }, - "exclusive_set": "#lzxnoneterraria:exclusive_set/mana_recover", - "max_cost": { - "base": 45, - "per_level_above_first": 10 - }, - "max_level": 3, - "min_cost": { - "base": 5, - "per_level_above_first": 10 - }, - "primary_items": "#lzxnoneterraria:magic_weapons", - "slots": [ - "mainhand" - ], - "supported_items": "#lzxnoneterraria:magic_weapons", - "weight": 5 -} diff --git a/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering_curse.json b/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering_curse.json deleted file mode 100644 index b593f54..0000000 --- a/src/main/resources/data/lzxnoneterraria/enchantment/mana_gathering_curse.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "anvil_cost": 8, - "description": { - "translate": "enchantment.lzxnoneterraria.mana_gathering_curse" - }, - "exclusive_set": "#lzxnoneterraria:exclusive_set/mana_recover", - "max_cost": { - "base": 50, - "per_level_above_first": 0 - }, - "max_level": 1, - "min_cost": { - "base": 25, - "per_level_above_first": 0 - }, - "primary_items": "#lzxnoneterraria:magic_weapons", - "slots": [ - "mainhand" - ], - "supported_items": "#lzxnoneterraria:magic_weapons", - "weight": 1 -} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json b/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json new file mode 100644 index 0000000..aa60f95 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:natures_gift" + }, + { + "type": "neoforge:components", + "items": "minecraft:potion", + "components": { + "minecraft:potion_contents": { + "potion": "lzxnoneterraria:mana_0" + } + } + } + ], + "result": { + "id": "lzxnoneterraria:mana_flower", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/tags/enchantment/exclusive_set/mana_recover.json b/src/main/resources/data/lzxnoneterraria/tags/enchantment/exclusive_set/mana_recover.json deleted file mode 100644 index af88f48..0000000 --- a/src/main/resources/data/lzxnoneterraria/tags/enchantment/exclusive_set/mana_recover.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "lzxnoneterraria:mana_gathering", - "lzxnoneterraria:mana_gathering_curse" - ] -} diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/ammo.json b/src/main/resources/data/lzxnoneterraria/tags/item/ammo.json new file mode 100644 index 0000000..3ecf994 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/tags/item/ammo.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#lzxnoneterraria:bullet_ammo", + "lzxnoneterraria:fallen_star", + "minecraft:snowball", + "minecraft:slime_ball" + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/ranged_weapons.json b/src/main/resources/data/lzxnoneterraria/tags/item/ranged_weapons.json index dab201a..fc5ac97 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/ranged_weapons.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/ranged_weapons.json @@ -20,6 +20,11 @@ "lzxnoneterraria:tactical_shotgun", "lzxnoneterraria:sniper_rifle", "lzxnoneterraria:chain_gun", - "lzxnoneterraria:sdmg" + "lzxnoneterraria:sdmg", + "lzxnoneterraria:snowball_cannon", + "lzxnoneterraria:star_cannon", + "lzxnoneterraria:super_star_shooter", + "lzxnoneterraria:flamethrower", + "lzxnoneterraria:elf_melter" ] } diff --git a/src/main/resources/data/minecraft/tags/enchantment/curse.json b/src/main/resources/data/minecraft/tags/enchantment/curse.json index fa9a913..96f15c4 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/curse.json +++ b/src/main/resources/data/minecraft/tags/enchantment/curse.json @@ -2,7 +2,6 @@ "replace": false, "values": [ "lzxnoneterraria:mana_leak", - "lzxnoneterraria:mana_gathering_curse", "lzxnoneterraria:ammo_exhaustion" ] } diff --git a/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json b/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json index 04194c8..f0977ef 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json +++ b/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json @@ -3,8 +3,6 @@ "values": [ "lzxnoneterraria:mana_leak", "lzxnoneterraria:mana_efficiency", - "lzxnoneterraria:mana_gathering", - "lzxnoneterraria:mana_gathering_curse", "lzxnoneterraria:arcane_amplification", "lzxnoneterraria:summon_amplification", "lzxnoneterraria:ammo_exhaustion", diff --git a/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json index 1bd6ed7..f0977ef 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json +++ b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json @@ -3,7 +3,6 @@ "values": [ "lzxnoneterraria:mana_leak", "lzxnoneterraria:mana_efficiency", - "lzxnoneterraria:mana_gathering", "lzxnoneterraria:arcane_amplification", "lzxnoneterraria:summon_amplification", "lzxnoneterraria:ammo_exhaustion", diff --git a/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json b/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json index 04194c8..f0977ef 100644 --- a/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json +++ b/src/main/resources/data/minecraft/tags/enchantment/tooltip_order.json @@ -3,8 +3,6 @@ "values": [ "lzxnoneterraria:mana_leak", "lzxnoneterraria:mana_efficiency", - "lzxnoneterraria:mana_gathering", - "lzxnoneterraria:mana_gathering_curse", "lzxnoneterraria:arcane_amplification", "lzxnoneterraria:summon_amplification", "lzxnoneterraria:ammo_exhaustion", diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index b2daa27..81dffdc 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -95,6 +95,13 @@ Example mod description. ordering="NONE" side="CLIENT" +[[dependencies.${mod_id}]] + modId="curios" + type="required" + versionRange="[9.5.1,)" + ordering="AFTER" + side="BOTH" + #Optional dependency for dynamic lighting [[dependencies.${mod_id}]] modId="lambdynlights"