diff --git a/HDSkins b/HDSkins deleted file mode 160000 index a4064e13..00000000 --- a/HDSkins +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a4064e13e77d9cd0e840109d626f65e424e4c944 diff --git a/build.gradle b/build.gradle index 39dad559..ccf19913 100644 --- a/build.gradle +++ b/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})", diff --git a/settings.gradle b/settings.gradle index 16f9ab8a..3005f0fd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = 'MineLittlePony' -include 'HDSkins' +// Checkout to parent dir to dev both +includeBuild '../HDSkins' \ No newline at end of file diff --git a/src/api/java/mcp/MethodsReturnNonnullByDefault.java b/src/api/java/mcp/MethodsReturnNonnullByDefault.java deleted file mode 100644 index fb02ffca..00000000 --- a/src/api/java/mcp/MethodsReturnNonnullByDefault.java +++ /dev/null @@ -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: - * - * - */ -@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 {} diff --git a/src/api/java/net/minecraftforge/client/ForgeHooksClient.java b/src/api/java/net/minecraftforge/client/ForgeHooksClient.java deleted file mode 100644 index c5baa429..00000000 --- a/src/api/java/net/minecraftforge/client/ForgeHooksClient.java +++ /dev/null @@ -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; - } - -} diff --git a/src/api/java/org/spongepowered/asm/mixin/Mixin.java b/src/api/java/org/spongepowered/asm/mixin/Mixin.java deleted file mode 100644 index 5278c08e..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/Mixin.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.spongepowered.asm.mixin; - -public @interface Mixin { - Class value(); -} diff --git a/src/api/java/org/spongepowered/asm/mixin/gen/Accessor.java b/src/api/java/org/spongepowered/asm/mixin/gen/Accessor.java deleted file mode 100644 index 3247cc3f..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/gen/Accessor.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.spongepowered.asm.mixin.gen; - -public @interface Accessor { - String value() default ""; -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/At.java b/src/api/java/org/spongepowered/asm/mixin/injection/At.java deleted file mode 100644 index fc796c71..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/At.java +++ /dev/null @@ -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 - } -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/api/java/org/spongepowered/asm/mixin/injection/Inject.java deleted file mode 100644 index 46ee8f4c..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/Inject.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.spongepowered.asm.mixin.injection; - -public @interface Inject { - String method() default ""; - At at(); - boolean cancellable() default false; -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/ModifyArg.java b/src/api/java/org/spongepowered/asm/mixin/injection/ModifyArg.java deleted file mode 100644 index 3f6786d0..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/ModifyArg.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.spongepowered.asm.mixin.injection; - -public @interface ModifyArg { - String method() default ""; - At at(); - int index(); -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/api/java/org/spongepowered/asm/mixin/injection/Redirect.java deleted file mode 100644 index 5a85ef7f..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.spongepowered.asm.mixin.injection; - -public @interface Redirect { - String[] method() default ""; - At at(); -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java b/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java deleted file mode 100644 index 061042c0..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.spongepowered.asm.mixin.injection.callback; - -public abstract class CallbackInfo { - public abstract void cancel(); -} diff --git a/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java b/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java deleted file mode 100644 index 836131aa..00000000 --- a/src/api/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.spongepowered.asm.mixin.injection.callback; - -public abstract class CallbackInfoReturnable { - public abstract T getReturnValue(); - public abstract void setReturnValue(T t); -}