diff --git a/build.gradle b/build.gradle index fdc7a2ae..c0c00434 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,19 @@ minecraft { tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' clientJvmArgs += '-Dmcpenv=true' } +sourceSets { + def deps = [ + configurations.forgeGradleMcDeps, + configurations.forgeGradleMc, + configurations.provided + ] + common { + compileClasspath += files deps + } + hdskins { + compileClasspath += files deps + } +} project('forge') { apply plugin: 'net.minecraftforge.gradle.forge' minecraft { @@ -50,13 +63,16 @@ repositories.flatDir { dependencies { deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' provided voxellib + compile sourceSets.common.output + compile sourceSets.hdskins.output + hdskinsCompile sourceSets.common.output } jar { manifest.attributes.remove 'TweakClass' } task standaloneJar(type: Jar, dependsOn: [{voxellib.reobfObfJar}, {project('forge').compileJava}]) { extension 'litemod' - from sourceSets.main.output + from sourceSets*.output from {project('forge').sourceSets.main.output} // voxellib diff --git a/src/main/java/com/mumfrey/liteloader/core/LiteLoaderFriend.java b/src/common/java/com/mumfrey/liteloader/core/LiteLoaderFriend.java similarity index 100% rename from src/main/java/com/mumfrey/liteloader/core/LiteLoaderFriend.java rename to src/common/java/com/mumfrey/liteloader/core/LiteLoaderFriend.java diff --git a/src/main/java/com/mumfrey/liteloader/core/api/LoadableModFileFriend.java b/src/common/java/com/mumfrey/liteloader/core/api/LoadableModFileFriend.java similarity index 100% rename from src/main/java/com/mumfrey/liteloader/core/api/LoadableModFileFriend.java rename to src/common/java/com/mumfrey/liteloader/core/api/LoadableModFileFriend.java diff --git a/src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java b/src/common/java/com/voxelmodpack/common/VoxelCommonLiteMod.java similarity index 100% rename from src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java rename to src/common/java/com/voxelmodpack/common/VoxelCommonLiteMod.java diff --git a/src/main/java/com/voxelmodpack/voxelmenu/IPanoramaRenderer.java b/src/common/java/com/voxelmodpack/voxelmenu/IPanoramaRenderer.java similarity index 100% rename from src/main/java/com/voxelmodpack/voxelmenu/IPanoramaRenderer.java rename to src/common/java/com/voxelmodpack/voxelmenu/IPanoramaRenderer.java diff --git a/src/main/resources/assets/voxelcommon/textures/gui/guiparts.png b/src/common/resources/assets/voxelcommon/textures/gui/guiparts.png similarity index 100% rename from src/main/resources/assets/voxelcommon/textures/gui/guiparts.png rename to src/common/resources/assets/voxelcommon/textures/gui/guiparts.png diff --git a/src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDPrivateFields.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java rename to src/hdskins/java/com/voxelmodpack/hdskins/HDPrivateFields.java diff --git a/src/main/java/com/voxelmodpack/hdskins/HDSkinDownload.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinDownload.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/HDSkinDownload.java rename to src/hdskins/java/com/voxelmodpack/hdskins/HDSkinDownload.java diff --git a/src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java rename to src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java diff --git a/src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java b/src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java rename to src/hdskins/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java diff --git a/src/main/java/com/voxelmodpack/hdskins/PreviewTexture.java b/src/hdskins/java/com/voxelmodpack/hdskins/PreviewTexture.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/PreviewTexture.java rename to src/hdskins/java/com/voxelmodpack/hdskins/PreviewTexture.java diff --git a/src/main/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java rename to src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java diff --git a/src/main/java/com/voxelmodpack/hdskins/gui/FileDropListener.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/gui/FileDropListener.java rename to src/hdskins/java/com/voxelmodpack/hdskins/gui/FileDropListener.java diff --git a/src/main/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/gui/GuiSkins.java rename to src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java diff --git a/src/main/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java rename to src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java diff --git a/src/main/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java rename to src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java diff --git a/src/main/java/com/voxelmodpack/hdskins/mod/HDSkinsMod.java b/src/hdskins/java/com/voxelmodpack/hdskins/mod/HDSkinsMod.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/mod/HDSkinsMod.java rename to src/hdskins/java/com/voxelmodpack/hdskins/mod/HDSkinsMod.java diff --git a/src/main/java/com/voxelmodpack/hdskins/mod/HDSkinsModCore.java b/src/hdskins/java/com/voxelmodpack/hdskins/mod/HDSkinsModCore.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/mod/HDSkinsModCore.java rename to src/hdskins/java/com/voxelmodpack/hdskins/mod/HDSkinsModCore.java diff --git a/src/main/java/com/voxelmodpack/hdskins/mod/LiteModHDSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkins.java similarity index 100% rename from src/main/java/com/voxelmodpack/hdskins/mod/LiteModHDSkins.java rename to src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkins.java diff --git a/src/main/resources/assets/hdskins/lang/en_US.lang b/src/hdskins/resources/assets/hdskins/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/hdskins/lang/en_US.lang rename to src/hdskins/resources/assets/hdskins/lang/en_US.lang diff --git a/src/main/resources/assets/hdskins/lang/fr_FR.lang b/src/hdskins/resources/assets/hdskins/lang/fr_FR.lang similarity index 100% rename from src/main/resources/assets/hdskins/lang/fr_FR.lang rename to src/hdskins/resources/assets/hdskins/lang/fr_FR.lang diff --git a/src/main/resources/assets/hdskins/lang/ru_RU.lang b/src/hdskins/resources/assets/hdskins/lang/ru_RU.lang similarity index 100% rename from src/main/resources/assets/hdskins/lang/ru_RU.lang rename to src/hdskins/resources/assets/hdskins/lang/ru_RU.lang diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_0.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_0.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_0.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_0.png diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_1.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_1.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_1.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_1.png diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_2.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_2.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_2.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_2.png diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_3.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_3.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_3.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_3.png diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_4.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_4.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_4.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_4.png diff --git a/src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_5.png b/src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_5.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/cubemaps/cubemap0_5.png rename to src/hdskins/resources/assets/hdskins/textures/cubemaps/cubemap0_5.png diff --git a/src/main/resources/assets/hdskins/textures/mob/noskin.png b/src/hdskins/resources/assets/hdskins/textures/mob/noskin.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/mob/noskin.png rename to src/hdskins/resources/assets/hdskins/textures/mob/noskin.png diff --git a/src/main/resources/assets/hdskins/textures/mob/tempskin.png b/src/hdskins/resources/assets/hdskins/textures/mob/tempskin.png similarity index 100% rename from src/main/resources/assets/hdskins/textures/mob/tempskin.png rename to src/hdskins/resources/assets/hdskins/textures/mob/tempskin.png diff --git a/src/main/resources/events.json b/src/hdskins/resources/events.json similarity index 100% rename from src/main/resources/events.json rename to src/hdskins/resources/events.json diff --git a/src/main/java/com/brohoof/minelittlepony/PonyManager.java b/src/main/java/com/brohoof/minelittlepony/PonyManager.java index 2d2352cb..104cd49d 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyManager.java +++ b/src/main/java/com/brohoof/minelittlepony/PonyManager.java @@ -14,31 +14,31 @@ import net.minecraft.util.ResourceLocation; public class PonyManager { - public static final String RESOURCE_NAMESPACE = "minelittlepony"; - public static final ResourceLocation ZOMBIE = new ResourceLocation("minelittlepony", "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 PIGMAN = new ResourceLocation("minelittlepony", "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 WITHER_SKELETON = new ResourceLocation("minelittlepony", "textures/entity/skeleton/skeleton_wither_pony.png"); - public static final ResourceLocation STEVE = new ResourceLocation("minelittlepony", "textures/entity/steve_pony.png"); - public static final ResourceLocation ALEX = new ResourceLocation("minelittlepony", "textures/entity/alex_pony.png"); + private static final String NAMESPACE = "minelittlepony"; + public static final ResourceLocation ZOMBIE = new ResourceLocation(NAMESPACE, "textures/entity/zombie/zombie_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(NAMESPACE, "textures/entity/zombie/zombie_pigman_pony.png"); + public static final ResourceLocation SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/skeleton_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(NAMESPACE, "textures/entity/steve_pony.png"); + public static final ResourceLocation ALEX = new ResourceLocation(NAMESPACE, "textures/entity/alex_pony.png"); private static final int MAX_BGPONY_COUNT = 141; - public final List backgroundPonyList = makeBkgndPonies(); - public final List villagerList = ImmutableList. builder() - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/farmer_pony.png")) - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/librarian_pony.png")) - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/priest_pony.png")) - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/smith_pony.png")) - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/butcher_pony.png")) - .add(new ResourceLocation("minelittlepony", "textures/entity/villager/villager_pony.png")) + private final List backgroundPonyList = makeBkgndPonies(); + private final List villagerList = ImmutableList. builder() + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/farmer_pony.png")) + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/librarian_pony.png")) + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/priest_pony.png")) + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/smith_pony.png")) + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/butcher_pony.png")) + .add(new ResourceLocation(NAMESPACE, "textures/entity/villager/villager_pony.png")) .build(); private static List makeBkgndPonies() { ImmutableList.Builder list = ImmutableList.builder(); 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(); }