Rework for Dimension Display (#19)

* Rework for Dimension Display

* side (again)

* :weary:

10 files changed, 150 insertions, 235 deletions

diff --git a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
index 928fe07bd5..55a8680555 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/GTNEIOrePlugin.java
@@ -11,8 +11,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pers.gwyog.gtneioreplugin.plugin.items.ModItems;
-import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer;
+import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
 import pers.gwyog.gtneioreplugin.util.GuiRecipeHelper;
@@ -75,10 +74,7 @@ public class GTNEIOrePlugin {
 
     @EventHandler
     public void init(FMLInitializationEvent event) {
-        ModItems.init();
-        if (event.getSide() == Side.CLIENT) {
-            new ItemDimensionDisplayRenderer();
-        }
+        ModBlocks.init();
     }
 
     @EventHandler
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java
new file mode 100644
index 0000000000..5ef2cb04a9
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/BlockDimensionDisplay.java
@@ -0,0 +1,48 @@
+package pers.gwyog.gtneioreplugin.plugin.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.IIcon;
+
+public class BlockDimensionDisplay extends Block {
+
+    private final String dimension;
+    private IIcon iconTop;
+    private IIcon iconRight;
+    private IIcon iconLeft;
+
+    public BlockDimensionDisplay(String dimension) {
+        super(Material.rock);
+        this.dimension = dimension;
+    }
+
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        EnumFacing direction = EnumFacing.getFront(side);
+        switch (direction) {
+            case NORTH:
+            case SOUTH:
+                return iconRight;
+            case WEST:
+            case EAST:
+                return iconLeft;
+            case UP:
+            case DOWN:
+            default:
+                return iconTop;
+        }
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister iconRegister) {
+        this.iconTop = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_top");
+        this.iconRight = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_right");
+        this.iconLeft = iconRegister.registerIcon("gtneioreplugin:" + dimension + "_left");
+    }
+
+    public String getDimension() {
+        return dimension;
+    }
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java
new file mode 100644
index 0000000000..fce0a0883e
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/block/ModBlocks.java
@@ -0,0 +1,25 @@
+package pers.gwyog.gtneioreplugin.plugin.block;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import java.util.HashMap;
+import java.util.Map;
+import net.minecraft.block.Block;
+import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
+import pers.gwyog.gtneioreplugin.util.DimensionHelper;
+
+public class ModBlocks {
+
+    public static final Map<String, Block> blocks = new HashMap<>();
+
+    public static void init() {
+        for (String dimension : DimensionHelper.DimNameDisplayed) {
+            Block block = new BlockDimensionDisplay(dimension);
+            GameRegistry.registerBlock(block, ItemDimensionDisplay.class, "blockDimensionDisplay_" + dimension);
+            blocks.put(dimension, block);
+        }
+    }
+
+    public static Block getBlock(String dimension) {
+        return blocks.get(dimension);
+    }
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
index 0955409d58..bf24ee186e 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5SmallOreStat.java
@@ -9,7 +9,7 @@ import java.util.Comparator;
 import java.util.List;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
-import pers.gwyog.gtneioreplugin.plugin.items.ItemDimensionDisplay;
+import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper.OreSmallWrapper;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index 67da9bab02..cafb69a8f6 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -11,7 +11,7 @@ import java.util.Comparator;
 import java.util.List;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
-import pers.gwyog.gtneioreplugin.plugin.items.ItemDimensionDisplay;
+import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 import pers.gwyog.gtneioreplugin.util.DimensionHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper;
 import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper.OreLayerWrapper;
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
new file mode 100644
index 0000000000..7584cf405c
--- /dev/null
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/item/ItemDimensionDisplay.java
@@ -0,0 +1,58 @@
+package pers.gwyog.gtneioreplugin.plugin.item;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import java.util.Objects;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.MinecraftForgeClient;
+import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
+import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay;
+import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks;
+import pers.gwyog.gtneioreplugin.plugin.renderer.ItemDimensionDisplayRenderer;
+import pers.gwyog.gtneioreplugin.util.DimensionHelper;
+
+public class ItemDimensionDisplay extends ItemBlock {
+
+    public ItemDimensionDisplay(Block block) {
+        super(block);
+        setCreativeTab(GTNEIOrePlugin.creativeTab);
+
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
+            MinecraftForgeClient.registerItemRenderer(this, new ItemDimensionDisplayRenderer());
+        }
+    }
+
+    public static ItemStack getItem(String dimension) {
+        Block block = ModBlocks.getBlock(dimension);
+        if (block != null) {
+            return new ItemStack(block);
+        }
+        return null;
+    }
+
+    public static String getDimension(ItemStack stack) {
+        if (stack.getItem() instanceof ItemDimensionDisplay) {
+            return ((BlockDimensionDisplay) Block.getBlockFromItem(stack.getItem())).getDimension();
+        }
+        return null;
+    }
+
+    public static boolean isDimensionEqual(ItemStack stack1, ItemStack stack2) {
+        if (!(stack1.getItem() instanceof ItemDimensionDisplay)
+                || !(stack2.getItem() instanceof ItemDimensionDisplay)) {
+            return false;
+        }
+        return Objects.equals(getDimension(stack1), getDimension(stack2));
+    }
+
+    @Override
+    public String getItemStackDisplayName(ItemStack stack) {
+        String dimension = getDimension(stack);
+        if (dimension != null) {
+            return DimensionHelper.convertCondensedStringToToolTip(dimension).get(0);
+        }
+        return super.getItemStackDisplayName(stack);
+    }
+}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ItemDimensionDisplay.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ItemDimensionDisplay.java
deleted file mode 100644
index 76be6536e8..0000000000
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ItemDimensionDisplay.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package pers.gwyog.gtneioreplugin.plugin.items;
-
-import cpw.mods.fml.common.Loader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.Constants;
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-import pers.gwyog.gtneioreplugin.util.DimensionHelper;
-
-public class ItemDimensionDisplay extends Item {
-
-    private static final String TAG_DIMENSION = "dimension";
-    private static final Map<String, ItemStack> items = new HashMap<>();
-
-    public ItemDimensionDisplay() {
-        setUnlocalizedName(GTNEIOrePlugin.MODID + ".itemDimensionDisplay");
-        setCreativeTab(GTNEIOrePlugin.creativeTab);
-    }
-
-    public static ItemStack getItem(String dimension) {
-        if (items.get(dimension) != null) {
-            return items.get(dimension).copy();
-        }
-        return null;
-    }
-
-    public static void setDimension(ItemStack stack, String dimension) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setString(TAG_DIMENSION, dimension);
-        stack.setTagCompound(nbt);
-    }
-
-    public static String getDimension(ItemStack stack) {
-        if (stack.hasTagCompound() && stack.getTagCompound().hasKey(TAG_DIMENSION, Constants.NBT.TAG_STRING)) {
-            return stack.getTagCompound().getString(TAG_DIMENSION);
-        }
-        return null;
-    }
-
-    public static boolean isDimensionEqual(ItemStack stack1, ItemStack stack2) {
-        if (!(stack1.getItem() instanceof ItemDimensionDisplay)
-                || !(stack2.getItem() instanceof ItemDimensionDisplay)) {
-            return false;
-        }
-        return Objects.equals(getDimension(stack1), getDimension(stack2));
-    }
-
-    @Override
-    public String getItemStackDisplayName(ItemStack stack) {
-        String dimension = getDimension(stack);
-        if (dimension != null) {
-            return DimensionHelper.convertCondensedStringToToolTip(dimension).get(0);
-        }
-        return super.getItemStackDisplayName(stack);
-    }
-
-    @Override
-    public Item setTextureName(String p_111206_1_) {
-        return super.setTextureName(p_111206_1_);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) {
-        for (ItemStack stack : items.values()) {
-            itemList.add(stack.copy());
-        }
-    }
-
-    public static void loadItems() {
-        String[] vanilla_gt = new String[] {"Ow", "Ne", "TF", "EN", "VA", "EA"};
-        for (String dimension : vanilla_gt) {
-            ItemStack stack = new ItemStack(ModItems.itemDimensionDisplay);
-            setDimension(stack, dimension);
-            items.put(dimension, stack);
-        }
-        String[] gc = new String[] {"Mo", "Ma", "As"};
-        if (Loader.isModLoaded("GalacticraftCore")) {
-            for (String dimension : gc) {
-                ItemStack stack = new ItemStack(ModItems.itemDimensionDisplay);
-                setDimension(stack, dimension);
-                items.put(dimension, stack);
-            }
-        }
-        String[] gs = new String[] {
-            "De", "Ph", "Ca", "Ce", "Eu", "Ga", "Io", "Me", "Ve", "En", "Mi", "Ob", "Ti", "Pr", "Tr", "Ha", "KB", "MM",
-            "Pl", "BC", "BE", "BF", "CB", "TE", "VB"
-        };
-        if (Loader.isModLoaded("GalaxySpace")) {
-            for (String dimension : gs) {
-                ItemStack stack = new ItemStack(ModItems.itemDimensionDisplay);
-                setDimension(stack, dimension);
-                items.put(dimension, stack);
-            }
-        }
-        String[] xu = new String[] {"DD"};
-        if (Loader.isModLoaded("ExtraUtilities")) {
-            for (String dimension : xu) {
-                ItemStack stack = new ItemStack(ModItems.itemDimensionDisplay);
-                setDimension(stack, dimension);
-                items.put(dimension, stack);
-            }
-        }
-    }
-}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ModItems.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ModItems.java
deleted file mode 100644
index 1a519c4548..0000000000
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/items/ModItems.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pers.gwyog.gtneioreplugin.plugin.items;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.item.Item;
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-
-public class ModItems {
-
-    public static Item itemDimensionDisplay = new ItemDimensionDisplay();
-
-    public static void init() {
-        GameRegistry.registerItem(itemDimensionDisplay, "itemDimensionDisplay", GTNEIOrePlugin.MODID);
-        ItemDimensionDisplay.loadItems();
-    }
-}
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
index d85a3764d3..3b281713f7 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/plugin/renderer/ItemDimensionDisplayRenderer.java
@@ -2,25 +2,19 @@ package pers.gwyog.gtneioreplugin.plugin.renderer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.client.MinecraftForgeClient;
 import org.lwjgl.opengl.GL11;
-import pers.gwyog.gtneioreplugin.GTNEIOrePlugin;
-import pers.gwyog.gtneioreplugin.plugin.items.ItemDimensionDisplay;
-import pers.gwyog.gtneioreplugin.plugin.items.ModItems;
+import pers.gwyog.gtneioreplugin.plugin.item.ItemDimensionDisplay;
 
 public class ItemDimensionDisplayRenderer implements IItemRenderer {
 
-    public ItemDimensionDisplayRenderer() {
-        MinecraftForgeClient.registerItemRenderer(ModItems.itemDimensionDisplay, this);
-    }
+    private final RenderItem renderItem = new RenderItem();
 
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-        return true;
+        return type == ItemRenderType.INVENTORY;
     }
 
     @Override
@@ -29,112 +23,32 @@ public class ItemDimensionDisplayRenderer implements IItemRenderer {
     }
 
     @Override
-    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        String dimension = ItemDimensionDisplay.getDimension(item);
+    public void renderItem(ItemRenderType type, ItemStack stack, Object... data) {
+        String dimension = ItemDimensionDisplay.getDimension(stack);
         if (dimension == null) {
             return;
         }
 
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glEnable(GL11.GL_ALPHA_TEST);
-
-        Minecraft.getMinecraft().renderEngine.bindTexture(getResourceLocation(dimension));
-
-        Tessellator tess = Tessellator.instance;
-        tess.startDrawingQuads();
-        tess.addVertexWithUV(0, 16, 0, 0, 1);
-        tess.addVertexWithUV(16, 16, 0, 1, 1);
-        tess.addVertexWithUV(16, 0, 0, 1, 0);
-        tess.addVertexWithUV(0, 0, 0, 0, 0);
-        tess.draw();
-
-        GL11.glDisable(GL11.GL_BLEND);
+        renderItem.renderItemIntoGUI(
+                Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().renderEngine, stack, 0, 0, false);
 
         String prefix = getPrefix(dimension);
         if (!prefix.isEmpty()) {
             FontRenderer fontRender = Minecraft.getMinecraft().fontRenderer;
-            float smallTextScale = fontRender.getUnicodeFlag() ? 3F / 4F : 1F / 2F;
+            float smallTextScale = 3F / 4F;
+
+            GL11.glPushMatrix();
+            GL11.glTranslatef(0, 0, 300);
             GL11.glScalef(smallTextScale, smallTextScale, 1.0f);
 
             fontRender.drawString(prefix, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
+
+            GL11.glPopMatrix();
         }
 
         GL11.glDisable(GL11.GL_ALPHA_TEST);
     }
 
-    private ResourceLocation getResourceLocation(String dimension) {
-        switch (dimension) {
-            case "Ow":
-            case "Ne":
-            case "TF":
-            case "EN":
-            case "VA":
-            case "EA":
-                return new ResourceLocation(
-                        GTNEIOrePlugin.MODID, String.format("textures/items/dimensionDisplay/%s.png", dimension));
-            case "Mo":
-                return new ResourceLocation("galacticraftcore:textures/gui/celestialbodies/moon.png");
-            case "De":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/deimos.png");
-            case "Ma":
-                return new ResourceLocation("galacticraftcore:textures/gui/celestialbodies/mars.png");
-            case "Ph":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/phobos.png");
-            case "As":
-                return new ResourceLocation("galacticraftcore:textures/gui/celestialbodies/asteroid.png");
-            case "Ca":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/callisto.png");
-            case "Ce":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/ceres.png");
-            case "Eu":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/europa.png");
-            case "Ga":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/ganymede.png");
-            case "Io":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/io.png");
-            case "Me":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/mercury.png");
-            case "Ve":
-                return new ResourceLocation("galacticraftcore:textures/gui/celestialbodies/venus.png");
-            case "En":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/enceladus.png");
-            case "Mi":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/miranda.png");
-            case "Ob":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/oberon.png");
-            case "Ti":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/titan.png");
-            case "Pr":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/proteus.png");
-            case "Tr":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/triton.png");
-            case "Ha":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/haumea.png");
-            case "KB":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/kuiperbelt.png");
-            case "MM":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/makemake.png");
-            case "Pl":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/pluto.png");
-            case "BC":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/barnards/Barnarda2.png");
-            case "BE":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/barnards/Barnarda4.png");
-            case "BF":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/barnards/Barnarda5.png");
-            case "CB":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/aCentauri/CentauriBb.png");
-            case "TE":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/tceti/TCetiE.png");
-            case "DD":
-                return new ResourceLocation("extrautils:textures/blocks/dark_portal.png");
-            case "VB":
-                return new ResourceLocation("galaxyspace:textures/gui/celestialbodies/vega/Vega1.png");
-            default:
-                return new ResourceLocation(GTNEIOrePlugin.MODID, "textures/items/dimensionDisplay/_unknown.png");
-        }
-    }
-
     private static String getPrefix(String dimName) {
         switch (dimName) {
             case "Mo":
diff --git a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
index ac4ceb6f95..90d49d7e35 100644
--- a/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
+++ b/src/main/java/pers/gwyog/gtneioreplugin/util/DimensionHelper.java
@@ -63,7 +63,7 @@ public class DimensionHelper {
         "Ow", // Overworld
         "Ne", // Nether
         "TF", // Twilight
-        "EN", // TheEnd because En = Encalus
+        "ED", // TheEnd because En = Encalus
         "VA", // Vanilla_EndAsteroids
         "EA", // EndAsteroid
         // T1