/*
 * This file is part of Sponge, licensed under the MIT License (MIT).
 *
 * Copyright (c) SpongePowered.org <http://www.spongepowered.org>
 * Copyright (c) contributors
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */
package org.spongepowered.api;

import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.item.Item;

import javax.annotation.Nullable;

/**
 * Provides an easy way to retrieve objects from the {@link Game} based on their ids.
 */
public interface GameRegistry {

    /**
     * Gets a {@link BlockType} by its identifier.
     *
     * @param id The id to look up
     * @return The block or null if not found
     */
    @Nullable
    BlockType getBlock(String id);

    /**
     * Gets an {@link Item} by its identifier.
     *
     * @param id The id to look up
     * @return The item or null if not found
     */
    @Nullable
    Item getItem(String id);

    /**
     * Gets the id registered to the object.
     *
     * @param obj The object to look up
     * @return The id or null if none found
     */
    @Nullable
    String getID(Object obj);
}

@@ -1244,16 +1244,17 @@
 RE.%0A */%0A
+%0A
 package 
@@ -1277,16 +1277,56 @@
 d.api;%0A%0A
+import com.google.common.base.Optional;%0A
 import o
@@ -1408,43 +1408,8 @@
 m;%0A%0A
-import javax.annotation.Nullable;%0A%0A
 /**%0A
@@ -1448,24 +1448,20 @@
 eve 
-object
+type
 s from 
-the
+a
  %7B@l
@@ -1473,27 +1473,8 @@
 ame%7D
- based on their ids
 .%0A *
@@ -1667,30 +1667,25 @@
  */%0A    
-@Nullable%0A    
+Optional%3C
 BlockTyp
@@ -1685,16 +1685,17 @@
 lockType
+%3E
  getBloc
@@ -1867,26 +1867,22 @@
     
-@Nullable%0A    
+Optional%3C
 Item
+%3E
  get
@@ -1923,18 +1923,18 @@
 ets the 
-id
+ID
  registe
@@ -2059,34 +2059,30 @@
     
-@Nullable%0A    
+Optional%3C
 String
+%3E
  getI
-D
+d
 (Obj

Make GameRegistry use Optional and update formatting issues.