Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Feb 1, 2014
1 parent 48402e1 commit ffd383d
Show file tree
Hide file tree
Showing 44 changed files with 224 additions and 205 deletions.
17 changes: 12 additions & 5 deletions build.gradle
View file
Expand Up @@ -9,16 +9,23 @@
buildscript {
repositories {
mavenCentral()
mavenLocal()
maven {
name = 'ForgeFS'
url = 'http://files.minecraftforge.net/maven'
}
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}

}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
}
}


repositories {
ivy {
name 'Forge FS legacy'
Expand Down Expand Up @@ -69,9 +76,9 @@ if (configFile2.exists()){

dependencies {
compile "mantle:Mantle:${config.mantle_version}:dev"
compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar'
compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar'
compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar'
//compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar'
//compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar'
//compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar'
}

// Finds and sets version data
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/tconstruct/blocks/ConveyorBase.java
View file
Expand Up @@ -36,7 +36,7 @@ public boolean isBlockReplaceable (World world, int x, int y, int z)
}

@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
public AxisAlignedBB func_149668_a (World world, int x, int y, int z)
{
return null;
}
Expand Down Expand Up @@ -118,19 +118,19 @@ public boolean func_149686_d ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}

@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}

@Override
public int getRenderType ()
public int func_149645_b ()
{
return SlimeChannelRender.model;
}
Expand All @@ -149,7 +149,7 @@ public void func_149651_a (IIconRegister iconRegister)

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
if (meta >= 8)
return icons[0];
Expand Down
21 changes: 17 additions & 4 deletions src/main/java/tconstruct/blocks/CraftingStationBlock.java
View file
Expand Up @@ -6,6 +6,7 @@
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
Expand Down Expand Up @@ -40,7 +41,7 @@ public String[] getTextureNames ()
}

@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return icons[meta * 3 + getTextureIndex(side)];
}
Expand All @@ -62,13 +63,13 @@ public boolean func_149686_d ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}

@Override
public int getRenderType ()
public int func_149645_b ()
{
return TableRender.tabelModelID;
}
Expand Down Expand Up @@ -104,11 +105,23 @@ public Object getModInstance ()
}

@Override
public void getSubBlocks (Block b, CreativeTabs tab, List list)
public void func_149666_a (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 1; iter++)
{
list.add(new ItemStack(b, 1, iter));
}
}

@Override
public TileEntity func_149915_a (World var1, int metadata)
{
switch (metadata)
{
case 0:
return new CraftingStationLogic();
default:
return null;
}
}
}
15 changes: 7 additions & 8 deletions src/main/java/tconstruct/blocks/DryingRack.java
View file
Expand Up @@ -8,7 +8,6 @@
import tconstruct.library.TConstructRegistry;
import mantle.blocks.abstracts.InventoryBlock;
import tconstruct.library.tools.AbilityHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
Expand Down Expand Up @@ -40,7 +39,7 @@ public TileEntity func_149915_a (World world, int metadata)
}

@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}
Expand Down Expand Up @@ -78,7 +77,7 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving livi

/* Activation */
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
{
return activateDryingRack(world, x, y, z, player);
}
Expand Down Expand Up @@ -203,12 +202,12 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z)
public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity)
{
this.setBlockBoundsBasedOnState(world, x, y, z);
super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity);
super.func_149743_a(world, x, y, z, aabb, list, entity);
}

/* Rendering */
@Override
public int getRenderType ()
public int func_149645_b ()
{
return DryingRackRender.model;
}
Expand All @@ -222,9 +221,9 @@ public String[] getTextureNames ()
}

@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return Blocks.planks.getIcon(side, 0);
return Blocks.planks.func_149691_a(side, 0);
}

public int getTextureIndex (int side)
Expand All @@ -244,7 +243,7 @@ public boolean func_149686_d ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/blocks/EquipBlock.java
View file
Expand Up @@ -58,13 +58,13 @@ public boolean func_149686_d ()
}

@Override
public boolean isOpaqueCube ()
public boolean func_149662_c ()
{
return false;
}

@Override
public int getRenderType ()
public int func_149645_b ()
{
return FrypanRender.frypanModelID;
}
Expand Down Expand Up @@ -122,7 +122,7 @@ public void func_149689_a (World par1World, int par2, int par3, int par4, Entity
@Override
public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta)
{
TileEntity te = par1World.getBlockTileEntity(x, y, z);
TileEntity te = par1World.func_147438_o(x, y, z);

if (te != null && te instanceof EquipLogic)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/GlassPaneStained.java
View file
Expand Up @@ -34,7 +34,7 @@ public int getRenderBlockPass ()
}

@Override
public int damageDropped (int par1)
public int func_149692_a (int par1)
{
return par1;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/GravelOre.java
View file
Expand Up @@ -37,7 +37,7 @@ public void registerIcons (IIconRegister iconRegister)
}

@Override
public IIcon getIcon (int side, int meta)
public IIcon func_149691_a (int side, int meta)
{
return icons[meta];
}
Expand All @@ -52,7 +52,7 @@ public float getBlockHardness (World world, int x, int y, int z)
}

@Override
public int damageDropped (int meta)
public int func_149692_a (int meta)
{
/*if (meta == 1)
return 0;*/
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/tconstruct/blocks/LavaTankBlock.java
View file
Expand Up @@ -11,6 +11,7 @@
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
Expand Down Expand Up @@ -157,13 +158,13 @@ public TileEntity func_149915_a (World world, int metadata)
}

@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ)
{
ItemStack heldItem = player.inventory.getCurrentItem();
if (heldItem != null)
{
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem());
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
if (liquid != null)
{
int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false);
Expand Down Expand Up @@ -237,11 +238,11 @@ public TileEntity createNewTileEntity (World world)
}

@Override
public void getSubBlocks (int id, CreativeTabs tab, List list)
public void getSubBlocks (Item i, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 3; iter++)
{
list.add(new ItemStack(id, 1, iter));
list.add(new ItemStack(i, 1, iter));
}
}

Expand All @@ -254,7 +255,7 @@ public int damageDropped (int meta)
/* Updates */
public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID)
{
TileEntity logic = world.getBlockTileEntity(x, y, z);
TileEntity logic = world.func_147438_o(x, y, z);
if (logic instanceof IServantLogic)
{
((IServantLogic) logic).notifyMasterOfChange();
Expand All @@ -267,7 +268,7 @@ public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int
player.addExhaustion(0.025F);
int meta = world.getBlockMetadata(x, y, z);
ItemStack stack = new ItemStack(this, 1, meta);
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
FluidStack liquid = logic.tank.getFluid();
if (liquid != null)
{
Expand Down Expand Up @@ -311,7 +312,7 @@ public void func_149689_a (World world, int x, int y, int z, EntityLivingBase li
if (liquidTag != null)
{
FluidStack liquid = FluidStack.loadFluidStackFromNBT(liquidTag);
LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z);
LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z);
logic.tank.setFluid(liquid);
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/tconstruct/blocks/component/SmelteryScan.java
View file
Expand Up @@ -130,15 +130,14 @@ public void readNetworkNBT (NBTTagCompound tags)
{
super.readNetworkNBT(tags);

NBTTagList tanks = tags.getTagList("Tanks");
NBTTagList tanks = tags.func_150295_c("Tanks",11);
if (tanks != null)
{
lavaTanks.clear();

for (int i = 0; i < tanks.tagCount(); ++i)
{
NBTTagIntArray tag = (NBTTagIntArray) tanks.tagAt(i);
int[] coord = tag.intArray;
int[] coord = tanks.func_150306_c(i);
layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2]));
}
}
Expand All @@ -152,7 +151,7 @@ public void writeNetworkNBT (NBTTagCompound tags)
NBTTagList tanks = new NBTTagList();
for (CoordTuple coord : lavaTanks)
{
tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z }));
tanks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z }));
}
tags.setTag("Tanks", tanks);
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
View file
Expand Up @@ -517,9 +517,9 @@ public void func_145839_a (NBTTagCompound tags)
super.func_145839_a(tags);
readNetworkNBT(tags);

structure.func_145839_a(tags);
multitank.func_145839_a(tags);
smeltery.func_145839_a(tags);
structure.readFromNBT(tags);
multitank.readFromNBT(tags);
smeltery.readFromNBT(tags);
}

public void readNetworkNBT (NBTTagCompound tags)
Expand All @@ -539,9 +539,9 @@ public void func_145841_b (NBTTagCompound tags)
super.func_145841_b(tags);
writeNetworkNBT(tags);

structure.func_145841_b(tags);
multitank.func_145841_b(tags);
smeltery.func_145841_b(tags);
structure.writeToNBT(tags);
multitank.writeToNBT(tags);
smeltery.writeToNBT(tags);
}

public void writeNetworkNBT (NBTTagCompound tags)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
View file
Expand Up @@ -293,7 +293,7 @@ public int getLiquidAmount ()

/* Updating */
@Override
public void updateEntity ()
public void func_145845_h ()
{
if (castingDelay > 0)
{
Expand Down Expand Up @@ -370,7 +370,7 @@ public void writeCustomNBT (NBTTagCompound tags)
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
tags.setBoolean("Initialized", init);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java
View file
Expand Up @@ -547,7 +547,7 @@ public void writeCustomNBT (NBTTagCompound tags)
if (liquid != null)
{
NBTTagCompound nbt = new NBTTagCompound();
liquid.func_145841_b(nbt);
liquid.writeToNBT(nbt);
tags.setTag("Fluid", nbt);
}
tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider));
Expand Down

0 comments on commit ffd383d

Please sign in to comment.