diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java index 188f481c..1ceda668 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java @@ -2,10 +2,8 @@ package WayofTime.bloodmagic.api.soul; import net.minecraft.util.IStringSerializable; import lombok.Getter; -import lombok.RequiredArgsConstructor; @Getter -@RequiredArgsConstructor public enum EnumDemonWillType implements IStringSerializable { DEFAULT("Default"), @@ -15,4 +13,8 @@ public enum EnumDemonWillType implements IStringSerializable STEADFAST("Steadfast"); public final String name; + + EnumDemonWillType(String name) { + this.name = name; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 868d900b..07960416 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -21,8 +22,13 @@ import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockAltar extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockAltar extends BlockContainer implements IVariantProvider { public BlockAltar() { @@ -150,4 +156,10 @@ public class BlockAltar extends BlockContainer super.breakBlock(world, blockPos, blockState); } + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index b74cf906..ce273c93 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -1,11 +1,17 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockBloodRune extends BlockString +import java.util.ArrayList; +import java.util.List; + +public class BlockBloodRune extends BlockString implements IVariantProvider { public static final String[] names = { "blank", "speed", "efficiency", "sacrifice", "selfSacrifice", "displacement", "capacity", "augCapacity", "orb", "acceleration", "charging" }; @@ -26,4 +32,12 @@ public class BlockBloodRune extends BlockString { return meta; } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index 7768953c..2b8ade80 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -1,11 +1,17 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockBloodStoneBrick extends BlockString +import java.util.ArrayList; +import java.util.List; + +public class BlockBloodStoneBrick extends BlockString implements IVariantProvider { public static final String[] names = { "large", "brick" }; @@ -21,4 +27,12 @@ public class BlockBloodStoneBrick extends BlockString setStepSound(soundTypeStone); setHarvestLevel("pickaxe", 2); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java index 76b12ea0..d410109e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java @@ -1,11 +1,17 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockCrystal extends BlockString +import java.util.ArrayList; +import java.util.List; + +public class BlockCrystal extends BlockString implements IVariantProvider { public static final String[] names = { "large", "brick" }; @@ -21,4 +27,12 @@ public class BlockCrystal extends BlockString setResistance(5.0F); setHarvestLevel("pickaxe", 2); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 57f445ed..286280d0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -15,8 +16,13 @@ import WayofTime.bloodmagic.api.soul.IDemonWillGem; import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockDemonCrucible extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockDemonCrucible extends BlockContainer implements IVariantProvider { public BlockDemonCrucible() { @@ -95,4 +101,11 @@ public class BlockDemonCrucible extends BlockContainer super.breakBlock(world, blockPos, blockState); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 395f10cf..9f04043e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -10,8 +11,13 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileDemonCrystallizer; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockDemonCrystallizer extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockDemonCrystallizer extends BlockContainer implements IVariantProvider { public BlockDemonCrystallizer() { @@ -62,4 +68,11 @@ public class BlockDemonCrystallizer extends BlockContainer { return new TileDemonCrystallizer(); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 32ae9992..befb6273 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -7,8 +8,13 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileDemonPylon; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockDemonPylon extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockDemonPylon extends BlockContainer implements IVariantProvider { public BlockDemonPylon() { @@ -53,4 +59,11 @@ public class BlockDemonPylon extends BlockContainer { return new TileDemonPylon(); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 7c264ac1..422d2be2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -9,8 +10,13 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileIncenseAltar; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockIncenseAltar extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockIncenseAltar extends BlockContainer implements IVariantProvider { public BlockIncenseAltar() { @@ -65,4 +71,11 @@ public class BlockIncenseAltar extends BlockContainer super.breakBlock(world, blockPos, blockState); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index f731127c..ba1dea5c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; @@ -8,8 +9,13 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockString; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockPath extends BlockString implements IIncensePath +import java.util.ArrayList; +import java.util.List; + +public class BlockPath extends BlockString implements IIncensePath, IVariantProvider { public static final String[] names = { "wood", "woodTile", "stone", "stoneTile", "wornstone", "wornstoneTile", "obsidian", "obsidianTile" }; @@ -55,4 +61,12 @@ public class BlockPath extends BlockString implements IIncensePath return 0; } } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 5d31bde6..b397dd75 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.block; +import java.util.ArrayList; +import java.util.List; import java.util.Random; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,8 +20,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TilePhantomBlock; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockPhantom extends BlockContainer +public class BlockPhantom extends BlockContainer implements IVariantProvider { public BlockPhantom() { @@ -87,4 +92,11 @@ public class BlockPhantom extends BlockContainer { return new TilePhantomBlock(100); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 451c3ec4..63d0d00a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -20,8 +21,13 @@ import WayofTime.bloodmagic.registry.ModItems; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.ChatUtil; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockRitualController extends BlockStringContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockRitualController extends BlockStringContainer implements IVariantProvider { public static final String[] names = { "master", "imperfect" }; @@ -98,4 +104,12 @@ public class BlockRitualController extends BlockStringContainer { return meta == 0 ? (new TileMasterRitualStone()) : (new TileImperfectRitualStone()); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 5401d6aa..25f91d27 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; @@ -10,8 +11,13 @@ import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.block.base.BlockString; import WayofTime.bloodmagic.registry.ModBlocks; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockRitualStone extends BlockString implements IRitualStone +import java.util.ArrayList; +import java.util.List; + +public class BlockRitualStone extends BlockString implements IRitualStone, IVariantProvider { public static final String[] names = { "blank", "water", "fire", "earth", "air", "dusk", "dawn" }; @@ -47,4 +53,12 @@ public class BlockRitualStone extends BlockString implements IRitualStone IBlockState newState = ModBlocks.ritualStone.getStateFromMeta(meta); world.setBlockState(pos, newState); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + for (int i = 0; i < names.length; i++) + ret.add(new ImmutablePair(i, "type=" + names[i])); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 10c55587..642909bc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -11,8 +12,13 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileSoulForge; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockSoulForge extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockSoulForge extends BlockContainer implements IVariantProvider { public BlockSoulForge() { @@ -77,4 +83,11 @@ public class BlockSoulForge extends BlockContainer { return new TileSoulForge(); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 17a3fdf5..f3d14264 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -1,8 +1,10 @@ package WayofTime.bloodmagic.block; +import java.util.ArrayList; import java.util.List; import java.util.Random; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -17,8 +19,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileSpectralBlock; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockSpectral extends BlockContainer +public class BlockSpectral extends BlockContainer implements IVariantProvider { public BlockSpectral() { @@ -76,4 +80,11 @@ public class BlockSpectral extends BlockContainer { return new TileSpectralBlock(); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 3035df6f..5a0087b6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -13,8 +14,13 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; -public class BlockTeleposer extends BlockContainer +import java.util.ArrayList; +import java.util.List; + +public class BlockTeleposer extends BlockContainer implements IVariantProvider { public BlockTeleposer() { @@ -61,4 +67,11 @@ public class BlockTeleposer extends BlockContainer { return new TileTeleposer(); } + + @Override + public List> getVariants() { + List> ret = new ArrayList>(); + ret.add(new ImmutablePair(0, "normal")); + return ret; + } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 12577e59..6d511421 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -165,49 +165,15 @@ public class ModBlocks InventoryRenderHelperV2 renderHelperV2 = BloodMagic.proxy.getRenderHelperV2(); renderHelper.fluidRender(lifeEssence); - for (int i = 0; i < BlockBloodRune.names.length; i++) - { - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), i); - } - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(altar)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualController), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualController), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 2); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 3); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 4); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 5); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 6); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodStoneBrick), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodStoneBrick), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(crystal), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(crystal), 1); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodLight)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 0); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(teleposer)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(alchemyArray)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(spectralBlock)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(phantomBlock)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(soulForge)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(outputRoutingNode)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(inputRoutingNode)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(masterRoutingNode)); renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(itemRoutingNode)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(incenseAltar)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonCrucible)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonCrystallizer)); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 0); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 1); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 2); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 3); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 4); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 5); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 6); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 7); - renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonPylon)); renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 0, "ItemBlockDemonCrystal", "default"); renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 1, "ItemBlockDemonCrystal", "corrosive"); renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 2, "ItemBlockDemonCrystal", "destructive"); @@ -219,8 +185,10 @@ public class ModBlocks private static Block registerBlock(Block block, Class itemBlock, String name) { - if (!ConfigHandler.blockBlacklist.contains(name)) - GameRegistry.registerBlock(block, itemBlock, name); + if (!ConfigHandler.blockBlacklist.contains(name)) { + GameRegistry.registerBlock(block, itemBlock); + BloodMagic.proxy.tryHandleBlockModel(block, name); + } return block; } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index a06dd276..d7691fc0 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -266,37 +266,6 @@ public class ModItems renderHelper.itemRender(bucketEssence); -// renderHelper.itemRender(sigilDivination); -// renderHelper.itemRender(sigilAir); -// renderHelper.itemRender(sigilWater); -// renderHelper.itemRender(sigilLava); -// renderHelper.itemRender(sigilVoid); -// renderHelper.itemRender(sigilGreenGrove, 0); -// renderHelper.itemRender(sigilGreenGrove, 1); -// renderHelper.itemRender(sigilBloodLight); -// renderHelper.itemRender(sigilElementalAffinity, 0); -// renderHelper.itemRender(sigilElementalAffinity, 1); -// renderHelper.itemRender(sigilMagnetism, 0); -// renderHelper.itemRender(sigilMagnetism, 1); -// renderHelper.itemRender(sigilSuppression, 0); -// renderHelper.itemRender(sigilSuppression, 1); -// renderHelper.itemRender(sigilHaste, 0); -// renderHelper.itemRender(sigilHaste, 1); -// renderHelper.itemRender(sigilFastMiner, 0); -// renderHelper.itemRender(sigilFastMiner, 1); -// renderHelper.itemRender(sigilSeer); -// renderHelper.itemRender(sigilPhantomBridge, 0); -// renderHelper.itemRender(sigilPhantomBridge, 1); -// renderHelper.itemRender(sigilWhirlwind, 0); -// renderHelper.itemRender(sigilWhirlwind, 1); -// renderHelper.itemRender(sigilCompression, 0); -// renderHelper.itemRender(sigilCompression, 1); -// renderHelper.itemRender(sigilEnderSeverance, 0); -// renderHelper.itemRender(sigilEnderSeverance, 1); -// -// renderHelper.itemRender(sigilTeleposition); -// renderHelper.itemRender(sigilTransposition); - renderHelper.itemRender(sentientBow, 0, "ItemSentientBow"); renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0"); renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1"); diff --git a/src/main/resources/assets/bloodmagic/blockstates/BlockAltar.json b/src/main/resources/assets/bloodmagic/blockstates/BlockAltar.json index 38345ee1..e97777c1 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/BlockAltar.json +++ b/src/main/resources/assets/bloodmagic/blockstates/BlockAltar.json @@ -31,7 +31,7 @@ }, "gui": { "translation": [ 0, -0.15, -0.03 ], - "scale": [ 1.04, 1.04, 1.04 ] + "scale": [ 1, 1, 1 ] } } }] diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json deleted file mode 100644 index 51e1784a..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 93dd17da..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/SpeedRune" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune10.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune10.json deleted file mode 100644 index ccbe9e63..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ChargingRune" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json deleted file mode 100644 index f1177342..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 1e68fe13..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index d2feea3c..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ee2104be..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index e1c665ba..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 8e20efd7..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 03cc3ff9..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index c007c8ca..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodRune9.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/AccelerationRune" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json deleted file mode 100644 index 362bbd0b..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/LargeBloodStoneBrick" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json b/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json deleted file mode 100644 index 081b0b64..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockBloodStoneBrick1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/BloodStoneBrick" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json deleted file mode 100644 index 6e7787eb..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ShardCluster" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json b/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json deleted file mode 100644 index ad9dce6c..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockCrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ShardClusterBrick" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json deleted file mode 100644 index 2cda0fc9..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/WoodBrickPath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json deleted file mode 100644 index 68e93a2e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/WoodTilePath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json deleted file mode 100644 index dde569d0..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/StoneBrickPath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json deleted file mode 100644 index 92b5df04..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/StoneTilePath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json deleted file mode 100644 index 0b3d7b70..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/WornStoneBrickPath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json deleted file mode 100644 index 695c4658..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath5.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/WornStoneTilePath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json deleted file mode 100644 index 4a2f5ebf..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath6.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ObsidianBrickPath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json b/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json deleted file mode 100644 index 89e8daa1..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockPath7.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ObsidianTilePath" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualController0.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualController0.json deleted file mode 100644 index 6723e5e9..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualController0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/MasterRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualController1.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualController1.json deleted file mode 100644 index 4c2b559e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualController1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/ImperfectRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone0.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone0.json deleted file mode 100644 index 1a936326..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/RitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone1.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone1.json deleted file mode 100644 index fbe92e67..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/WaterRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone2.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone2.json deleted file mode 100644 index 7a72cfb8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/FireRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone3.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone3.json deleted file mode 100644 index d64c897e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/EarthRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone4.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone4.json deleted file mode 100644 index 113fbce0..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/AirRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone5.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone5.json deleted file mode 100644 index 82a6751e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/DuskRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone6.json b/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone6.json deleted file mode 100644 index 75200e70..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockRitualStone6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/LightRitualStone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/BlockTeleposer.json b/src/main/resources/assets/bloodmagic/models/block/BlockTeleposer.json deleted file mode 100644 index d3a31bd3..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/BlockTeleposer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "block/orientable", - "textures": { - "top": "bloodmagic:blocks/Teleposer_Top", - "side": "bloodmagic:blocks/Teleposer_Side", - "front": "bloodmagic:blocks/Teleposer_Side", - "bottom": "bloodmagic:blocks/Teleposer_Side" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json deleted file mode 100644 index 62b56db7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 31e0c9f4..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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/BlockBloodRune10.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune10.json deleted file mode 100644 index bc553b9d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune10.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockBloodRune10", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json deleted file mode 100644 index 2df21318..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index f8a5db86..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 0f720cb0..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 26321447..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 4d061822..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index c96861c7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 5494dee6..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 4ac735f9..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodRune9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockBloodStoneBrick0.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodStoneBrick0.json deleted file mode 100644 index 4b300767..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodStoneBrick0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockBloodStoneBrick0", - "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/BlockBloodStoneBrick1.json b/src/main/resources/assets/bloodmagic/models/item/BlockBloodStoneBrick1.json deleted file mode 100644 index 50350c00..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockBloodStoneBrick1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockBloodStoneBrick1", - "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/BlockCrystal0.json b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json deleted file mode 100644 index b5780718..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockCrystal0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockCrystal0", - "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/BlockCrystal1.json b/src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json deleted file mode 100644 index c111c164..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockCrystal1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockCrystal1", - "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/BlockPath0.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath0.json deleted file mode 100644 index ce8cdb83..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath0", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath1.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath1.json deleted file mode 100644 index 27715321..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath1", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath2.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath2.json deleted file mode 100644 index 6a23c1fe..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath2", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json deleted file mode 100644 index 71d76e69..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath3.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath3", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json deleted file mode 100644 index 65edf404..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath4.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath4", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json deleted file mode 100644 index db5f20a7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath5.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath5", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json deleted file mode 100644 index e41fd824..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath6.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath6", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json b/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json deleted file mode 100644 index b7f845bb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockPath7.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockPath7", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualController0.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualController0.json deleted file mode 100644 index eb4808ef..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualController0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualController0", - "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/BlockRitualController1.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualController1.json deleted file mode 100644 index db9900d1..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualController1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualController1", - "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/BlockRitualStone0.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone0.json deleted file mode 100644 index 2b6b4a92..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone0", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone1.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone1.json deleted file mode 100644 index 4badac0c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone1", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone2.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone2.json deleted file mode 100644 index 678f5582..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone2", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone3.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone3.json deleted file mode 100644 index 72ebfc67..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone3.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone3", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone4.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone4.json deleted file mode 100644 index 6920fffa..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone4.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone4", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone5.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone5.json deleted file mode 100644 index 10db8434..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone5.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone5", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone6.json b/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone6.json deleted file mode 100644 index e8ae0c87..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockRitualStone6.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockRitualStone6", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/BlockTeleposer.json b/src/main/resources/assets/bloodmagic/models/item/BlockTeleposer.json deleted file mode 100644 index d777beb7..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/BlockTeleposer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/BlockTeleposer", - "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