Move into different sourcesets.

This commit is contained in:
Matthew Messinger 2015-12-09 16:05:21 -05:00
parent 674a02f1c9
commit b04468266c
32 changed files with 34 additions and 18 deletions

View file

@ -16,6 +16,19 @@ minecraft {
tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker'
clientJvmArgs += '-Dmcpenv=true' clientJvmArgs += '-Dmcpenv=true'
} }
sourceSets {
def deps = [
configurations.forgeGradleMcDeps,
configurations.forgeGradleMc,
configurations.provided
]
common {
compileClasspath += files deps
}
hdskins {
compileClasspath += files deps
}
}
project('forge') { project('forge') {
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
minecraft { minecraft {
@ -50,13 +63,16 @@ repositories.flatDir {
dependencies { dependencies {
deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames'
provided voxellib provided voxellib
compile sourceSets.common.output
compile sourceSets.hdskins.output
hdskinsCompile sourceSets.common.output
} }
jar { jar {
manifest.attributes.remove 'TweakClass' manifest.attributes.remove 'TweakClass'
} }
task standaloneJar(type: Jar, dependsOn: [{voxellib.reobfObfJar}, {project('forge').compileJava}]) { task standaloneJar(type: Jar, dependsOn: [{voxellib.reobfObfJar}, {project('forge').compileJava}]) {
extension 'litemod' extension 'litemod'
from sourceSets.main.output from sourceSets*.output
from {project('forge').sourceSets.main.output} from {project('forge').sourceSets.main.output}
// voxellib // voxellib

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -14,31 +14,31 @@ import net.minecraft.util.ResourceLocation;
public class PonyManager { public class PonyManager {
public static final String RESOURCE_NAMESPACE = "minelittlepony"; private static final String NAMESPACE = "minelittlepony";
public static final ResourceLocation ZOMBIE = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pony.png"); public static final ResourceLocation ZOMBIE = new ResourceLocation(NAMESPACE, "textures/entity/zombie/zombie_pony.png");
public static final ResourceLocation ZOMBIE_VILLAGER = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_villager_pony.png"); public static final ResourceLocation ZOMBIE_VILLAGER = new ResourceLocation(NAMESPACE, "textures/entity/zombie/zombie_villager_pony.png");
public static final ResourceLocation PIGMAN = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pigman_pony.png"); public static final ResourceLocation PIGMAN = new ResourceLocation(NAMESPACE, "textures/entity/zombie/zombie_pigman_pony.png");
public static final ResourceLocation SKELETON = new ResourceLocation("minelittlepony", "textures/entity/skeleton/skeleton_pony.png"); public static final ResourceLocation SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/skeleton_pony.png");
public static final ResourceLocation WITHER_SKELETON = new ResourceLocation("minelittlepony", "textures/entity/skeleton/skeleton_wither_pony.png"); public static final ResourceLocation WITHER_SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/skeleton_wither_pony.png");
public static final ResourceLocation STEVE = new ResourceLocation("minelittlepony", "textures/entity/steve_pony.png"); public static final ResourceLocation STEVE = new ResourceLocation(NAMESPACE, "textures/entity/steve_pony.png");
public static final ResourceLocation ALEX = new ResourceLocation("minelittlepony", "textures/entity/alex_pony.png"); public static final ResourceLocation ALEX = new ResourceLocation(NAMESPACE, "textures/entity/alex_pony.png");
private static final int MAX_BGPONY_COUNT = 141; private static final int MAX_BGPONY_COUNT = 141;
public final List<ResourceLocation> backgroundPonyList = makeBkgndPonies(); private final List<ResourceLocation> backgroundPonyList = makeBkgndPonies();
public final List<ResourceLocation> villagerList = ImmutableList.<ResourceLocation> builder() private final List<ResourceLocation> villagerList = ImmutableList.<ResourceLocation> builder()
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/farmer_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/farmer_pony.png"))
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/librarian_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/librarian_pony.png"))
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/priest_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/priest_pony.png"))
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/smith_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/smith_pony.png"))
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/butcher_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/butcher_pony.png"))
.add(new ResourceLocation("minelittlepony", "textures/entity/villager/villager_pony.png")) .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/villager_pony.png"))
.build(); .build();
private static List<ResourceLocation> makeBkgndPonies() { private static List<ResourceLocation> makeBkgndPonies() {
ImmutableList.Builder<ResourceLocation> list = ImmutableList.builder(); ImmutableList.Builder<ResourceLocation> list = ImmutableList.builder();
for (int check = 0; check < MAX_BGPONY_COUNT; ++check) { for (int check = 0; check < MAX_BGPONY_COUNT; ++check) {
list.add(new ResourceLocation("minelittlepony", "textures/entity/pony/bpony_" + check + ".png")); list.add(new ResourceLocation(NAMESPACE, "textures/entity/pony/bpony_" + check + ".png"));
} }
return list.build(); return list.build();
} }