From 660ff4255e7da6b6a36b3e8477ca56a114e11bf2 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Wed, 25 Jun 2014 14:33:19 -0400 Subject: [PATCH] Code Cleaning 1. Cleaned up some spacing and unused imports in EventHookContainer. Also changed an indirect reference to BaseItemDoor.trytoPlaceDoor() to a direct reference seeing as the function is static and should be accessed that way. 2. Renamed getDoortoItemMapping() to getDoorBlock(). The original named had a minor capitalization mistake and implied that it would return a mapping table or would associate doors to items. The function actually associates items to door blocks. --- .../mod_pocketDim/EventHookContainer.java | 10 +++------- .../mod_pocketDim/items/BaseItemDoor.java | 6 +++--- .../mod_pocketDim/items/ItemDimensionalDoor.java | 2 +- .../mod_pocketDim/items/ItemGoldDimDoor.java | 2 +- .../mod_pocketDim/items/ItemUnstableDoor.java | 2 +- .../mod_pocketDim/items/ItemWarpDoor.java | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 4e47d8f..773877b 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -1,14 +1,11 @@ package StevenDimDoors.mod_pocketDim; -import net.minecraft.block.Block; import net.minecraft.client.audio.SoundManager; import net.minecraft.client.audio.SoundPoolEntry; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemDoor; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; @@ -20,7 +17,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.terraingen.InitMapGenEvent; import net.minecraftforge.event.world.WorldEvent; -import StevenDimDoors.mod_pocketDim.blocks.BaseDimDoor; import StevenDimDoors.mod_pocketDim.config.DDProperties; import StevenDimDoors.mod_pocketDim.core.DDTeleporter; import StevenDimDoors.mod_pocketDim.core.PocketManager; @@ -84,7 +80,7 @@ public class EventHookContainer public void onPlayerEvent(PlayerInteractEvent event) { // Handle all door placement here - if(event.action == Action.LEFT_CLICK_BLOCK) + if (event.action == Action.LEFT_CLICK_BLOCK) { return; } @@ -92,9 +88,9 @@ public class EventHookContainer ItemStack stack = event.entityPlayer.inventory.getCurrentItem(); if (stack != null && stack.getItem() instanceof ItemDoor) { - if(BaseItemDoor.getDoorToPlace(stack.getItem())!=null) + if (BaseItemDoor.getDoorToPlace(stack.getItem()) != null) { - if (mod_pocketDim.itemDimensionalDoor.tryToPlaceDoor(stack, event.entityPlayer, world, + if (BaseItemDoor.tryToPlaceDoor(stack, event.entityPlayer, world, event.x, event.y, event.z, event.face)) { // Cancel the event so that we don't get two doors from vanilla doors diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java index dafcd91..ddd2502 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java @@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim.items; import java.util.HashMap; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -64,7 +65,7 @@ public abstract class BaseItemDoor extends ItemDoor * * @return */ - protected abstract BaseDimDoor getDoortoItemMapping(); + protected abstract BaseDimDoor getDoorBlock(); /** * Overriden here to remove vanilla block placement functionality from @@ -73,7 +74,6 @@ public abstract class BaseItemDoor extends ItemDoor @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - // TODO Auto-generated method stub return false; } @@ -87,7 +87,7 @@ public abstract class BaseItemDoor extends ItemDoor { return null; } - return ((BaseItemDoor) item).getDoortoItemMapping(); + return ((BaseItemDoor) item).getDoorBlock(); } /** diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java index d6bb9ce..18f123d 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java @@ -28,7 +28,7 @@ public class ItemDimensionalDoor extends BaseItemDoor } @Override - protected BaseDimDoor getDoortoItemMapping() + protected BaseDimDoor getDoorBlock() { return (BaseDimDoor) mod_pocketDim.dimensionalDoor; } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java index 9dde8f5..abf9f09 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java @@ -28,7 +28,7 @@ public class ItemGoldDimDoor extends BaseItemDoor } @Override - protected BaseDimDoor getDoortoItemMapping() + protected BaseDimDoor getDoorBlock() { return (BaseDimDoor) mod_pocketDim.goldenDimensionalDoor; } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java index c859443..e51bcaa 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java @@ -25,7 +25,7 @@ public class ItemUnstableDoor extends BaseItemDoor } @Override - protected BaseDimDoor getDoortoItemMapping() + protected BaseDimDoor getDoorBlock() { return (BaseDimDoor) mod_pocketDim.unstableDoor; } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java index 35c5737..403bbc1 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java @@ -28,7 +28,7 @@ public class ItemWarpDoor extends BaseItemDoor } @Override - protected BaseDimDoor getDoortoItemMapping() + protected BaseDimDoor getDoorBlock() { return (BaseDimDoor) mod_pocketDim.warpDoor; }