Skip to content

Commit

Permalink
Adjust each tier of materials for tools and armors so they inline wit…
Browse files Browse the repository at this point in the history 
…h their vanilla tiers. Ultrite slightly tweaked.
  • Loading branch information
@Waterpicker
Waterpicker committed Jan 8, 2025
1 parent 5dbfa5f commit 0cf818a
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 39 deletions.
42 changes: 22 additions & 20 deletions ...g/generations/core/generationscore/common/world/item/armor/GenerationsArmorMaterials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,28 @@
import java.util.function.Supplier;

public enum GenerationsArmorMaterials implements ArmorMaterial {
AETHER("aether", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.SILICON),
AQUA("saphire", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.SAPPHIRE),
FLARE("flare", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.RUBY),
GALACTIC("galactic", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.SILICON),
MAGMA("ruby", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.RUBY),
NEO_PLASMA("neo_plasma", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.CRYSTAL),
PLASMA("plasma", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.CRYSTAL),
ROCKET("rocket", 200, new int[]{3, 6, 7, 3}, 10, () -> Items.AMETHYST_SHARD),
SKULL("skull", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.SILICON),
CRYSTAL("crystal", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.CRYSTAL),
ULTRA("ultra", 200, new int[]{3, 6, 7, 3}, 10, GenerationsItems.Z_INGOT),
DAWN_STONE("dawn_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.DAWN_STONE, 2.0f, 0.0f),
DUSK_STONE("dusk_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.DUSK_STONE, 2.0f, 0.0f),
FIRE_STONE("fire_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.FIRE_STONE, 2.0f, 0.0f),
ICE_STONE("ice_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.ICE_STONE, 2.0f, 0.0f),
LEAF_STONE("leaf_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.LEAF_STONE, 2.0f, 0.0f),
MOON_STONE("moon_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.MOON_STONE, 2.0f, 0.0f),
SUN_STONE("sun_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.SUN_STONE, 2.0f, 0.0f),
THUNDER_STONE("thunder_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.THUNDER_STONE, 2.0f, 0.0f),
WATER_STONE("water_stone", 33, new int[]{3, 6, 8, 3}, 10, () -> CobblemonItems.WATER_STONE, 2.0f, 0.0f),
AETHER("aether", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.SILICON),
AQUA("saphire", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.SAPPHIRE),
FLARE("flare", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.RUBY),
GALACTIC("galactic", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.SILICON),
MAGMA("ruby", 15, new int[] { 2, 5, 6, 2 }, 19, GenerationsItems.RUBY),
NEO_PLASMA("neo_plasma", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.CRYSTAL),
PLASMA("plasma", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.CRYSTAL),
ROCKET("rocket", 15, new int[] { 2, 5, 6, 2 }, 9, () -> Items.AMETHYST_SHARD),
SKULL("skull", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.SILICON),
CRYSTAL("crystal", 15, new int[] { 2, 5, 6, 2 }, 9, GenerationsItems.CRYSTAL),

ULTRA("ultra", 33, new int[] { 3, 6, 7, 3 }, 10, GenerationsItems.Z_INGOT),
DAWN_STONE("dawn_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.DAWN_STONE, 2.0f, 0.0f),
DUSK_STONE("dusk_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.DUSK_STONE, 2.0f, 0.0f),
FIRE_STONE("fire_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.FIRE_STONE, 2.0f, 0.0f),
ICE_STONE("ice_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.ICE_STONE, 2.0f, 0.0f),
LEAF_STONE("leaf_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.LEAF_STONE, 2.0f, 0.0f),
MOON_STONE("moon_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.MOON_STONE, 2.0f, 0.0f),
SUN_STONE("sun_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.SUN_STONE, 2.0f, 0.0f),
THUNDER_STONE("thunder_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.THUNDER_STONE, 2.0f, 0.0f),
WATER_STONE("water_stone", 33, new int[] { 3, 6, 8, 3 }, 10, () -> CobblemonItems.WATER_STONE, 2.0f, 0.0f),

ULTRITE("ultrite", 42, new int[]{3, 6, 8, 3}, 20, GenerationsItems.ULTRITE_INGOT, 4.0f, 0.2f);

private final String name;
Expand Down
39 changes: 20 additions & 19 deletions ...rations/gg/generations/core/generationscore/common/world/item/tools/GenerationsTiers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,26 @@
import java.util.function.Supplier;

public enum GenerationsTiers implements Tier {
CHARGE_STONE(1, 185, 5.0F, 1.2F, 8, () -> GenerationsBlocks.CHARGE_STONE_SET.getBaseBlock().asItem()),
VOLCANIC_STONE(1, 185, 5.0F, 1.2F, 8, () -> GenerationsBlocks.VOLCANIC_STONE.get().asItem()),
AMETHYST(2, 300, 6.5F, 2.0F, 14, () -> Items.AMETHYST_SHARD),
CRYSTAL(2, 300, 6.5F, 2.0F, 14, GenerationsItems.CRYSTAL),
DAWN_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.DAWN_STONE),
DUSK_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.DUSK_STONE),
FIRE_STONE(3, 1561, 8.0F, 3.0F, 10, () -> CobblemonItems.FIRE_STONE),
ICE_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.ICE_STONE),
LEAF_STONE(2, 250, 6.0F, 2.0F, 14, () -> CobblemonItems.LEAF_STONE),
MOON_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.MOON_STONE),

RUBY(2, 300, 6.5F, 2.0F, 14, GenerationsItems.RUBY),

SAPPHIRE(2, 300, 6.5F, 2.0F, 14, GenerationsItems.SAPPHIRE),
SILICON(2, 100, 45F, 10F, 30, GenerationsItems.SILICON),
SUN_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.SUN_STONE),
THUNDER_STONE(3, 1561, 12.0F, 0.0F, 22, () -> CobblemonItems.THUNDER_STONE),
WATER_STONE(3, 1561, 8.0F, 3.0F, 10, () -> CobblemonItems.WATER_STONE),
ULTRITE(4, 2640, 10.0F, 5.0F, 18, GenerationsItems.ULTRITE_INGOT);
CHARGE_STONE(1, 131, 5.0F, 1.0F, 5, () -> GenerationsBlocks.CHARGE_STONE_SET.getBaseBlock().asItem()),
VOLCANIC_STONE(1, 131, 4.0F, 1.0F, 5, () -> GenerationsBlocks.VOLCANIC_STONE.get().asItem()),

AMETHYST(2, 250, 6f, 2f, 14, () -> Items.AMETHYST_SHARD),
CRYSTAL(2, 250, 6f, 2f, 14, GenerationsItems.CRYSTAL),
SAPPHIRE(2, 250, 6f, 2f, 14, GenerationsItems.SAPPHIRE),
SILICON(2, 250, 6f, 2f, 14, GenerationsItems.SILICON),
RUBY(2, 250, 6f, 2f, 14, GenerationsItems.RUBY),

DAWN_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.DAWN_STONE),
DUSK_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.DUSK_STONE),
FIRE_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.FIRE_STONE),
ICE_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.ICE_STONE),
LEAF_STONE(2, 1561, 12f, 3f, 10, () -> CobblemonItems.LEAF_STONE),
MOON_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.MOON_STONE),
SUN_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.SUN_STONE),
THUNDER_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.THUNDER_STONE),
WATER_STONE(3, 1561, 12f, 3f, 10, () -> CobblemonItems.WATER_STONE),

ULTRITE(5, 2640, 10.0F, 5.0F, 20, GenerationsItems.ULTRITE_INGOT);

private final int level;
private final int uses;
Expand Down

0 comments on commit 0cf818a

Please sign in to comment.