Balancing Nether Tools&Armor (#253)

paulevsGitch · Mar 4, 2022 · 9470610 · 9470610
1 parent 0deb29d
commit 9470610
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/src/main/java/paulevs/betternether/items/materials/BNArmorMaterial.java b/src/main/java/paulevs/betternether/items/materials/BNArmorMaterial.java
@@ -9,26 +9,38 @@
 import paulevs.betternether.registry.NetherItems;
 
 public enum BNArmorMaterial implements ArmorMaterial {
-	CINCINNASITE("cincinnasite", 12, 4, SoundEvents.ARMOR_EQUIP_IRON, NetherItems.CINCINNASITE_INGOT, 1F, new int[] { 3, 5, 7, 3 }),
-	NETHER_RUBY("nether_ruby", 13, 3, SoundEvents.ARMOR_EQUIP_IRON, NetherItems.NETHER_RUBY, 1F, new int[] { 3, 5, 7, 3 });
+	CINCINNASITE("cincinnasite", 12, new int[] { 3, 5, 6, 3 }, 20, SoundEvents.ARMOR_EQUIP_GOLD, 1.0F, 0.05f, NetherItems.CINCINNASITE_INGOT),
+	NETHER_RUBY("nether_ruby", 30, new int[] { 3, 6, 8, 3 }, 25, SoundEvents.ARMOR_EQUIP_NETHERITE, 2.4F, 0.2f, NetherItems.NETHER_RUBY);
 
-	private static final int[] DURABILITY = new int[] { 3, 6, 8, 3 };
+	/* Vanilla Settings
+	LEATHER("leather", 5, new int[]{1, 2, 3, 1}, 15, SoundEvents.ARMOR_EQUIP_LEATHER, 0.0f, 0.0f, () -> Ingredient.of(Items.LEATHER)),
+    CHAIN("chainmail", 15, new int[]{1, 4, 5, 2}, 12, SoundEvents.ARMOR_EQUIP_CHAIN, 0.0f, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)),
+    IRON("iron", 15, new int[]{2, 5, 6, 2}, 9, SoundEvents.ARMOR_EQUIP_IRON, 0.0f, 0.0f, () -> Ingredient.of(Items.IRON_INGOT)),
+    GOLD("gold", 7, new int[]{1, 3, 5, 2}, 25, SoundEvents.ARMOR_EQUIP_GOLD, 0.0f, 0.0f, () -> Ingredient.of(Items.GOLD_INGOT)),
+    DIAMOND("diamond", 33, new int[]{3, 6, 8, 3}, 10, SoundEvents.ARMOR_EQUIP_DIAMOND, 2.0f, 0.0f, () -> Ingredient.of(Items.DIAMOND)),
+    TURTLE("turtle", 25, new int[]{2, 5, 6, 2}, 9, SoundEvents.ARMOR_EQUIP_TURTLE, 0.0f, 0.0f, () -> Ingredient.of(Items.SCUTE)),
+    NETHERITE("netherite", 37, new int[]{3, 6, 8, 3}, 15, SoundEvents.ARMOR_EQUIP_NETHERITE, 3.0f, 0.1f, () -> Ingredient.of(Items.NETHERITE_INGOT));
+	 */
+
+	private static final int[] DURABILITY = new int[] {13, 15, 16, 11};
 	private final String name;
 	private final int multiplier;
 	private final int enchantLevel;
 	private final SoundEvent sound;
 	private final ItemLike repair;
 	private final float toughness;
+	private final float knockbackResistance;
 	private final int[] protection;
 
-	BNArmorMaterial(String name, int durabilityMultiplier, int enchantLevel, SoundEvent equipSound, ItemLike repairItem, float toughness, int[] protection) {
+	BNArmorMaterial(String name, int durabilityMultiplier, int[] protection, int enchantLevel, SoundEvent equipSound, float toughness, float knockback, ItemLike repairItem) {
 		this.name = name;
 		this.multiplier = durabilityMultiplier;
 		this.enchantLevel = enchantLevel;
 		this.sound = equipSound;
 		this.repair = repairItem;
 		this.toughness = toughness;
 		this.protection = protection;
+		this.knockbackResistance = knockback;
 	}
 
 	@Override
@@ -68,6 +80,6 @@ public float getToughness() {
 
 	@Override
 	public float getKnockbackResistance() {
-		return 0;
+		return knockbackResistance;
 	}
 }
diff --git a/src/main/java/paulevs/betternether/items/materials/BNToolMaterial.java b/src/main/java/paulevs/betternether/items/materials/BNToolMaterial.java
@@ -7,19 +7,27 @@
 import paulevs.betternether.registry.NetherItems;
 
 public enum BNToolMaterial implements Tier {
-	CINCINNASITE(512, 6F, 2, 14, 2.5F,NetherItems.CINCINNASITE_INGOT),
-	CINCINNASITE_DIAMOND(1800, 8F, 3, 22, 3.5F, Items.DIAMOND),
-	NETHER_RUBY(1300, 4F, 3, 9, 2.0F, NetherItems.NETHER_RUBY);
+	CINCINNASITE        	(2, 512, 6F, 2.0F, 16, NetherItems.CINCINNASITE_INGOT),
+	CINCINNASITE_DIAMOND	(3, 1800, 8F, 3.5F, 14, Items.DIAMOND),
+	NETHER_RUBY				(4, 1300, 9F, 4.0F, 22, NetherItems.NETHER_RUBY);
 
-	private final int durability;
+	/* Vanilla Settings
+	WOOD(0, 59, 2.0f, 0.0f, 15, () -> Ingredient.of(ItemTags.PLANKS)),
+    STONE(1, 131, 4.0f, 1.0f, 5, () -> Ingredient.of(ItemTags.STONE_TOOL_MATERIALS)),
+    IRON(2, 250, 6.0f, 2.0f, 14, () -> Ingredient.of(Items.IRON_INGOT)),
+    DIAMOND(3, 1561, 8.0f, 3.0f, 10, () -> Ingredient.of(Items.DIAMOND)),
+    GOLD(0, 32, 12.0f, 0.0f, 22, () -> Ingredient.of(Items.GOLD_INGOT)),
+    NETHERITE(4, 2031, 9.0f, 4.0f, 15, () -> Ingredient.of(Items.NETHERITE_INGOT));
+	 */
+	private final int uses;
 	private final float speed;
 	private final int level;
 	private final int enchantibility;
 	private final float damage;
 	private final ItemLike reapair;
 
-	BNToolMaterial(int durability, float speed, int level, int enchantibility, float damage, ItemLike reapair) {
-		this.durability = durability;
+	BNToolMaterial(int level, int uses, float speed, float damage, int enchantibility, ItemLike reapair) {
+		this.uses = uses;
 		this.speed = speed;
 		this.level = level;
 		this.enchantibility = enchantibility;
@@ -29,7 +37,7 @@ public enum BNToolMaterial implements Tier {
 
 	@Override
 	public int getUses() {
-		return durability;
+		return uses;
 	}
 
 	@Override