From 841fcffcb1c049f23a9b6c6bc4dd3c61387dd9cf Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Mon, 11 Nov 2013 03:41:14 -0500 Subject: [PATCH] fixes --- StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java | 10 +++++++++- .../mod_pocketDim/blocks/BlockGoldDimDoor.java | 3 ++- StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java | 2 +- .../mod_pocketDim/world/GatewayGenerator.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java index 5e715402..1cbd1732 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java @@ -1,5 +1,7 @@ package StevenDimDoors.mod_pocketDim.blocks; +import java.util.Random; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import StevenDimDoors.mod_pocketDim.DDProperties; @@ -7,6 +9,7 @@ import StevenDimDoors.mod_pocketDim.mod_pocketDim; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; @@ -29,8 +32,13 @@ public class BlockDoorGold extends BlockDoor { this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_top"); this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom"); - } + } + public int idDropped(int par1, Random par2Random, int par3) + { + return mod_pocketDim.itemGoldDoor.itemID; + } + @Override public Icon getIcon(int par1, int par2) { diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java b/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java index 4dad5c0b..7753cb1f 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java @@ -1,6 +1,7 @@ package StevenDimDoors.mod_pocketDim.blocks; import StevenDimDoors.mod_pocketDim.DDProperties; +import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.core.DimLink; import StevenDimDoors.mod_pocketDim.core.LinkTypes; import StevenDimDoors.mod_pocketDim.core.NewDimData; @@ -37,7 +38,7 @@ public class BlockGoldDimDoor extends BaseDimDoor @Override public int getDrops() { - return this.properties.GoldDoorItemID; + return mod_pocketDim.itemGoldDoor.itemID; } @Override diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java index a47d7e98..531d736e 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java @@ -27,7 +27,7 @@ public class TransientDoor extends BaseDimDoor public void enterDimDoor(World world, int x, int y, int z, Entity entity) { // We need to ignore particle entities - if (world.isRemote || entity instanceof EntityFX) + if (world.isRemote) { return; } diff --git a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java b/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java index a37ce803..6b0dd0ad 100644 --- a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java @@ -101,7 +101,7 @@ public class GatewayGenerator implements IWorldGenerator if (link == null) { dimension = PocketManager.getDimensionData(world); - link = dimension.createLink(x, y + 1, z, LinkTypes.POCKET); + link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON); } else {