Final Update and a Rename

8 files changed, 7 insertions, 281 deletions

diff --git a/build.gradle b/build.gradle
index 0cd0f45d8f..62040659fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ file "build.properties" withReader {
 
 version = "${config.detravscanner.version}"
 group= "com.detrav.detravscannermod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "detravscannermod"
+archivesBaseName = "GT Scanner Mod"
 
 minecraft {
     version = "${config.minecraft.version}-${config.forge.version}"
diff --git a/build.properties b/build.properties
index 2083f037d2..59ef4c0d81 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1566-1.7.10
 
-detravscanner.version=0.74
+detravscanner.version=1.0
 
 ae2.version=rv2-beta-33
 applecore.version=1.7.10-1.2.1+107.59407
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 5119a7114a..73b1d88581 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -1,6 +1,5 @@
 package com.detrav;
 
-import com.detrav.commands.DetravBiomeScannerCommand;
 import com.detrav.events.DetravLoginEventHandler;
 import com.detrav.proxies.CommonProxy;
 import com.detrav.utils.DetravCreativeTab;
@@ -69,9 +68,4 @@ public class DetravScannerMod
         proxy.onPostLoad();
     }
 
-    @EventHandler
-    public void serverLoad(FMLServerStartingEvent event)
-    {
-        event.registerServerCommand(new DetravBiomeScannerCommand());
-    }
 }
diff --git a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
index cd4836c86a..2af2d2a8e5 100644
--- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
+++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java
@@ -1,6 +1,5 @@
 package com.detrav;
 
-import com.detrav.enums.DetravItemList;
 import com.detrav.items.DetravMetaGeneratedTool01;
 import com.detrav.items.processing.*;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java b/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java
deleted file mode 100644
index 9ac6deef47..0000000000
--- a/src/main/java/com/detrav/commands/DetravBiomeScannerCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.detrav.commands;
-
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChunkCoordinates;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import scala.Int;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by wital_000 on 25.03.2016.
- */
-public class DetravBiomeScannerCommand implements ICommand {
-    private List aliases;
-
-    public DetravBiomeScannerCommand()
-    {
-        this.aliases = new ArrayList<String>();
-        this.aliases.add("DetravBiomeScanner");
-        this.aliases.add("dbscan");
-    }
-
-    @Override
-    public String getCommandName() {
-        return "DetravBiomeScanner";
-    }
-
-    @Override
-    public String getCommandUsage(ICommandSender sender) {
-        return "DetravBiomeScanner radius [name]";
-    }
-
-    @Override
-    public List getCommandAliases() {
-        return this.aliases;
-    }
-
-    @Override
-    public void processCommand(ICommandSender sender, String[] args) {
-        try {
-            if(args.length>0) {
-                int aXaZ = Integer.parseInt(args[0]);
-                String name = null;
-                if(args.length>1)
-                name = args[1].toLowerCase();
-                else
-                name = "";
-                int step = aXaZ * 2 / 512;
-                if (step < 1) step = 1;
-                World w = sender.getEntityWorld();
-                ChunkCoordinates cor = sender.getPlayerCoordinates();
-                BufferedImage image = new BufferedImage(512, 512, BufferedImage.TYPE_INT_ARGB);
-                WritableRaster r = image.getRaster();
-                HashMap<String, Integer> colors = new HashMap<String, Integer>();
-                for (int i = cor.posX - aXaZ, ii = 0; ii < 512; i += step, ii++)
-                    for (int j = cor.posZ - aXaZ, jj = 0; jj < 512; j += step, jj++) {
-                        BiomeGenBase biome = w.getBiomeGenForCoords(i, j);
-                        if(name.length()==0 || biome.biomeName.toLowerCase().contains(name)) {
-                            r.setSample(ii, jj, 0, (biome.color  >> 16) & 0xFF );
-                            r.setSample(ii, jj, 1, (biome.color >> 8) & 0xFF);
-                            r.setSample(ii, jj, 2, biome.color & 0xFF);
-                            r.setSample(ii, jj, 3, 0xFF);
-                            if (!colors.containsKey(biome.biomeName))
-                                colors.put(biome.biomeName, biome.color);
-                        }
-                    }
-                File outfile = new File("biomes.png");
-                ImageIO.write(image, "png", outfile);
-                File outfileTxt = new File("biomes.txt");
-                PrintWriter fw = new PrintWriter(outfileTxt);
-                for (String key : colors.keySet()) {
-                    fw.println(String.format("Biome: %s , Color: %d", key, colors.get(key)));
-                }
-                fw.println(String.format("From (%d,%d) to (%d,%d)", cor.posX - aXaZ, cor.posZ - aXaZ, cor.posX - aXaZ + step * 512, cor.posZ - aXaZ + step * 512));
-                fw.flush();
-                fw.close();
-                return;
-            }
-        }
-        catch (Exception e)
-        {
-            sender.addChatMessage(new ChatComponentText("catch ERROR"));
-            return;
-        }
-        sender.addChatMessage(new ChatComponentText("ERROR"));
-    }
-
-    @Override
-    public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) {
-        return true;
-    }
-
-    @Override
-    public List addTabCompletionOptions(ICommandSender p_71516_1_, String[] p_71516_2_) {
-        return null;
-    }
-
-    @Override
-    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
-        return false;
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        return 0;
-    }
-}
diff --git a/src/main/java/com/detrav/enums/DetravItemList.java b/src/main/java/com/detrav/enums/DetravItemList.java
deleted file mode 100644
index 3c5ae29991..0000000000
--- a/src/main/java/com/detrav/enums/DetravItemList.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.detrav.enums;
-
-import gregtech.api.interfaces.IItemContainer;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import static gregtech.api.enums.GT_Values.W;
-
-/**
- * Created by wital_000 on 20.03.2016.
- */
-public enum DetravItemList implements IItemContainer {
-    Shape_Extruder_ProPick,
-    //Solar_Boiler_Low,
-    Solar_Boiler_Medium,
-    Solar_Boiler_High,
-    DetravAdvancedMiner2,
-    ConfiguredCircuit;
-
-
-    private ItemStack mStack;
-    private boolean mHasNotBeenSet = true;
-
-    @Override
-    public IItemContainer set(Item aItem) {
-        mHasNotBeenSet = false;
-        if (aItem == null) return this;
-        ItemStack aStack = new ItemStack(aItem, 1, 0);
-        mStack = GT_Utility.copyAmount(1, aStack);
-        return this;
-    }
-
-    @Override
-    public IItemContainer set(ItemStack aStack) {
-        mHasNotBeenSet = false;
-        mStack = GT_Utility.copyAmount(1, aStack);
-        return this;
-    }
-
-    @Override
-    public Item getItem() {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return null;
-        return mStack.getItem();
-    }
-
-    @Override
-    public Block getBlock() {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        return GT_Utility.getBlockFromItem(getItem());
-    }
-
-    @Override
-    public final boolean hasBeenSet() {
-        return !mHasNotBeenSet;
-    }
-
-    @Override
-    public boolean isStackEqual(Object aStack) {
-        return isStackEqual(aStack, false, false);
-    }
-
-    @Override
-    public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
-    }
-
-    @Override
-    public ItemStack get(long aAmount, Object... aReplacements) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
-    }
-
-    @Override
-    public ItemStack getWildcard(long aAmount, Object... aReplacements) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
-    }
-
-    @Override
-    public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
-    }
-
-    @Override
-    public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack));
-    }
-
-    @Override
-    public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
-        ItemStack rStack = get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) return null;
-        rStack.setStackDisplayName(aDisplayName);
-        return GT_Utility.copyAmount(aAmount, rStack);
-    }
-
-    @Override
-    public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
-        ItemStack rStack = get(1, aReplacements);
-        if (GT_Utility.isStackInvalid(rStack)) return null;
-        GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
-        return GT_Utility.copyAmount(aAmount, rStack);
-    }
-
-    @Override
-    public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
-        return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
-    }
-
-    @Override
-    public IItemContainer registerOre(Object... aOreNames) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
-        return this;
-    }
-
-    @Override
-    public IItemContainer registerWildcardAsOre(Object... aOreNames) {
-        if (mHasNotBeenSet)
-            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
-        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
-        return this;
-    }
-
-}
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 07db9e15bc..d75e3deee8 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -2,7 +2,6 @@ package com.detrav.proxies;
 
 import com.detrav.DetravScannerMod;
 
-import com.detrav.enums.DetravItemList;
 import com.detrav.events.DetravLoginEventHandler;
 import com.detrav.gui.DetravGuiProPick;
 import com.detrav.items.DetravMetaGeneratedTool01;
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index c86d7d51a9..93d5fd0a4a 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,14 +1,14 @@
 [
 {
   "modid": "detravscannermod",
-  "name": "Detrav Scanner Mod",
+  "name": "GT Scanner Mod",
   "description": "To locate ores deep underground.",
-  "version": "0.73",
+  "version": "1.0",
   "mcversion": "1.7.10",
-  "url": "https://github.com/Ethryan/DetravScannerMod",
+  "url": "https://github.com/Ethryan/GTScannerMod",
   "updateUrl": "",
-  "authorList": ["Detrav, Ethryan"],
-  "credits": "From Detrav ^_^",
+  "authorList": ["Ethryan"],
+  "credits": "Detrav",
   "logoFile": "",
   "screenshots": [],
   "dependencies": []