From d15c4f2c8e62596e67835539c0da436f3d821e28 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Mon, 24 Aug 2015 17:27:49 -0400 Subject: [PATCH] JSON and the Arghhhh-onauts --- .../AlchemicalWizardry.java | 4 ++-- .../client/BlockRenderer.java | 22 ++++++++++++++++++ .../client/ClientProxy.java | 5 ++-- .../client/InventoryRenderHelper.java | 1 + .../common/block/BlockBloodRune.java | 11 ++++----- .../common/block/BlockEmptySocket.java | 16 +++++++++++++ .../common/block/BlockFilledSocket.java | 6 +++++ .../common/block/BlockMasterStone.java | 6 +++++ .../common/block/BlockSpectral.java | 20 ++++++++++++++++ .../common/block/BlockSpellTable.java | 6 +++++ .../common/block/BlockTeleposer.java | 6 +++++ .../common/items/ItemComponents.java | 2 +- .../common/tileEntity/TESpectralBlock.java | 5 ---- .../blockstates/COPY THIS - Copy (17).json | 5 ++++ .../blockstates/COPY THIS - Copy (18).json | 5 ++++ .../blockstates/COPY THIS - Copy (19).json | 5 ++++ .../blockstates/COPY THIS - Copy (20).json | 5 ++++ .../blockstates/COPY THIS - Copy (21).json | 5 ++++ .../blockstates/COPY THIS - Copy (22).json | 5 ++++ .../blockstates/COPY THIS - Copy (23).json | 5 ++++ .../blockstates/COPY THIS - Copy (24).json | 5 ++++ .../blockstates/COPY THIS - Copy.json | 5 ++++ .../blockstates/COPY THIS.json | 5 ++++ .../blockstates/bloodstone_brick.json | 5 ++++ .../blockstates/efficiency_rune.json | 5 ++++ .../blockstates/empty_socket.json | 5 ++++ .../blockstates/enchantment_glyph.json | 5 ++++ .../blockstates/filled_socket.json | 5 ++++ .../blockstates/imperfect_ritual_stone.json | 5 ++++ .../blockstates/large_bloodstone_brick.json | 5 ++++ .../blockstates/master_ritual_stone.json | 5 ++++ .../blockstates/sacrifice_rune.json | 5 ++++ .../blockstates/self_sacrifice_rune.json | 5 ++++ .../blockstates/spectral_block.json | 5 ++++ .../blockstates/speed_rune.json | 5 ++++ .../blockstates/spell_table.json | 5 ++++ .../blockstates/stability_glyph.json | 5 ++++ .../blockstates/teleposer.json | 5 ++++ .../models/block/COPY THIS - Copy (18).json | 6 +++++ .../models/block/COPY THIS - Copy.json | 6 +++++ .../models/block/COPY THIS.json | 6 +++++ .../models/block/base_rune.json | 6 +++++ .../models/block/base_rune_capacity.json | 6 +++++ .../models/block/bloodstone_brick.json | 6 +++++ .../models/block/efficiency_rune.json | 6 +++++ .../models/block/empty_socket.json | 6 +++++ .../models/block/enchantment_glyph.json | 6 +++++ .../models/block/filled_socket.json | 6 +++++ .../models/block/imperfect_ritual_stone.json | 6 +++++ .../models/block/large_bloodstone_brick.json | 6 +++++ .../models/block/master_ritual_stone.json | 6 +++++ .../models/block/sacrifice_rune.json | 6 +++++ .../models/block/self_sacrifice_rune.json | 6 +++++ .../models/block/spectral_block.json | 6 +++++ .../models/block/speed_rune.json | 6 +++++ .../models/block/spell_table.json | 12 ++++++++++ .../models/block/stability_glyph.json | 6 +++++ .../models/block/teleposer.json | 12 ++++++++++ .../models/item/COPY THIS - Copy (15).json | 10 ++++++++ .../models/item/COPY THIS - Copy (16).json | 10 ++++++++ .../models/item/COPY THIS - Copy.json | 10 ++++++++ .../models/item/COPY THIS.json | 10 ++++++++ .../models/item/bloodstone_brick.json | 10 ++++++++ .../models/item/efficiency_rune.json | 10 ++++++++ .../models/item/empty_socket.json | 10 ++++++++ .../models/item/enchantment_glyph.json | 10 ++++++++ .../models/item/filled_socket.json | 10 ++++++++ .../models/item/imperfect_ritual_stone.json | 10 ++++++++ .../models/item/large_bloodstone_brick.json | 10 ++++++++ .../models/item/master_ritual_stone.json | 10 ++++++++ .../models/item/sacrifice_rune.json | 10 ++++++++ .../models/item/self_sacrifice_rune.json | 10 ++++++++ .../models/item/soul_armour_forge.json | 2 +- .../models/item/spectral_block.json | 10 ++++++++ .../models/item/speed_rune.json | 10 ++++++++ .../models/item/spell_table.json | 10 ++++++++ .../models/item/stability_glyph.json | 10 ++++++++ .../models/item/teleposer.json | 10 ++++++++ ...GlyphStability1.png => GlyphStability.png} | Bin .../textures/blocks/HomHeart_top1.png | Bin 197 -> 0 bytes ...eart_bottom.png => spell_table_bottom.png} | Bin ...HomHeart_side.png => spell_table_side.png} | Bin .../{HomHeart_top.png => spell_table_top.png} | Bin 83 files changed, 541 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (17).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (18).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (19).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (20).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (21).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (22).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (23).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (24).json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/efficiency_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/empty_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/enchantment_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/filled_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/imperfect_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/large_bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/master_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/self_sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/spectral_block.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/speed_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/spell_table.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/stability_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/blockstates/teleposer.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy (18).json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/base_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/base_rune_capacity.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/efficiency_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/empty_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/enchantment_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/filled_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/imperfect_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/large_bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/master_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/self_sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/spectral_block.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/speed_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/spell_table.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/stability_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/teleposer.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (15).json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (16).json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/efficiency_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/empty_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/enchantment_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/filled_socket.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/imperfect_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/large_bloodstone_brick.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/master_ritual_stone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/self_sacrifice_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/spectral_block.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/speed_rune.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/spell_table.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/stability_glyph.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/teleposer.json rename src/main/resources/assets/alchemicalwizardry/textures/blocks/{GlyphStability1.png => GlyphStability.png} (100%) delete mode 100644 src/main/resources/assets/alchemicalwizardry/textures/blocks/HomHeart_top1.png rename src/main/resources/assets/alchemicalwizardry/textures/blocks/{HomHeart_bottom.png => spell_table_bottom.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/blocks/{HomHeart_side.png => spell_table_side.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/blocks/{HomHeart_top.png => spell_table_top.png} (100%) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 11836664..60bf2a37 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -269,7 +269,7 @@ import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiHandler; //import WayofTime.alchemicalWizardry.common.tweaker.MineTweakerIntegration; -@Mod(modid = "AWWayofTime", name = "AlchemicalWizardry", version = "v1.3.3", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory") +@Mod(modid = "AlchemicalWizardry", name = "AlchemicalWizardry", version = "v1.3.3", guiFactory = "WayofTime.alchemicalWizardry.client.gui.ConfigGuiFactory") public class AlchemicalWizardry { public static String MODID = "AWWayofTime"; //Temporary @@ -461,7 +461,7 @@ public class AlchemicalWizardry public static Fluid lifeEssenceFluid; // The instance of your mod that Forge uses. - @Instance("AWWayofTime") + @Instance("AlchemicalWizardry") public static AlchemicalWizardry instance; // Says where the client and server 'proxy' code is loaded. diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/BlockRenderer.java b/src/main/java/WayofTime/alchemicalWizardry/client/BlockRenderer.java index 8ade0296..9fc4b342 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/BlockRenderer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/BlockRenderer.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.client; +import WayofTime.alchemicalWizardry.ModBlocks; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -7,6 +8,27 @@ import net.minecraft.item.Item; public class BlockRenderer { + public static void registerBlockRenders() + { + registerBlock(ModBlocks.armourForge); + registerBlock(ModBlocks.speedRune); + registerBlock(ModBlocks.efficiencyRune); + registerBlock(ModBlocks.bloodSocket); + registerBlock(ModBlocks.emptySocket); + registerBlock(ModBlocks.blockEnchantmentGlyph); + registerBlock(ModBlocks.blockStabilityGlyph); + registerBlock(ModBlocks.runeOfSelfSacrifice); + registerBlock(ModBlocks.runeOfSacrifice); + registerBlock(ModBlocks.bloodStoneBrick); + registerBlock(ModBlocks.largeBloodStoneBrick); + registerBlock(ModBlocks.blockMasterStone); + registerBlock(ModBlocks.ritualStone); + registerBlock(ModBlocks.blockTeleposer); + registerBlock(ModBlocks.blockSpellTable); + registerBlock(ModBlocks.imperfectRitualStone); + registerBlock(ModBlocks.spectralBlock); + } + public static void registerBlock(Block block) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), 0, new ModelResourceLocation("alchemicalwizardry:" + block.getUnlocalizedName().substring(5), "inventory")); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index 9f33dd25..a63e6810 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -104,8 +104,6 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; public class ClientProxy extends CommonProxy { - public static int renderPass; - @Override public void registerPostSideObjects() { @@ -170,7 +168,8 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockSpellModifier), new TESpellModifierBlockItemRenderer()); MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockAlchemicalCalcinator), new TEAlchemicalCalcinatorItemRenderer()); MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.blockCrystalBelljar), new TEBellJarItemRenderer()); - + + BlockRenderer.registerBlockRenders(); InventoryRenderHelper.registerItems(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java index 2e2dd419..6f39d62d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.client; +import WayofTime.alchemicalWizardry.common.block.BlockBloodRune; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java index 7bf74a8d..0c98f2bc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; @@ -22,7 +21,7 @@ public class BlockBloodRune extends Block public BlockBloodRune() { super(Material.iron); - this.setDefaultState(this.blockState.getBaseState().withProperty(INTEGER, Integer.valueOf(0))); + this.setDefaultState(this.blockState.getBaseState().withProperty(INTEGER, 0)); setHardness(2.0F); setResistance(5.0F); } @@ -30,13 +29,13 @@ public class BlockBloodRune extends Block @Override protected BlockState createBlockState() { - return new BlockState(this, new IProperty[] {INTEGER}); + return new BlockState(this, INTEGER); } @Override public IBlockState getStateFromMeta(int meta) { - return this.getDefaultState().withProperty(INTEGER, Integer.valueOf(meta)); + return this.getDefaultState().withProperty(INTEGER, meta); } @Override @@ -45,9 +44,9 @@ public class BlockBloodRune extends Block return ((Integer)state.getValue(INTEGER)).intValue(); } - public int getRuneEffect(int metaData) + public int getRuneEffect(int meta) { - switch (metaData) + switch (meta) { case 0: return 0; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java index 8aa7e951..b51d876d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java @@ -2,6 +2,9 @@ package WayofTime.alchemicalWizardry.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class BlockEmptySocket extends Block { @@ -17,4 +20,17 @@ public class BlockEmptySocket extends Block { return false; } + + @Override + @SideOnly(Side.CLIENT) + public EnumWorldBlockLayer getBlockLayer() + { + return EnumWorldBlockLayer.CUTOUT; + } + + @Override + public boolean isFullCube() + { + return false; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java index d59b4cb9..4ea85129 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java @@ -27,6 +27,12 @@ public class BlockFilledSocket extends BlockContainer //func_111022_d("AlchemicalWizardry:blocks"); } + @Override + public int getRenderType() + { + return 3; + } + @Override public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java index d30f3e5e..f39df1a5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java @@ -23,6 +23,12 @@ public class BlockMasterStone extends BlockContainer setResistance(5.0F); } + @Override + public int getRenderType() + { + return 3; + } + @Override public void onBlockHarvested(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java index 5ad9f527..4b34cddd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -25,6 +26,25 @@ public class BlockSpectral extends BlockContainer super(Material.rock); } + @Override + public int getRenderType() + { + return 3; + } + + @Override + @SideOnly(Side.CLIENT) + public EnumWorldBlockLayer getBlockLayer() + { + return EnumWorldBlockLayer.TRANSLUCENT; + } + + @Override + public boolean isFullCube() + { + return false; + } + @Override public boolean isOpaqueCube() { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java index 89b4746e..295647dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java @@ -22,6 +22,12 @@ public class BlockSpellTable extends BlockContainer setResistance(5.0F); } + @Override + public int getRenderType() + { + return 3; + } + @Override public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java index 56a31494..4214646f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java @@ -38,6 +38,12 @@ public class BlockTeleposer extends BlockContainer setResistance(5.0F); } + @Override + public int getRenderType() + { + return 3; + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index 07872f66..5f728a5f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -32,7 +32,7 @@ public class ItemComponents extends Item { //This is what will do all the localisation things on the alchemy components so you dont have to set it :D int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ITEM_NAMES.length - 1); - return (getUnlocalizedName() + "." + ITEM_NAMES[meta]); + return getUnlocalizedName() + "." + ITEM_NAMES[meta]; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralBlock.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralBlock.java index 56ddd107..527369df 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralBlock.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralBlock.java @@ -35,11 +35,6 @@ public class TESpectralBlock extends TileEntity implements IUpdatePlayerListBox @Override public void update() { - if (worldObj.isRemote) - { - return; - } - this.ticksRemaining--; if (this.ticksRemaining <= 0) diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (17).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (17).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (17).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (18).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (18).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (18).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (19).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (19).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (19).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (20).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (20).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (20).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (21).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (21).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (21).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (22).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (22).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (22).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (23).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (23).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (23).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (24).json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (24).json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy (24).json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy.json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy.json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS - Copy.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS.json b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS.json new file mode 100644 index 00000000..e2dcb2d7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/COPY THIS.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:soul_armour_forge" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/blockstates/bloodstone_brick.json new file mode 100644 index 00000000..b5a7ec7e --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/bloodstone_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:bloodstone_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/efficiency_rune.json b/src/main/resources/assets/alchemicalwizardry/blockstates/efficiency_rune.json new file mode 100644 index 00000000..43c011ac --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/efficiency_rune.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:efficiency_rune" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/empty_socket.json b/src/main/resources/assets/alchemicalwizardry/blockstates/empty_socket.json new file mode 100644 index 00000000..7e2a3053 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/empty_socket.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:empty_socket" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/enchantment_glyph.json b/src/main/resources/assets/alchemicalwizardry/blockstates/enchantment_glyph.json new file mode 100644 index 00000000..8161fc2d --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/enchantment_glyph.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:enchantment_glyph" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/filled_socket.json b/src/main/resources/assets/alchemicalwizardry/blockstates/filled_socket.json new file mode 100644 index 00000000..8e2a3b24 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/filled_socket.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:filled_socket" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/imperfect_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/blockstates/imperfect_ritual_stone.json new file mode 100644 index 00000000..5d69d7e7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/imperfect_ritual_stone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:imperfect_ritual_stone" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/large_bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/blockstates/large_bloodstone_brick.json new file mode 100644 index 00000000..f6042869 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/large_bloodstone_brick.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:large_bloodstone_brick" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/master_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/blockstates/master_ritual_stone.json new file mode 100644 index 00000000..10df39aa --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/master_ritual_stone.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:master_ritual_stone" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/blockstates/sacrifice_rune.json new file mode 100644 index 00000000..3eb95118 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/sacrifice_rune.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:sacrifice_rune" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/self_sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/blockstates/self_sacrifice_rune.json new file mode 100644 index 00000000..85ca29ae --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/self_sacrifice_rune.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:self_sacrifice_rune" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/spectral_block.json b/src/main/resources/assets/alchemicalwizardry/blockstates/spectral_block.json new file mode 100644 index 00000000..49ea73b2 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/spectral_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:spectral_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/speed_rune.json b/src/main/resources/assets/alchemicalwizardry/blockstates/speed_rune.json new file mode 100644 index 00000000..afd9cbb7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/speed_rune.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:block/speed_rune" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/spell_table.json b/src/main/resources/assets/alchemicalwizardry/blockstates/spell_table.json new file mode 100644 index 00000000..dbd40b5b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/spell_table.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:spell_table" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/stability_glyph.json b/src/main/resources/assets/alchemicalwizardry/blockstates/stability_glyph.json new file mode 100644 index 00000000..310b45b2 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/stability_glyph.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:stability_glyph" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/teleposer.json b/src/main/resources/assets/alchemicalwizardry/blockstates/teleposer.json new file mode 100644 index 00000000..9bfb252e --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/teleposer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "alchemicalwizardry:teleposer" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy (18).json b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy (18).json new file mode 100644 index 00000000..b455a113 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy (18).json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/SoulForge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy.json b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy.json new file mode 100644 index 00000000..b455a113 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS - Copy.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/SoulForge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS.json b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS.json new file mode 100644 index 00000000..b455a113 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/COPY THIS.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/SoulForge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/base_rune.json b/src/main/resources/assets/alchemicalwizardry/models/block/base_rune.json new file mode 100644 index 00000000..9288187b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/base_rune.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/BlankRune" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/base_rune_capacity.json b/src/main/resources/assets/alchemicalwizardry/models/block/base_rune_capacity.json new file mode 100644 index 00000000..31f1f2eb --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/base_rune_capacity.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/AltarCapacityRune" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/models/block/bloodstone_brick.json new file mode 100644 index 00000000..78e64cbd --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/bloodstone_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/BloodStoneBrick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/efficiency_rune.json b/src/main/resources/assets/alchemicalwizardry/models/block/efficiency_rune.json new file mode 100644 index 00000000..62b7e2c3 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/efficiency_rune.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/EfficiencyRune" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/empty_socket.json b/src/main/resources/assets/alchemicalwizardry/models/block/empty_socket.json new file mode 100644 index 00000000..d01f9189 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/empty_socket.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/EmptySocket" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/enchantment_glyph.json b/src/main/resources/assets/alchemicalwizardry/models/block/enchantment_glyph.json new file mode 100644 index 00000000..07ed3572 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/enchantment_glyph.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/GlyphEnchantmentLevel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/filled_socket.json b/src/main/resources/assets/alchemicalwizardry/models/block/filled_socket.json new file mode 100644 index 00000000..313d13cd --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/filled_socket.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/BloodSocket" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/imperfect_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/models/block/imperfect_ritual_stone.json new file mode 100644 index 00000000..260e3a11 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/imperfect_ritual_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/ImperfectRitualStone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/large_bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/models/block/large_bloodstone_brick.json new file mode 100644 index 00000000..9222ba94 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/large_bloodstone_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/LargeBloodStoneBrick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/master_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/models/block/master_ritual_stone.json new file mode 100644 index 00000000..5a12f0c5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/master_ritual_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/MasterStone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/models/block/sacrifice_rune.json new file mode 100644 index 00000000..9aa7994f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/sacrifice_rune.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/RuneOfSacrifice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/self_sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/models/block/self_sacrifice_rune.json new file mode 100644 index 00000000..27d3b5f4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/self_sacrifice_rune.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/RuneOfSelfSacrifice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/spectral_block.json b/src/main/resources/assets/alchemicalwizardry/models/block/spectral_block.json new file mode 100644 index 00000000..99ad6e21 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/spectral_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/SpectralBlock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/speed_rune.json b/src/main/resources/assets/alchemicalwizardry/models/block/speed_rune.json new file mode 100644 index 00000000..f707fb81 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/speed_rune.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/SpeedRune" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/spell_table.json b/src/main/resources/assets/alchemicalwizardry/models/block/spell_table.json new file mode 100644 index 00000000..425f4ecb --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/spell_table.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "alchemicalwizardry:blocks/spell_table_top", + "down": "alchemicalwizardry:blocks/spell_table_bottom", + "up": "alchemicalwizardry:blocks/spell_table_top", + "north": "alchemicalwizardry:blocks/spell_table_side", + "east": "alchemicalwizardry:blocks/spell_table_side", + "south": "alchemicalwizardry:blocks/spell_table_side", + "west": "alchemicalwizardry:blocks/spell_table_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/stability_glyph.json b/src/main/resources/assets/alchemicalwizardry/models/block/stability_glyph.json new file mode 100644 index 00000000..e15bb41b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/stability_glyph.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/GlyphStability" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/teleposer.json b/src/main/resources/assets/alchemicalwizardry/models/block/teleposer.json new file mode 100644 index 00000000..aab8fe87 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/teleposer.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "alchemicalwizardry:blocks/Teleposer_Side", + "down": "alchemicalwizardry:blocks/Teleposer_Side", + "up": "alchemicalwizardry:blocks/Teleposer_Top", + "north": "alchemicalwizardry:blocks/Teleposer_Side", + "east": "alchemicalwizardry:blocks/Teleposer_Side", + "south": "alchemicalwizardry:blocks/Teleposer_Side", + "west": "alchemicalwizardry:blocks/Teleposer_Side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (15).json b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (15).json new file mode 100644 index 00000000..0576a3b4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (15).json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/soul_armour_forge", + "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/alchemicalwizardry/models/item/COPY THIS - Copy (16).json b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (16).json new file mode 100644 index 00000000..0576a3b4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy (16).json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/soul_armour_forge", + "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/alchemicalwizardry/models/item/COPY THIS - Copy.json b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy.json new file mode 100644 index 00000000..0576a3b4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS - Copy.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/soul_armour_forge", + "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/alchemicalwizardry/models/item/COPY THIS.json b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS.json new file mode 100644 index 00000000..0576a3b4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/COPY THIS.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/soul_armour_forge", + "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/alchemicalwizardry/models/item/bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/models/item/bloodstone_brick.json new file mode 100644 index 00000000..c5319346 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/bloodstone_brick.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/bloodstone_brick", + "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/alchemicalwizardry/models/item/efficiency_rune.json b/src/main/resources/assets/alchemicalwizardry/models/item/efficiency_rune.json new file mode 100644 index 00000000..6b1ff806 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/efficiency_rune.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/efficiency_rune", + "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/alchemicalwizardry/models/item/empty_socket.json b/src/main/resources/assets/alchemicalwizardry/models/item/empty_socket.json new file mode 100644 index 00000000..647c104f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/empty_socket.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/empty_socket", + "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/alchemicalwizardry/models/item/enchantment_glyph.json b/src/main/resources/assets/alchemicalwizardry/models/item/enchantment_glyph.json new file mode 100644 index 00000000..e2460a34 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/enchantment_glyph.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/enchantment_glyph", + "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/alchemicalwizardry/models/item/filled_socket.json b/src/main/resources/assets/alchemicalwizardry/models/item/filled_socket.json new file mode 100644 index 00000000..a88f5285 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/filled_socket.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/filled_socket", + "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/alchemicalwizardry/models/item/imperfect_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/models/item/imperfect_ritual_stone.json new file mode 100644 index 00000000..3a239abc --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/imperfect_ritual_stone.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/imperfect_ritual_stone", + "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/alchemicalwizardry/models/item/large_bloodstone_brick.json b/src/main/resources/assets/alchemicalwizardry/models/item/large_bloodstone_brick.json new file mode 100644 index 00000000..008eee3b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/large_bloodstone_brick.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/large_bloodstone_brick", + "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/alchemicalwizardry/models/item/master_ritual_stone.json b/src/main/resources/assets/alchemicalwizardry/models/item/master_ritual_stone.json new file mode 100644 index 00000000..b343dc9b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/master_ritual_stone.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/master_ritual_stone", + "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/alchemicalwizardry/models/item/sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/models/item/sacrifice_rune.json new file mode 100644 index 00000000..6c13bacd --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sacrifice_rune.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/sacrifice_rune", + "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/alchemicalwizardry/models/item/self_sacrifice_rune.json b/src/main/resources/assets/alchemicalwizardry/models/item/self_sacrifice_rune.json new file mode 100644 index 00000000..74875d3d --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/self_sacrifice_rune.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/self_sacrifice_rune", + "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/alchemicalwizardry/models/item/soul_armour_forge.json b/src/main/resources/assets/alchemicalwizardry/models/item/soul_armour_forge.json index ca3e1dff..0576a3b4 100644 --- a/src/main/resources/assets/alchemicalwizardry/models/item/soul_armour_forge.json +++ b/src/main/resources/assets/alchemicalwizardry/models/item/soul_armour_forge.json @@ -1,5 +1,5 @@ { - "parent":"hemomancy:block/soul_armour_forge", + "parent":"alchemicalwizardry:block/soul_armour_forge", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/spectral_block.json b/src/main/resources/assets/alchemicalwizardry/models/item/spectral_block.json new file mode 100644 index 00000000..93355b48 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/spectral_block.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/spectral_block", + "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/alchemicalwizardry/models/item/speed_rune.json b/src/main/resources/assets/alchemicalwizardry/models/item/speed_rune.json new file mode 100644 index 00000000..86177fc2 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/speed_rune.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/speed_rune", + "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/alchemicalwizardry/models/item/spell_table.json b/src/main/resources/assets/alchemicalwizardry/models/item/spell_table.json new file mode 100644 index 00000000..6c9f0e04 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/spell_table.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/spell_table", + "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/alchemicalwizardry/models/item/stability_glyph.json b/src/main/resources/assets/alchemicalwizardry/models/item/stability_glyph.json new file mode 100644 index 00000000..256b7c82 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/stability_glyph.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/stability_glyph", + "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/alchemicalwizardry/models/item/teleposer.json b/src/main/resources/assets/alchemicalwizardry/models/item/teleposer.json new file mode 100644 index 00000000..8a02909d --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/teleposer.json @@ -0,0 +1,10 @@ +{ + "parent":"alchemicalwizardry:block/teleposer", + "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/alchemicalwizardry/textures/blocks/GlyphStability1.png b/src/main/resources/assets/alchemicalwizardry/textures/blocks/GlyphStability.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/blocks/GlyphStability1.png rename to src/main/resources/assets/alchemicalwizardry/textures/blocks/GlyphStability.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/blocks/HomHeart_top1.png b/src/main/resources/assets/alchemicalwizardry/textures/blocks/HomHeart_top1.png deleted file mode 100644 index d8ad8f9e4d4c223d00daf0ed92a2223ee4e87127..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#E{Cu%tD^n2_m_b}vY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zJ5b!()5S4F