Switch to using jitpack

HDSkins

@@ -1 +0,0 @@
-Subproject commit a4064e13e77d9cd0e840109d626f65e424e4c944

build.gradle

@@ -5,29 +5,25 @@ buildscript {
             name 'forge'
             url 'http://files.minecraftforge.net/maven'
         }
-        maven {
-            name = 'sponge'
-            url = 'https://repo.spongepowered.org/maven'
-        }
+//        maven {
+//            name = 'sponge'
+//            url = 'https://repo.spongepowered.org/maven'
+//        }
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+        classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1'
     }
 }
 
-plugins {
-    id 'org.ajoberstar.grgit' version '1.7.2'
-}
-
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'org.ajoberstar.grgit'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
-compileJava.sourceCompatibility = '1.8'
-compileJava.targetCompatibility = '1.8'
 
 ext {
     revision = grgit.log().size()
@@ -85,8 +81,6 @@ minecraft {
                 minelittlepony {
                     // TODO: Remember to add /bin/default to the Environment configs
                     // minelittlepony%%C:/.../bin/default
-                    source sourceSets.client
-                    source sourceSets.main
                     source sourceSets.fml
                 }
             }
@@ -98,6 +92,9 @@ repositories {
     maven {
         url = 'https://repo.spongepowered.org/maven'
     }
+    maven {
+        url = 'https://jitpack.io'
+    }
 }
 
 dependencies {
@@ -110,11 +107,16 @@ dependencies {
         transitive = false
     }
 
-    compile(project(':HDSkins')) {
-        transitive = false
-    }
+    compile "com.github.MineLittlePony:Kirin:master-SNAPSHOT:base"
+    compile "com.github.MineLittlePony:HDSkins:1.13-SNAPSHOT:base"
+//
+//    compile(project(':HDSkins')) {
+//        transitive = false
+//    }
 }
 
+compileJava.options.compilerArgs += '-proc:none'
+
 manifest {
     attributes(
         "Implementation-Version": "${version} (git-${project.hash})",

settings.gradle

@@ -1,2 +1,3 @@
 rootProject.name = 'MineLittlePony'
-include 'HDSkins'
+// Checkout to parent dir to dev both
+includeBuild '../HDSkins'

src/api/java/mcp/MethodsReturnNonnullByDefault.java

@@ -1,26 +0,0 @@
-package mcp;
-
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * This annotation can be applied to a package, class or method to indicate that
- * the method in that element are nonnull by default unless there is:
- * <ul>
- * <li>An explicit nullness annotation
- * <li>The method overrides a method in a superclass (in which case the
- * annotation of the corresponding method in the superclass applies)
- * <li> there is a default parameter annotation applied to a more tightly nested
- * element.
- * </ul>
- *
- */
-@Documented
-@Nonnull
-@TypeQualifierDefault(ElementType.METHOD) // Note: This is a copy of javax.annotation.ParametersAreNonnullByDefault with target changed to METHOD
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MethodsReturnNonnullByDefault {}

src/api/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -1,20 +0,0 @@
-package net.minecraftforge.client;
-
-import net.minecraft.client.renderer.entity.model.ModelBiped;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.ItemStack;
-
-// stub
-public class ForgeHooksClient {
-
-    public static String getArmorTexture(Entity entity, ItemStack armor, String def, EntityEquipmentSlot slot, String type) {
-        return def;
-    }
-
-    public static ModelBiped getArmorModel(EntityLivingBase entity, ItemStack item, EntityEquipmentSlot slot, ModelBiped def) {
-        return def;
-    }
-
-}

src/api/java/org/spongepowered/asm/mixin/Mixin.java

@@ -1,5 +0,0 @@
-package org.spongepowered.asm.mixin;
-
-public @interface Mixin {
-    Class<?> value();
-}

src/api/java/org/spongepowered/asm/mixin/gen/Accessor.java

@@ -1,5 +0,0 @@
-package org.spongepowered.asm.mixin.gen;
-
-public @interface Accessor {
-    String value() default "";
-}

src/api/java/org/spongepowered/asm/mixin/injection/At.java

@@ -1,14 +0,0 @@
-package org.spongepowered.asm.mixin.injection;
-
-public @interface At {
-    String value() default "";
-    String target() default "";
-    int ordinal() default 0;
-    boolean remap() default true;
-    Shift shift() default Shift.BEFORE;
-    
-    enum Shift {
-        BEFORE,
-        AFTER
-    }
-}

src/api/java/org/spongepowered/asm/mixin/injection/Inject.java

@@ -1,7 +0,0 @@
-package org.spongepowered.asm.mixin.injection;
-
-public @interface Inject {
-    String method() default "";
-    At at();
-    boolean cancellable() default false;
-}

src/api/java/org/spongepowered/asm/mixin/injection/ModifyArg.java

@@ -1,7 +0,0 @@
-package org.spongepowered.asm.mixin.injection;
-
-public @interface ModifyArg {
-    String method() default "";
-    At at();
-    int index();
-}

src/api/java/org/spongepowered/asm/mixin/injection/Redirect.java

@@ -1,6 +0,0 @@
-package org.spongepowered.asm.mixin.injection;
-
-public @interface Redirect {
-    String[] method() default "";
-    At at();
-}

src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java

@@ -1,5 +0,0 @@
-package org.spongepowered.asm.mixin.injection.callback;
-
-public abstract class CallbackInfo {
-    public abstract void cancel();
-}

src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java

@@ -1,6 +0,0 @@
-package org.spongepowered.asm.mixin.injection.callback;
-
-public abstract class CallbackInfoReturnable<T> {
-    public abstract T getReturnValue();
-    public abstract void setReturnValue(T t);
-}