Switch to using jitpack

This commit is contained in:
Matthew Messinger 2019-04-30 20:57:19 -04:00
parent ef9b51e9ec
commit c3c87dbf74
13 changed files with 19 additions and 118 deletions

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

View file

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

View file

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

View file

@ -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 {}

View file

@ -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;
}
}

View file

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

View file

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

View file

@ -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
}
}

View file

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

View file

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

View file

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

View file

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

View file

@ -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);
}