diff --git a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java index d940e6ab..105efae2 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/altar/AltarTier.java @@ -100,31 +100,32 @@ public enum AltarTier { } } }, - SIX() { - @Override - public void buildComponents(Consumer components) { - FIVE.getAltarComponents().forEach(components); - - for (int i = -4; i <= 2; i++) { - components.accept(new AltarComponent(new BlockPos(11, i, 11))); - components.accept(new AltarComponent(new BlockPos(-11, i, -11))); - components.accept(new AltarComponent(new BlockPos(11, i, -11))); - components.accept(new AltarComponent(new BlockPos(-11, i, 11))); - } - - components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); - - for (int i = -9; i <= 9; i++) { - components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }; +// SIX() { +// @Override +// public void buildComponents(Consumer components) { +// FIVE.getAltarComponents().forEach(components); +// +// for (int i = -4; i <= 2; i++) { +// components.accept(new AltarComponent(new BlockPos(11, i, 11))); +// components.accept(new AltarComponent(new BlockPos(-11, i, -11))); +// components.accept(new AltarComponent(new BlockPos(11, i, -11))); +// components.accept(new AltarComponent(new BlockPos(-11, i, 11))); +// } +// +// components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); +// components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); +// +// for (int i = -9; i <= 9; i++) { +// components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); +// components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); +// } +// } +// }, + ; public static final int MAXTIERS = values().length; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index 3a0d0164..e8d2e44d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -76,8 +76,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_BRICK), ComponentType.BLOODSTONE.name()); api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.BLOODSTONE_TILE), ComponentType.BLOODSTONE.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); - api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; for (BloodRuneType runeType : BloodRuneType.values()) diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java index d9cdcdff..b0b31622 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java @@ -7,8 +7,9 @@ import java.util.Locale; public enum EnumDecorative implements IStringSerializable { BLOODSTONE_TILE, BLOODSTONE_BRICK, - CRYSTAL_TILE, - CRYSTAL_BRICK,; +// CRYSTAL_TILE, +// CRYSTAL_BRICK, + ; @Override public String toString() { diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index c039399d..2b352d8b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -47,8 +47,8 @@ public class RegistrarBloodMagic public static final BloodOrb ORB_MASTER = ORB_DEF; @GameRegistry.ObjectHolder("archmage") public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; - @GameRegistry.ObjectHolder("transcendent") - public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; +// @GameRegistry.ObjectHolder("transcendent") +// public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; public static final Potion BOOST = MobEffects.HASTE; public static final Potion WHIRLWIND = MobEffects.HASTE; @@ -75,8 +75,8 @@ public class RegistrarBloodMagic new BloodOrb("apprentice", 2, 25000, 5).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"), new BloodOrb("magician", 3, 150000, 15).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"), new BloodOrb("master", 4, 1000000, 25).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"), - new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"), - new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") + new BloodOrb("archmage", 5, 10000000, 50).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage") +// new BloodOrb("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent") ); } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 78d38d5f..fb416608 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -98,8 +98,8 @@ public class RegistrarBloodMagicRecipes registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); // SIX - registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); - registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); +// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); +// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); } public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java index 1cf2f0ce..64242e37 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java @@ -28,7 +28,7 @@ import java.util.function.Consumer; @RitualRegister("altar_builder") public class RitualAltarBuilder extends Ritual { - private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); + private Iterator altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); private boolean cycleDone = false; private AltarComponent currentComponent; @@ -52,7 +52,7 @@ public class RitualAltarBuilder extends Ritual { } if (cycleDone) { - altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); + altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator(); } if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) {