From ac5402df6b912cf34737804a4892f6fb0af7b5ac Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 2 Nov 2015 19:18:53 -0800 Subject: [PATCH] Cleanup Renders for Runes Creative crystal renders Formatting Lang additions Some attempted (not successful) fixes for SoulNetwork --- .../bloodmagic/altar/BloodAltar.java | 80 +++++--------- .../bloodmagic/api/altar/AltarUpgrade.java | 33 ++---- .../api/altar/EnumAltarComponent.java | 2 +- .../bloodmagic/api/altar/EnumAltarTier.java | 64 +++++------ .../bloodmagic/api/network/SoulNetwork.java | 30 +++-- .../api/registry/ImperfectRitualRegistry.java | 7 +- .../bloodmagic/block/BlockBloodRune.java | 103 +++++++----------- .../block/BlockRitualController.java | 1 + .../item/block/ItemBlockBloodRune.java | 10 +- .../bloodmagic/registry/ModBlocks.java | 41 ++++--- .../bloodmagic/registry/ModItems.java | 1 + .../imperfect/ImperfectRitualNight.java | 4 +- .../tile/TileImperfectRitualStone.java | 1 - .../blockstates/BlockBloodRune.json | 62 +++++++++++ .../blockstates/BlockRitualController.json | 4 +- .../assets/bloodmagic/lang/en_US.lang | 17 ++- .../models/block/BlockBloodRune0.json | 6 + .../models/block/BlockBloodRune1.json | 6 + .../models/block/BlockBloodRune2.json | 6 + .../models/block/BlockBloodRune3.json | 6 + .../models/block/BlockBloodRune4.json | 6 + .../models/block/BlockBloodRune5.json | 6 + .../models/block/BlockBloodRune6.json | 6 + .../models/block/BlockBloodRune7.json | 6 + .../models/block/BlockBloodRune8.json | 6 + .../models/block/BlockBloodRune9.json | 6 + .../models/item/BlockBloodRune0.json | 10 ++ .../models/item/BlockBloodRune1.json | 10 ++ .../models/item/BlockBloodRune2.json | 10 ++ .../models/item/BlockBloodRune3.json | 10 ++ .../models/item/BlockBloodRune4.json | 10 ++ .../models/item/BlockBloodRune5.json | 10 ++ .../models/item/BlockBloodRune6.json | 10 ++ .../models/item/BlockBloodRune7.json | 10 ++ .../models/item/BlockBloodRune8.json | 10 ++ .../models/item/BlockBloodRune9.json | 10 ++ 36 files changed, 400 insertions(+), 220 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/blockstates/BlockBloodRune.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune1.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune3.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune4.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune5.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune6.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune7.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune8.json create mode 100644 src/main/resources/assets/bloodmagic/models/block/BlockBloodRune9.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune1.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune3.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune4.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune5.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune6.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune7.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune8.json create mode 100644 src/main/resources/assets/bloodmagic/models/item/BlockBloodRune9.json diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 162d2886..72a36a91 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -12,15 +12,11 @@ import net.minecraft.world.World; import java.util.List; -public class BloodAltar -{ +public class BloodAltar { - public static EnumAltarTier getAltarTier(World world, BlockPos pos) - { - for (int i = EnumAltarTier.MAXTIERS; i >= 2; i--) - { - if (checkAltarIsValid(world, pos, i)) - { + public static EnumAltarTier getAltarTier(World world, BlockPos pos) { + for (int i = EnumAltarTier.MAXTIERS; i >= 2; i--) { + if (checkAltarIsValid(world, pos, i)) { return EnumAltarTier.values()[i]; } @@ -29,27 +25,19 @@ public class BloodAltar return EnumAltarTier.ONE; } - public static boolean checkAltarIsValid(World world, BlockPos worldPos, int altarTier) - { - for (AltarComponent altarComponent : EnumAltarTier.values()[altarTier].getAltarComponents()) - { + public static boolean checkAltarIsValid(World world, BlockPos worldPos, int altarTier) { + for (AltarComponent altarComponent : EnumAltarTier.values()[altarTier].getAltarComponents()) { BlockPos componentPos = worldPos.add(altarComponent.getOffset()); BlockStack worldBlock = new BlockStack(world.getBlockState(componentPos).getBlock(), world.getBlockState(componentPos).getBlock().getMetaFromState(world.getBlockState(componentPos))); - if (altarComponent.isBloodRune()) - { - if (!checkRune(altarComponent, worldBlock)) - { + if (altarComponent.isBloodRune()) { + if (!checkRune(altarComponent, worldBlock)) { return false; } - } - else - { - if (((altarComponent.getBlockStack().getBlock() != worldBlock.getBlock()) || (altarComponent.getBlockStack().getMeta() != worldBlock.getMeta())) && (altarComponent.getBlockStack().getBlock() == Blocks.air && !world.isAirBlock(componentPos))) - { - if (!checkSpecials(altarComponent, worldBlock)) - { + } else { + if (((altarComponent.getBlockStack().getBlock() != worldBlock.getBlock()) || (altarComponent.getBlockStack().getMeta() != worldBlock.getMeta())) && (altarComponent.getBlockStack().getBlock() == Blocks.air && !world.isAirBlock(componentPos))) { + if (!checkSpecials(altarComponent, worldBlock)) { return false; } } @@ -59,28 +47,22 @@ public class BloodAltar return true; } - public static AltarUpgrade getUpgrades(World world, BlockPos pos, int altarTier) - { - if (world.isRemote) - { + public static AltarUpgrade getUpgrades(World world, BlockPos pos, int altarTier) { + if (world.isRemote) { return null; } AltarUpgrade upgrades = new AltarUpgrade(); List list = EnumAltarTier.values()[altarTier].getAltarComponents(); - for (AltarComponent altarComponent : list) - { + for (AltarComponent altarComponent : list) { BlockPos componentPos = pos.add(altarComponent.getOffset()); - if (altarComponent.isUpgradeSlot()) - { + if (altarComponent.isUpgradeSlot()) { BlockStack worldBlock = new BlockStack(world.getBlockState(componentPos).getBlock(), world.getBlockState(componentPos).getBlock().getMetaFromState(world.getBlockState(componentPos))); - if (worldBlock.getBlock() instanceof BlockBloodRune) - { - switch (((BlockBloodRune) worldBlock.getBlock()).getRuneEffect(worldBlock.getMeta())) - { + if (worldBlock.getBlock() instanceof BlockBloodRune) { + switch (((BlockBloodRune) worldBlock.getBlock()).getRuneEffect(worldBlock.getMeta())) { case 1: upgrades.addSpeed(); break; @@ -98,19 +80,19 @@ public class BloodAltar break; case 5: - upgrades.addCapacity(); - break; - - case 6: upgrades.addDisplacement(); break; + case 6: + upgrades.addCapacity(); + break; + case 7: - upgrades.addOrbCapacity(); + upgrades.addBetterCapacity(); break; case 8: - upgrades.addBetterCapacity(); + upgrades.addOrbCapacity(); break; case 9: @@ -124,12 +106,9 @@ public class BloodAltar return upgrades; } - private static boolean checkRune(AltarComponent altarComponent, BlockStack blockStack) - { - if (altarComponent.getBlockStack().getBlock() == ModBlocks.blood_rune) - { - if (blockStack.getBlock() instanceof BlockBloodRune || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.BLOODRUNE))) - { + private static boolean checkRune(AltarComponent altarComponent, BlockStack blockStack) { + if (altarComponent.getBlockStack().getBlock() == ModBlocks.bloodRune) { + if (blockStack.getBlock() instanceof BlockBloodRune || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.BLOODRUNE))) { return true; } @@ -137,15 +116,14 @@ public class BloodAltar return false; } - private static boolean checkSpecials(AltarComponent altarComponent, BlockStack blockStack) - { + private static boolean checkSpecials(AltarComponent altarComponent, BlockStack blockStack) { if (altarComponent.getBlockStack().getBlock() == ModBlocks.bloodStone) // if (blockStack.getBlock() instanceof BlockBloodStone || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.BLOODSTONE))) - return true; + return true; if (altarComponent.getBlockStack().getBlock() == ModBlocks.crystal) // if (blockStack.getBlock() instanceof BlockCrystal || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.CRYSTAL))) - return true; + return true; if (altarComponent.getBlockStack().getBlock() == Blocks.glowstone) if (blockStack.getBlock() instanceof BlockGlowstone || (blockStack.getBlock() instanceof IAltarComponent && (((IAltarComponent) blockStack.getBlock()).getType(blockStack.getMeta()) == EnumAltarComponent.GLOWSTONE))) diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java index 8ac7b96d..3f4beaa5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java @@ -3,8 +3,7 @@ package WayofTime.bloodmagic.api.altar; import lombok.Getter; @Getter -public class AltarUpgrade -{ +public class AltarUpgrade { private int speedCount; private int efficiencyCount; private int sacrificeCount; @@ -15,63 +14,53 @@ public class AltarUpgrade private int betterCapacityCount; private int accelerationCount; - public AltarUpgrade() - { + public AltarUpgrade() { } // Adders - public AltarUpgrade addSpeed() - { + public AltarUpgrade addSpeed() { speedCount++; return this; } - public AltarUpgrade addEfficiency() - { + public AltarUpgrade addEfficiency() { efficiencyCount++; return this; } - public AltarUpgrade addSacrifice() - { + public AltarUpgrade addSacrifice() { sacrificeCount++; return this; } - public AltarUpgrade addSelfSacrifice() - { + public AltarUpgrade addSelfSacrifice() { selfSacrificeCount++; return this; } - public AltarUpgrade addDisplacement() - { + public AltarUpgrade addDisplacement() { displacementCount++; return this; } - public AltarUpgrade addCapacity() - { + public AltarUpgrade addCapacity() { capacityCount++; return this; } - public AltarUpgrade addOrbCapacity() - { + public AltarUpgrade addOrbCapacity() { orbCapacityCount++; return this; } - public AltarUpgrade addBetterCapacity() - { + public AltarUpgrade addBetterCapacity() { betterCapacityCount++; return this; } - public AltarUpgrade addAcceleration() - { + public AltarUpgrade addAcceleration() { accelerationCount++; return this; } diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java index 54516428..f6a8b176 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.api.altar; -public enum EnumAltarComponent { +public enum EnumAltarComponent { GLOWSTONE, BLOODSTONE, diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java index 9bc04621..c0b94026 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java @@ -14,28 +14,28 @@ public enum EnumAltarTier { TWO() { @Override public void buildComponents() { - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ModBlocks.blood_rune).setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ModBlocks.blood_rune).setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ModBlocks.blood_rune).setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ModBlocks.blood_rune).setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ModBlocks.bloodRune).setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ModBlocks.bloodRune).setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ModBlocks.bloodRune).setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ModBlocks.bloodRune).setBloodRune()); } }, THREE() { @Override public void buildComponents() { altarComponents.addAll(TWO.getAltarComponents()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, -1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, -1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, -1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 0), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 0), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-1, -1, 1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(0, -1, 1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(1, -1, 1), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); altarComponents.add(new AltarComponent(new BlockPos(-3, -1, -3))); altarComponents.add(new AltarComponent(new BlockPos(-3, 0, -3))); altarComponents.add(new AltarComponent(new BlockPos(3, -1, -3))); @@ -50,10 +50,10 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(3, 1, 3), Blocks.glowstone)); for (int i = -2; i <= 2; i++) { - altarComponents.add(new AltarComponent(new BlockPos(3, -2, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-3, -2, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, 3), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -2, -3), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(3, -2, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-3, -2, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -2, 3), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -2, -3), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); } } }, @@ -63,10 +63,10 @@ public enum EnumAltarTier { altarComponents.addAll(THREE.getAltarComponents()); for (int i = -3; i <= 3; i++) { - altarComponents.add(new AltarComponent(new BlockPos(5, -3, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-5, -3, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, 5), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -3, -5), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(5, -3, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-5, -3, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -3, 5), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -3, -5), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); } for (int i = -2; i <= 1; i++) { @@ -92,10 +92,10 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(8, -3, 8), Blocks.beacon)); for (int i = -6; i <= 6; i++) { - altarComponents.add(new AltarComponent(new BlockPos(8, -4, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-8, -4, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, 8), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -4, -8), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(8, -4, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-8, -4, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -4, 8), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -4, -8), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); } } }, @@ -117,10 +117,10 @@ public enum EnumAltarTier { altarComponents.add(new AltarComponent(new BlockPos(-11, 3, 11), ModBlocks.crystal)); for (int i = -9; i <= 9; i++) { - altarComponents.add(new AltarComponent(new BlockPos(11, -5, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(-11, -5, i), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, 11), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); - altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), ModBlocks.blood_rune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(11, -5, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(-11, -5, i), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -5, 11), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); + altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), ModBlocks.bloodRune).setUpgradeSlot().setBloodRune()); } } }; diff --git a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java index c20b5bfc..3ae84d57 100644 --- a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java @@ -40,6 +40,11 @@ public class SoulNetwork extends WorldSavedData { nbttagcompound.setInteger(NBTHolder.NBT_MAXORB, maxOrb); } + /** + * Used to syphon LP from the network. + * + * @return - . + */ public int syphon(int syphon) { if (getCurrentEssence() >= syphon) { setCurrentEssence(getCurrentEssence() - syphon); @@ -50,18 +55,27 @@ public class SoulNetwork extends WorldSavedData { return 0; } - public boolean syphonAndDamage(int syphon) { - SoulNetworkEvent.PlayerDrainNetworkEvent event = new SoulNetworkEvent.PlayerDrainNetworkEvent(getPlayer(), mapName, syphon); + public boolean syphonAndDamage(int toSyphon) { +// SoulNetworkEvent.PlayerDrainNetworkEvent event = new SoulNetworkEvent.PlayerDrainNetworkEvent(getPlayer(), mapName, syphon); +// +// if (MinecraftForge.EVENT_BUS.post(event)) +// return false; +// +// syphon(syphon); +// int drain = Math.max(0, getCurrentEssence() - syphon); +// +// if (drain == 0 || event.shouldDamage) +// hurtPlayer(event.syphon); +// +// return event.getResult() != Event.Result.DENY; - if (MinecraftForge.EVENT_BUS.post(event)) + if (player.worldObj.isRemote) return false; - int drain = syphon(event.syphon); + int drain = syphon(toSyphon); + hurtPlayer(toSyphon - drain); - if (drain == 0 || event.shouldDamage) - hurtPlayer(event.syphon); - - return event.getResult() != Event.Result.DENY; + return true; } public void hurtPlayer(int syphon) { diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index d3dc594b..98552106 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -30,12 +30,9 @@ public class ImperfectRitualRegistry { } public static ImperfectRitual getRitualForBlock(BlockStack blockStack) { - for (ImperfectRitual imperfectRitual : getRegistry().values()) { - if (imperfectRitual.getRequiredBlock().equals(blockStack)) { - System.out.println(imperfectRitual.toString()); + for (ImperfectRitual imperfectRitual : getRegistry().values()) + if (imperfectRitual.getRequiredBlock().equals(blockStack)) return imperfectRitual; - } - } return null; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 568b1539..824ed16d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -1,102 +1,73 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.BloodMagic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class BlockBloodRune extends Block -{ - public static final String[] names = { "speed", "efficiency", "sacrifice", "self_sacrifice", "displacement", "capacity", "orb_capacity", "better_capacity", "acceleration" }; - public static final PropertyInteger INTEGER = PropertyInteger.create("rune", 0, 5); +public class BlockBloodRune extends Block { - public BlockBloodRune() - { + public static final String[] names = { "blank", "speed", "efficiency", "sacrifice", "selfSacrifice", "displacement", "capacity", "augCapacity", "orb", "acceleration" }; + public static final PropertyInteger META = PropertyInteger.create("META", 0, names.length - 1); + + public BlockBloodRune() { super(Material.iron); - this.setDefaultState(this.blockState.getBaseState().withProperty(INTEGER, 0)); + + setUnlocalizedName(BloodMagic.MODID + ".rune."); + setCreativeTab(BloodMagic.tabBloodMagic); + setStepSound(soundTypeStone); setHardness(2.0F); setResistance(5.0F); + setHarvestLevel("pickaxe", 2); } - public int getRuneEffect(int metaData) - { - switch (metaData) - { - case 0: - return 0; - - case 1: //Altar Capacity rune - return 5; - - case 2: //Filling/emptying rune - return 6; - - case 3: //Orb Capacity rune - return 7; - - case 4: //Better Capacity rune - return 8; - - case 5: //Acceleration rune - return 9; - } - - return 0; + public int getRuneEffect(int meta) { + return meta; } @Override - protected BlockState createBlockState() - { - return new BlockState(this, INTEGER); + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(META, meta); } @Override - public IBlockState getStateFromMeta(int meta) - { - return this.getDefaultState().withProperty(INTEGER, meta); + public int getMetaFromState(IBlockState state) { + return (Integer) state.getValue(META); } @Override - public int getMetaFromState(IBlockState state) - { - return ((Integer)state.getValue(INTEGER)).intValue(); + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, META); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { + return new ItemStack(this, 1, this.getMetaFromState(world.getBlockState(pos))); } @Override @SideOnly(Side.CLIENT) - - /** - * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) - */ - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) - { - if (this.equals(ModBlocks.blood_rune)) - { - par3List.add(new ItemStack(par1, 1, 0)); - par3List.add(new ItemStack(par1, 1, 1)); - par3List.add(new ItemStack(par1, 1, 2)); - par3List.add(new ItemStack(par1, 1, 3)); - par3List.add(new ItemStack(par1, 1, 4)); - par3List.add(new ItemStack(par1, 1, 5)); - } - else - { - super.getSubBlocks(par1, par2CreativeTabs, par3List); - } - } - - @Override - public int damageDropped(IBlockState blockState) - { - return blockState.getBlock().damageDropped(blockState); + @SuppressWarnings("unchecked") + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < names.length; i++) + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index b7843e81..a8a1b666 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -36,6 +36,7 @@ public class BlockRitualController extends BlockContainer { setCreativeTab(BloodMagic.tabBloodMagic); setStepSound(soundTypeStone); setHardness(2.0F); + setResistance(5.0F); setHarvestLevel("pickaxe", 2); } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java index cba578d0..949ce9f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java @@ -5,17 +5,15 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class ItemBlockBloodRune extends ItemBlock -{ - public ItemBlockBloodRune(Block block) - { +public class ItemBlockBloodRune extends ItemBlock { + + public ItemBlockBloodRune(Block block) { super(block); setHasSubtypes(true); } @Override - public String getUnlocalizedName(ItemStack stack) - { + public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName(stack) + BlockBloodRune.names[stack.getItemDamage()]; } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index a4318533..0cd86056 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -16,10 +16,9 @@ import net.minecraft.item.ItemBlock; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; -public class ModBlocks -{ +public class ModBlocks { public static Block altar; - public static Block blood_rune; + public static Block bloodRune; public static Block ritualStone; public static Block lifeEssence; @@ -27,54 +26,52 @@ public class ModBlocks public static Block crystal; public static Block bloodStone; - public static void init() - { + public static void init() { FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence()); lifeEssence = registerBlock(new BlockLifeEssence()); altar = registerBlock(new BlockAltar()); - blood_rune = registerBlock(new BlockBloodRune(), ItemBlockBloodRune.class); + bloodRune = registerBlock(new BlockBloodRune(), ItemBlockBloodRune.class); ritualStone = registerBlock(new BlockRitualController(), ItemBlockRitualController.class); initTiles(); } - public static void initTiles() - { + public static void initTiles() { GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":" + TileImperfectRitualStone.class.getSimpleName()); GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":" + TileMasterRitualStone.class.getSimpleName()); } - public static void initRenders() - { + public static void initRenders() { InventoryRenderHelper renderHelper = BloodMagic.instance.getRenderHelper(); renderHelper.fluidRender(lifeEssence); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 2); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 3); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 4); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(blood_rune), 5); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 0); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 1); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 2); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 3); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 4); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 5); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 6); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 7); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 8); + renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), 9); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 0); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 1); } - private static Block registerBlock(Block block, Class itemBlock, String name) - { + private static Block registerBlock(Block block, Class itemBlock, String name) { if (!ConfigHandler.blockBlacklist.contains(name)) GameRegistry.registerBlock(block, itemBlock, name); return block; } - private static Block registerBlock(Block block, Class itemBlock) - { + private static Block registerBlock(Block block, Class itemBlock) { return registerBlock(block, itemBlock, block.getClass().getSimpleName()); } - private static Block registerBlock(Block block, String name) - { + private static Block registerBlock(Block block, String name) { if (!ConfigHandler.blockBlacklist.contains(name)) GameRegistry.registerBlock(block, name); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 028cf763..12728123 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -67,6 +67,7 @@ public class ModItems { renderHelper.itemRender(activationCrystal, 0); renderHelper.itemRender(activationCrystal, 1); + renderHelper.itemRender(activationCrystal, 2, "ItemActivationCrystal0"); renderHelper.itemRender(sigilDivination); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 5a06dd2c..7a302926 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -10,7 +10,7 @@ import net.minecraft.init.Blocks; public class ImperfectRitualNight extends ImperfectRitual { public ImperfectRitualNight() { - super("night", new BlockStack(Blocks.lapis_block), 5000, true); + super("night", new BlockStack(Blocks.lapis_block), 100, true); } @Override @@ -19,7 +19,7 @@ public class ImperfectRitualNight extends ImperfectRitual { boolean retFlag = false; if (!imperfectRitualStone.getWorld().isRemote) { - imperfectRitualStone.getWorld().addWeatherEffect(new EntityLightningBolt(imperfectRitualStone.getWorld(), imperfectRitualStone.getPos().getX(), imperfectRitualStone.getPos().getY() + 2, imperfectRitualStone.getPos().getZ())); +// imperfectRitualStone.getWorld().addWeatherEffect(new EntityLightningBolt(imperfectRitualStone.getWorld(), imperfectRitualStone.getPos().getX(), imperfectRitualStone.getPos().getY() + 2, imperfectRitualStone.getPos().getZ())); imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000 + 13800); retFlag = true; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index 8b4b47fd..028d3857 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -21,7 +21,6 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi public boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, EntityPlayer player) { if (imperfectRitual != null && ImperfectRitualRegistry.ritualEnabled(imperfectRitual)) { - System.out.println(imperfectRitual.toString()); NetworkHelper.getSoulNetwork(player.getDisplayNameString(), world).syphonAndDamage(imperfectRitual.getActivationCost()); return imperfectRitual.onActivate(this, player); } diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockBloodRune.json b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodRune.json new file mode 100644 index 00000000..32a9c43e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockBloodRune.json @@ -0,0 +1,62 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { }, + "model": "cube_all", + "uvlock": true + }, + "variants": { + "meta": { + "0": { + "textures": { + "all": "bloodmagic:blocks/BlankRune" + } + }, + "1": { + "textures": { + "all": "bloodmagic:blocks/SpeedRune" + } + }, + "2": { + "textures": { + "all": "bloodmagic:blocks/EfficiencyRune" + } + }, + "3": { + "textures": { + "all": "bloodmagic:blocks/RuneOfSacrifice" + } + }, + "4": { + "textures": { + "all": "bloodmagic:blocks/RuneOfSelfSacrifice" + } + }, + "5": { + "textures": { + "all": "bloodmagic:blocks/DislocationRune" + } + }, + "6": { + "textures": { + "all": "bloodmagic:blocks/AltarCapacityRune" + } + }, + "7": { + "textures": { + "all": "bloodmagic:blocks/BetterCapacityRune" + } + }, + "8": { + "textures": { + "all": "bloodmagic:blocks/OrbCapacityRune" + } + }, + "9": { + "textures": { + "all": "bloodmagic:blocks/AccelerationRune" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json b/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json index c4cb94ea..08b23293 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockRitualController.json @@ -1,9 +1,7 @@ { "forge_marker": 1, "defaults": { - "textures": { - "all": "bloodmagic:blocks/MasterRitualStone" - }, + "textures": { }, "model": "cube_all", "uvlock": true }, diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 6a0f7d54..598110a7 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -58,9 +58,21 @@ item.BloodMagic.sigil.divination.name=Divination Sigil # Blocks tile.BloodMagic.fluid.lifeEssence.name=Life Essence + tile.BloodMagic.stone.ritual.master.name=Master Ritual Stone tile.BloodMagic.stone.ritual.imperfect.name=Imperfect Ritual Stone + tile.BloodMagic.altar.name=Blood Altar +tile.BloodMagic.rune.blank.name=Blank Rune +tile.BloodMagic.rune.speed.name=Speed Rune +tile.BloodMagic.rune.efficiency.name=Efficiency Rune +tile.BloodMagic.rune.sacrifice.name=Rune of Sacrifice +tile.BloodMagic.rune.selfSacrifice.name=Rune of Self Sacrifice +tile.BloodMagic.rune.displacement.name=Displacement Rune +tile.BloodMagic.rune.capacity.name=Rune of Capacity +tile.BloodMagic.rune.augCapacity.name=Rune of Augmented Capacity +tile.BloodMagic.rune.orb.name=Rune of the Orb +tile.BloodMagic.rune.acceleration.name=Acceleration Rune # Tooltips tooltip.BloodMagic.orb.desc=Stores raw Life Essence @@ -70,4 +82,7 @@ tooltip.BloodMagic.sigil.air.desc=&oI feel lighter already... tooltip.BloodMagic.sigil.bloodLight.desc=&oI see a light! tooltip.BloodMagic.sigil.compression.desc=&oHands of Diamonds tooltip.BloodMagic.sigil.divination.desc=&oPeer into the soul -tooltip.BloodMagic.sigil.divination.currentEssence=Current Essence: %d LP \ No newline at end of file +tooltip.BloodMagic.sigil.divination.currentEssence=Current Essence: %d LP +tooltip.BloodMagic.activationCrystal.weak=Activates low-level rituals +tooltip.BloodMagic.activationCrystal.awakened=Activates more powerful rituals +tooltip.BloodMagic.activationCrystal.creative=Creative Only - Activates any ritual \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json new file mode 100644 index 00000000..51e1784a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/BlankRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune1.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune1.json new file mode 100644 index 00000000..93dd17da --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/SpeedRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json new file mode 100644 index 00000000..f1177342 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/EfficiencyRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune3.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune3.json new file mode 100644 index 00000000..1e68fe13 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/RuneOfSacrifice" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune4.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune4.json new file mode 100644 index 00000000..d2feea3c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/RuneOfSelfSacrifice" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune5.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune5.json new file mode 100644 index 00000000..ee2104be --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/DislocationRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune6.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune6.json new file mode 100644 index 00000000..e1c665ba --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/AltarCapacityRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune7.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune7.json new file mode 100644 index 00000000..8e20efd7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/BetterCapacityRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune8.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune8.json new file mode 100644 index 00000000..03cc3ff9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune8.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/OrbCapacityRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune9.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune9.json new file mode 100644 index 00000000..c007c8ca --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune9.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "bloodmagic:blocks/AccelerationRune" + } +} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json new file mode 100644 index 00000000..62b56db7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune0", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune1.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune1.json new file mode 100644 index 00000000..31e0c9f4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune1.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune1", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json new file mode 100644 index 00000000..2df21318 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune2", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune3.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune3.json new file mode 100644 index 00000000..f8a5db86 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune3.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune3", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune4.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune4.json new file mode 100644 index 00000000..0f720cb0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune4.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune4", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune5.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune5.json new file mode 100644 index 00000000..26321447 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune5.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune5", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune6.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune6.json new file mode 100644 index 00000000..4d061822 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune6.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune6", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune7.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune7.json new file mode 100644 index 00000000..c96861c7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune7.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune7", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune8.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune8.json new file mode 100644 index 00000000..5494dee6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune8.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune8", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune9.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune9.json new file mode 100644 index 00000000..4ac735f9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune9.json @@ -0,0 +1,10 @@ +{ + "parent": "bloodmagic:block/BlockBloodRune9", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file