fix and simplify config

Author: DerToaster98

src/main/java/de/dertoaster/crossbowverhaul/config/CrossbowverhaulConfigHolder.java

@@ -11,10 +11,10 @@ public class CrossbowverhaulConfigHolder {
 	private static final int defaultCrossbowDurability = 512;
 	private static final int defaultNetheriteCrossbowDurability = 1024;
 	private static final int defaultModifyMultiShotEnchantment = 3;
-	private static final double defaultModCrossbowChargeTime = 2.0D;
-	private static final double defaultModNetheriteCrossbowChargeTime = 3.0D;
-	private static final float defaultModCrossbowProjectileSpeed = 1.0F;
-	private static final float defaultModNetheriteCrossbowProjectileSpeed = 1.5F;
+	private static final Integer defaultModCrossbowChargeTime = 50;
+	private static final Integer defaultModNetheriteCrossbowChargeTime = 75;
+	private static final double defaultModCrossbowProjectileSpeed = 1.0F;
+	private static final double defaultModNetheriteCrossbowProjectileSpeed = 1.5F;
 	private static final double defaultModCrossbowProjectileRange = 1.0D;
 	private static final double defaultModNetheriteCrossbowProjectileRange = 1.5D;
 
@@ -24,11 +24,11 @@ public class CrossbowverhaulConfigHolder {
 	public static final ConfigValue<Integer> coModMultishot;
 	public static final ConfigValue<Integer> coCrossbowDurability;
 	public static final ConfigValue<Integer> coNetheriteCrossbowDurability;
-	public static final ConfigValue<Double> coModCrossbowChargeTime;
-	public static final ConfigValue<Double> coModNetheriteCrossbowChargeTime;
-	public static final ConfigValue<Float> coModCrossbowProjectileSpeed;
+	public static final ConfigValue<Integer> coModCrossbowChargeTime;
+	public static final ConfigValue<Integer> coModNetheriteCrossbowChargeTime;
+	public static final ConfigValue<Double> coModCrossbowProjectileSpeed;
 	public static final ConfigValue<Double> coModCrossbowProjectileRange;
-	public static final ConfigValue<Float> coModNetheriteCrossbowProjectileSpeed;
+	public static final ConfigValue<Double> coModNetheriteCrossbowProjectileSpeed;
 	public static final ConfigValue<Double> coModNetheriteCrossbowProjectileRange;
 
 	public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
@@ -63,20 +63,20 @@ public class CrossbowverhaulConfigHolder {
 					.define("Explosive bolts on non-netherite crossbow", defaultAllowExplosiveBoltsOnNormalCrossbow);
 
 			coModCrossbowChargeTime = BUILDER
-					.comment("Multiplier for the standard crossbow's charge time, base charge time is 25 ticks")
-					.defineInRange("Crossbow charge-time modifier", defaultModCrossbowChargeTime, 0.0D, Double.MAX_VALUE);
+					.comment("Standard crossbow charge time, vanilla charge time is 25 ticks")
+					.defineInRange("Crossbow charge-time modifier", defaultModCrossbowChargeTime, 1, Integer.MAX_VALUE);
 
 			coModNetheriteCrossbowChargeTime = BUILDER
-					.comment("Multiplier for the netherite crossbow's charge time, base charge time is 25 ticks")
-					.defineInRange("Netherite Crossbow charge-time modifier", defaultModNetheriteCrossbowChargeTime, 0.0D, Double.MAX_VALUE);
+					.comment("Netherite crossbow charge time, vanilla charge time is 25 ticks")
+					.defineInRange("Netherite Crossbow charge-time modifier", defaultModNetheriteCrossbowChargeTime, 1, Integer.MAX_VALUE);
 
 			coModCrossbowProjectileSpeed = BUILDER
 					.comment("Multiplier for the projectile speed for projectiles shot from the standard crossbow")
-					.defineInRange("Crossbow projectile speed multiplier", defaultModCrossbowProjectileSpeed, 1.0F, Float.MAX_VALUE, Float.class);
+					.defineInRange("Crossbow projectile speed multiplier", defaultModCrossbowProjectileSpeed, 1.0D, Float.MAX_VALUE);
 
 			coModNetheriteCrossbowProjectileSpeed = BUILDER
 					.comment("Multiplier for the projectile speed for projectiles shot from the netherite crossbow")
-					.defineInRange("Netherite Crossbow projectile speed multiplier", defaultModNetheriteCrossbowProjectileSpeed, 1.0F, Float.MAX_VALUE, Float.class);
+					.defineInRange("Netherite Crossbow projectile speed multiplier", defaultModNetheriteCrossbowProjectileSpeed, 1.0D, Float.MAX_VALUE);
 
 			coModCrossbowProjectileRange = BUILDER
 					.comment("Multiplier for the projectile rabge for projectiles shot from the standard crossbow")

src/main/java/de/dertoaster/crossbowverhaul/enchantment/MultishotEnchantment.java

@@ -12,7 +12,7 @@ public MultishotEnchantment(Rarity p_i50017_1_, EquipmentSlot... p_i50017_2_) {
 
 	@Override
 	public int getMaxLevel() {
-		return CrossbowverhaulConfigHolder.coModMultishot.get();
+		return CrossbowverhaulConfigHolder.coModMultishot.get().intValue();
 	}
 
 }

src/main/java/de/dertoaster/crossbowverhaul/item/ItemCrossbow.java

@@ -25,7 +25,7 @@ public class ItemCrossbow extends CrossbowItem implements Vanishable, IModifiedC
 	};
 
 	protected static final Predicate<ItemStack> PREDICATE_BOLTS_ONLY_NO_EXPLOSIVE = (itemstack) -> {
-		return itemstack.getItem() instanceof ItemBolt && (CrossbowverhaulConfigHolder.coAllowExplosiveBoltsOnNormalCrossbow.get() || !(itemstack.getItem() instanceof ItemBoltExplosive));
+		return itemstack.getItem() instanceof ItemBolt && (CrossbowverhaulConfigHolder.coAllowExplosiveBoltsOnNormalCrossbow.get().booleanValue() || !(itemstack.getItem() instanceof ItemBoltExplosive));
 	};
 
 	//This only checks the items in off and main hand
@@ -140,17 +140,18 @@ public static ItemStack getFirstLoadedBolt(ItemStack crossbow) {
 	//Override charging duration
 	@Override
 	public int getMaxChargeTime() {
-		return (int)(CrossbowverhaulConfigHolder.coModCrossbowChargeTime.get() * IModifiedCrossbowMethod.super.getMaxChargeTime());
+		return CrossbowverhaulConfigHolder.coModCrossbowChargeTime.get().intValue();
 	}
 
 	@Override
 	public int getDefaultProjectileRange() {
-		return (int)(CrossbowverhaulConfigHolder.coModCrossbowProjectileRange.get() * super.getDefaultProjectileRange());
+		return (int)(CrossbowverhaulConfigHolder.coModCrossbowProjectileRange.get().doubleValue() * super.getDefaultProjectileRange());
 	}
 
 	@Override
 	public float getProjectileSpeedModifier() {
-		return CrossbowverhaulConfigHolder.coModCrossbowProjectileSpeed.get() * IModifiedCrossbowMethod.super.getProjectileSpeedModifier();
+		float f = CrossbowverhaulConfigHolder.coModCrossbowProjectileSpeed.get().floatValue(); 
+		return f * IModifiedCrossbowMethod.super.getProjectileSpeedModifier();
 	}
 
 	protected boolean parentClassIsEnchantable(ItemStack stack) {
@@ -163,12 +164,12 @@ protected boolean parentClassIsBookEnchantable(ItemStack stack, ItemStack book)
 
 	@Override
 	public boolean isEnchantable(ItemStack p_41456_) {
-		return this.parentClassIsEnchantable(p_41456_) && CrossbowverhaulConfigHolder.coEnchCrossbow.get();
+		return this.parentClassIsEnchantable(p_41456_) && CrossbowverhaulConfigHolder.coEnchCrossbow.get().booleanValue();
 	}
 
 	@Override
 	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
-		return this.parentClassIsBookEnchantable(stack, book) && CrossbowverhaulConfigHolder.coEnchCrossbow.get();
+		return this.parentClassIsBookEnchantable(stack, book) && CrossbowverhaulConfigHolder.coEnchCrossbow.get().booleanValue();
 	}
 
 }

src/main/java/de/dertoaster/crossbowverhaul/item/ItemCrossbowNetherite.java

@@ -24,12 +24,12 @@ public Predicate<ItemStack> getAllSupportedProjectiles() {
 
 	@Override
 	public boolean isEnchantable(ItemStack p_41456_) {
-		return this.parentClassIsEnchantable(p_41456_) && CrossbowverhaulConfigHolder.coEnchNetheriteCrossbow.get();
+		return this.parentClassIsEnchantable(p_41456_) && CrossbowverhaulConfigHolder.coEnchNetheriteCrossbow.get().booleanValue();
 	}
 
 	@Override
 	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
-		return this.parentClassIsBookEnchantable(stack, book) && CrossbowverhaulConfigHolder.coEnchNetheriteCrossbow.get();
+		return this.parentClassIsBookEnchantable(stack, book) && CrossbowverhaulConfigHolder.coEnchNetheriteCrossbow.get().booleanValue();
 	}
 
 	public ItemCrossbowNetherite(Properties properties) {
@@ -38,18 +38,18 @@ public ItemCrossbowNetherite(Properties properties) {
 
 	@Override
 	public int getDefaultProjectileRange() {
-		return (int)(CrossbowverhaulConfigHolder.coModNetheriteCrossbowProjectileRange.get() * (super.getDefaultProjectileRange() / CrossbowverhaulConfigHolder.coModCrossbowProjectileRange.get()));
+		return (int)(CrossbowverhaulConfigHolder.coModNetheriteCrossbowProjectileRange.get().intValue() * (super.getDefaultProjectileRange() / CrossbowverhaulConfigHolder.coModCrossbowProjectileRange.get()));
 	}
 
 	@Override
 	public float getProjectileSpeedModifier() {
-		return CrossbowverhaulConfigHolder.coModNetheriteCrossbowProjectileSpeed.get() * (super.getProjectileSpeedModifier() / CrossbowverhaulConfigHolder.coModCrossbowProjectileSpeed.get());
+		return CrossbowverhaulConfigHolder.coModNetheriteCrossbowProjectileSpeed.get().floatValue() * (super.getProjectileSpeedModifier() / CrossbowverhaulConfigHolder.coModCrossbowProjectileSpeed.get().floatValue());
 	}
 
 	// Override charging duration
 	@Override
 	public int getMaxChargeTime() {
-		return (int)(CrossbowverhaulConfigHolder.coModNetheriteCrossbowChargeTime.get() * (super.getMaxChargeTime() / CrossbowverhaulConfigHolder.coModCrossbowChargeTime.get()));
+		return CrossbowverhaulConfigHolder.coModNetheriteCrossbowChargeTime.get().intValue();
 	}
 
 }