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

Various Updates #144

Merged
SenseiKiwi merged 28 commits from master into master 2014-03-24 18:45:47 +00:00
Conversation 0 Commits 28 Files Changed 56 +22 -21
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f2f86535b - Show all commits

39
src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -81,42 +81,43 @@ public class EventHookContainer
@ForgeSubscribe @ForgeSubscribe
public void onPlayerEvent(PlayerInteractEvent event) public void onPlayerEvent(PlayerInteractEvent event)
{ {
//Handle placement of vanilla doors on rifts // Handle placing Vanilla doors on rifts
if(!event.entity.worldObj.isRemote) if (!event.entity.worldObj.isRemote)
{ {
World world = event.entity.worldObj; World world = event.entity.worldObj;
ItemStack item = event.entityPlayer.inventory.getCurrentItem(); ItemStack stack = event.entityPlayer.inventory.getCurrentItem();
if(item!=null) if (stack != null)
{ {
if(item.getItem() instanceof ItemDoor&&!(item.getItem() instanceof BaseItemDoor)) Item item = stack.getItem();
if (item instanceof ItemDoor && !(item instanceof BaseItemDoor))
{ {
Block doorToPlace = null; Block doorToPlace = null;
if(item.itemID == Item.doorIron.itemID) if (stack.itemID == Item.doorIron.itemID)
{ {
doorToPlace =mod_pocketDim.dimensionalDoor; doorToPlace = mod_pocketDim.dimensionalDoor;
} }
else if(item.itemID == Item.doorWood.itemID) else if (stack.itemID == Item.doorWood.itemID)
{ {
doorToPlace =mod_pocketDim.warpDoor; doorToPlace = mod_pocketDim.warpDoor;
} }
else if(item.itemID == mod_pocketDim.itemGoldenDoor.itemID) else if (stack.itemID == mod_pocketDim.itemGoldenDoor.itemID)
{ {
doorToPlace =mod_pocketDim.goldenDimensionalDoor; doorToPlace = mod_pocketDim.goldenDimensionalDoor;
} }
if(((BaseItemDoor) mod_pocketDim.itemDimensionalDoor).tryPlacingDoor(doorToPlace, world, event.entityPlayer,item))
// SenseiKiwi: Why do we have a condition like this? And the event isn't cancelled if we take the else portion.
// Comments would have been very helpful.
if (mod_pocketDim.itemDimensionalDoor.tryPlacingDoor(doorToPlace, world, event.entityPlayer, stack))
{ {
if(!event.entityPlayer.capabilities.isCreativeMode) if (!event.entityPlayer.capabilities.isCreativeMode)
{ {
item.stackSize--; stack.stackSize--;
}
if(!event.entity.worldObj.isRemote)
{
event.setCanceled(true);
} }
event.setCanceled(true);
} }
else else
{ {
BaseItemDoor.tryItemUse(doorToPlace, item, event.entityPlayer, world, event.x, event.y, event.z, event.face, true, true); BaseItemDoor.tryItemUse(doorToPlace, stack, event.entityPlayer, world, event.x, event.y, event.z, event.face, true, true);
} }
} }
} }

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

@@ -124,7 +124,7 @@ public class mod_pocketDim
public static Item itemWorldThread; public static Item itemWorldThread;
public static Item itemRiftBlade; public static Item itemRiftBlade;
public static Item itemDimensionalDoor; public static ItemDimensionalDoor itemDimensionalDoor;
public static Item itemWarpDoor; public static Item itemWarpDoor;
public static Item itemRiftRemover; public static Item itemRiftRemover;
public static Item itemRiftSignature; public static Item itemRiftSignature;
@@ -203,7 +203,7 @@ public class mod_pocketDim
itemGoldenDimensionalDoor = (new ItemGoldDimDoor(properties.GoldenDimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemGoldDimDoor"); itemGoldenDimensionalDoor = (new ItemGoldDimDoor(properties.GoldenDimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemGoldDimDoor");
itemGoldenDoor = (new ItemGoldDoor(properties.GoldenDoorID, Material.wood)).setUnlocalizedName("itemGoldDoor"); itemGoldenDoor = (new ItemGoldDoor(properties.GoldenDoorID, Material.wood)).setUnlocalizedName("itemGoldDoor");
itemDimensionalDoor = (new ItemDimensionalDoor(properties.DimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemDimDoor"); itemDimensionalDoor = (ItemDimensionalDoor) (new ItemDimensionalDoor(properties.DimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemDimDoor");
itemWarpDoor = (new ItemWarpDoor(properties.WarpDoorItemID, Material.wood)).setUnlocalizedName("itemDimDoorWarp"); itemWarpDoor = (new ItemWarpDoor(properties.WarpDoorItemID, Material.wood)).setUnlocalizedName("itemDimDoorWarp");
itemRiftSignature = (new ItemRiftSignature(properties.RiftSignatureItemID)).setUnlocalizedName("itemLinkSignature"); itemRiftSignature = (new ItemRiftSignature(properties.RiftSignatureItemID)).setUnlocalizedName("itemLinkSignature");
itemRiftRemover = (new itemRiftRemover(properties.RiftRemoverItemID, Material.wood)).setUnlocalizedName("itemRiftRemover"); itemRiftRemover = (new itemRiftRemover(properties.RiftRemoverItemID, Material.wood)).setUnlocalizedName("itemRiftRemover");