apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Pick Block Results #170

Merged
SenseiKiwi merged 9 commits from master into master 2014-07-11 15:38:21 +00:00
Conversation 0 Commits 9 Files Changed 19 +64 -5
9 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d840ff895 - Show all commits

4
src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
View File

@@ -340,9 +340,9 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
*/
@Override
@SideOnly(Side.CLIENT)
public int idPicked(World par1World, int par2, int par3, int par4)
public int idPicked(World world, int x, int y, int z)
{
return this.getDrops();
return this.getDoorItem();
}
/**

8
src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
View File

@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.IconFlipped;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -36,6 +37,13 @@ public class BlockDoorGold extends BlockDoor
lowerTextures[1] = new IconFlipped(lowerTextures[0], true, false);
}
@Override
@SideOnly(Side.CLIENT)
public int idPicked(World world, int x, int y, int z)
{
return mod_pocketDim.itemGoldenDoor.itemID;
}
@Override
public int idDropped(int par1, Random par2Random, int par3)
{

6
src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
View File

@@ -34,6 +34,12 @@ public class BlockGoldDimDoor extends BaseDimDoor
}
}
@Override
public int getDoorItem()
{
return mod_pocketDim.itemGoldenDimensionalDoor.itemID;
}
@Override
public int getDrops()
{

7
src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
View File

@@ -3,6 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.config.DDProperties;
import StevenDimDoors.mod_pocketDim.core.DimLink;
import StevenDimDoors.mod_pocketDim.core.LinkTypes;
@@ -30,6 +31,12 @@ public class DimensionalDoor extends BaseDimDoor
}
}
@Override
public int getDoorItem()
{
return mod_pocketDim.itemDimensionalDoor.itemID;
}
@Override
public int getDrops()
{

2
src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
View File

@@ -12,5 +12,7 @@ public interface IDimDoor
public int getDrops();
public int getDoorItem();
public TileEntity initDoorTE(World world, int x, int y, int z);
}

19
src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
View File

@@ -2,6 +2,9 @@ package StevenDimDoors.mod_pocketDim.blocks;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockTrapDoor;
import net.minecraft.block.ITileEntityProvider;
@@ -100,17 +103,29 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit
}
}
@Override
@SideOnly(Side.CLIENT)
public int idPicked(World world, int x, int y, int z)
{
return this.getDoorItem();
}
@Override
public int idDropped(int metadata, Random random, int fortuneLevel)
{
return getDrops();
return this.getDrops();
}
@Override
public int getDoorItem()
{
return mod_pocketDim.transTrapdoor.blockID;
}
@Override
public int getDrops()
{
return Block.trapdoor.blockID;
return Block.trapdoor.blockID;
}
public static boolean isTrapdoorSetLow(int metadata)

6
src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
View File

@@ -73,6 +73,12 @@ public class TransientDoor extends BaseDimDoor
}
}
@Override
public int getDoorItem()
{
return 0;
}
@Override
public int getDrops()
{

8
src/main/java/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
View File

@@ -3,6 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.config.DDProperties;
import StevenDimDoors.mod_pocketDim.core.LinkTypes;
import StevenDimDoors.mod_pocketDim.core.NewDimData;
@@ -24,6 +25,13 @@ public class UnstableDoor extends BaseDimDoor
dimension.createLink(x, y, z, LinkTypes.RANDOM,world.getBlockMetadata(x, y - 1, z));
}
}
@Override
public int getDoorItem()
{
return mod_pocketDim.itemUnstableDoor.itemID;
}
@Override
public int getDrops()
{

7
src/main/java/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
View File

@@ -3,6 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.config.DDProperties;
import StevenDimDoors.mod_pocketDim.core.DimLink;
import StevenDimDoors.mod_pocketDim.core.LinkTypes;
@@ -30,6 +31,12 @@ public class WarpDoor extends BaseDimDoor
}
}
@Override
public int getDoorItem()
{
return mod_pocketDim.itemWarpDoor.itemID;
}
@Override
public int getDrops()
{