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

Fixed TEBellJar calls (may need to be changed back again...)

Browse source
This commit is contained in:
WayofTime 2015-07-30 20:50:48 -04:00
parent b5d9e3ee58
commit 1bd90ff01c
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBelljar.java
View file

@ -3,7 +3,6 @@ package WayofTime.alchemicalWizardry.common.block;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -18,12 +17,13 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainer;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
import net.minecraftforge.fml.relauncher.Side; import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBelljar extends BlockContainer public class BlockBelljar extends BlockContainer
{ {
@ -77,12 +77,12 @@ public class BlockBelljar extends BlockContainer
{ {
TileEntity tile = world.getTileEntity(blockPos); TileEntity tile = world.getTileEntity(blockPos);
if (tile instanceof TEBelljar) if (tile instanceof TEBellJar)
{ {
NBTTagCompound tag = stack.getTagCompound(); NBTTagCompound tag = stack.getTagCompound();
if (tag != null) if (tag != null)
{ {
((TEBelljar) tile).readTankNBTOnPlace(tag); ((TEBellJar) tile).readTankNBTOnPlace(tag);
} }
} }
} }
@ -90,7 +90,7 @@ public class BlockBelljar extends BlockContainer
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) public TileEntity createNewTileEntity(World world, int meta)
{ {
return new TEBelljar(); return new TEBellJar();
} }
@Override @Override
@ -121,9 +121,9 @@ public class BlockBelljar extends BlockContainer
public int getComparatorInputOverride(World world, BlockPos blockPos) public int getComparatorInputOverride(World world, BlockPos blockPos)
{ {
TileEntity tile = world.getTileEntity(blockPos); TileEntity tile = world.getTileEntity(blockPos);
if (tile instanceof TEBelljar) if (tile instanceof TEBellJar)
{ {
return ((TEBelljar) tile).getRSPowerOutput(); return ((TEBellJar) tile).getRSPowerOutput();
} }
return 15; return 15;
} }
@ -142,11 +142,11 @@ public class BlockBelljar extends BlockContainer
TileEntity tile = world.getTileEntity(blockPos); TileEntity tile = world.getTileEntity(blockPos);
if (tile instanceof TEBelljar) if (tile instanceof TEBellJar)
{ {
ItemStack drop = new ItemStack(this); ItemStack drop = new ItemStack(this);
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
((TEBelljar) tile).writeTankNBT(tag); ((TEBellJar) tile).writeTankNBT(tag);
drop.setTagCompound(tag); drop.setTagCompound(tag);
list.add(drop); list.add(drop);

7
src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderCrystalBelljar.java
View file

@ -1,12 +1,10 @@
package WayofTime.alchemicalWizardry.common.renderer.block; package WayofTime.alchemicalWizardry.common.renderer.block;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.FMLClientHandler;
@ -16,6 +14,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentContainerInfo;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelCrystalBelljar; import WayofTime.alchemicalWizardry.common.renderer.model.ModelCrystalBelljar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
public class RenderCrystalBelljar extends TileEntitySpecialRenderer public class RenderCrystalBelljar extends TileEntitySpecialRenderer
{ {
@ -26,9 +25,9 @@ public class RenderCrystalBelljar extends TileEntitySpecialRenderer
@Override @Override
public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i) public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f, int i)
{ {
if (tileEntity instanceof TEBelljar) if (tileEntity instanceof TEBellJar)
{ {
TEBelljar tileAltar = (TEBelljar) tileEntity; TEBellJar tileAltar = (TEBellJar) tileEntity;
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/CrystalBelljar.png"); ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/CrystalBelljar.png");