Undo a temporary hack-fix

build.gradle

@@ -7,28 +7,43 @@ buildscript {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
+        maven {
+            name = "gradle"
+            url "https://plugins.gradle.org/m2/"
+        }
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/groups/public"
         }
+        maven {
+            name = 'sponge'
+            url = 'http://repo.spongepowered.org/maven'
+        }
     }
     dependencies {
         classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
-        classpath "com.matthewprenger:CurseGradle:1.0-SNAPSHOT"
+        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.9"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5"
     }
 }
 
 apply plugin: "net.minecraftforge.gradle.forge"
 apply plugin: "com.matthewprenger.cursegradle"
 apply plugin: "maven-publish"
+apply plugin: "org.sonarqube"
 
 javadoc {
     failOnError = false
 }
 
+description = "Nether Metals"
 def mod_file = getModFile()
-def mc_version = "1.10.2"
-def short_version = getVersion("VERSION", mod_file)
+def mc_version = "1.11.2"
+
+ext {
+    short_version = getVersion("VERSION", mod_file)
+}
+
 version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
     version += "." + System.getenv().BUILD_NUMBER
@@ -62,63 +77,67 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = "1.10.2-12.18.3.2185"
+    version = "1.11.2-13.20.0.2228"
     runDir = "run"
-    mappings = "stable_29"
+    mappings = "stable_32"
 //  coreMod = corePlugin
 //  clientJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
 //  serverJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
 }
 
 repositories {
     maven {
+	    name "SpongePowered"
+        url "https://repo.spongepowered.org/maven/"
+    }
+    maven { // Mantle, TCon, JEI
         name "DVS1 Maven FS"
         url "http://dvs1.progwml6.com/files/maven"
     }
-    maven {
+    maven { // CCL, CCC, NEI
         name "Chickenbones Repo"
         url "http://chickenbones.net/maven/"
     }
-    maven {
+    maven { // The One Probe
         name "tterrag"
         url "http://maven.tterrag.com/"
     }
     maven {
         name "MMD"
         url "https://maven.mcmoddev.com/"
     }
-    maven {
+    maven { // MCMultipart
         name "amadornes"
         url "http://maven.amadornes.com/"
     }
-    maven {
+    maven { // Tesla
         name "epoxide"
         url "http://maven.epoxide.org"
     }
-    maven { // CraftTweaker
+    maven { // CraftTweaker, ZenScript
         name 'jared maven'
         url "http://blamejared.com/maven"
     }
-    maven {
+    maven { // Mekanism, TAIGA
         name "jitpack"
         url "https://jitpack.io"
     }
-    maven {
+    maven { // IC2
         name "industrialcraft"
         url "http://maven.ic2.player.to"
     }
-    maven { // Waila is here
+    maven { // Waila
     	name "tehnut"
     	url "http://tehnut.info/maven"
     }
-    maven { // CoFH stuff is here
+    maven { // CoFH
     	name "Covers Maven"
     	url "http://maven.covers1624.net"
     }
 }
 
 dependencies {
-    compile "mmd:orespawn:${orespawn_version}-${mc_version}:dev"
+    compile "com.mcmoddev:OreSpawn:${mc_version}-${orespawn_version}:deobf"
     compile "com.mcmoddev:BaseMetals:${mc_version}-${bme_version}:deobf"
     compile "com.mcmoddev:BaseMinerals:${mc_version}-${bmi_version}:deobf"
     compile "com.mcmoddev:ModernMetals:${mc_version}-${mme_version}:deobf"
@@ -240,6 +259,16 @@ curseforge {
     }
 }
 
+sonarqube {
+    properties {
+        property "sonar.host.url", secret.sonarHost
+        property "sonar.organization", secret.sonarOrganization
+        property "sonar.login", secret.sonarToken
+        property "sonar.projectName", project.archivesBaseName
+        property "sonar.projectKey", "$project.group:$project.archivesBaseName"
+    }
+}
+
 String getModFile() {
     String path = "";
     FileTree tree = fileTree(dir: "src/main/java")

gradle.properties

@@ -1,28 +1,24 @@
-mc_version=1.10.2
-top_mc_version=1.10
-//ccl_version=2.2.3.+
-//ccl_version=2.3.1.+
-//ccl_version=2.4.3.+
-ccl_version=2.5.2.+
-//ccc_version=2.1.8.+
-//ccc_version=2.2.1.+
-//ccc_version=2.3.5.+
-ccc_version=2.4.0.+
-nei_version=2.1.3.+
-//jei_version=3.10.0.+
-//jei_version=3.11.2.+
-//jei_version=3.12.8.+
-jei_version=3.13.6.+
-mantle_version=1.1.5.+
-tconstruct_version=2.6.3.+
-mcmp_version=1.2.1
-//mcmp_version=1.3.0
-mcmp_experimental_version=2.0.0_88
-top_version=1.3.3-41
-orespawn_version=2.0.0.15
-tesla_version=1.2.1.50
+mc_version=1.11.2
+top_mc_version=1.1x
+ccl_version=2.7.0.+
+ccc_version=2.4.1.+
+nei_version=2.3.0.+
+jei_version=4.4.1.+
+mantle_version=1.2.0.+
+tconstruct_version=2.7.0.+
+mcmp_version=2.0.1
+mcmp_experimental_version=2.0.1_31
+top_version=1.4.7-57
+orespawn_version=3.0.0.+
+tesla_version=1.3.0.+
 bme_version=2.5.0-beta+
 mme_version=2.5.0-beta+
 fme_version=2.5.0-beta+
 bmi_version=2.5.0-beta+
-pa_version=2.3.0
+pa_version=2.3.0
+cofhcore_version=4.2.3.+
+mekanism_version=471563e083
+taiga_version=b874a41abb
+ic2_version=2.7.71-ex111
+minetweaker_version=3.+
+hwyla_version=+

src/main/java/com/mcmoddev/nethermetals/NetherMetals.java

@@ -30,7 +30,7 @@
  * @author Jasmine Iwanek
  *
  */
-@Mod(modid = NetherMetals.MODID, name = NetherMetals.NAME, version = NetherMetals.VERSION, dependencies = "required-after:Forge@[12.18.3.2185,);after:basemetals;after:baseminerals;after:modernmetals", acceptedMinecraftVersions = "[1.10.2,)", updateJSON = "https://raw.githubusercontent.com/MinecraftModDevelopment/NetherMetals/master/update.json")
+@Mod(modid = NetherMetals.MODID, name = NetherMetals.NAME, version = NetherMetals.VERSION, dependencies = "required-after:forge@[13.20.0.2228,);after:basemetals;after:baseminerals;after:modernmetals", acceptedMinecraftVersions = "[1.11.2,)", updateJSON = "https://raw.githubusercontent.com/MinecraftModDevelopment/NetherMetals/master/update.json")
 public class NetherMetals {
 
 	@Instance

src/main/java/com/mcmoddev/nethermetals/init/ItemGroups.java

@@ -1,12 +1,22 @@
 package com.mcmoddev.nethermetals.init;
 
+import com.mcmoddev.basemetals.data.MaterialNames;
+import com.mcmoddev.lib.data.Names;
+import com.mcmoddev.lib.init.MMDCreativeTab;
+import com.mcmoddev.lib.init.Materials;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
 /**
  * This class initializes all item groups in Nether Metals.
  *
  * @author Jasmine Iwanek
  *
  */
 public class ItemGroups extends com.mcmoddev.lib.init.ItemGroups {
+	private static final int blocksTabId  = addTab("blocks", true );;
+	public static final MMDCreativeTab blocksTab = getTab(blocksTabId);
 
 	private static boolean initDone = false;
 
@@ -24,4 +34,10 @@ public static void init() {
 
 		initDone = true;
 	}
+
+	public static void setupIcons() {
+		Item blocksTabIconItem = Item.getItemFromBlock(Materials.getMaterialByName(MaterialNames.LAPIS).getBlock(Names.NETHERORE));
+
+		blocksTab.setTabIconItem(new ItemStack(blocksTabIconItem));
+	}
 }