Set everything up with gradle

This commit is contained in:
Sollace 2019-03-24 11:30:57 +02:00
parent 31cbb1bad4
commit 80f76ffc67
73 changed files with 84 additions and 19 deletions

View file

@ -61,14 +61,46 @@ mixin {
targetCompatibility = 1.8
sourceCompatibility = 1.8
sourceSets {
hdskins {
common {
// code shared between HDSkins and MineLP mods
// TODO: Make this into a library? I mean, it's not a lot.
compileClasspath += main.compileClasspath
}
hdskins {
// HDSkins.
// TODO: Move to a separate project
compileClasspath += main.compileClasspath
compileClasspath += common.output
ext.refMap = 'hdskins.mixin.refmap.json'
}
main {
client {
// Client-only code
compileClasspath += main.compileClasspath
compileClasspath += main.output
compileClasspath += common.output
compileClasspath += hdskins.output
ext.refMap = 'minelp.mixin.refmap.json'
}
main {
// Non-client code. Called main because gradle calls it that
// TODO: HorseLib.java
compileClasspath += common.output
}
// Litemod stuff, separated for future removal
litemod {
compileClasspath += main.compileClasspath
compileClasspath += main.output
compileClasspath += client.output
}
hdskinslitemod {
compileClasspath += main.compileClasspath
compileClasspath += litemod.output
compileClasspath += hdskins.output
}
}
dependencies {
@ -132,7 +164,13 @@ shadowJar {
extension 'litemod'
classifier "mc$minecraft.version"
from sourceSets.common.output
from sourceSets.hdskins.output
from sourceSets.hdskinslitemod.output
from sourceSets.client.output
from sourceSets.litemod.output
from litemod
exclude "/assets/minelittlepony/textures/entity/pony"
@ -155,13 +193,29 @@ shadowJar {
}
task srgJar(type: Jar) {
from sourceSets.common.output
from sourceSets.hdskins.output
from sourceSets.hdskinslitemod.output
from sourceSets.main.output
from sourceSets.client.output
from sourceSets.litemod.output
from sourceSets.hdskins.output
from litemod
classifier "mc$minecraft.version-srg"
}
task horseLib(type: Jar) {
from sourceSets.common.output
from sourceSets.main.output
baseName = "HoarseLib"
}
sourceJar.enabled = false
reobf {

View file

@ -4,13 +4,13 @@ import java.util.Map;
import com.google.common.collect.Maps;
import com.minelittlepony.client.ducks.IRenderPony;
import com.minelittlepony.client.gui.hdskins.EntityPonyModel;
import com.minelittlepony.client.gui.hdskins.RenderPonyModel;
import com.minelittlepony.client.mixin.MixinRenderManager;
import com.minelittlepony.client.model.races.PlayerModels;
import com.minelittlepony.client.render.LevitatingItemRenderer;
import com.minelittlepony.client.render.entities.MobRenderers;
import com.minelittlepony.client.render.entities.player.RenderPonyPlayer;
import com.minelittlepony.hdskins.entity.EntityPonyModel;
import com.minelittlepony.settings.PonyConfig;
import javax.annotation.Nullable;

View file

@ -1,4 +1,4 @@
package com.minelittlepony.hdskins.entity;
package com.minelittlepony.client.gui.hdskins;
import com.minelittlepony.hdskins.gui.EntityPlayerModel;
import com.mojang.authlib.GameProfile;

View file

@ -3,7 +3,6 @@ package com.minelittlepony.client.gui.hdskins;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.client.gui.IconicToggle;
import com.minelittlepony.common.client.gui.Style;
import com.minelittlepony.hdskins.entity.EntityPonyModel;
import com.minelittlepony.hdskins.gui.EntityPlayerModel;
import com.minelittlepony.hdskins.gui.GuiSkins;
import com.minelittlepony.hdskins.server.SkinServer;

View file

@ -8,7 +8,6 @@ import com.minelittlepony.client.pony.Pony;
import com.minelittlepony.client.render.RenderPony;
import com.minelittlepony.client.render.layer.LayerGear;
import com.minelittlepony.client.render.layer.LayerPonyElytra;
import com.minelittlepony.hdskins.entity.EntityPonyModel;
import com.minelittlepony.hdskins.gui.RenderPlayerModel;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;

View file

@ -4,8 +4,8 @@ import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.common.util.MoreStreams;
import com.minelittlepony.hdskins.ISkinCacheClearListener;
import com.minelittlepony.hdskins.util.MoreStreams;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.settings.PonyConfig;

View file

@ -0,0 +1,18 @@
package com.minelittlepony.client.settings;
import com.minelittlepony.hdskins.HDSkinManager;
import com.minelittlepony.settings.PonyConfig;
import com.minelittlepony.settings.PonyLevel;
public abstract class ClientPonyConfig extends PonyConfig {
@Override
public void setPonyLevel(PonyLevel ponylevel) {
// only trigger reloads when the value actually changes
if (ponylevel != getPonyLevel()) {
HDSkinManager.INSTANCE.parseSkins();
}
super.setPonyLevel(ponylevel);
}
}

View file

@ -1,6 +1,6 @@
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package com.minelittlepony.hdskins.entity;
package com.minelittlepony.client.settings;
import mcp.MethodsReturnNonnullByDefault;

View file

@ -1,6 +1,6 @@
package com.minelittlepony.common.client.gui;
import com.minelittlepony.hdskins.util.MoreStreams;
import com.minelittlepony.common.util.MoreStreams;
public class IconicToggle extends IconicButton {

View file

@ -1,4 +1,4 @@
package com.minelittlepony.hdskins.util;
package com.minelittlepony.common.util;
import java.util.List;
import java.util.function.Function;

View file

@ -11,6 +11,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Streams;
import com.minelittlepony.common.util.MoreStreams;
import com.minelittlepony.hdskins.ducks.INetworkPlayerInfo;
import com.minelittlepony.hdskins.gui.GuiSkins;
import com.minelittlepony.hdskins.resources.SkinResourceManager;
@ -22,7 +23,6 @@ import com.minelittlepony.hdskins.server.ServerType;
import com.minelittlepony.hdskins.server.SkinServer;
import com.minelittlepony.hdskins.server.ValhallaSkinServer;
import com.minelittlepony.hdskins.util.CallableFutures;
import com.minelittlepony.hdskins.util.MoreStreams;
import com.minelittlepony.hdskins.util.PlayerUtil;
import com.minelittlepony.hdskins.util.ProfileTextureUtil;
import com.mojang.authlib.GameProfile;

View file

@ -2,8 +2,8 @@ package com.minelittlepony.client;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.client.gui.GuiPonySettings;
import com.minelittlepony.client.settings.ClientPonyConfig;
import com.minelittlepony.common.client.gui.GuiLiteHost;
import com.minelittlepony.settings.PonyConfig;
import com.mumfrey.liteloader.Configurable;
import com.mumfrey.liteloader.InitCompleteListener;
import com.mumfrey.liteloader.Tickable;
@ -94,7 +94,7 @@ public class LiteModMineLittlePony implements IModUtilities, InitCompleteListene
}
@ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned)
class Config extends PonyConfig implements Exposable {
class Config extends ClientPonyConfig implements Exposable {
@Override
public void save() {
LiteLoader.getInstance().writeConfig(this);

View file

@ -4,7 +4,6 @@ import net.minecraft.util.math.MathHelper;
import com.google.gson.annotations.Expose;
import com.minelittlepony.common.SensibleConfig;
import com.minelittlepony.hdskins.HDSkinManager;
/**
* Storage container for MineLP client settings.
@ -66,11 +65,7 @@ public abstract class PonyConfig extends SensibleConfig {
* @param ponylevel
*/
public void setPonyLevel(PonyLevel ponylevel) {
// only trigger reloads when the value actually changes
if (ponylevel != this.ponylevel) {
this.ponylevel = ponylevel;
HDSkinManager.INSTANCE.parseSkins();
}
this.ponylevel = ponylevel;
}
public void setGlobalScaleFactor(float f) {