Merge pull request #431 from Arcaratus/bloodmagic1.8

JSON and the Arghhhh-onauts
1.12
WayofTime 2015-08-24 17:34:00 -04:00
commit 8bdd1f8b8f
83 changed files with 541 additions and 18 deletions

View File

@ -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.

View File

@ -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"));

View File

@ -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();
}

View File

@ -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;

View File

@ -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;

View File

@ -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;
}
}

View File

@ -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)
{

View File

@ -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)
{

View File

@ -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()
{

View File

@ -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)
{

View File

@ -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)
{

View File

@ -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

View File

@ -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)

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:soul_armour_forge" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:bloodstone_brick" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:efficiency_rune" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:empty_socket" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:enchantment_glyph" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:filled_socket" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:imperfect_ritual_stone" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:large_bloodstone_brick" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:master_ritual_stone" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:sacrifice_rune" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:self_sacrifice_rune" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:spectral_block" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:block/speed_rune" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:spell_table" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:stability_glyph" }
}
}

View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "alchemicalwizardry:teleposer" }
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/SoulForge"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/SoulForge"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/SoulForge"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/BlankRune"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/AltarCapacityRune"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/BloodStoneBrick"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/EfficiencyRune"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/EmptySocket"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/GlyphEnchantmentLevel"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/BloodSocket"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/ImperfectRitualStone"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/LargeBloodStoneBrick"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/MasterStone"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/RuneOfSacrifice"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/RuneOfSelfSacrifice"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/SpectralBlock"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/SpeedRune"
}
}

View File

@ -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"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "alchemicalwizardry:blocks/GlyphStability"
}
}

View File

@ -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"
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -1,5 +1,5 @@
{
"parent":"hemomancy:block/soul_armour_forge",
"parent":"alchemicalwizardry:block/soul_armour_forge",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

View File

@ -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 ]
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B