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>

2 files changed, 111 insertions, 111 deletions

diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
index bd866ba994..0ff54e2168 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
@@ -1,64 +1,64 @@
-package gregtech.common.items.behaviors;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import gregtech.api.items.GT_MetaBase_Item;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;

-import gregtech.api.util.GT_LanguageManager;

-import gregtech.api.util.GT_Utility;

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

-import net.minecraft.item.ItemStack;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.world.World;

-import net.minecraftforge.common.util.ForgeDirection;

-import net.minecraftforge.fluids.IFluidHandler;

-

-import java.util.List;

-

-public class Behaviour_Plunger_Fluid

-        extends Behaviour_None {

-    private final int mCosts;

-    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks");

-

-    public Behaviour_Plunger_Fluid(int aCosts) {

-        this.mCosts = aCosts;

-    }

-

-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {

-        if (aWorld.isRemote) {

-            return false;

-        }

-        TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((aTileEntity instanceof IFluidHandler)) {

-            for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {

-                if (((IFluidHandler) aTileEntity).drain(tDirection, 1000, false) != null) {

-                    if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {

-                        ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true);

-                        GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);

-                        return true;

-                    }

-                }

-            }

-

-        }       

-        if (aTileEntity instanceof IGregTechTileEntity) {

-        IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity;

-        IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();

-        if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) {

-          	GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;

-           	if(machine.mFluid!=null&&machine.mFluid.amount>0)

-           	machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);

-            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);

-           	return true;

-                }

-            }

-        return false;

-    }

-

-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {

-        aList.add(this.mTooltip);

-        return aList;

-    }

-}

+package gregtech.common.items.behaviors;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidHandler;
+
+import java.util.List;
+
+public class Behaviour_Plunger_Fluid
+        extends Behaviour_None {
+    private final int mCosts;
+    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks");
+
+    public Behaviour_Plunger_Fluid(int aCosts) {
+        this.mCosts = aCosts;
+    }
+
+    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+        if (aWorld.isRemote) {
+            return false;
+        }
+        TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if ((aTileEntity instanceof IFluidHandler)) {
+            for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
+                if (((IFluidHandler) aTileEntity).drain(tDirection, 1000, false) != null) {
+                    if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
+                        ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true);
+                        GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
+                        return true;
+                    }
+                }
+            }
+
+        }       
+        if (aTileEntity instanceof IGregTechTileEntity) {
+        IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity;
+        IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
+        if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) {
+          	GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;
+           	if(machine.mFluid!=null&&machine.mFluid.amount>0)
+           	machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);
+            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
+           	return true;
+                }
+            }
+        return false;
+    }
+
+    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+        aList.add(this.mTooltip);
+        return aList;
+    }
+}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
index 451bf982c2..289cc452e8 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java
@@ -1,47 +1,47 @@
-package gregtech.common.items.behaviors;

-

-import gregtech.api.items.GT_MetaBase_Item;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_LanguageManager;

-import ic2.api.crops.ICropTile;

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

-import net.minecraft.item.ItemStack;

-import net.minecraft.tileentity.TileEntity;

-import net.minecraft.world.World;

-

-import java.util.List;

-

-public class Behaviour_Sense

-        extends Behaviour_None {

-    private final int mCosts;

-    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks");

-

-    public Behaviour_Sense(int aCosts) {

-        this.mCosts = aCosts;

-    }

-

-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {

-        if (aWorld.isRemote) {

-            return false;

-        }

-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity instanceof ICropTile)) {

-            for (int i = -2; i < 3; i++) {

-                for (int j = -2; j < 3; j++) {

-                    for (int k = -2; k < 3; k++) {

-                        if ((aStack.stackSize > 0) && (((tTileEntity = aWorld.getTileEntity(aX + i, aY + j, aZ + k)) instanceof ICropTile)) && (((ICropTile) tTileEntity).harvest(true)) && (!aPlayer.capabilities.isCreativeMode)) {

-                            ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts/20);

-                        }

-                    }

-                }

-            }

-            return true;

-        }

-        return false;

-    }

-

-    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {

-        aList.add(this.mTooltip);

-        return aList;

-    }

-}

+package gregtech.common.items.behaviors;
+
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_LanguageManager;
+import ic2.api.crops.ICropTile;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+public class Behaviour_Sense
+        extends Behaviour_None {
+    private final int mCosts;
+    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks");
+
+    public Behaviour_Sense(int aCosts) {
+        this.mCosts = aCosts;
+    }
+
+    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+        if (aWorld.isRemote) {
+            return false;
+        }
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if ((tTileEntity instanceof ICropTile)) {
+            for (int i = -2; i < 3; i++) {
+                for (int j = -2; j < 3; j++) {
+                    for (int k = -2; k < 3; k++) {
+                        if ((aStack.stackSize > 0) && (((tTileEntity = aWorld.getTileEntity(aX + i, aY + j, aZ + k)) instanceof ICropTile)) && (((ICropTile) tTileEntity).harvest(true)) && (!aPlayer.capabilities.isCreativeMode)) {
+                            ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts/20);
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+        aList.add(this.mTooltip);
+        return aList;
+    }
+}