Void miner adjustments (#262)

* Added all Ores to Voidminer in DeepDark
+ removed Infinity Ore

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

* renormalize line endings

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

1 files changed, 92 insertions, 92 deletions

diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index f381ffc9d7..ace4306608 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -1,92 +1,92 @@
-package gregtech.common.items;

-

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

-import gregtech.api.enums.GT_Values;

-import gregtech.api.enums.ItemList;

-import gregtech.api.items.GT_Generic_Item;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.client.renderer.texture.IIconRegister;

-import net.minecraft.creativetab.CreativeTabs;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.Item;

-import net.minecraft.item.ItemStack;

-import net.minecraft.nbt.NBTTagCompound;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IIcon;

-import net.minecraftforge.fluids.Fluid;

-import net.minecraftforge.fluids.FluidRegistry;

-

-import java.util.List;

-

-public class GT_FluidDisplayItem

-        extends GT_Generic_Item {

-    public GT_FluidDisplayItem() {

-        super("GregTech_FluidDisplay", "Fluid Display", null);

-        ItemList.Display_Fluid.set(this);

-    }

-

-    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {

-        NBTTagCompound aNBT = aStack.getTagCompound();

-        if (GT_Values.D1) {

-            Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());

-            if (tFluid != null) {

-                aList.add("Registry: " + tFluid.getName());

-            }

-        }

-        if (aNBT != null) {

-            long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");

-            if (tToolTipAmount > 0L) {

-            	aList.add(EnumChatFormatting.BLUE + String.format(trans("016", "Amount: %s L"), "" + tToolTipAmount) + EnumChatFormatting.GRAY);

-            }

-            aList.add(EnumChatFormatting.RED + String.format(trans("017", "Temperature: %s K"), "" + aNBT.getLong("mFluidDisplayHeat")) + EnumChatFormatting.GRAY);

-            aList.add(EnumChatFormatting.GREEN + String.format(trans("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);

-        }

-    }

-

-    @SideOnly(Side.CLIENT)

-    public void registerIcons(IIconRegister aIconRegister) {

-    }

-

-    public IIcon getIconFromDamage(int aMeta) {

-        Fluid tFluid = FluidRegistry.getFluid(aMeta);

-        return tFluid == null ? FluidRegistry.WATER.getStillIcon() : tFluid.getStillIcon();

-    }

-

-    @SideOnly(Side.CLIENT)

-    public int getColorFromItemStack(ItemStack aStack, int aRenderPass) {

-        Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());

-        return tFluid == null ? 16777215 : tFluid.getColor();

-    }

-

-    public int getSpriteNumber() {

-        return 0;

-    }

-

-    public String getUnlocalizedName(ItemStack aStack) {

-        if (aStack != null) {

-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);

-        }

-        return "";

-    }

-

-    public String getItemStackDisplayName(ItemStack aStack) {

-        if (aStack != null) {

-            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);

-        }

-        return "";

-    }

-

-    @SideOnly(Side.CLIENT)

-    public void getSubItems(Item aItem, CreativeTabs aTab, List aList) {

-        if (GT_Values.D1) {

-            int i = 0;

-            for (int j = FluidRegistry.getMaxID(); i < j; i++) {

-                ItemStack tStack = GT_Utility.getFluidDisplayStack(FluidRegistry.getFluid(i));

-                if (tStack != null) {

-                    aList.add(tStack);

-                }

-            }

-        }

-    }

-}

+package gregtech.common.items;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+import java.util.List;
+
+public class GT_FluidDisplayItem
+        extends GT_Generic_Item {
+    public GT_FluidDisplayItem() {
+        super("GregTech_FluidDisplay", "Fluid Display", null);
+        ItemList.Display_Fluid.set(this);
+    }
+
+    protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        NBTTagCompound aNBT = aStack.getTagCompound();
+        if (GT_Values.D1) {
+            Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
+            if (tFluid != null) {
+                aList.add("Registry: " + tFluid.getName());
+            }
+        }
+        if (aNBT != null) {
+            long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");
+            if (tToolTipAmount > 0L) {
+            	aList.add(EnumChatFormatting.BLUE + String.format(trans("016", "Amount: %s L"), "" + tToolTipAmount) + EnumChatFormatting.GRAY);
+            }
+            aList.add(EnumChatFormatting.RED + String.format(trans("017", "Temperature: %s K"), "" + aNBT.getLong("mFluidDisplayHeat")) + EnumChatFormatting.GRAY);
+            aList.add(EnumChatFormatting.GREEN + String.format(trans("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister aIconRegister) {
+    }
+
+    public IIcon getIconFromDamage(int aMeta) {
+        Fluid tFluid = FluidRegistry.getFluid(aMeta);
+        return tFluid == null ? FluidRegistry.WATER.getStillIcon() : tFluid.getStillIcon();
+    }
+
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack aStack, int aRenderPass) {
+        Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
+        return tFluid == null ? 16777215 : tFluid.getColor();
+    }
+
+    public int getSpriteNumber() {
+        return 0;
+    }
+
+    public String getUnlocalizedName(ItemStack aStack) {
+        if (aStack != null) {
+            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), false);
+        }
+        return "";
+    }
+
+    public String getItemStackDisplayName(ItemStack aStack) {
+        if (aStack != null) {
+            return GT_Utility.getFluidName(FluidRegistry.getFluid(aStack.getItemDamage()), true);
+        }
+        return "";
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item aItem, CreativeTabs aTab, List aList) {
+        if (GT_Values.D1) {
+            int i = 0;
+            for (int j = FluidRegistry.getMaxID(); i < j; i++) {
+                ItemStack tStack = GT_Utility.getFluidDisplayStack(FluidRegistry.getFluid(i));
+                if (tStack != null) {
+                    aList.add(tStack);
+                }
+            }
+        }
+    }
+}