diff --git a/gradle.properties b/gradle.properties index 756d461..b0dfd01 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.4.2 +mod_version=1.5.0 ## 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 diff --git a/src/main/java/com/lzxnone/terraria/Config.java b/src/main/java/com/lzxnone/terraria/Config.java deleted file mode 100644 index fef5232..0000000 --- a/src/main/java/com/lzxnone/terraria/Config.java +++ /dev/null @@ -1,1112 +0,0 @@ -package com.lzxnone.terraria; - -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.config.ModConfigEvent; -import net.neoforged.neoforge.common.ModConfigSpec; - -@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) -public class Config { - public static final ModConfigSpec SPEC; - - public static final ModConfigSpec.DoubleValue BLOOD_BUTCHERER_DAMAGE_PER_LEVEL; - public static final ModConfigSpec.DoubleValue DEMONIC_FLAMES_DAMAGE_PER_LEVEL; - - public static final ModConfigSpec.DoubleValue ENCHANTED_SWORD_DAMAGE; - public static final ModConfigSpec.IntValue ENCHANTED_SWORD_LIFETIME; - public static final ModConfigSpec.DoubleValue ENCHANTED_SWORD_SPEED; - - public static final ModConfigSpec.IntValue BEE_KEEPER_MAX_BEES; - public static final ModConfigSpec.IntValue BEE_KEEPER_CONFUSION_DURATION; - public static final ModConfigSpec.DoubleValue BEE_KEEPER_BEE_DAMAGE; - - public static final ModConfigSpec.IntValue BLOOD_BUTCHERER_EFFECT_DURATION; - public static final ModConfigSpec.IntValue BLOOD_BUTCHERER_MAX_LEVEL; - - public static final ModConfigSpec.DoubleValue BLADE_OF_GRASS_PROJECTILE_DAMAGE; - public static final ModConfigSpec.IntValue BLADE_OF_GRASS_EFFECT_DURATION; - public static final ModConfigSpec.DoubleValue BLADE_OF_GRASS_TARGET_RANGE; - public static final ModConfigSpec.IntValue BLADE_OF_GRASS_PROJECTILE_LIFETIME; - public static final ModConfigSpec.IntValue BLADE_OF_GRASS_PROJECTILE_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue BLADE_OF_GRASS_RADIUS_GROWTH; - public static final ModConfigSpec.DoubleValue BLADE_OF_GRASS_ROTATION_SPEED; - - public static final ModConfigSpec.DoubleValue VOLCANO_EXPLOSION_RANGE; - public static final ModConfigSpec.DoubleValue VOLCANO_EXPLOSION_DAMAGE; - public static final ModConfigSpec.IntValue VOLCANO_EXPLOSION_MAX_HIT_COUNT; - public static final ModConfigSpec.IntValue VOLCANO_IGNITE_SECONDS; - - public static final ModConfigSpec.DoubleValue STARFURY_DAMAGE; - public static final ModConfigSpec.DoubleValue STARFURY_MAX_RANGE; - public static final ModConfigSpec.DoubleValue STARFURY_SPEED; - - public static final ModConfigSpec.DoubleValue SEEDLER_NUT_GRAVITY; - public static final ModConfigSpec.DoubleValue SEEDLER_NUT_BOUNCE; - public static final ModConfigSpec.DoubleValue SEEDLER_NUT_INITIAL_SPEED; - public static final ModConfigSpec.DoubleValue SEEDLER_THORN_DAMAGE; - public static final ModConfigSpec.IntValue SEEDLER_THORN_LIFETIME; - public static final ModConfigSpec.DoubleValue SEEDLER_THORN_SPEED; - - public static final ModConfigSpec.IntValue HORSEMANS_BLADE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue HORSEMANS_BLADE_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue HORSEMANS_BLADE_DAMAGE; - public static final ModConfigSpec.DoubleValue HORSEMANS_PUMPKIN_SPAWN_RANGE; - public static final ModConfigSpec.DoubleValue HORSEMANS_PUMPKIN_SPEED; - public static final ModConfigSpec.DoubleValue HORSEMANS_PUMPKIN_DAMAGE; - public static final ModConfigSpec.DoubleValue HORSEMANS_PUMPKIN_MAX_TARGET_RANGE; - - public static final ModConfigSpec.DoubleValue INFLUX_WAVER_DAMAGE; - public static final ModConfigSpec.IntValue INFLUX_WAVER_MAX_COUNT; - public static final ModConfigSpec.DoubleValue INFLUX_WAVER_SPEED; - public static final ModConfigSpec.DoubleValue INFLUX_WAVER_SPAWN_RANGE; - public static final ModConfigSpec.DoubleValue INFLUX_WAVER_TARGET_RANGE; - - public static final ModConfigSpec.DoubleValue STAR_WRATH_DAMAGE; - public static final ModConfigSpec.DoubleValue STAR_WRATH_SPEED; - public static final ModConfigSpec.DoubleValue STAR_WRATH_MAX_RANGE; - - public static final ModConfigSpec.DoubleValue MEOWMERE_DAMAGE; - public static final ModConfigSpec.DoubleValue MEOWMERE_GRAVITY; - public static final ModConfigSpec.DoubleValue MEOWMERE_INITIAL_SPEED; - - public static final ModConfigSpec.DoubleValue LIGHTS_BANE_BIG_DAMAGE; - public static final ModConfigSpec.DoubleValue LIGHTS_BANE_SMALL_DAMAGE; - public static final ModConfigSpec.DoubleValue LIGHTS_BANE_TARGET_RANGE; - - public static final ModConfigSpec.DoubleValue MACE_PROJECTILE_SPEED; - public static final ModConfigSpec.DoubleValue MACE_GRAVITY; - public static final ModConfigSpec.DoubleValue MACE_DAMAGE; - public static final ModConfigSpec.IntValue MACE_FLY_TIME; - public static final ModConfigSpec.DoubleValue MACE_MAX_RANGE; - - public static final ModConfigSpec.DoubleValue MURAMASA_BEAM_DAMAGE; - - public static final ModConfigSpec.DoubleValue TERRAGRIM_HIT_RANGE; - public static final ModConfigSpec.DoubleValue TERRAGRIM_DAMAGE; - public static final ModConfigSpec.IntValue TERRAGRIM_ROTATE_RANGE; - - public static final ModConfigSpec.IntValue EXCALIBUR_ROTATE_RANGE; - public static final ModConfigSpec.IntValue EXCALIBUR_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue EXCALIBUR_DAMAGE; - - public static final ModConfigSpec.BooleanValue NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_MAX_HIT_COUNT; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue NIGHTS_EDGE_DAMAGE; - public static final ModConfigSpec.DoubleValue NIGHTS_EDGE_PROJECTILE_DAMAGE; - public static final ModConfigSpec.DoubleValue NIGHTS_EDGE_PROJECTILE_SPEED; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_PROJECTILE_LIFETIME; - public static final ModConfigSpec.IntValue NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED; - - public static final ModConfigSpec.BooleanValue TERRA_PROJECTILE_ALIGN_TO_BLADE; - public static final ModConfigSpec.IntValue TERRA_BLADE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue TERRA_PROJECTILE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue TERRA_BLADE_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue TERRA_BLADE_DAMAGE; - public static final ModConfigSpec.DoubleValue TERRA_PROJECTILE_DAMAGE; - public static final ModConfigSpec.DoubleValue TERRA_PROJECTILE_SPEED; - public static final ModConfigSpec.IntValue TERRA_PROJECTILE_LIFETIME; - public static final ModConfigSpec.DoubleValue TERRA_PROJECTILE_DAMAGE_DECAY; - - public static final ModConfigSpec.DoubleValue ZENITH_DAMAGE; - public static final ModConfigSpec.DoubleValue ZENITH_MAX_RANGE; - public static final ModConfigSpec.BooleanValue ZENITH_DISTANCE_MODE; - public static final ModConfigSpec.IntValue ZENITH_SCROLL_SPEED; - public static final ModConfigSpec.DoubleValue ZENITH_TRAIL_B; - public static final ModConfigSpec.IntValue ZENITH_TRAIL_OFFSET; - public static final ModConfigSpec.IntValue ZENITH_WEAPON_COUNT; - public static final ModConfigSpec.DoubleValue ZENITH_BOUNDING_BOX_SIZE; - public static final ModConfigSpec.IntValue ZENITH_CYCLE; - public static final ModConfigSpec.DoubleValue ZENITH_SCALE; - public static final ModConfigSpec.DoubleValue ZENITH_TRAIL_ALPHA; - public static final ModConfigSpec.IntValue ZENITH_TRAIL_MAX_LENGTH; - - public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_PROJECTILE_DAMAGE; - public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_BOUNDING_BOX_SIZE; - public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_PROJECTILE_SPEED; - public static final ModConfigSpec.IntValue FIRST_FRACTAL_PROJECTILE_LIFETIME; - public static final ModConfigSpec.BooleanValue FIRST_FRACTAL_DISTANCE_MODE; - public static final ModConfigSpec.IntValue FIRST_FRACTAL_SCROLL_SPEED; - public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_MAX_RANGE; - public static final ModConfigSpec.DoubleValue FIRST_FRACTAL_SPAWN_RANGE; - - public static final ModConfigSpec.IntValue TRUE_EXCALIBUR_ROTATE_RANGE; - public static final ModConfigSpec.IntValue TRUE_EXCALIBUR_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue TRUE_EXCALIBUR_DAMAGE; - - public static final ModConfigSpec.BooleanValue TRUE_NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_MAX_HIT_COUNT; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT; - public static final ModConfigSpec.DoubleValue TRUE_NIGHTS_EDGE_DAMAGE; - public static final ModConfigSpec.DoubleValue TRUE_NIGHTS_EDGE_PROJECTILE_DAMAGE; - public static final ModConfigSpec.DoubleValue TRUE_NIGHTS_EDGE_PROJECTILE_MAX_SPEED; - public static final ModConfigSpec.DoubleValue TRUE_NIGHTS_EDGE_PROJECTILE_ACCELERATION; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_PROJECTILE_LIFETIME; - public static final ModConfigSpec.IntValue TRUE_NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED; - - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_KILL_MODE_TIME; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_KILL_MODE_COOLDOWN_TIME; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_PROJECTILE_DAMAGE; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_PROJECTILE_LIFETIME; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_PROJECTILE_SPEED; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_STUCK_PROJECTILE_DAMAGE; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_STUCK_PROJECTILE_LIFETIME; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_STUCK_PROJECTILE_SPEED; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_CYCLE; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_DAMAGE; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_ROTATE; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_STUCK_LIFETIME; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_MAX_STUCK_COUNT; - public static final ModConfigSpec.DoubleValue DEVILS_DEVASTATION_MARK_LIGHTNING_DAMAGE; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_PROJECTILE_EFFECT_DURATION; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_STUCK_PROJECTILE_EFFECT_DURATION; - public static final ModConfigSpec.IntValue DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_EFFECT_DURATION; - - public static double bloodButchererDamagePerLevel; - public static double demonicFlamesDamagePerLevel; - - public static double enchantedSwordDamage; - public static int enchantedSwordLifetime; - public static double enchantedSwordSpeed; - - public static int beeKeeperMaxBees; - public static int beeKeeperConfusionDuration; - public static double beeKeeperBeeDamage; - - public static int bloodButchererEffectDuration; - public static int bloodButchererMaxLevel; - - public static double bladeOfGrassProjectileDamage; - public static int bladeOfGrassEffectDuration; - public static double bladeOfGrassTargetRange; - public static int bladeOfGrassProjectileLifetime; - public static int bladeOfGrassProjectileMaxHitCount; - public static double bladeOfGrassRadiusGrowth; - public static double bladeOfGrassRotationSpeed; - - public static double volcanoExplosionRange; - public static double volcanoExplosionDamage; - public static int volcanoExplosionMaxHitCount; - public static int volcanoIgniteSeconds; - - public static double starfuryDamage; - public static double starfuryMaxRange; - public static double starfurySpeed; - - public static double seedlerNutGravity; - public static double seedlerNutBounce; - public static double seedlerNutInitialSpeed; - public static double seedlerThornDamage; - public static int seedlerThornLifetime; - public static double seedlerThornSpeed; - - public static int horsemansBladeRotateRange; - public static int horsemansBladeMaxHitCount; - public static double horsemansBladeDamage; - public static double horsemansPumpkinSpawnRange; - public static double horsemansPumpkinSpeed; - public static double horsemansPumpkinDamage; - public static double horsemansPumpkinMaxTargetRange; - - public static double influxWaverDamage; - public static int influxWaverMaxCount; - public static double influxWaverSpeed; - public static double influxWaverSpawnRange; - public static double influxWaverTargetRange; - - public static double starWrathDamage; - public static double starWrathSpeed; - public static double starWrathMaxRange; - - public static double meowmereDamage; - public static double meowmereGravity; - public static double meowmereInitialSpeed; - - public static double lightsBaneBigDamage; - public static double lightsBaneSmallDamage; - public static double lightsBaneTargetRange; - - public static double maceProjectileSpeed; - public static double maceGravity; - public static double maceDamage; - public static int maceFlyTime; - public static double maceMaxRange; - - public static double muramasaBeamDamage; - - public static double terragrimHitRange; - public static double terragrimDamage; - public static int terragrimRotateRange; - - public static int excaliburRotateRange; - public static int excaliburMaxHitCount; - public static double excaliburDamage; - - public static boolean nightsEdgeProjectileAlignToBlade; - public static int nightsEdgeRotateRange; - public static int nightsEdgeProjectileRotateRange; - public static int nightsEdgeMaxHitCount; - public static int nightsEdgeProjectileMaxHitCount; - public static double nightsEdgeDamage; - public static double nightsEdgeProjectileDamage; - public static double nightsEdgeProjectileSpeed; - public static int nightsEdgeProjectileLifetime; - public static int nightsEdgeProjectileRotationSpeed; - - public static boolean terraProjectileAlignToBlade; - public static int terraBladeRotateRange; - public static int terraProjectileRotateRange; - public static int terraBladeMaxHitCount; - public static double terraBladeDamage; - public static double terraProjectileDamage; - public static double terraProjectileSpeed; - public static int terraProjectileLifetime; - public static double terraProjectileDamageDecay; - - public static double zenithDamage; - public static double zenithMaxRange; - public static boolean zenithDistanceMode; - public static int zenithMouseSpeed; - public static double zenithTrailB; - public static int zenithTrailOffset; - public static int zenithWeaponCount; - public static double zenithBoundingBoxSize; - public static int zenithCycle; - public static double zenithScale; - public static double zenithTrailAlpha; - public static int zenithTrailMaxLength; - - public static double firstFractalProjectileDamage; - public static double firstFractalBoundingBoxSize; - public static double firstFractalProjectileSpeed; - public static int firstFractalProjectileLifetime; - public static boolean firstFractalDistanceMode; - public static int firstFractalScrollSpeed; - public static double firstFractalMaxRange; - public static double firstFractalSpawnRange; - - public static int trueExcaliburRotateRange; - public static int trueExcaliburMaxHitCount; - public static double trueExcaliburDamage; - - public static boolean trueNightsEdgeProjectileAlignToBlade; - public static int trueNightsEdgeRotateRange; - public static int trueNightsEdgeProjectileRotateRange; - public static int trueNightsEdgeMaxHitCount; - public static int trueNightsEdgeProjectileMaxHitCount; - public static double trueNightsEdgeDamage; - public static double trueNightsEdgeProjectileDamage; - public static double trueNightsEdgeProjectileMaxSpeed; - public static double trueNightsEdgeProjectileAcceleration; - public static int trueNightsEdgeProjectileLifetime; - public static int trueNightsEdgeProjectileRotationSpeed; - - public static int devilsDevastationKillModeTime; - public static int devilsDevastationKillModeCooldownTime; - public static double devilsDevastationProjectileDamage; - public static int devilsDevastationProjectileLifetime; - public static double devilsDevastationProjectileSpeed; - public static double devilsDevastationStuckProjectileDamage; - public static int devilsDevastationStuckProjectileLifetime; - public static double devilsDevastationStuckProjectileSpeed; - public static int devilsDevastationKillModeProjectileCycle; - public static double devilsDevastationKillModeProjectileDamage; - public static int devilsDevastationKillModeProjectileRotate; - public static int devilsDevastationStuckLifetime; - public static int devilsDevastationMaxStuckCount; - public static double devilsDevastationMarkLightningDamage; - public static int devilsDevastationProjectileEffectDuration; - public static int devilsDevastationStuckProjectileEffectDuration; - public static int devilsDevastationKillModeProjectileEffectDuration; - - static { - ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); - - builder.push("effect_settings"); - - BLOOD_BUTCHERER_DAMAGE_PER_LEVEL = builder - .comment("血腥屠宰效果每级伤害") - .defineInRange("blood_butcherer_damage_per_level", 0.5, 0, 8388600); - - DEMONIC_FLAMES_DAMAGE_PER_LEVEL = builder - .comment("恶魔之焰效果每级伤害") - .defineInRange("demonic_flames_damage_per_level", 2.5, 0, 8388600); - - builder.pop(); - - builder.push("enchanted_sword_settings"); - - ENCHANTED_SWORD_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("enchanted_sword_damage", 4.0, 0, 2147483647); - - ENCHANTED_SWORD_LIFETIME = builder - .comment("弹射持续时间") - .defineInRange("enchanted_sword_lifetime", 60, 1, 1200); - - ENCHANTED_SWORD_SPEED = builder - .comment("弹射速度") - .defineInRange("enchanted_sword_speed", 1.0, 0, 10); - - builder.pop(); - - - builder.push("bee_keeper_settings"); - - BEE_KEEPER_MAX_BEES = builder - .comment("最大蜜蜂生成数量") - .defineInRange("bee_keeper_max_bees", 3, 0, 10); - - BEE_KEEPER_CONFUSION_DURATION = builder - .comment("困惑持续时间") - .defineInRange("bee_keeper_confusion_duration", 40, 0, 1200); - - BEE_KEEPER_BEE_DAMAGE = builder - .comment("蜜蜂的攻击伤害") - .defineInRange("bee_keeper_bee_damage", 2.0, 0, 2147483647); - - builder.pop(); - - builder.push("blood_butcherer_settings"); - - BLOOD_BUTCHERER_EFFECT_DURATION = builder - .comment("血腥屠宰效果持续时间(刻)") - .defineInRange("blood_butcherer_effect_duration", 180, 0, 72000); - - BLOOD_BUTCHERER_MAX_LEVEL = builder - .comment("血腥屠宰效果最大等级") - .defineInRange("blood_butcherer_max_level", 4, 0, 255); - - builder.pop(); - - builder.push("blade_of_grass_settings"); - - BLADE_OF_GRASS_PROJECTILE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("blade_of_grass_projectile_damage", 2.0, 0, 2147483647.0); - - BLADE_OF_GRASS_EFFECT_DURATION = builder - .comment("效果持续时间(刻)") - .defineInRange("blade_of_grass_effect_duration", 140, 0, 72000); - - BLADE_OF_GRASS_TARGET_RANGE = builder - .comment("弹射最大寻敌范围") - .defineInRange("blade_of_grass_target_range", 8.0, 1.0, 64.0); - - BLADE_OF_GRASS_PROJECTILE_LIFETIME = builder - .comment("弹射持续时间") - .defineInRange("blade_of_grass_projectile_lifetime", 60, 1, 600); - - BLADE_OF_GRASS_PROJECTILE_MAX_HIT_COUNT = builder - .comment("弹射最大击中数") - .defineInRange("blade_of_grass_projectile_max_hit_count", 2, 0, 100); - - BLADE_OF_GRASS_RADIUS_GROWTH = builder - .comment("弹射半径增大速度") - .defineInRange("blade_of_grass_radius_growth", 0.05, 0, 1.0); - - BLADE_OF_GRASS_ROTATION_SPEED = builder - .comment("弹射旋转速度") - .defineInRange("blade_of_grass_rotation_speed", 0.2, 0, 1.0); - - builder.pop(); - - builder.push("volcano_settings"); - - VOLCANO_EXPLOSION_RANGE = builder - .comment("爆炸范围") - .defineInRange("volcano_explosion_range", 4.0, 1.0, 64.0); - - VOLCANO_EXPLOSION_DAMAGE = builder - .comment("爆炸伤害") - .defineInRange("volcano_explosion_damage", 6.0, 0, 2147483647.0); - - VOLCANO_EXPLOSION_MAX_HIT_COUNT = builder - .comment("爆炸最大击中数") - .defineInRange("volcano_explosion_max_hit_count", 2, 0, 100); - - VOLCANO_IGNITE_SECONDS = builder - .comment("着火时间(秒)") - .defineInRange("volcano_ignite_seconds", 3, 0, 60); - - builder.pop(); - - builder.push("starfury_settings"); - - STARFURY_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("starfury_damage", 6.0, 0, 2147483647); - - STARFURY_MAX_RANGE = builder - .comment("最大范围") - .defineInRange("starfury_max_range", 24.0, 1.0, 1024.0); - - STARFURY_SPEED = builder - .comment("弹射速度") - .defineInRange("starfury_speed", 2.0, 0, 10); - - builder.pop(); - - - builder.push("seedler_settings"); - - SEEDLER_NUT_GRAVITY = builder - .comment("坚果重力") - .defineInRange("seedler_nut_gravity", 0.075, 0.0, 1.0); - - SEEDLER_NUT_BOUNCE = builder - .comment("坚果弹力") - .defineInRange("seedler_nut_bounce", 0.5, 0.0, 1.0); - - SEEDLER_NUT_INITIAL_SPEED = builder - .comment("坚果初速度") - .defineInRange("seedler_nut_initial_speed", 0.75, 0, 10.0); - - SEEDLER_THORN_DAMAGE = builder - .comment("荆棘伤害") - .defineInRange("seedler_thorn_damage", 2.0, 0, 2147483647); - - SEEDLER_THORN_LIFETIME = builder - .comment("荆棘持续时间") - .defineInRange("seedler_thorn_lifetime", 30, 1, 1200); - - SEEDLER_THORN_SPEED = builder - .comment("荆棘速度") - .defineInRange("seedler_thorn_speed", 2.0, 0, 10); - - builder.pop(); - - - builder.push("horsemans_blade_settings"); - - HORSEMANS_BLADE_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("horsemans_blade_rotate_range", 45, 0, 90); - - HORSEMANS_BLADE_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("horsemans_blade_max_hit_count", 3, 0, 100); - - HORSEMANS_BLADE_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("horsemans_blade_damage", 15.0, 0, 2147483647.0); - - HORSEMANS_PUMPKIN_SPAWN_RANGE = builder - .comment("南瓜生成范围") - .defineInRange("horsemans_pumpkin_spawn_range", 16.0, 1.0, 64.0); - - HORSEMANS_PUMPKIN_SPEED = builder - .comment("南瓜速度") - .defineInRange("horsemans_pumpkin_speed", 0.5, 0, 10); - - HORSEMANS_PUMPKIN_DAMAGE = builder - .comment("南瓜伤害") - .defineInRange("horsemans_pumpkin_damage", 15.0, 0, 2147483647.0); - - HORSEMANS_PUMPKIN_MAX_TARGET_RANGE = builder - .comment("南瓜最大寻敌范围") - .defineInRange("horsemans_pumpkin_max_target_range", 32.0, 1.0, 64.0); - - builder.pop(); - - - builder.push("influx_waver_settings"); - - INFLUX_WAVER_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("influx_waver_damage", 12.0, 0, 2147483647.0); - - INFLUX_WAVER_MAX_COUNT = builder - .comment("弹射最大生成数量") - .defineInRange("influx_waver_max_count", 2, 0, 10); - - INFLUX_WAVER_SPEED = builder - .comment("弹射速度") - .defineInRange("influx_waver_speed", 1.0, 0, 10); - - INFLUX_WAVER_SPAWN_RANGE = builder - .comment("弹射生成范围") - .defineInRange("influx_waver_spawn_range", 8.0, 1.0, 64.0); - - INFLUX_WAVER_TARGET_RANGE = builder - .comment("弹射寻敌范围") - .defineInRange("influx_waver_target_range", 24.0, 1.0, 64.0); - - builder.pop(); - - - builder.push("star_wrath_settings"); - - STAR_WRATH_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("star_wrath_damage", 16.0, 0, 2147483647.0); - - STAR_WRATH_SPEED = builder - .comment("弹射速度") - .defineInRange("star_wrath_speed", 2.0, 0, 10); - - STAR_WRATH_MAX_RANGE = builder - .comment("最大范围") - .defineInRange("star_wrath_max_range", 48.0, 1.0, 1024.0); - - builder.pop(); - - - builder.push("meowmere_settings"); - - MEOWMERE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("meowmere_damage", 20.0, 0, 2147483647.0); - - MEOWMERE_GRAVITY = builder - .comment("弹射重力") - .defineInRange("meowmere_gravity", 0.025, 0.0, 1.0); - - MEOWMERE_INITIAL_SPEED = builder - .comment("弹射初速度") - .defineInRange("meowmere_initial_speed", 1.5, 0, 10); - - builder.pop(); - - - builder.push("lights_bane_settings"); - - LIGHTS_BANE_BIG_DAMAGE = builder - .comment("大斩击伤害") - .defineInRange("lights_bane_big_damage", 4.0, 0, 2147483647.0); - - LIGHTS_BANE_SMALL_DAMAGE = builder - .comment("小斩击伤害") - .defineInRange("lights_bane_small_damage", 2.0, 0, 2147483647.0); - - LIGHTS_BANE_TARGET_RANGE = builder - .comment("寻敌范围") - .defineInRange("lights_bane_target_range", 2.0, 1.0, 64.0); - - builder.pop(); - - builder.push("mace_settings"); - - MACE_PROJECTILE_SPEED = builder - .comment("弹射速度") - .defineInRange("mace_projectile_speed", 2.0, 0, 10); - - MACE_GRAVITY = builder - .comment("弹射重力") - .defineInRange("mace_gravity", 0.75, 0, 5); - - MACE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("mace_damage", 4.0, 0, 2147483647.0); - - MACE_FLY_TIME = builder - .comment("弹射最大飞行时间") - .defineInRange("mace_fly_time", 10, 1, 100); - - MACE_MAX_RANGE = builder - .comment("弹射最大范围") - .defineInRange("mace_max_range", 32.0, 1.0, 512.0); - - builder.pop(); - - builder.push("muramasa_settings"); - - MURAMASA_BEAM_DAMAGE = builder - .comment("蓝色光线伤害") - .defineInRange("muramasa_beam_damage", 2.5, 0, 2147483647.0); - - builder.pop(); - - - builder.push("terragrim_settings"); - - TERRAGRIM_HIT_RANGE = builder - .comment("碰撞箱范围") - .defineInRange("terragrim_hit_range", 2.5, 0.5, 10.0); - - TERRAGRIM_DAMAGE = builder - .comment("伤害") - .defineInRange("terragrim_damage", 0.25, 0, 2147483647.0); - - TERRAGRIM_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("terragrim_rotate_range", 45, 0, 90); - - builder.pop(); - - - builder.push("excalibur_settings"); - - EXCALIBUR_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("excalibur_rotate_range", 45, 0, 90); - - EXCALIBUR_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("excalibur_max_hit_count", 3, 0, 100); - - EXCALIBUR_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("excalibur_damage", 8.0, 0, 2147483647.0); - - builder.pop(); - - - builder.push("nights_edge_settings"); - - NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE = builder - .comment("弹射是否匹配刀光方向") - .define("nights_edge_projectile_align_to_blade", true); - - NIGHTS_EDGE_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("nights_edge_rotate_range", 45, 0, 90); - - NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE = builder - .comment("弹射偏转角范围") - .defineInRange("nights_edge_projectile_rotate_range", 40, 0, 90); - - NIGHTS_EDGE_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("nights_edge_max_hit_count", 2, 0, 100); - - NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT = builder - .comment("弹射刀光单次最大击中生物数量") - .defineInRange("nights_edge_projectile_max_hit_count", 2, 0, 100); - - NIGHTS_EDGE_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("nights_edge_damage", 7.0, 0, 2147483647.0); - - NIGHTS_EDGE_PROJECTILE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("nights_edge_projectile_damage", 7.0, 0, 2147483647.0); - - NIGHTS_EDGE_PROJECTILE_SPEED = builder - .comment("弹射速度") - .defineInRange("nights_edge_projectile_speed", 0.25, 0, 10); - - NIGHTS_EDGE_PROJECTILE_LIFETIME = builder - .comment("弹射持续时间") - .defineInRange("nights_edge_projectile_lifetime", 10, 1, 1200); - - NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED = builder - .comment("弹射旋转速度") - .defineInRange("nights_edge_projectile_rotation_speed", 36, 0, 360); - - builder.pop(); - - - builder.push("terra_blade_settings"); - - TERRA_PROJECTILE_ALIGN_TO_BLADE = builder - .comment("弹射是否匹配刀光方向") - .define("terra_projectile_align_to_blade", true); - - TERRA_BLADE_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("terra_blade_rotate_range", 45, 0, 90); - - TERRA_PROJECTILE_ROTATE_RANGE = builder - .comment("弹射偏转角范围") - .defineInRange("terra_projectile_rotate_range", 45, 0, 90); - - TERRA_BLADE_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("terra_blade_max_hit_count", 3, 0, 100); - - TERRA_BLADE_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("terra_blade_damage", 11.0, 0, 2147483647.0); - - TERRA_PROJECTILE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("terra_projectile_damage", 11.0, 0, 2147483647.0); - - TERRA_PROJECTILE_SPEED = builder - .comment("弹射速度") - .defineInRange("terra_projectile_speed", 2.0, 0, 10); - - TERRA_PROJECTILE_LIFETIME = builder - .comment("弹射持续时间") - .defineInRange("terra_projectile_lifetime", 60, 1, 1200); - - TERRA_PROJECTILE_DAMAGE_DECAY = builder - .comment("弹射伤害递减系数") - .defineInRange("terra_projectile_damage_decay", 0.75, 0.0, 1.0); - - builder.pop(); - - - builder.push("zenith_settings"); - - ZENITH_DAMAGE = builder - .comment("弹射单次伤害x-2x") - .defineInRange("zenith_damage", 4.0, 1.0, 2147483647); - - ZENITH_MAX_RANGE = builder - .comment("最大范围(2a)") - .defineInRange("zenith_max_range", 64.0, 1.0, 1024.0); - - ZENITH_DISTANCE_MODE = builder - .comment("使用相对距离") - .define("zenith_distance_mode", true); - - ZENITH_SCROLL_SPEED = builder - .comment("滚轮调节距离速度") - .defineInRange("zenith_mouse_speed", 4, 0, 128); - - ZENITH_TRAIL_B = builder - .comment("椭圆轨道半短轴(b)") - .defineInRange("zenith_trail_b", 4.0, 0.1, 512.0); - - ZENITH_TRAIL_OFFSET = builder - .comment("轨道偏转角范围") - .defineInRange("zenith_trail_offset", 30, 0, 90); - - ZENITH_WEAPON_COUNT = builder - .comment("单把武器实际数量") - .defineInRange("zenith_weapon_count", 3, 1, 3); - - ZENITH_BOUNDING_BOX_SIZE = builder - .comment("弹射碰撞箱大小") - .defineInRange("zenith_bounding_box_size", 1.5, 0.1, 4.0); - - ZENITH_CYCLE = builder - .comment("弹射运动周期") - .defineInRange("zenith_cycle", 20, 10, 100); - - ZENITH_SCALE = builder - .comment("弹射大小倍数") - .defineInRange("zenith_scale", 2.0, 0.1, 10.0); - - ZENITH_TRAIL_ALPHA = builder - .comment("尾迹透明度") - .defineInRange("zenith_trail_alpha", 0.15, 0.0, 1.0); - - ZENITH_TRAIL_MAX_LENGTH = builder - .comment("尾迹长度") - .defineInRange("zenith_trail_max_length", 10, 0, 100); - - builder.pop(); - - builder.push("first_fractal_settings"); - - FIRST_FRACTAL_PROJECTILE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("first_fractal_projectile_damage", 10.0, 0, 2147483647.0); - - FIRST_FRACTAL_BOUNDING_BOX_SIZE = builder - .comment("弹射碰撞箱大小") - .defineInRange("first_fractal_bounding_box_size", 1.5, 0.5, 10.0); - - FIRST_FRACTAL_PROJECTILE_SPEED = builder - .comment("弹射速度") - .defineInRange("first_fractal_projectile_speed", 1.5, 0, 10.0); - - FIRST_FRACTAL_PROJECTILE_LIFETIME = builder - .comment("弹射生命周期") - .defineInRange("first_fractal_projectile_lifetime", 30, 1, 1200); - - FIRST_FRACTAL_DISTANCE_MODE = builder - .comment("使用相对距离模式") - .define("first_fractal_distance_mode", true); - - FIRST_FRACTAL_SCROLL_SPEED = builder - .comment("滚轮调节距离速度") - .defineInRange("first_fractal_scroll_speed", 4, 0, 128); - - FIRST_FRACTAL_MAX_RANGE = builder - .comment("最大范围") - .defineInRange("first_fractal_max_range", 64.0, 1.0, 1024.0); - - FIRST_FRACTAL_SPAWN_RANGE = builder - .comment("弹射生成范围") - .defineInRange("first_fractal_spawn_range", 16.0, 1.0, 64.0); - - builder.pop(); - - builder.push("true_excalibur_settings"); - - TRUE_EXCALIBUR_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("true_excalibur_rotate_range", 45, 0, 90); - - TRUE_EXCALIBUR_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("true_excalibur_max_hit_count", 6, 0, 100); - - TRUE_EXCALIBUR_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("true_excalibur_damage", 8.0, 0, 2147483647.0); - - builder.pop(); - - builder.push("true_nights_edge_settings"); - - TRUE_NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE = builder - .comment("弹射是否匹配刀光方向") - .define("true_nights_edge_projectile_align_to_blade", true); - - TRUE_NIGHTS_EDGE_ROTATE_RANGE = builder - .comment("刀光偏转角范围") - .defineInRange("true_nights_edge_rotate_range", 45, 0, 90); - - TRUE_NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE = builder - .comment("弹射偏转角范围") - .defineInRange("true_nights_edge_projectile_rotate_range", 45, 0, 90); - - TRUE_NIGHTS_EDGE_MAX_HIT_COUNT = builder - .comment("刀光单次最大击中生物数量") - .defineInRange("true_nights_edge_max_hit_count", 2, 0, 100); - - TRUE_NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT = builder - .comment("弹射刀光单次最大击中生物数量") - .defineInRange("true_nights_edge_projectile_max_hit_count", 3, 0, 100); - - TRUE_NIGHTS_EDGE_DAMAGE = builder - .comment("刀光伤害") - .defineInRange("true_nights_edge_damage", 8.0, 0, 2147483647.0); - - TRUE_NIGHTS_EDGE_PROJECTILE_DAMAGE = builder - .comment("弹射伤害") - .defineInRange("true_nights_edge_projectile_damage", 4.0, 0, 2147483647.0); - - TRUE_NIGHTS_EDGE_PROJECTILE_MAX_SPEED = builder - .comment("弹射最大速度") - .defineInRange("true_nights_edge_projectile_max_speed", 2.0, 0, 10); - - TRUE_NIGHTS_EDGE_PROJECTILE_ACCELERATION = builder - .comment("弹射加速度") - .defineInRange("true_nights_edge_projectile_acceleration", 0.03, 0, 10.0); - - TRUE_NIGHTS_EDGE_PROJECTILE_LIFETIME = builder - .comment("弹射持续时间") - .defineInRange("true_nights_edge_projectile_lifetime", 60, 1, 1200); - - TRUE_NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED = builder - .comment("弹射旋转速度") - .defineInRange("true_nights_edge_projectile_rotation_speed", 30, 0, 360); - - builder.pop(); - - builder.push("devils_devastation_settings"); - - DEVILS_DEVASTATION_KILL_MODE_TIME = builder - .comment("杀戮模式持续时间(刻)") - .defineInRange("devils_devastation_kill_mode_time", 100, 0, 72000); - - DEVILS_DEVASTATION_KILL_MODE_COOLDOWN_TIME = builder - .comment("杀戮模式冷却时间(刻)") - .defineInRange("devils_devastation_kill_mode_cooldown_time", 100, 0, 72000); - - DEVILS_DEVASTATION_PROJECTILE_DAMAGE = builder - .comment("右键弹射伤害") - .defineInRange("devils_devastation_projectile_damage", 30.0, 0, 2147483647.0); - - DEVILS_DEVASTATION_PROJECTILE_LIFETIME = builder - .comment("右键弹射持续时间(刻)") - .defineInRange("devils_devastation_projectile_lifetime", 40, 1, 1200); - - DEVILS_DEVASTATION_PROJECTILE_SPEED = builder - .comment("右键弹射速度") - .defineInRange("devils_devastation_projectile_speed", 3.0, 0, 10); - - DEVILS_DEVASTATION_STUCK_PROJECTILE_DAMAGE = builder - .comment("弹出弹射伤害") - .defineInRange("devils_devastation_stuck_projectile_damage", 30.0, 0, 2147483647.0); - - DEVILS_DEVASTATION_STUCK_PROJECTILE_LIFETIME = builder - .comment("弹出弹射持续时间(刻)") - .defineInRange("devils_devastation_stuck_projectile_lifetime", 40, 1, 1200); - - DEVILS_DEVASTATION_STUCK_PROJECTILE_SPEED = builder - .comment("弹出弹射速度") - .defineInRange("devils_devastation_stuck_projectile_speed", 3.0, 0, 10); - - DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_CYCLE = builder - .comment("杀戮模式弹射周期(刻)") - .defineInRange("devils_devastation_kill_mode_projectile_cycle", 10, 1, 200); - - DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_DAMAGE = builder - .comment("杀戮模式弹射伤害") - .defineInRange("devils_devastation_kill_mode_projectile_damage", 200.0, 0, 2147483647.0); - - DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_ROTATE = builder - .comment("杀戮模式弹射旋转角度") - .defineInRange("devils_devastation_kill_mode_projectile_rotate", 30, 0, 360); - - DEVILS_DEVASTATION_STUCK_LIFETIME = builder - .comment("附着弹射存在时间(刻)") - .defineInRange("devils_devastation_stuck_lifetime", 200, 1, 72000); - - DEVILS_DEVASTATION_MAX_STUCK_COUNT = builder - .comment("最大附着数量") - .defineInRange("devils_devastation_max_stuck_count", 5, 1, 50); - - DEVILS_DEVASTATION_MARK_LIGHTNING_DAMAGE = builder - .comment("标记闪电伤害") - .defineInRange("devils_devastation_mark_lightning_damage", 100.0, 0, 2147483647.0); - - DEVILS_DEVASTATION_PROJECTILE_EFFECT_DURATION = builder - .comment("右键弹射造成效果持续时间(刻)") - .defineInRange("devils_devastation_projectile_effect_duration", 40, 0, 72000); - - DEVILS_DEVASTATION_STUCK_PROJECTILE_EFFECT_DURATION = builder - .comment("弹出弹射造成效果持续时间(刻)") - .defineInRange("devils_devastation_stuck_projectile_effect_duration", 60, 0, 72000); - - DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_EFFECT_DURATION = builder - .comment("杀戮模式弹射造成效果持续时间(刻)") - .defineInRange("devils_devastation_kill_mode_projectile_effect_duration", 70, 0, 72000); - - builder.pop(); - - SPEC = builder.build(); - } - - @SubscribeEvent - static void onLoad(final ModConfigEvent event) { - if(event.getConfig().getSpec() == SPEC) { - bloodButchererDamagePerLevel = BLOOD_BUTCHERER_DAMAGE_PER_LEVEL.get(); - demonicFlamesDamagePerLevel = DEMONIC_FLAMES_DAMAGE_PER_LEVEL.get(); - enchantedSwordDamage = ENCHANTED_SWORD_DAMAGE.get(); - enchantedSwordLifetime = ENCHANTED_SWORD_LIFETIME.get(); - enchantedSwordSpeed = ENCHANTED_SWORD_SPEED.get(); - beeKeeperMaxBees = BEE_KEEPER_MAX_BEES.get(); - beeKeeperConfusionDuration = BEE_KEEPER_CONFUSION_DURATION.get(); - beeKeeperBeeDamage = BEE_KEEPER_BEE_DAMAGE.get(); - bloodButchererEffectDuration = BLOOD_BUTCHERER_EFFECT_DURATION.get(); - bloodButchererMaxLevel = BLOOD_BUTCHERER_MAX_LEVEL.get(); - bloodButchererDamagePerLevel = BLOOD_BUTCHERER_DAMAGE_PER_LEVEL.get(); - bladeOfGrassProjectileDamage = BLADE_OF_GRASS_PROJECTILE_DAMAGE.get(); - bladeOfGrassEffectDuration = BLADE_OF_GRASS_EFFECT_DURATION.get(); - bladeOfGrassTargetRange = BLADE_OF_GRASS_TARGET_RANGE.get(); - bladeOfGrassProjectileLifetime = BLADE_OF_GRASS_PROJECTILE_LIFETIME.get(); - bladeOfGrassProjectileMaxHitCount = BLADE_OF_GRASS_PROJECTILE_MAX_HIT_COUNT.get(); - bladeOfGrassRadiusGrowth = BLADE_OF_GRASS_RADIUS_GROWTH.get(); - bladeOfGrassRotationSpeed = BLADE_OF_GRASS_ROTATION_SPEED.get(); - volcanoExplosionRange = VOLCANO_EXPLOSION_RANGE.get(); - volcanoExplosionDamage = VOLCANO_EXPLOSION_DAMAGE.get(); - volcanoExplosionMaxHitCount = VOLCANO_EXPLOSION_MAX_HIT_COUNT.get(); - volcanoIgniteSeconds = VOLCANO_IGNITE_SECONDS.get(); - starfuryDamage = STARFURY_DAMAGE.get(); - starfuryMaxRange = STARFURY_MAX_RANGE.get(); - starfurySpeed = STARFURY_SPEED.get(); - seedlerNutGravity = SEEDLER_NUT_GRAVITY.get(); - seedlerNutBounce = SEEDLER_NUT_BOUNCE.get(); - seedlerNutInitialSpeed = SEEDLER_NUT_INITIAL_SPEED.get(); - seedlerThornDamage = SEEDLER_THORN_DAMAGE.get(); - seedlerThornLifetime = SEEDLER_THORN_LIFETIME.get(); - seedlerThornSpeed = SEEDLER_THORN_SPEED.get(); - horsemansBladeRotateRange = HORSEMANS_BLADE_ROTATE_RANGE.get(); - horsemansBladeMaxHitCount = HORSEMANS_BLADE_MAX_HIT_COUNT.get(); - horsemansBladeDamage = HORSEMANS_BLADE_DAMAGE.get(); - horsemansPumpkinSpawnRange = HORSEMANS_PUMPKIN_SPAWN_RANGE.get(); - horsemansPumpkinSpeed = HORSEMANS_PUMPKIN_SPEED.get(); - horsemansPumpkinDamage = HORSEMANS_PUMPKIN_DAMAGE.get(); - horsemansPumpkinMaxTargetRange = HORSEMANS_PUMPKIN_MAX_TARGET_RANGE.get(); - influxWaverDamage = INFLUX_WAVER_DAMAGE.get(); - influxWaverMaxCount = INFLUX_WAVER_MAX_COUNT.get(); - influxWaverSpeed = INFLUX_WAVER_SPEED.get(); - influxWaverSpawnRange = INFLUX_WAVER_SPAWN_RANGE.get(); - influxWaverTargetRange = INFLUX_WAVER_TARGET_RANGE.get(); - starWrathDamage = STAR_WRATH_DAMAGE.get(); - starWrathSpeed = STAR_WRATH_SPEED.get(); - starWrathMaxRange = STAR_WRATH_MAX_RANGE.get(); - meowmereDamage = MEOWMERE_DAMAGE.get(); - meowmereGravity = MEOWMERE_GRAVITY.get(); - meowmereInitialSpeed = MEOWMERE_INITIAL_SPEED.get(); - lightsBaneBigDamage = LIGHTS_BANE_BIG_DAMAGE.get(); - lightsBaneSmallDamage = LIGHTS_BANE_SMALL_DAMAGE.get(); - lightsBaneTargetRange = LIGHTS_BANE_TARGET_RANGE.get(); - maceProjectileSpeed = MACE_PROJECTILE_SPEED.get(); - maceGravity = MACE_GRAVITY.get(); - maceDamage = MACE_DAMAGE.get(); - maceFlyTime = MACE_FLY_TIME.get(); - maceMaxRange = MACE_MAX_RANGE.get(); - muramasaBeamDamage = MURAMASA_BEAM_DAMAGE.get(); - terragrimHitRange = TERRAGRIM_HIT_RANGE.get(); - terragrimDamage = TERRAGRIM_DAMAGE.get(); - terragrimRotateRange = TERRAGRIM_ROTATE_RANGE.get(); - excaliburRotateRange = EXCALIBUR_ROTATE_RANGE.get(); - excaliburMaxHitCount = EXCALIBUR_MAX_HIT_COUNT.get(); - excaliburDamage = EXCALIBUR_DAMAGE.get(); - nightsEdgeProjectileAlignToBlade = NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE.get(); - nightsEdgeRotateRange = NIGHTS_EDGE_ROTATE_RANGE.get(); - nightsEdgeProjectileRotateRange = NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE.get(); - nightsEdgeMaxHitCount = NIGHTS_EDGE_MAX_HIT_COUNT.get(); - nightsEdgeProjectileMaxHitCount = NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT.get(); - nightsEdgeDamage = NIGHTS_EDGE_DAMAGE.get(); - nightsEdgeProjectileDamage = NIGHTS_EDGE_PROJECTILE_DAMAGE.get(); - nightsEdgeProjectileSpeed = NIGHTS_EDGE_PROJECTILE_SPEED.get(); - nightsEdgeProjectileLifetime = NIGHTS_EDGE_PROJECTILE_LIFETIME.get(); - nightsEdgeProjectileRotationSpeed = NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED.get(); - terraProjectileAlignToBlade = TERRA_PROJECTILE_ALIGN_TO_BLADE.get(); - terraBladeRotateRange = TERRA_BLADE_ROTATE_RANGE.get(); - terraProjectileRotateRange = TERRA_PROJECTILE_ROTATE_RANGE.get(); - terraBladeMaxHitCount = TERRA_BLADE_MAX_HIT_COUNT.get(); - terraBladeDamage = TERRA_BLADE_DAMAGE.get(); - terraProjectileDamage = TERRA_PROJECTILE_DAMAGE.get(); - terraProjectileSpeed = TERRA_PROJECTILE_SPEED.get(); - terraProjectileLifetime = TERRA_PROJECTILE_LIFETIME.get(); - terraProjectileDamageDecay = TERRA_PROJECTILE_DAMAGE_DECAY.get(); - zenithDamage = ZENITH_DAMAGE.get(); - zenithMaxRange = ZENITH_MAX_RANGE.get(); - zenithDistanceMode = ZENITH_DISTANCE_MODE.get(); - zenithMouseSpeed = ZENITH_SCROLL_SPEED.get(); - zenithTrailB = ZENITH_TRAIL_B.get(); - zenithTrailOffset = ZENITH_TRAIL_OFFSET.get(); - zenithWeaponCount = ZENITH_WEAPON_COUNT.get(); - zenithBoundingBoxSize = ZENITH_BOUNDING_BOX_SIZE.get(); - zenithCycle = ZENITH_CYCLE.get(); - zenithScale = ZENITH_SCALE.get(); - zenithTrailAlpha = ZENITH_TRAIL_ALPHA.get(); - zenithTrailMaxLength = ZENITH_TRAIL_MAX_LENGTH.get(); - firstFractalProjectileDamage = FIRST_FRACTAL_PROJECTILE_DAMAGE.get(); - firstFractalBoundingBoxSize = FIRST_FRACTAL_BOUNDING_BOX_SIZE.get(); - firstFractalProjectileSpeed = FIRST_FRACTAL_PROJECTILE_SPEED.get(); - firstFractalProjectileLifetime = FIRST_FRACTAL_PROJECTILE_LIFETIME.get(); - firstFractalDistanceMode = FIRST_FRACTAL_DISTANCE_MODE.get(); - firstFractalScrollSpeed = FIRST_FRACTAL_SCROLL_SPEED.get(); - firstFractalMaxRange = FIRST_FRACTAL_MAX_RANGE.get(); - firstFractalSpawnRange = FIRST_FRACTAL_SPAWN_RANGE.get(); - trueExcaliburRotateRange = TRUE_EXCALIBUR_ROTATE_RANGE.get(); - trueExcaliburMaxHitCount = TRUE_EXCALIBUR_MAX_HIT_COUNT.get(); - trueExcaliburDamage = TRUE_EXCALIBUR_DAMAGE.get(); - trueNightsEdgeProjectileAlignToBlade = TRUE_NIGHTS_EDGE_PROJECTILE_ALIGN_TO_BLADE.get(); - trueNightsEdgeRotateRange = TRUE_NIGHTS_EDGE_ROTATE_RANGE.get(); - trueNightsEdgeProjectileRotateRange = TRUE_NIGHTS_EDGE_PROJECTILE_ROTATE_RANGE.get(); - trueNightsEdgeMaxHitCount = TRUE_NIGHTS_EDGE_MAX_HIT_COUNT.get(); - trueNightsEdgeProjectileMaxHitCount = TRUE_NIGHTS_EDGE_PROJECTILE_MAX_HIT_COUNT.get(); - trueNightsEdgeDamage = TRUE_NIGHTS_EDGE_DAMAGE.get(); - trueNightsEdgeProjectileDamage = TRUE_NIGHTS_EDGE_PROJECTILE_DAMAGE.get(); - trueNightsEdgeProjectileMaxSpeed = TRUE_NIGHTS_EDGE_PROJECTILE_MAX_SPEED.get(); - trueNightsEdgeProjectileAcceleration = TRUE_NIGHTS_EDGE_PROJECTILE_ACCELERATION.get(); - trueNightsEdgeProjectileLifetime = TRUE_NIGHTS_EDGE_PROJECTILE_LIFETIME.get(); - trueNightsEdgeProjectileRotationSpeed = TRUE_NIGHTS_EDGE_PROJECTILE_ROTATION_SPEED.get(); - devilsDevastationKillModeTime = DEVILS_DEVASTATION_KILL_MODE_TIME.get(); - devilsDevastationKillModeCooldownTime = DEVILS_DEVASTATION_KILL_MODE_COOLDOWN_TIME.get(); - devilsDevastationProjectileDamage = DEVILS_DEVASTATION_PROJECTILE_DAMAGE.get(); - devilsDevastationProjectileLifetime = DEVILS_DEVASTATION_PROJECTILE_LIFETIME.get(); - devilsDevastationProjectileSpeed = DEVILS_DEVASTATION_PROJECTILE_SPEED.get(); - devilsDevastationStuckProjectileDamage = DEVILS_DEVASTATION_STUCK_PROJECTILE_DAMAGE.get(); - devilsDevastationStuckProjectileLifetime = DEVILS_DEVASTATION_STUCK_PROJECTILE_LIFETIME.get(); - devilsDevastationStuckProjectileSpeed = DEVILS_DEVASTATION_STUCK_PROJECTILE_SPEED.get(); - devilsDevastationKillModeProjectileCycle = DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_CYCLE.get(); - devilsDevastationKillModeProjectileDamage = DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_DAMAGE.get(); - devilsDevastationKillModeProjectileRotate = DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_ROTATE.get(); - devilsDevastationStuckLifetime = DEVILS_DEVASTATION_STUCK_LIFETIME.get(); - devilsDevastationMaxStuckCount = DEVILS_DEVASTATION_MAX_STUCK_COUNT.get(); - devilsDevastationMarkLightningDamage = DEVILS_DEVASTATION_MARK_LIGHTNING_DAMAGE.get(); - devilsDevastationProjectileEffectDuration = DEVILS_DEVASTATION_PROJECTILE_EFFECT_DURATION.get(); - devilsDevastationStuckProjectileEffectDuration = DEVILS_DEVASTATION_STUCK_PROJECTILE_EFFECT_DURATION.get(); - devilsDevastationKillModeProjectileEffectDuration = DEVILS_DEVASTATION_KILL_MODE_PROJECTILE_EFFECT_DURATION.get(); - } - } -} diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java index 5e45d34..41a5d65 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java @@ -15,15 +15,13 @@ import com.mojang.logging.LogUtils; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.ModContainer; @Mod(LzxnoneTerraria.MODID) public class LzxnoneTerraria { public static final String MODID = "lzxnoneterraria"; public static final Logger LOGGER = LogUtils.getLogger(); - public LzxnoneTerraria(IEventBus modEventBus, ModContainer modContainer) { + public LzxnoneTerraria(IEventBus modEventBus) { //注册 ModBlocks.BLOCKS.register(modEventBus); ModItems.ITEMS.register(modEventBus); @@ -36,9 +34,6 @@ public class LzxnoneTerraria { //实体属性创建 modEventBus.addListener(this::onEntityAttributeCreation); - - //配置 - modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC); } public void onEntityAttributeCreation(EntityAttributeCreationEvent event) { diff --git a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java index 46c8f05..d0443f0 100644 --- a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java @@ -22,9 +22,9 @@ 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 double DAMAGE_PER_LEVEL_DEFAULT = 0.5; - public static final double DAMAGE_PER_LEVEL_MIN = 0.0; - public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0; + 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); @@ -33,7 +33,7 @@ public class BloodButcheredEffect extends MobEffect { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(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); + 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); } }; @@ -45,8 +45,8 @@ public class BloodButcheredEffect extends MobEffect { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamagePerLevel() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + 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( @@ -80,3 +80,4 @@ public class BloodButcheredEffect extends MobEffect { return true; } } + diff --git a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java index 800ae64..d4cac90 100644 --- a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java @@ -21,9 +21,9 @@ 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 double DAMAGE_PER_LEVEL_DEFAULT = 2.5; - public static final double DAMAGE_PER_LEVEL_MIN = 0.0; - public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0; + 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); @@ -32,7 +32,7 @@ public class DemonicFlamesEffect extends MobEffect { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(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); + 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); } }; @@ -44,8 +44,8 @@ public class DemonicFlamesEffect extends MobEffect { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamagePerLevel() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + 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( @@ -82,3 +82,4 @@ public class DemonicFlamesEffect extends MobEffect { return true; } } + 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 912a030..1c6d965 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 @@ -42,9 +42,9 @@ public class BeeKeeper extends SwordItem { public static final int CONFUSION_DURATION_MAX = 1200; public static final String BEE_DAMAGE_PATH = "weapon.bee_keeper.bee_damage"; - public static final double BEE_DAMAGE_DEFAULT = 2.0; - public static final double BEE_DAMAGE_MIN = 0.0; - public static final double BEE_DAMAGE_MAX = 2147483647.0; + 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 BeeKeeper() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() @@ -63,7 +63,7 @@ public class BeeKeeper extends SwordItem { 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.loadDoubleConfig(BEE_DAMAGE_PATH, configText("bee_keeper_bee_damage"), configTooltip("bee_keeper_bee_damage"), BEE_DAMAGE_DEFAULT, BEE_DAMAGE_MIN, BEE_DAMAGE_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); } }; @@ -83,8 +83,8 @@ public class BeeKeeper extends SwordItem { return Math.clamp(ConfigUtil.readInt(CONFUSION_DURATION_PATH, CONFUSION_DURATION_DEFAULT), CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX); } - public static double getBeeDamage() { - return Math.clamp(ConfigUtil.readDouble(BEE_DAMAGE_PATH, BEE_DAMAGE_DEFAULT), BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); + public static float getBeeDamage() { + return Math.clamp(ConfigUtil.readFloat(BEE_DAMAGE_PATH, BEE_DAMAGE_DEFAULT), BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -128,3 +128,4 @@ public class BeeKeeper extends SwordItem { } }; } + 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 d0d801d..8ae4e8a 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 @@ -62,9 +62,9 @@ public class BladeOfGrass extends SwordItem { 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 double PROJECTILE_DAMAGE_DEFAULT = 2.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -99,7 +99,7 @@ public class BladeOfGrass extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(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.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); @@ -117,8 +117,8 @@ public class BladeOfGrass extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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 int getEffectDuration() { @@ -337,3 +337,4 @@ public class BladeOfGrass extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 3264cf4..0865e8e 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 @@ -79,9 +79,9 @@ public class DevilsDevastation extends SwordItem { 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 double PROJECTILE_DAMAGE_DEFAULT = 30.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -94,9 +94,9 @@ public class DevilsDevastation extends SwordItem { 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 double STUCK_PROJECTILE_DAMAGE_DEFAULT = 30.0; - public static final double STUCK_PROJECTILE_DAMAGE_MIN = 0.0; - public static final double STUCK_PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -114,9 +114,9 @@ public class DevilsDevastation extends SwordItem { 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 double KILL_MODE_PROJECTILE_DAMAGE_DEFAULT = 200.0; - public static final double KILL_MODE_PROJECTILE_DAMAGE_MIN = 0.0; - public static final double KILL_MODE_PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -134,9 +134,9 @@ public class DevilsDevastation extends SwordItem { 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 double MARK_LIGHTNING_DAMAGE_DEFAULT = 100.0; - public static final double MARK_LIGHTNING_DAMAGE_MIN = 0.0; - public static final double MARK_LIGHTNING_DAMAGE_MAX = 2147483647.0; + 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; @@ -158,18 +158,18 @@ public class DevilsDevastation extends SwordItem { 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.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("devils_devastation_projectile_damage"), configTooltip("devils_devastation_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_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.loadDoubleConfig(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.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.loadDoubleConfig(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.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.loadDoubleConfig(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.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); @@ -192,8 +192,8 @@ public class DevilsDevastation extends SwordItem { 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 double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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 int getProjectileLifetime() { @@ -204,8 +204,8 @@ public class DevilsDevastation extends SwordItem { return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); } - public static double getStuckProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(STUCK_PROJECTILE_DAMAGE_PATH, STUCK_PROJECTILE_DAMAGE_DEFAULT), STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_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() { @@ -220,8 +220,8 @@ public class DevilsDevastation extends SwordItem { 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 double getKillModeProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(KILL_MODE_PROJECTILE_DAMAGE_PATH, KILL_MODE_PROJECTILE_DAMAGE_DEFAULT), KILL_MODE_PROJECTILE_DAMAGE_MIN, KILL_MODE_PROJECTILE_DAMAGE_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() { @@ -236,8 +236,8 @@ public class DevilsDevastation extends SwordItem { return Math.clamp(ConfigUtil.readInt(MAX_STUCK_COUNT_PATH, MAX_STUCK_COUNT_DEFAULT), MAX_STUCK_COUNT_MIN, MAX_STUCK_COUNT_MAX); } - public static double getMarkLightningDamage() { - return Math.clamp(ConfigUtil.readDouble(MARK_LIGHTNING_DAMAGE_PATH, MARK_LIGHTNING_DAMAGE_DEFAULT), MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_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() { @@ -870,7 +870,7 @@ public class DevilsDevastation extends SwordItem { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, getKillModeTime()); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonCustomData = new CompoundTag(); @@ -1593,3 +1593,4 @@ public class DevilsDevastation extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 57e041a..fa54cf4 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 @@ -43,9 +43,9 @@ public class EnchantedSword extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.enchanted_sword.damage"; - public static final double DAMAGE_DEFAULT = 4.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -74,7 +74,7 @@ public class EnchantedSword extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("enchanted_sword_damage"), configTooltip("enchanted_sword_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); } @@ -88,8 +88,8 @@ public class EnchantedSword extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static int getLifetime() { @@ -213,3 +213,4 @@ public class EnchantedSword extends SwordItem { } } } + 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 607953c..5dd914b 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 @@ -53,16 +53,16 @@ public class Excalibur extends SwordItem { public static final int MAX_HIT_COUNT_MAX = 100; public static final String DAMAGE_PATH = "weapon.excalibur.damage"; - public static final double DAMAGE_DEFAULT = 8.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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 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.loadDoubleConfig(DAMAGE_PATH, configText("excalibur_damage"), configTooltip("excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("excalibur_damage"), configTooltip("excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); } }; @@ -82,8 +82,8 @@ public class Excalibur extends SwordItem { return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_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( @@ -213,3 +213,4 @@ public class Excalibur extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 87415fb..97714f3 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 @@ -55,9 +55,9 @@ public class FirstFractal extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String PROJECTILE_DAMAGE_PATH = "weapon.first_fractal.projectile_damage"; - public static final double PROJECTILE_DAMAGE_DEFAULT = 10.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -95,7 +95,7 @@ public class FirstFractal extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("first_fractal_projectile_damage"), configTooltip("first_fractal_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + 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); @@ -114,8 +114,8 @@ public class FirstFractal extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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 getBoundingBoxSize() { @@ -507,3 +507,4 @@ public class FirstFractal extends SwordItem { return UseAnim.BLOCK; } } + 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 310ca4a..5f314f6 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 @@ -49,9 +49,9 @@ public class InfluxWaver extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.influx_waver.damage"; - public static final double DAMAGE_DEFAULT = 12.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -76,7 +76,7 @@ public class InfluxWaver extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("influx_waver_damage"), configTooltip("influx_waver_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); @@ -92,8 +92,8 @@ public class InfluxWaver extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static int getMaxCount() { @@ -324,3 +324,4 @@ public class InfluxWaver extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 e5bbeb6..508141b 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 @@ -54,14 +54,14 @@ public class LightsBane extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String BIG_DAMAGE_PATH = "weapon.lights_bane.big_damage"; - public static final double BIG_DAMAGE_DEFAULT = 4.0; - public static final double BIG_DAMAGE_MIN = 0.0; - public static final double BIG_DAMAGE_MAX = 2147483647.0; + 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 double SMALL_DAMAGE_DEFAULT = 2.0; - public static final double SMALL_DAMAGE_MIN = 0.0; - public static final double SMALL_DAMAGE_MAX = 2147483647.0; + 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; @@ -83,8 +83,8 @@ public class LightsBane extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(BIG_DAMAGE_PATH, configText("lights_bane_big_damage"), configTooltip("lights_bane_big_damage"), BIG_DAMAGE_DEFAULT, BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(SMALL_DAMAGE_PATH, configText("lights_bane_small_damage"), configTooltip("lights_bane_small_damage"), SMALL_DAMAGE_DEFAULT, SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX); + 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); } }; @@ -97,12 +97,12 @@ public class LightsBane extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getBigDamage() { - return Math.clamp(ConfigUtil.readDouble(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); + public static float getBigDamage() { + return Math.clamp(ConfigUtil.readFloat(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); } - public static double getSmallDamage() { - return Math.clamp(ConfigUtil.readDouble(SMALL_DAMAGE_PATH, SMALL_DAMAGE_DEFAULT), SMALL_DAMAGE_MIN, SMALL_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() { @@ -270,3 +270,4 @@ public class LightsBane extends SwordItem { } }; } + 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 ec2848d..bfc8cfe 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 @@ -63,9 +63,9 @@ public class Mace extends SwordItem { public static final double GRAVITY_MAX = 5.0; public static final String DAMAGE_PATH = "weapon.mace.damage"; - public static final double DAMAGE_DEFAULT = 4.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -82,7 +82,7 @@ public class Mace extends SwordItem { 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.loadDoubleConfig(DAMAGE_PATH, configText("mace_damage"), configTooltip("mace_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_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); } @@ -104,8 +104,8 @@ public class Mace extends SwordItem { return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static int getFlyTime() { @@ -666,3 +666,4 @@ public class Mace extends SwordItem { } } } + 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 204a210..f154a8b 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 @@ -46,9 +46,9 @@ public class Meowmere extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.meowmere.damage"; - public static final double DAMAGE_DEFAULT = 20.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -75,7 +75,7 @@ public class Meowmere extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("meowmere_damage"), configTooltip("meowmere_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); } @@ -89,8 +89,8 @@ public class Meowmere extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static double getGravity() { @@ -331,7 +331,7 @@ public class Meowmere extends SwordItem { if(!level.isClientSide()) { StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); summon.setOwner(player); - Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); + Vec3 pos = player.getBoundingBox().getCenter(); summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MEOWMERE_PROJECTILE); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); @@ -368,3 +368,4 @@ public class Meowmere extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 96140e8..5e295e2 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 @@ -47,14 +47,14 @@ public class Muramasa extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String BEAM_DAMAGE_PATH = "weapon.muramasa.beam_damage"; - public static final double BEAM_DAMAGE_DEFAULT = 2.5; - public static final double BEAM_DAMAGE_MIN = 0.0; - public static final double BEAM_DAMAGE_MAX = 2147483647.0; + 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 IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(BEAM_DAMAGE_PATH, configText("muramasa_beam_damage"), configTooltip("muramasa_beam_damage"), BEAM_DAMAGE_DEFAULT, BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); + ConfigFactory.loadFloatConfig(BEAM_DAMAGE_PATH, configText("muramasa_beam_damage"), configTooltip("muramasa_beam_damage"), BEAM_DAMAGE_DEFAULT, BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); } }; @@ -66,8 +66,8 @@ public class Muramasa extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getBeamDamage() { - return Math.clamp(ConfigUtil.readDouble(BEAM_DAMAGE_PATH, BEAM_DAMAGE_DEFAULT), BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); + 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( @@ -268,3 +268,4 @@ public class Muramasa extends SwordItem { } }; } + 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 94f6883..93f4c94 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 @@ -77,14 +77,14 @@ public class NightsEdge extends SwordItem { public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; public static final String DAMAGE_PATH = "weapon.nights_edge.damage"; - public static final double DAMAGE_DEFAULT = 7.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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 double PROJECTILE_DAMAGE_DEFAULT = 7.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -109,8 +109,8 @@ public class NightsEdge extends SwordItem { 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.loadDoubleConfig(DAMAGE_PATH, configText("nights_edge_damage"), configTooltip("nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("nights_edge_projectile_damage"), configTooltip("nights_edge_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_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); @@ -145,12 +145,12 @@ public class NightsEdge extends SwordItem { 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 getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } - public static double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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() { @@ -597,3 +597,4 @@ public class NightsEdge extends SwordItem { } } + 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 12859cd..601716a 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 @@ -57,9 +57,9 @@ public class Seedler extends SwordItem { public static final double NUT_INITIAL_SPEED_MAX = 10.0; public static final String THORN_DAMAGE_PATH = "weapon.seedler.thorn_damage"; - public static final double THORN_DAMAGE_DEFAULT = 2.0; - public static final double THORN_DAMAGE_MIN = 0.0; - public static final double THORN_DAMAGE_MAX = 2147483647.0; + 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; @@ -89,7 +89,7 @@ public class Seedler extends SwordItem { 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.loadDoubleConfig(THORN_DAMAGE_PATH, configText("seedler_thorn_damage"), configTooltip("seedler_thorn_damage"), THORN_DAMAGE_DEFAULT, THORN_DAMAGE_MIN, THORN_DAMAGE_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); } @@ -115,8 +115,8 @@ public class Seedler extends SwordItem { return Math.clamp(ConfigUtil.readDouble(NUT_INITIAL_SPEED_PATH, NUT_INITIAL_SPEED_DEFAULT), NUT_INITIAL_SPEED_MIN, NUT_INITIAL_SPEED_MAX); } - public static double getThornDamage() { - return Math.clamp(ConfigUtil.readDouble(THORN_DAMAGE_PATH, THORN_DAMAGE_DEFAULT), THORN_DAMAGE_MIN, THORN_DAMAGE_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() { @@ -308,3 +308,4 @@ public class Seedler extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 f0f43ce..9d97a21 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 @@ -38,9 +38,9 @@ public class StarWrath extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.star_wrath.damage"; - public static final double DAMAGE_DEFAULT = 16.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -67,7 +67,7 @@ public class StarWrath extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("star_wrath_damage"), configTooltip("star_wrath_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); } @@ -81,8 +81,8 @@ public class StarWrath extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static double getSpeed() { @@ -290,3 +290,4 @@ public class StarWrath extends SwordItem { } } } + 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 65da7c6..23a9603 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 @@ -41,9 +41,9 @@ public class Starfury extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.starfury.damage"; - public static final double DAMAGE_DEFAULT = 6.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -70,7 +70,7 @@ public class Starfury extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("starfury_damage"), configTooltip("starfury_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); } @@ -84,8 +84,8 @@ public class Starfury extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static double getMaxRange() { @@ -242,3 +242,4 @@ public class Starfury extends SwordItem { } } } + 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 17d6a81..48cb631 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 @@ -70,14 +70,14 @@ public class TerraBlade extends SwordItem { 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 double SWORD_BEAM_DAMAGE_DEFAULT = 11.0; - public static final double SWORD_BEAM_DAMAGE_MIN = 0.0; - public static final double SWORD_BEAM_DAMAGE_MAX = 2147483647.0; + 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 double PROJECTILE_DAMAGE_DEFAULT = 11.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -90,9 +90,9 @@ public class TerraBlade extends SwordItem { 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 double PROJECTILE_DAMAGE_DECAY_DEFAULT = 0.75; - public static final double PROJECTILE_DAMAGE_DECAY_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_DECAY_MAX = 1.0; + 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 TerraBlade() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() @@ -113,11 +113,11 @@ public class TerraBlade extends SwordItem { 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.loadDoubleConfig(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.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("terra_projectile_damage"), configTooltip("terra_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_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.loadDoubleConfig(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); + 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); } }; @@ -145,12 +145,12 @@ public class TerraBlade extends SwordItem { 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 double getSwordBeamDamage() { - return Math.clamp(ConfigUtil.readDouble(SWORD_BEAM_DAMAGE_PATH, SWORD_BEAM_DAMAGE_DEFAULT), SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_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 double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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() { @@ -161,8 +161,8 @@ public class TerraBlade extends SwordItem { return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); } - public static double getProjectileDamageDecay() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_DECAY_PATH, PROJECTILE_DAMAGE_DECAY_DEFAULT), PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_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( @@ -635,3 +635,4 @@ public class TerraBlade extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 d3970b8..06e670d 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 @@ -55,9 +55,9 @@ public class Terragrim extends SwordItem { public static final double HIT_RANGE_MAX = 10.0; public static final String DAMAGE_PATH = "weapon.terragrim.damage"; - public static final double DAMAGE_DEFAULT = 0.25; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -80,7 +80,7 @@ public class Terragrim extends SwordItem { @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.loadDoubleConfig(DAMAGE_PATH, configText("terragrim_damage"), configTooltip("terragrim_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_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); } }; @@ -97,8 +97,8 @@ public class Terragrim extends SwordItem { return Math.clamp(ConfigUtil.readDouble(HIT_RANGE_PATH, HIT_RANGE_DEFAULT), HIT_RANGE_MIN, HIT_RANGE_MAX); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static int getRotateRange() { @@ -287,3 +287,4 @@ public class Terragrim extends SwordItem { return UseAnim.BLOCK; } } + 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 b96e5d1..f98e34d 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 @@ -64,9 +64,9 @@ public class TheHorsemansBlade extends SwordItem { 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 double BLADE_DAMAGE_DEFAULT = 15.0; - public static final double BLADE_DAMAGE_MIN = 0.0; - public static final double BLADE_DAMAGE_MAX = 2147483647.0; + 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; @@ -79,9 +79,9 @@ public class TheHorsemansBlade extends SwordItem { 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 double PUMPKIN_DAMAGE_DEFAULT = 15.0; - public static final double PUMPKIN_DAMAGE_MIN = 0.0; - public static final double PUMPKIN_DAMAGE_MAX = 2147483647.0; + 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; @@ -93,10 +93,10 @@ public class TheHorsemansBlade extends SwordItem { 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.loadDoubleConfig(BLADE_DAMAGE_PATH, configText("horsemans_blade_damage"), configTooltip("horsemans_blade_damage"), BLADE_DAMAGE_DEFAULT, BLADE_DAMAGE_MIN, BLADE_DAMAGE_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.loadDoubleConfig(PUMPKIN_DAMAGE_PATH, configText("horsemans_pumpkin_damage"), configTooltip("horsemans_pumpkin_damage"), PUMPKIN_DAMAGE_DEFAULT, PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_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); } }; @@ -117,8 +117,8 @@ public class TheHorsemansBlade extends SwordItem { 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 double getBladeDamage() { - return Math.clamp(ConfigUtil.readDouble(BLADE_DAMAGE_PATH, BLADE_DAMAGE_DEFAULT), BLADE_DAMAGE_MIN, BLADE_DAMAGE_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() { @@ -129,8 +129,8 @@ public class TheHorsemansBlade extends SwordItem { return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPEED_PATH, PUMPKIN_SPEED_DEFAULT), PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX); } - public static double getPumpkinDamage() { - return Math.clamp(ConfigUtil.readDouble(PUMPKIN_DAMAGE_PATH, PUMPKIN_DAMAGE_DEFAULT), PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_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() { @@ -388,3 +388,4 @@ public class TheHorsemansBlade extends SwordItem { } }; } + 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 7b7034a..a3c294c 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 @@ -56,16 +56,16 @@ public class TrueExcalibur extends SwordItem { public static final int MAX_HIT_COUNT_MAX = 100; public static final String DAMAGE_PATH = "weapon.true_excalibur.damage"; - public static final double DAMAGE_DEFAULT = 8.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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 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.loadDoubleConfig(DAMAGE_PATH, configText("true_excalibur_damage"), configTooltip("true_excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadFloatConfig(DAMAGE_PATH, configText("true_excalibur_damage"), configTooltip("true_excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); } }; @@ -85,8 +85,8 @@ public class TrueExcalibur extends SwordItem { return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_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( @@ -344,3 +344,4 @@ public class TrueExcalibur extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 3f42ee6..7bee7c8 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 @@ -77,14 +77,14 @@ public class TrueNightsEdge extends SwordItem { public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; public static final String DAMAGE_PATH = "weapon.true_nights_edge.damage"; - public static final double DAMAGE_DEFAULT = 8.0; - public static final double DAMAGE_MIN = 0.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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 double PROJECTILE_DAMAGE_DEFAULT = 4.0; - public static final double PROJECTILE_DAMAGE_MIN = 0.0; - public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + 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; @@ -114,8 +114,8 @@ public class TrueNightsEdge extends SwordItem { 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.loadDoubleConfig(DAMAGE_PATH, configText("true_nights_edge_damage"), configTooltip("true_nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); - ConfigFactory.loadDoubleConfig(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.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); @@ -151,12 +151,12 @@ public class TrueNightsEdge extends SwordItem { 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 getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } - public static double getProjectileDamage() { - return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_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() { @@ -709,3 +709,4 @@ public class TrueNightsEdge extends SwordItem { return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); } } + 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 622bf2c..8672364 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 @@ -50,9 +50,9 @@ public class Volcano extends SwordItem { public static final double EXPLOSION_RANGE_MAX = 64.0; public static final String EXPLOSION_DAMAGE_PATH = "weapon.volcano.explosion_damage"; - public static final double EXPLOSION_DAMAGE_DEFAULT = 6.0; - public static final double EXPLOSION_DAMAGE_MIN = 0.0; - public static final double EXPLOSION_DAMAGE_MAX = 2147483647.0; + 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; @@ -80,7 +80,7 @@ public class Volcano extends SwordItem { @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.loadDoubleConfig(EXPLOSION_DAMAGE_PATH, configText("volcano_explosion_damage"), configTooltip("volcano_explosion_damage"), EXPLOSION_DAMAGE_DEFAULT, EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_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); } @@ -98,8 +98,8 @@ public class Volcano extends SwordItem { return Math.clamp(ConfigUtil.readDouble(EXPLOSION_RANGE_PATH, EXPLOSION_RANGE_DEFAULT), EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX); } - public static double getExplosionDamage() { - return Math.clamp(ConfigUtil.readDouble(EXPLOSION_DAMAGE_PATH, EXPLOSION_DAMAGE_DEFAULT), EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_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() { @@ -241,3 +241,4 @@ public class Volcano extends SwordItem { } }; } + 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 b81e56a..818bc7a 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 @@ -53,9 +53,9 @@ public class Zenith extends SwordItem { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String DAMAGE_PATH = "weapon.zenith.damage"; - public static final double DAMAGE_DEFAULT = 4.0; - public static final double DAMAGE_MIN = 1.0; - public static final double DAMAGE_MAX = 2147483647.0; + 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; @@ -113,7 +113,7 @@ public class Zenith extends SwordItem { public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("zenith_damage"), configTooltip("zenith_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + 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); @@ -136,8 +136,8 @@ public class Zenith extends SwordItem { return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); } - public static double getDamage() { - return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + public static float getDamage() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); } public static double getMaxRange() { @@ -641,3 +641,4 @@ public class Zenith extends SwordItem { return UseAnim.BLOCK; } } + diff --git a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java index 9e4d46c..15355d7 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java @@ -38,7 +38,7 @@ public final class ModParticleRenderTypes { Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer(); RenderSystem.enableBlend(); RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE); - RenderSystem.depthMask(false); + RenderSystem.depthMask(true); RenderSystem.disableCull(); RenderSystem.enableDepthTest(); RenderSystem.setShader(GameRenderer::getRendertypeEntityTranslucentEmissiveShader);