lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix "how do i get tier 6" questions

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-09-16 11:13:25 -07:00
parent d54c828fba
commit fd03265764
6 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/main/java/WayofTime/bloodmagic/altar/AltarTier.java
View file

@ -100,31 +100,32 @@ public enum AltarTier {
} }
} }
}, },
SIX() { // SIX() {
@Override // @Override
public void buildComponents(Consumer<AltarComponent> components) { // public void buildComponents(Consumer<AltarComponent> components) {
FIVE.getAltarComponents().forEach(components); // FIVE.getAltarComponents().forEach(components);
//
for (int i = -4; i <= 2; i++) { // 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, 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));
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++) { // 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(-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());
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; public static final int MAXTIERS = values().length;

4
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java
View file

@ -76,8 +76,8 @@ public class BloodMagicCorePlugin implements IBloodMagicPlugin
BlockDecorative decorative = (BlockDecorative) RegistrarBloodMagicBlocks.DECORATIVE_BRICK; 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_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.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_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_TILE), ComponentType.CRYSTAL.name());
BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE; BlockBloodRune bloodRune = (BlockBloodRune) RegistrarBloodMagicBlocks.BLOOD_RUNE;
for (BloodRuneType runeType : BloodRuneType.values()) for (BloodRuneType runeType : BloodRuneType.values())

5
src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
View file

@ -7,8 +7,9 @@ import java.util.Locale;
public enum EnumDecorative implements IStringSerializable { public enum EnumDecorative implements IStringSerializable {
BLOODSTONE_TILE, BLOODSTONE_TILE,
BLOODSTONE_BRICK, BLOODSTONE_BRICK,
CRYSTAL_TILE, // CRYSTAL_TILE,
CRYSTAL_BRICK,; // CRYSTAL_BRICK,
;
@Override @Override
public String toString() { public String toString() {

8
src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java
View file

@ -47,8 +47,8 @@ public class RegistrarBloodMagic
public static final BloodOrb ORB_MASTER = ORB_DEF; public static final BloodOrb ORB_MASTER = ORB_DEF;
@GameRegistry.ObjectHolder("archmage") @GameRegistry.ObjectHolder("archmage")
public static final BloodOrb ORB_ARCHMAGE = ORB_DEF; public static final BloodOrb ORB_ARCHMAGE = ORB_DEF;
@GameRegistry.ObjectHolder("transcendent") // @GameRegistry.ObjectHolder("transcendent")
public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF; // public static final BloodOrb ORB_TRANSCENDENT = ORB_DEF;
public static final Potion BOOST = MobEffects.HASTE; public static final Potion BOOST = MobEffects.HASTE;
public static final Potion WHIRLWIND = 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("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("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("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("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("transcendent", 6, 30000000, 50).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent")
); );
} }

4
src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java
View file

@ -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); registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100);
// SIX // 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(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(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200);
} }
public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar) public static void registerAlchemyTableRecipes(BloodMagicRecipeRegistrar registrar)

4
src/main/java/WayofTime/bloodmagic/ritual/types/RitualAltarBuilder.java
View file

@ -28,7 +28,7 @@ import java.util.function.Consumer;
@RitualRegister("altar_builder") @RitualRegister("altar_builder")
public class RitualAltarBuilder extends Ritual { public class RitualAltarBuilder extends Ritual {
private Iterator<AltarComponent> altarComponentsIterator = new ArrayList<>(AltarTier.SIX.getAltarComponents()).iterator(); private Iterator<AltarComponent> altarComponentsIterator = new ArrayList<>(AltarTier.values()[AltarTier.MAXTIERS - 1].getAltarComponents()).iterator();
private boolean cycleDone = false; private boolean cycleDone = false;
private AltarComponent currentComponent; private AltarComponent currentComponent;
@ -52,7 +52,7 @@ public class RitualAltarBuilder extends Ritual {
} }
if (cycleDone) { 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)) { if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true)) {