Port and update to MC 1.12 and the new Forge registry changes

build.gradle

@@ -7,23 +7,23 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
 
-version = "1.11-1.4.5" 
-group= "com.azanor.baubles" 
+version = "1.12-1.4.5"
+group= "com.azanor.baubles"
 archivesBaseName = "Baubles"
 
 srcCompat = JavaVersion.VERSION_1_8
 targetCompat = JavaVersion.VERSION_1_8
 
 minecraft {
-      version = "1.11-13.19.0.2180"
+    version = "1.12-14.21.1.2404"
     runDir = "run"
-    mappings = "snapshot_20170502"
+    mappings = "snapshot_20170708"
     makeObfSourceJar = false
 }
 
@@ -49,11 +49,15 @@ task deobfJar(type: Jar) {
     classifier = 'deobf'
 }
 
-// Create API library zip
-task apiZip(type: Zip) {
+// Create API library jar
+task apiZip(type: Jar) {
     from(sourceSets.main.java) {
         include "baubles/api/**"
     }
+    from(sourceSets.main.output) {
+        include "baubles/api/**"
+    }
+
     classifier = 'api'
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Tue May 16 17:06:48 EEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

src/main/java/baubles/api/BaubleType.java

@@ -8,13 +8,13 @@ public enum BaubleType {
 	HEAD(4),
 	BODY(5),
 	CHARM(6);
-	
+
 	int[] validSlots;
 
 	private BaubleType(int ... validSlots) {
 		this.validSlots = validSlots;
 	}
-	
+
 	public boolean hasSlot(int slot) {
 		for (int s:validSlots) {
 			if (s == slot) return true;
@@ -25,6 +25,4 @@ public boolean hasSlot(int slot) {
 	public int[] getValidSlots() {
 		return validSlots;
 	}
-
-
 }

src/main/java/baubles/api/BaublesApi.java

@@ -9,9 +9,8 @@
 /**
  * @author Azanor
  */
-public class BaublesApi 
-{	
-
+public class BaublesApi
+{
 	/**
 	 * Retrieves the baubles inventory capability handler for the supplied player
 	 */
@@ -20,7 +19,7 @@ public static IBaublesItemHandler getBaublesHandler(EntityPlayer player)
 		IBaublesItemHandler handler = player.getCapability(BaublesCapabilities.CAPABILITY_BAUBLES, null);
 		handler.setPlayer(player);
 		return handler;
-	}	
+	}
 
 	/**
 	 * Retrieves the baubles capability handler wrapped as a IInventory for the supplied player
@@ -32,5 +31,4 @@ public static IInventory getBaubles(EntityPlayer player)
 		handler.setPlayer(player);
 		return new BaublesInventoryWrapper(handler, player);
 	}
-
 }

src/main/java/baubles/api/IBauble.java

@@ -11,25 +11,25 @@
  */
 
 public interface IBauble {
-	
+
 	/**
 	 * This method return the type of bauble this is. 
 	 * Type is used to determine the slots it can go into.
 	 */
 	public BaubleType getBaubleType(ItemStack itemstack);
-	
+
 	/**
 	 * This method is called once per tick if the bauble is being worn by a player
 	 */
 	public default void onWornTick(ItemStack itemstack, EntityLivingBase player) {		
 	}
-	
+
 	/**
 	 * This method is called when the bauble is equipped by a player
 	 */
 	public default void onEquipped(ItemStack itemstack, EntityLivingBase player) {		
 	}
-	
+
 	/**
 	 * This method is called when the bauble is unequipped by a player
 	 */
@@ -42,14 +42,14 @@ public default void onUnequipped(ItemStack itemstack, EntityLivingBase player) {
 	public default boolean canEquip(ItemStack itemstack, EntityLivingBase player) {		
 		return true;
 	}
-	
+
 	/**
 	 * Can this bauble be removed from a bauble slot
 	 */
 	public default boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
 		return true;
 	}
-	
+
 	/**
 	 * Will bauble automatically sync to client if a change is detected in its NBT or damage values?
 	 * Default is off, so override and set to true if you want to auto sync.
@@ -58,5 +58,4 @@ public default boolean canUnequip(ItemStack itemstack, EntityLivingBase player)
 	public default boolean willAutoSync(ItemStack itemstack, EntityLivingBase player) {
 		return false;
 	}
-
 }

src/main/java/baubles/api/cap/BaublesCapabilities.java

@@ -7,25 +7,20 @@
 import net.minecraftforge.common.capabilities.CapabilityInject;
 
 public class BaublesCapabilities {
-
 	/**
-     * Access to the baubles capability. 
-     */
-    @CapabilityInject(IBaublesItemHandler.class)
-    public static final Capability<IBaublesItemHandler> CAPABILITY_BAUBLES = null;
-
-    public static class CapabilityBaubles<T extends IBaublesItemHandler> implements IStorage<IBaublesItemHandler> {
-
-        @Override
-        public NBTBase writeNBT (Capability<IBaublesItemHandler> capability, IBaublesItemHandler instance, EnumFacing side) {
-
-            return null;
-        }
-
-        @Override
-        public void readNBT (Capability<IBaublesItemHandler> capability, IBaublesItemHandler instance, EnumFacing side, NBTBase nbt) {
-
-        }
-    }
-
+	 * Access to the baubles capability. 
+	 */
+	@CapabilityInject(IBaublesItemHandler.class)
+	public static final Capability<IBaublesItemHandler> CAPABILITY_BAUBLES = null;
+
+	public static class CapabilityBaubles<T extends IBaublesItemHandler> implements IStorage<IBaublesItemHandler> {
+
+		@Override
+		public NBTBase writeNBT (Capability<IBaublesItemHandler> capability, IBaublesItemHandler instance, EnumFacing side) {
+			return null;
+		}
+
+		@Override
+		public void readNBT (Capability<IBaublesItemHandler> capability, IBaublesItemHandler instance, EnumFacing side, NBTBase nbt){ }
+	}
 }

src/main/java/baubles/api/cap/BaublesContainer.java

@@ -11,15 +11,15 @@ public class BaublesContainer extends ItemStackHandler implements IBaublesItemHa
 	private boolean[] changed = new boolean[BAUBLE_SLOTS];
 	private boolean blockEvents=false;	
 	private EntityLivingBase player;
-	
+
 	public BaublesContainer()
-    {
-        super(BAUBLE_SLOTS);
-    }
-	
+	{
+		super(BAUBLE_SLOTS);
+	}
+
 	@Override
 	public void setSize(int size)
-    {
+	{
 		if (size<BAUBLE_SLOTS) size = BAUBLE_SLOTS;
 		super.setSize(size);
 		boolean[] old = changed;
@@ -28,7 +28,7 @@ public void setSize(int size)
 		{
 			changed[i] = old[i];
 		}
-    }
+	}
 
 	/**
 	 * Returns true if automation is allowed to insert the given stack (ignoring
@@ -38,10 +38,10 @@ public void setSize(int size)
 	public boolean isItemValidForSlot(int slot, ItemStack stack, EntityLivingBase player) {
 		if (stack==null || stack.isEmpty() || !(stack.getItem() instanceof IBauble) ||
 				!((IBauble) stack.getItem()).canEquip(stack, player))
-			return false;		
+			return false;
 		return ((IBauble) stack.getItem()).getBaubleType(stack).hasSlot(slot);
 	}
-	
+
 	@Override
 	public void setStackInSlot(int slot, ItemStack stack) {
 		if (stack==null || stack.isEmpty() || this.isItemValidForSlot(slot, stack, player)) {
@@ -54,7 +54,7 @@ public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
 		if (!this.isItemValidForSlot(slot, stack, player)) return stack;
 		return super.insertItem(slot, stack, simulate);
 	}
-	
+
 	@Override
 	public boolean isEventBlocked() {
 		return blockEvents;
@@ -64,13 +64,13 @@ public boolean isEventBlocked() {
 	public void setEventBlock(boolean blockEvents) {
 		this.blockEvents = blockEvents;
 	}
-	
+
 	@Override
 	protected void onContentsChanged(int slot)
-    {
+	{
 		setChanged(slot,true);
-    }	
-	
+	}
+
 	@Override
 	public boolean isChanged(int slot) {
 		if (changed==null) {
@@ -91,5 +91,4 @@ public void setChanged(int slot, boolean change) {
 	public void setPlayer(EntityLivingBase player) {
 		this.player=player;
 	}
-
 }