full update to 1.8.9

build.gradle

@@ -18,38 +18,30 @@ repositories {
         name = "forge"
         url = "http://files.minecraftforge.net/maven"
     }
-    maven { // the repo from which to get NEI and stuff
-        name 'CB Repo'
-        url "http://chickenbones.net/maven"
-    }
     maven {
-        name "Waila Mobius Repo"
-        url "http://mobiusstrip.eu/maven"
-    }
-    ivy {
-        name 'FMP'
-        artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
+        name = "jei"
+        url =  "http://dvs1.progwml6.com/files/maven"
     }
-
 }
 
 dependencies {
-    //compile "codechicken:NotEnoughItems:${version_minecraft}-${version_nei}:dev"
-    //compile "codechicken:CodeChickenLib:${version_minecraft}-${version_cclib}:dev"
-    //compile "codechicken:CodeChickenCore:${version_minecraft}-${version_cccore}:dev"
-    //compile "mcp.mobius.waila:Waila:${waila_version}_${version_minecraft}:dev"
-
-	compile fileTree(dir: 'lib', include: '*.jar')
+    deobfCompile "mezz.jei:jei_${version_minecraft}:${version_jei}"
+    compile fileTree(dir: 'lib', include: '*.jar')
 }
 
-group = "BetterAchievements"
+group = "betterachievements"
 archivesBaseName = "BetterAchievements"
 
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
 minecraft {
     version = "${version_minecraft}-${version_forge}"
     mappings = "${version_mappings}"
     runDir = "run"
 
+    useDepAts = true
+
     replace "@MAJOR@", version_major
     replace "@MINOR@", version_minor
     replace "@REVIS@", version_revis
@@ -68,38 +60,37 @@ processResources {
     }
 
     from(sourceSets.main.resources.srcDirs) { exclude '**/*.info' }
+
+    // Move access transformers to META-INF
+    rename '(.+_at.cfg)', 'META-INF/$1'
 }
 
 version = "${version_minecraft}-${version_major}.${version_minor}.${version_revis}"
 
 jar {
-    from "build/sources/main"
     destinationDir = file (rootProject.getRootDir().getPath() + '/output')
-    exclude('betterachievementsdemo/**')
 }
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     classifier = 'deobf'
     destinationDir = file (rootProject.getRootDir().getPath() + '/output')
-    exclude('betterachievementsdemo/**')
+    exclude("**/betterachievementsdemo/**")
 }
 
 task sourcesJar(type: Jar, dependsOn: 'sourceMainJava') {
-    from "build/sources/java"
-    from "build/resources/main/java"
+    from "build/sources/main"
+    from "build/resources/main"
     classifier "sources"
     destinationDir = file (rootProject.getRootDir().getPath() + '/output')
 }
 
-artifacts {
-    archives sourcesJar, deobfJar
+task apiJar(type: Jar, dependsOn: 'sourceMainJava') {
+    from "build/sources/main/java/betterachievements/api"
+    classifier "api"
+    destinationDir = file (rootProject.getRootDir().getPath() + '/output')
 }
 
-sourceSets {
-    main {
-        java {
-            srcDirs += "src/demo/java"
-        }
-    }
+artifacts {
+    archives deobfJar, sourcesJar, apiJar
 }

gradle.properties

@@ -1,10 +1,7 @@
-version_cccore=1.0.5.36
-version_cclib=1.1.2.133
-version_forge=11.15.0.1663
+version_forge=11.15.0.1690
 version_minecraft=1.8.9
 version_major=0
 version_minor=1
 version_revis=1
-version_nei=1.0.5.104
-waila_version=1.6.0
-version_mappings=snapshot_20151230
+version_mappings=snapshot_20160101
+version_jei=2.16+

src/main/java/betterachievements/api/util/IMCHelper.java

@@ -1,11 +1,11 @@
 package betterachievements.api.util;
 
 import betterachievements.api.components.page.ICustomIcon;
-import net.minecraftforge.fml.common.event.FMLInterModComms;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
 
 /**
  * Used to send an IMC message containing the {@link ItemStack} to render on the tab

src/main/java/betterachievements/gui/GuiBetterAchievements.java

@@ -13,14 +13,12 @@
 import betterachievements.reference.Resources;
 import betterachievements.registry.AchievementRegistry;
 import betterachievements.util.RenderHelper;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Blocks;
@@ -31,6 +29,8 @@
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.MathHelper;
 import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;

src/main/java/betterachievements/gui/ModGuiConfig.java

@@ -2,8 +2,8 @@
 
 import betterachievements.handler.ConfigHandler;
 import betterachievements.reference.Reference;
-import net.minecraftforge.fml.client.config.GuiConfig;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.client.config.GuiConfig;
 
 public class ModGuiConfig extends GuiConfig
 {

src/main/java/betterachievements/gui/ModGuiFactory.java

@@ -1,8 +1,8 @@
 package betterachievements.gui;
 
-import net.minecraftforge.fml.client.IModGuiFactory;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.client.IModGuiFactory;
 
 import java.util.Set;
 

src/main/java/betterachievements/handler/ConfigHandler.java

@@ -4,13 +4,13 @@
 import betterachievements.gui.GuiBetterAchievements;
 import betterachievements.reference.Reference;
 import betterachievements.registry.AchievementRegistry;
-import net.minecraftforge.fml.client.config.IConfigElement;
-import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
+import net.minecraftforge.fml.client.config.IConfigElement;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.io.File;
 import java.util.ArrayList;

src/main/java/betterachievements/handler/GuiOpenHandler.java

@@ -2,11 +2,11 @@
 
 import betterachievements.gui.GuiAchievementsOld;
 import betterachievements.gui.GuiBetterAchievements;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.achievement.GuiAchievements;
 import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 
 import java.lang.reflect.Field;

src/main/java/betterachievements/handler/SaveHandler.java

@@ -1,8 +1,8 @@
 package betterachievements.handler;
 
 import betterachievements.registry.AchievementRegistry;
-import  net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class SaveHandler
 {

src/main/java/betterachievements/registry/AchievementRegistry.java

@@ -2,17 +2,16 @@
 
 import betterachievements.api.components.page.ICustomIcon;
 import betterachievements.util.LogHelper;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.JsonToNBT;
-import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTException;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.stats.Achievement;
 import net.minecraft.stats.AchievementList;
 import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;