v1.5.0
This commit is contained in:
1 parent
67390cf4c6
commit
091ef48009
28 files changed
+227
-1320
No files matched your search
+1
-1
@@ -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.
|
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||||
mod_license=All Rights Reserved
|
mod_license=All Rights Reserved
|
||||||
# The mod version. See https://semver.org/
|
# 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.
|
## 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.
|
# This should match the base package used for the mod sources.
|
||||||
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -15,15 +15,13 @@ import com.mojang.logging.LogUtils;
|
|||||||
|
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
import net.neoforged.fml.common.Mod;
|
import net.neoforged.fml.common.Mod;
|
||||||
import net.neoforged.fml.config.ModConfig;
|
|
||||||
import net.neoforged.fml.ModContainer;
|
|
||||||
|
|
||||||
@Mod(LzxnoneTerraria.MODID)
|
@Mod(LzxnoneTerraria.MODID)
|
||||||
public class LzxnoneTerraria {
|
public class LzxnoneTerraria {
|
||||||
public static final String MODID = "lzxnoneterraria";
|
public static final String MODID = "lzxnoneterraria";
|
||||||
public static final Logger LOGGER = LogUtils.getLogger();
|
public static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
public LzxnoneTerraria(IEventBus modEventBus, ModContainer modContainer) {
|
public LzxnoneTerraria(IEventBus modEventBus) {
|
||||||
//注册
|
//注册
|
||||||
ModBlocks.BLOCKS.register(modEventBus);
|
ModBlocks.BLOCKS.register(modEventBus);
|
||||||
ModItems.ITEMS.register(modEventBus);
|
ModItems.ITEMS.register(modEventBus);
|
||||||
@@ -36,9 +34,6 @@ public class LzxnoneTerraria {
|
|||||||
|
|
||||||
//实体属性创建
|
//实体属性创建
|
||||||
modEventBus.addListener(this::onEntityAttributeCreation);
|
modEventBus.addListener(this::onEntityAttributeCreation);
|
||||||
|
|
||||||
//配置
|
|
||||||
modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntityAttributeCreation(EntityAttributeCreationEvent event) {
|
public void onEntityAttributeCreation(EntityAttributeCreationEvent event) {
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ public class BloodButcheredEffect extends MobEffect {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
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 String DAMAGE_PER_LEVEL_PATH = "effect.blood_butchered.damage_per_level";
|
||||||
public static final double DAMAGE_PER_LEVEL_DEFAULT = 0.5;
|
public static final float DAMAGE_PER_LEVEL_DEFAULT = 0.5f;
|
||||||
public static final double DAMAGE_PER_LEVEL_MIN = 0.0;
|
public static final float DAMAGE_PER_LEVEL_MIN = 0.0f;
|
||||||
public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0;
|
public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f;
|
||||||
|
|
||||||
public BloodButcheredEffect() {
|
public BloodButcheredEffect() {
|
||||||
super(MobEffectCategory.HARMFUL, 0xFF0000);
|
super(MobEffectCategory.HARMFUL, 0xFF0000);
|
||||||
@@ -33,7 +33,7 @@ public class BloodButcheredEffect extends MobEffect {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamagePerLevel() {
|
public static float getDamagePerLevel() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX);
|
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(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -80,3 +80,4 @@ public class BloodButcheredEffect extends MobEffect {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,9 +21,9 @@ public class DemonicFlamesEffect extends MobEffect {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
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 String DAMAGE_PER_LEVEL_PATH = "effect.demonic_flames.damage_per_level";
|
||||||
public static final double DAMAGE_PER_LEVEL_DEFAULT = 2.5;
|
public static final float DAMAGE_PER_LEVEL_DEFAULT = 2.5f;
|
||||||
public static final double DAMAGE_PER_LEVEL_MIN = 0.0;
|
public static final float DAMAGE_PER_LEVEL_MIN = 0.0f;
|
||||||
public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0;
|
public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f;
|
||||||
|
|
||||||
public DemonicFlamesEffect() {
|
public DemonicFlamesEffect() {
|
||||||
super(MobEffectCategory.HARMFUL, 0xCC2DC7);
|
super(MobEffectCategory.HARMFUL, 0xCC2DC7);
|
||||||
@@ -32,7 +32,7 @@ public class DemonicFlamesEffect extends MobEffect {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamagePerLevel() {
|
public static float getDamagePerLevel() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX);
|
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(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -82,3 +82,4 @@ public class DemonicFlamesEffect extends MobEffect {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,9 +42,9 @@ public class BeeKeeper extends SwordItem {
|
|||||||
public static final int CONFUSION_DURATION_MAX = 1200;
|
public static final int CONFUSION_DURATION_MAX = 1200;
|
||||||
|
|
||||||
public static final String BEE_DAMAGE_PATH = "weapon.bee_keeper.bee_damage";
|
public static final String BEE_DAMAGE_PATH = "weapon.bee_keeper.bee_damage";
|
||||||
public static final double BEE_DAMAGE_DEFAULT = 2.0;
|
public static final float BEE_DAMAGE_DEFAULT = 2.0f;
|
||||||
public static final double BEE_DAMAGE_MIN = 0.0;
|
public static final float BEE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double BEE_DAMAGE_MAX = 2147483647.0;
|
public static final float BEE_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public BeeKeeper() {
|
public BeeKeeper() {
|
||||||
super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder()
|
super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder()
|
||||||
@@ -63,7 +63,7 @@ public class BeeKeeper extends SwordItem {
|
|||||||
public void onConfigLoad() {
|
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(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.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);
|
return Math.clamp(ConfigUtil.readInt(CONFUSION_DURATION_PATH, CONFUSION_DURATION_DEFAULT), CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getBeeDamage() {
|
public static float getBeeDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(BEE_DAMAGE_PATH, BEE_DAMAGE_DEFAULT), BEE_DAMAGE_MIN, BEE_DAMAGE_MAX);
|
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(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -128,3 +128,4 @@ public class BeeKeeper extends SwordItem {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,9 +62,9 @@ public class BladeOfGrass extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
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 String PROJECTILE_DAMAGE_PATH = "weapon.blade_of_grass.projectile_damage";
|
||||||
public static final double PROJECTILE_DAMAGE_DEFAULT = 2.0;
|
public static final float PROJECTILE_DAMAGE_DEFAULT = 2.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
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 String EFFECT_DURATION_PATH = "weapon.blade_of_grass.effect_duration";
|
||||||
public static final int EFFECT_DURATION_DEFAULT = 140;
|
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() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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.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.loadDoubleConfig(TARGET_RANGE_PATH, configText("blade_of_grass_target_range"), configTooltip("blade_of_grass_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX);
|
||||||
ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("blade_of_grass_projectile_lifetime"), configTooltip("blade_of_grass_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX);
|
ConfigFactory.loadIntConfig(PROJECTILE_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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileDamage() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getEffectDuration() {
|
public static int getEffectDuration() {
|
||||||
@@ -337,3 +337,4 @@ public class BladeOfGrass extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,9 +79,9 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final int KILL_MODE_COOLDOWN_TIME_MAX = 72000;
|
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 String PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.projectile_damage";
|
||||||
public static final double PROJECTILE_DAMAGE_DEFAULT = 30.0;
|
public static final float PROJECTILE_DAMAGE_DEFAULT = 30.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.projectile_lifetime";
|
public static final String PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.projectile_lifetime";
|
||||||
public static final int PROJECTILE_LIFETIME_DEFAULT = 40;
|
public static final int PROJECTILE_LIFETIME_DEFAULT = 40;
|
||||||
@@ -94,9 +94,9 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final double PROJECTILE_SPEED_MAX = 10.0;
|
public static final double PROJECTILE_SPEED_MAX = 10.0;
|
||||||
|
|
||||||
public static final String STUCK_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.stuck_projectile_damage";
|
public static final String STUCK_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.stuck_projectile_damage";
|
||||||
public static final double STUCK_PROJECTILE_DAMAGE_DEFAULT = 30.0;
|
public static final float STUCK_PROJECTILE_DAMAGE_DEFAULT = 30.0f;
|
||||||
public static final double STUCK_PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float STUCK_PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double STUCK_PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
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 String STUCK_PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.stuck_projectile_lifetime";
|
||||||
public static final int STUCK_PROJECTILE_LIFETIME_DEFAULT = 40;
|
public static final int STUCK_PROJECTILE_LIFETIME_DEFAULT = 40;
|
||||||
@@ -114,9 +114,9 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final int KILL_MODE_PROJECTILE_CYCLE_MAX = 200;
|
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 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 float KILL_MODE_PROJECTILE_DAMAGE_DEFAULT = 200.0f;
|
||||||
public static final double KILL_MODE_PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float KILL_MODE_PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double KILL_MODE_PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
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 String KILL_MODE_PROJECTILE_ROTATE_PATH = "weapon.devils_devastation.kill_mode_projectile_rotate";
|
||||||
public static final int KILL_MODE_PROJECTILE_ROTATE_DEFAULT = 30;
|
public static final int KILL_MODE_PROJECTILE_ROTATE_DEFAULT = 30;
|
||||||
@@ -134,9 +134,9 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public static final int MAX_STUCK_COUNT_MAX = 50;
|
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 String MARK_LIGHTNING_DAMAGE_PATH = "weapon.devils_devastation.mark_lightning_damage";
|
||||||
public static final double MARK_LIGHTNING_DAMAGE_DEFAULT = 100.0;
|
public static final float MARK_LIGHTNING_DAMAGE_DEFAULT = 100.0f;
|
||||||
public static final double MARK_LIGHTNING_DAMAGE_MIN = 0.0;
|
public static final float MARK_LIGHTNING_DAMAGE_MIN = 0.0f;
|
||||||
public static final double MARK_LIGHTNING_DAMAGE_MAX = 2147483647.0;
|
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 String PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.projectile_effect_duration";
|
||||||
public static final int PROJECTILE_EFFECT_DURATION_DEFAULT = 40;
|
public static final int PROJECTILE_EFFECT_DURATION_DEFAULT = 40;
|
||||||
@@ -158,18 +158,18 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
public void onConfigLoad() {
|
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_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.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.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(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.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.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.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(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(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.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(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(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);
|
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);
|
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() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getProjectileLifetime() {
|
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);
|
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getStuckProjectileDamage() {
|
public static float getStuckProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(STUCK_PROJECTILE_DAMAGE_PATH, STUCK_PROJECTILE_DAMAGE_DEFAULT), STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_MAX);
|
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() {
|
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);
|
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() {
|
public static float 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);
|
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() {
|
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);
|
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() {
|
public static float getMarkLightningDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(MARK_LIGHTNING_DAMAGE_PATH, MARK_LIGHTNING_DAMAGE_DEFAULT), MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_MAX);
|
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() {
|
public static int getProjectileEffectDuration() {
|
||||||
@@ -870,7 +870,7 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
summon.setPos(pos);
|
summon.setPos(pos);
|
||||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK);
|
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK);
|
||||||
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
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);
|
summon.getEntityData().set(StaticSummon.GLOW, true);
|
||||||
|
|
||||||
CompoundTag summonCustomData = new CompoundTag();
|
CompoundTag summonCustomData = new CompoundTag();
|
||||||
@@ -1593,3 +1593,4 @@ public class DevilsDevastation extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,9 +43,9 @@ public class EnchantedSword extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.enchanted_sword.damage";
|
public static final String DAMAGE_PATH = "weapon.enchanted_sword.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 4.0;
|
public static final float DAMAGE_DEFAULT = 4.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String LIFETIME_PATH = "weapon.enchanted_sword.lifetime";
|
public static final String LIFETIME_PATH = "weapon.enchanted_sword.lifetime";
|
||||||
public static final int LIFETIME_DEFAULT = 60;
|
public static final int LIFETIME_DEFAULT = 60;
|
||||||
@@ -74,7 +74,7 @@ public class EnchantedSword extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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.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);
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getLifetime() {
|
public static int getLifetime() {
|
||||||
@@ -213,3 +213,4 @@ public class EnchantedSword extends SwordItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,16 +53,16 @@ public class Excalibur extends SwordItem {
|
|||||||
public static final int MAX_HIT_COUNT_MAX = 100;
|
public static final int MAX_HIT_COUNT_MAX = 100;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.excalibur.damage";
|
public static final String DAMAGE_PATH = "weapon.excalibur.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 8.0;
|
public static final float DAMAGE_DEFAULT = 8.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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.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);
|
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() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -213,3 +213,4 @@ public class Excalibur extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,9 +55,9 @@ public class FirstFractal extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String PROJECTILE_DAMAGE_PATH = "weapon.first_fractal.projectile_damage";
|
public static final String PROJECTILE_DAMAGE_PATH = "weapon.first_fractal.projectile_damage";
|
||||||
public static final double PROJECTILE_DAMAGE_DEFAULT = 10.0;
|
public static final float PROJECTILE_DAMAGE_DEFAULT = 10.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
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 String BOUNDING_BOX_SIZE_PATH = "weapon.first_fractal.bounding_box_size";
|
||||||
public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5;
|
public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5;
|
||||||
@@ -95,7 +95,7 @@ public class FirstFractal extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("first_fractal_projectile_speed"), configTooltip("first_fractal_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX);
|
||||||
ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("first_fractal_projectile_lifetime"), configTooltip("first_fractal_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX);
|
ConfigFactory.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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileDamage() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getBoundingBoxSize() {
|
public static double getBoundingBoxSize() {
|
||||||
@@ -507,3 +507,4 @@ public class FirstFractal extends SwordItem {
|
|||||||
return UseAnim.BLOCK;
|
return UseAnim.BLOCK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,9 +49,9 @@ public class InfluxWaver extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.influx_waver.damage";
|
public static final String DAMAGE_PATH = "weapon.influx_waver.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 12.0;
|
public static final float DAMAGE_DEFAULT = 12.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String MAX_COUNT_PATH = "weapon.influx_waver.max_count";
|
public static final String MAX_COUNT_PATH = "weapon.influx_waver.max_count";
|
||||||
public static final int MAX_COUNT_DEFAULT = 2;
|
public static final int MAX_COUNT_DEFAULT = 2;
|
||||||
@@ -76,7 +76,7 @@ public class InfluxWaver extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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.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(SPEED_PATH, configText("influx_waver_speed"), configTooltip("influx_waver_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX);
|
||||||
ConfigFactory.loadDoubleConfig(SPAWN_RANGE_PATH, configText("influx_waver_spawn_range"), configTooltip("influx_waver_spawn_range"), SPAWN_RANGE_DEFAULT, SPAWN_RANGE_MIN, SPAWN_RANGE_MAX);
|
ConfigFactory.loadDoubleConfig(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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxCount() {
|
public static int getMaxCount() {
|
||||||
@@ -324,3 +324,4 @@ public class InfluxWaver extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,14 +54,14 @@ public class LightsBane extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String BIG_DAMAGE_PATH = "weapon.lights_bane.big_damage";
|
public static final String BIG_DAMAGE_PATH = "weapon.lights_bane.big_damage";
|
||||||
public static final double BIG_DAMAGE_DEFAULT = 4.0;
|
public static final float BIG_DAMAGE_DEFAULT = 4.0f;
|
||||||
public static final double BIG_DAMAGE_MIN = 0.0;
|
public static final float BIG_DAMAGE_MIN = 0.0f;
|
||||||
public static final double BIG_DAMAGE_MAX = 2147483647.0;
|
public static final float BIG_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String SMALL_DAMAGE_PATH = "weapon.lights_bane.small_damage";
|
public static final String SMALL_DAMAGE_PATH = "weapon.lights_bane.small_damage";
|
||||||
public static final double SMALL_DAMAGE_DEFAULT = 2.0;
|
public static final float SMALL_DAMAGE_DEFAULT = 2.0f;
|
||||||
public static final double SMALL_DAMAGE_MIN = 0.0;
|
public static final float SMALL_DAMAGE_MIN = 0.0f;
|
||||||
public static final double SMALL_DAMAGE_MAX = 2147483647.0;
|
public static final float SMALL_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String TARGET_RANGE_PATH = "weapon.lights_bane.target_range";
|
public static final String TARGET_RANGE_PATH = "weapon.lights_bane.target_range";
|
||||||
public static final double TARGET_RANGE_DEFAULT = 2.0;
|
public static final double TARGET_RANGE_DEFAULT = 2.0;
|
||||||
@@ -83,8 +83,8 @@ public class LightsBane extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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.loadFloatConfig(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(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);
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getBigDamage() {
|
public static float getBigDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getSmallDamage() {
|
public static float getSmallDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(SMALL_DAMAGE_PATH, SMALL_DAMAGE_DEFAULT), SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(SMALL_DAMAGE_PATH, SMALL_DAMAGE_DEFAULT), SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getTargetRange() {
|
public static double getTargetRange() {
|
||||||
@@ -270,3 +270,4 @@ public class LightsBane extends SwordItem {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,9 +63,9 @@ public class Mace extends SwordItem {
|
|||||||
public static final double GRAVITY_MAX = 5.0;
|
public static final double GRAVITY_MAX = 5.0;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.mace.damage";
|
public static final String DAMAGE_PATH = "weapon.mace.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 4.0;
|
public static final float DAMAGE_DEFAULT = 4.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String FLY_TIME_PATH = "weapon.mace.fly_time";
|
public static final String FLY_TIME_PATH = "weapon.mace.fly_time";
|
||||||
public static final int FLY_TIME_DEFAULT = 10;
|
public static final int FLY_TIME_DEFAULT = 10;
|
||||||
@@ -82,7 +82,7 @@ public class Mace extends SwordItem {
|
|||||||
public void onConfigLoad() {
|
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(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(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.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);
|
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);
|
return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFlyTime() {
|
public static int getFlyTime() {
|
||||||
@@ -666,3 +666,4 @@ public class Mace extends SwordItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,9 +46,9 @@ public class Meowmere extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.meowmere.damage";
|
public static final String DAMAGE_PATH = "weapon.meowmere.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 20.0;
|
public static final float DAMAGE_DEFAULT = 20.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String GRAVITY_PATH = "weapon.meowmere.gravity";
|
public static final String GRAVITY_PATH = "weapon.meowmere.gravity";
|
||||||
public static final double GRAVITY_DEFAULT = 0.025;
|
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() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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);
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getGravity() {
|
public static double getGravity() {
|
||||||
@@ -331,7 +331,7 @@ public class Meowmere extends SwordItem {
|
|||||||
if(!level.isClientSide()) {
|
if(!level.isClientSide()) {
|
||||||
StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level);
|
StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level);
|
||||||
summon.setOwner(player);
|
summon.setOwner(player);
|
||||||
Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ());
|
Vec3 pos = player.getBoundingBox().getCenter();
|
||||||
summon.setPos(pos);
|
summon.setPos(pos);
|
||||||
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MEOWMERE_PROJECTILE);
|
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MEOWMERE_PROJECTILE);
|
||||||
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom");
|
||||||
@@ -368,3 +368,4 @@ public class Meowmere extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,14 +47,14 @@ public class Muramasa extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String BEAM_DAMAGE_PATH = "weapon.muramasa.beam_damage";
|
public static final String BEAM_DAMAGE_PATH = "weapon.muramasa.beam_damage";
|
||||||
public static final double BEAM_DAMAGE_DEFAULT = 2.5;
|
public static final float BEAM_DAMAGE_DEFAULT = 2.5f;
|
||||||
public static final double BEAM_DAMAGE_MIN = 0.0;
|
public static final float BEAM_DAMAGE_MIN = 0.0f;
|
||||||
public static final double BEAM_DAMAGE_MAX = 2147483647.0;
|
public static final float BEAM_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getBeamDamage() {
|
public static float getBeamDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(BEAM_DAMAGE_PATH, BEAM_DAMAGE_DEFAULT), BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX);
|
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(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -268,3 +268,4 @@ public class Muramasa extends SwordItem {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,14 +77,14 @@ public class NightsEdge extends SwordItem {
|
|||||||
public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100;
|
public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.nights_edge.damage";
|
public static final String DAMAGE_PATH = "weapon.nights_edge.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 7.0;
|
public static final float DAMAGE_DEFAULT = 7.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String PROJECTILE_DAMAGE_PATH = "weapon.nights_edge.projectile_damage";
|
public static final String PROJECTILE_DAMAGE_PATH = "weapon.nights_edge.projectile_damage";
|
||||||
public static final double PROJECTILE_DAMAGE_DEFAULT = 7.0;
|
public static final float PROJECTILE_DAMAGE_DEFAULT = 7.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String PROJECTILE_SPEED_PATH = "weapon.nights_edge.projectile_speed";
|
public static final String PROJECTILE_SPEED_PATH = "weapon.nights_edge.projectile_speed";
|
||||||
public static final double PROJECTILE_SPEED_DEFAULT = 0.25;
|
public static final double PROJECTILE_SPEED_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(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(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.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.loadFloatConfig(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(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.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_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);
|
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);
|
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() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileDamage() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileSpeed() {
|
public static double getProjectileSpeed() {
|
||||||
@@ -597,3 +597,4 @@ public class NightsEdge extends SwordItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,9 +57,9 @@ public class Seedler extends SwordItem {
|
|||||||
public static final double NUT_INITIAL_SPEED_MAX = 10.0;
|
public static final double NUT_INITIAL_SPEED_MAX = 10.0;
|
||||||
|
|
||||||
public static final String THORN_DAMAGE_PATH = "weapon.seedler.thorn_damage";
|
public static final String THORN_DAMAGE_PATH = "weapon.seedler.thorn_damage";
|
||||||
public static final double THORN_DAMAGE_DEFAULT = 2.0;
|
public static final float THORN_DAMAGE_DEFAULT = 2.0f;
|
||||||
public static final double THORN_DAMAGE_MIN = 0.0;
|
public static final float THORN_DAMAGE_MIN = 0.0f;
|
||||||
public static final double THORN_DAMAGE_MAX = 2147483647.0;
|
public static final float THORN_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String THORN_LIFETIME_PATH = "weapon.seedler.thorn_lifetime";
|
public static final String THORN_LIFETIME_PATH = "weapon.seedler.thorn_lifetime";
|
||||||
public static final int THORN_LIFETIME_DEFAULT = 30;
|
public static final int THORN_LIFETIME_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_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_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(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.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);
|
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);
|
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() {
|
public static float getThornDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(THORN_DAMAGE_PATH, THORN_DAMAGE_DEFAULT), THORN_DAMAGE_MIN, THORN_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(THORN_DAMAGE_PATH, THORN_DAMAGE_DEFAULT), THORN_DAMAGE_MIN, THORN_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getThornLifetime() {
|
public static int getThornLifetime() {
|
||||||
@@ -308,3 +308,4 @@ public class Seedler extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,9 +38,9 @@ public class StarWrath extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.star_wrath.damage";
|
public static final String DAMAGE_PATH = "weapon.star_wrath.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 16.0;
|
public static final float DAMAGE_DEFAULT = 16.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String SPEED_PATH = "weapon.star_wrath.speed";
|
public static final String SPEED_PATH = "weapon.star_wrath.speed";
|
||||||
public static final double SPEED_DEFAULT = 2.0;
|
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() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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);
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getSpeed() {
|
public static double getSpeed() {
|
||||||
@@ -290,3 +290,4 @@ public class StarWrath extends SwordItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,9 +41,9 @@ public class Starfury extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.starfury.damage";
|
public static final String DAMAGE_PATH = "weapon.starfury.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 6.0;
|
public static final float DAMAGE_DEFAULT = 6.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String MAX_RANGE_PATH = "weapon.starfury.max_range";
|
public static final String MAX_RANGE_PATH = "weapon.starfury.max_range";
|
||||||
public static final double MAX_RANGE_DEFAULT = 24.0;
|
public static final double MAX_RANGE_DEFAULT = 24.0;
|
||||||
@@ -70,7 +70,7 @@ public class Starfury extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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);
|
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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getMaxRange() {
|
public static double getMaxRange() {
|
||||||
@@ -242,3 +242,4 @@ public class Starfury extends SwordItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,14 +70,14 @@ public class TerraBlade extends SwordItem {
|
|||||||
public static final int SWORD_BEAM_MAX_HIT_COUNT_MAX = 100;
|
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 String SWORD_BEAM_DAMAGE_PATH = "weapon.terra_blade.sword_beam_damage";
|
||||||
public static final double SWORD_BEAM_DAMAGE_DEFAULT = 11.0;
|
public static final float SWORD_BEAM_DAMAGE_DEFAULT = 11.0f;
|
||||||
public static final double SWORD_BEAM_DAMAGE_MIN = 0.0;
|
public static final float SWORD_BEAM_DAMAGE_MIN = 0.0f;
|
||||||
public static final double SWORD_BEAM_DAMAGE_MAX = 2147483647.0;
|
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 String PROJECTILE_DAMAGE_PATH = "weapon.terra_blade.projectile_damage";
|
||||||
public static final double PROJECTILE_DAMAGE_DEFAULT = 11.0;
|
public static final float PROJECTILE_DAMAGE_DEFAULT = 11.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
public static final float PROJECTILE_DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String PROJECTILE_SPEED_PATH = "weapon.terra_blade.projectile_speed";
|
public static final String PROJECTILE_SPEED_PATH = "weapon.terra_blade.projectile_speed";
|
||||||
public static final double PROJECTILE_SPEED_DEFAULT = 2.0;
|
public static final double PROJECTILE_SPEED_DEFAULT = 2.0;
|
||||||
@@ -90,9 +90,9 @@ public class TerraBlade extends SwordItem {
|
|||||||
public static final int PROJECTILE_LIFETIME_MAX = 1200;
|
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 String PROJECTILE_DAMAGE_DECAY_PATH = "weapon.terra_blade.projectile_damage_decay";
|
||||||
public static final double PROJECTILE_DAMAGE_DECAY_DEFAULT = 0.75;
|
public static final float PROJECTILE_DAMAGE_DECAY_DEFAULT = 0.75f;
|
||||||
public static final double PROJECTILE_DAMAGE_DECAY_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_DECAY_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_DECAY_MAX = 1.0;
|
public static final float PROJECTILE_DAMAGE_DECAY_MAX = 1.0f;
|
||||||
|
|
||||||
public TerraBlade() {
|
public TerraBlade() {
|
||||||
super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder()
|
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(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(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.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.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.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("terra_projectile_damage"), configTooltip("terra_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_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.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.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);
|
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() {
|
public static float getSwordBeamDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(SWORD_BEAM_DAMAGE_PATH, SWORD_BEAM_DAMAGE_DEFAULT), SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_MAX);
|
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() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileSpeed() {
|
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);
|
return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileDamageDecay() {
|
public static float getProjectileDamageDecay() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_DECAY_PATH, PROJECTILE_DAMAGE_DECAY_DEFAULT), PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_MAX);
|
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(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -635,3 +635,4 @@ public class TerraBlade extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,9 +55,9 @@ public class Terragrim extends SwordItem {
|
|||||||
public static final double HIT_RANGE_MAX = 10.0;
|
public static final double HIT_RANGE_MAX = 10.0;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.terragrim.damage";
|
public static final String DAMAGE_PATH = "weapon.terragrim.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 0.25;
|
public static final float DAMAGE_DEFAULT = 0.25f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String ROTATE_RANGE_PATH = "weapon.terragrim.rotate_range";
|
public static final String ROTATE_RANGE_PATH = "weapon.terragrim.rotate_range";
|
||||||
public static final int ROTATE_RANGE_DEFAULT = 45;
|
public static final int ROTATE_RANGE_DEFAULT = 45;
|
||||||
@@ -80,7 +80,7 @@ public class Terragrim extends SwordItem {
|
|||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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);
|
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);
|
return Math.clamp(ConfigUtil.readDouble(HIT_RANGE_PATH, HIT_RANGE_DEFAULT), HIT_RANGE_MIN, HIT_RANGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getRotateRange() {
|
public static int getRotateRange() {
|
||||||
@@ -287,3 +287,4 @@ public class Terragrim extends SwordItem {
|
|||||||
return UseAnim.BLOCK;
|
return UseAnim.BLOCK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,9 +64,9 @@ public class TheHorsemansBlade extends SwordItem {
|
|||||||
public static final int BLADE_MAX_HIT_COUNT_MAX = 100;
|
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 String BLADE_DAMAGE_PATH = "weapon.the_horsemans_blade.blade_damage";
|
||||||
public static final double BLADE_DAMAGE_DEFAULT = 15.0;
|
public static final float BLADE_DAMAGE_DEFAULT = 15.0f;
|
||||||
public static final double BLADE_DAMAGE_MIN = 0.0;
|
public static final float BLADE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double BLADE_DAMAGE_MAX = 2147483647.0;
|
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 String PUMPKIN_SPAWN_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_spawn_range";
|
||||||
public static final double PUMPKIN_SPAWN_RANGE_DEFAULT = 16.0;
|
public static final double PUMPKIN_SPAWN_RANGE_DEFAULT = 16.0;
|
||||||
@@ -79,9 +79,9 @@ public class TheHorsemansBlade extends SwordItem {
|
|||||||
public static final double PUMPKIN_SPEED_MAX = 10.0;
|
public static final double PUMPKIN_SPEED_MAX = 10.0;
|
||||||
|
|
||||||
public static final String PUMPKIN_DAMAGE_PATH = "weapon.the_horsemans_blade.pumpkin_damage";
|
public static final String PUMPKIN_DAMAGE_PATH = "weapon.the_horsemans_blade.pumpkin_damage";
|
||||||
public static final double PUMPKIN_DAMAGE_DEFAULT = 15.0;
|
public static final float PUMPKIN_DAMAGE_DEFAULT = 15.0f;
|
||||||
public static final double PUMPKIN_DAMAGE_MIN = 0.0;
|
public static final float PUMPKIN_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PUMPKIN_DAMAGE_MAX = 2147483647.0;
|
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 String PUMPKIN_MAX_TARGET_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_max_target_range";
|
||||||
public static final double PUMPKIN_MAX_TARGET_RANGE_DEFAULT = 32.0;
|
public static final double PUMPKIN_MAX_TARGET_RANGE_DEFAULT = 32.0;
|
||||||
@@ -93,10 +93,10 @@ public class TheHorsemansBlade extends SwordItem {
|
|||||||
public void onConfigLoad() {
|
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_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.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_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_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);
|
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);
|
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() {
|
public static float getBladeDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(BLADE_DAMAGE_PATH, BLADE_DAMAGE_DEFAULT), BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(BLADE_DAMAGE_PATH, BLADE_DAMAGE_DEFAULT), BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getPumpkinSpawnRange() {
|
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);
|
return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPEED_PATH, PUMPKIN_SPEED_DEFAULT), PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getPumpkinDamage() {
|
public static float getPumpkinDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PUMPKIN_DAMAGE_PATH, PUMPKIN_DAMAGE_DEFAULT), PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PUMPKIN_DAMAGE_PATH, PUMPKIN_DAMAGE_DEFAULT), PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getPumpkinMaxTargetRange() {
|
public static double getPumpkinMaxTargetRange() {
|
||||||
@@ -388,3 +388,4 @@ public class TheHorsemansBlade extends SwordItem {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,16 +56,16 @@ public class TrueExcalibur extends SwordItem {
|
|||||||
public static final int MAX_HIT_COUNT_MAX = 100;
|
public static final int MAX_HIT_COUNT_MAX = 100;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.true_excalibur.damage";
|
public static final String DAMAGE_PATH = "weapon.true_excalibur.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 8.0;
|
public static final float DAMAGE_DEFAULT = 8.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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(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.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);
|
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() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
|
||||||
@@ -344,3 +344,4 @@ public class TrueExcalibur extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,14 +77,14 @@ public class TrueNightsEdge extends SwordItem {
|
|||||||
public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100;
|
public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100;
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.true_nights_edge.damage";
|
public static final String DAMAGE_PATH = "weapon.true_nights_edge.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 8.0;
|
public static final float DAMAGE_DEFAULT = 8.0f;
|
||||||
public static final double DAMAGE_MIN = 0.0;
|
public static final float DAMAGE_MIN = 0.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String PROJECTILE_DAMAGE_PATH = "weapon.true_nights_edge.projectile_damage";
|
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 float PROJECTILE_DAMAGE_DEFAULT = 4.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MIN = 0.0;
|
public static final float PROJECTILE_DAMAGE_MIN = 0.0f;
|
||||||
public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0;
|
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 String PROJECTILE_MAX_SPEED_PATH = "weapon.true_nights_edge.projectile_max_speed";
|
||||||
public static final double PROJECTILE_MAX_SPEED_DEFAULT = 2.0;
|
public static final double PROJECTILE_MAX_SPEED_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(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(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.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.loadFloatConfig(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(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_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.loadDoubleConfig(PROJECTILE_ACCELERATION_PATH, configText("true_nights_edge_projectile_acceleration"), configTooltip("true_nights_edge_projectile_acceleration"), PROJECTILE_ACCELERATION_DEFAULT, PROJECTILE_ACCELERATION_MIN, PROJECTILE_ACCELERATION_MAX);
|
||||||
ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("true_nights_edge_projectile_lifetime"), configTooltip("true_nights_edge_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX);
|
ConfigFactory.loadIntConfig(PROJECTILE_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);
|
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() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileDamage() {
|
public static float getProjectileDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getProjectileMaxSpeed() {
|
public static double getProjectileMaxSpeed() {
|
||||||
@@ -709,3 +709,4 @@ public class TrueNightsEdge extends SwordItem {
|
|||||||
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
return InteractionResultHolder.sidedSuccess(stack, level.isClientSide());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,9 +50,9 @@ public class Volcano extends SwordItem {
|
|||||||
public static final double EXPLOSION_RANGE_MAX = 64.0;
|
public static final double EXPLOSION_RANGE_MAX = 64.0;
|
||||||
|
|
||||||
public static final String EXPLOSION_DAMAGE_PATH = "weapon.volcano.explosion_damage";
|
public static final String EXPLOSION_DAMAGE_PATH = "weapon.volcano.explosion_damage";
|
||||||
public static final double EXPLOSION_DAMAGE_DEFAULT = 6.0;
|
public static final float EXPLOSION_DAMAGE_DEFAULT = 6.0f;
|
||||||
public static final double EXPLOSION_DAMAGE_MIN = 0.0;
|
public static final float EXPLOSION_DAMAGE_MIN = 0.0f;
|
||||||
public static final double EXPLOSION_DAMAGE_MAX = 2147483647.0;
|
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 String EXPLOSION_MAX_HIT_COUNT_PATH = "weapon.volcano.explosion_max_hit_count";
|
||||||
public static final int EXPLOSION_MAX_HIT_COUNT_DEFAULT = 2;
|
public static final int EXPLOSION_MAX_HIT_COUNT_DEFAULT = 2;
|
||||||
@@ -80,7 +80,7 @@ public class Volcano extends SwordItem {
|
|||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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_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(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);
|
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);
|
return Math.clamp(ConfigUtil.readDouble(EXPLOSION_RANGE_PATH, EXPLOSION_RANGE_DEFAULT), EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getExplosionDamage() {
|
public static float getExplosionDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(EXPLOSION_DAMAGE_PATH, EXPLOSION_DAMAGE_DEFAULT), EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(EXPLOSION_DAMAGE_PATH, EXPLOSION_DAMAGE_DEFAULT), EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getExplosionMaxHitCount() {
|
public static int getExplosionMaxHitCount() {
|
||||||
@@ -241,3 +241,4 @@ public class Volcano extends SwordItem {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,9 +53,9 @@ public class Zenith extends SwordItem {
|
|||||||
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration.";
|
||||||
|
|
||||||
public static final String DAMAGE_PATH = "weapon.zenith.damage";
|
public static final String DAMAGE_PATH = "weapon.zenith.damage";
|
||||||
public static final double DAMAGE_DEFAULT = 4.0;
|
public static final float DAMAGE_DEFAULT = 4.0f;
|
||||||
public static final double DAMAGE_MIN = 1.0;
|
public static final float DAMAGE_MIN = 1.0f;
|
||||||
public static final double DAMAGE_MAX = 2147483647.0;
|
public static final float DAMAGE_MAX = 8388600.0f;
|
||||||
|
|
||||||
public static final String MAX_RANGE_PATH = "weapon.zenith.max_range";
|
public static final String MAX_RANGE_PATH = "weapon.zenith.max_range";
|
||||||
public static final double MAX_RANGE_DEFAULT = 64.0;
|
public static final double MAX_RANGE_DEFAULT = 64.0;
|
||||||
@@ -113,7 +113,7 @@ public class Zenith extends SwordItem {
|
|||||||
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
public static final IConfigData CONFIG_DATA = new IConfigData() {
|
||||||
@Override
|
@Override
|
||||||
public void onConfigLoad() {
|
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.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.loadBooleanConfig(DISTANCE_MODE_PATH, configText("zenith_distance_mode"), configTooltip("zenith_distance_mode"), DISTANCE_MODE_DEFAULT);
|
||||||
ConfigFactory.loadIntConfig(MOUSE_SPEED_PATH, configText("zenith_mouse_speed"), configTooltip("zenith_mouse_speed"), MOUSE_SPEED_DEFAULT, MOUSE_SPEED_MIN, MOUSE_SPEED_MAX);
|
ConfigFactory.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");
|
return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getDamage() {
|
public static float getDamage() {
|
||||||
return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
return Math.clamp(ConfigUtil.readFloat(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double getMaxRange() {
|
public static double getMaxRange() {
|
||||||
@@ -641,3 +641,4 @@ public class Zenith extends SwordItem {
|
|||||||
return UseAnim.BLOCK;
|
return UseAnim.BLOCK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@ public final class ModParticleRenderTypes {
|
|||||||
Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
|
Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
|
||||||
RenderSystem.enableBlend();
|
RenderSystem.enableBlend();
|
||||||
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE);
|
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE);
|
||||||
RenderSystem.depthMask(false);
|
RenderSystem.depthMask(true);
|
||||||
RenderSystem.disableCull();
|
RenderSystem.disableCull();
|
||||||
RenderSystem.enableDepthTest();
|
RenderSystem.enableDepthTest();
|
||||||
RenderSystem.setShader(GameRenderer::getRendertypeEntityTranslucentEmissiveShader);
|
RenderSystem.setShader(GameRenderer::getRendertypeEntityTranslucentEmissiveShader);
|
||||||
|
|||||||
Reference in new issue
Block a user