From 80f76ffc67e2e098652936da14d6574ce66420a1 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 11:30:57 +0200 Subject: [PATCH] Set everything up with gradle --- build.gradle | 58 ++++++++++++++++++- .../client/PonyRenderManager.java | 2 +- .../client/gui/hdskins}/EntityPonyModel.java | 2 +- .../client/gui/hdskins/GuiSkinsMineLP.java | 1 - .../client/gui/hdskins/RenderPonyModel.java | 1 - .../client/pony/PonyManager.java | 2 +- .../client/settings/ClientPonyConfig.java | 18 ++++++ .../client/settings}/package-info.java | 2 +- .../common/client/gui/Button.java | 0 .../common/client/gui/Checkbox.java | 0 .../common/client/gui/GameGui.java | 0 .../common/client/gui/GuiHost.java | 0 .../common/client/gui/IGuiAction.java | 0 .../common/client/gui/IGuiCallback.java | 0 .../common/client/gui/IGuiGuest.java | 0 .../common/client/gui/IGuiTooltipped.java | 0 .../common/client/gui/IStyleFactory.java | 0 .../common/client/gui/IconicButton.java | 0 .../common/client/gui/IconicToggle.java | 2 +- .../common/client/gui/Label.java | 0 .../common/client/gui/Slider.java | 0 .../common/client/gui/Style.java | 0 .../common/client/gui/package-info.java | 0 .../common}/util/MoreStreams.java | 2 +- .../minelittlepony/hdskins/HDSkinManager.java | 2 +- .../client/LiteModMineLittlePony.java | 4 +- .../com/minelittlepony/MineLittlePony.java | 0 .../MissingRendererException.java | 0 .../com/minelittlepony/model/BodyPart.java | 0 .../com/minelittlepony/model/ICapitated.java | 0 .../java/com/minelittlepony/model/IModel.java | 0 .../java/com/minelittlepony/model/IPart.java | 0 .../com/minelittlepony/model/IPegasus.java | 0 .../com/minelittlepony/model/IUnicorn.java | 0 .../model/PonyModelConstants.java | 0 .../model/armour/ArmourLayer.java | 0 .../minelittlepony/model/armour/IArmour.java | 0 .../model/armour/IArmourTextureResolver.java | 0 .../model/armour/IEquestrianArmour.java | 0 .../model/armour/package-info.java | 0 .../model/capabilities/IModelWrapper.java | 0 .../model/capabilities/package-info.java | 0 .../minelittlepony/model/package-info.java | 0 .../java/com/minelittlepony/package-info.java | 0 .../java/com/minelittlepony/pony/IPony.java | 0 .../com/minelittlepony/pony/IPonyData.java | 0 .../com/minelittlepony/pony/IPonyManager.java | 0 .../pony/ITriggerPixelMapped.java | 0 .../com/minelittlepony/pony/meta/Gender.java | 0 .../com/minelittlepony/pony/meta/Race.java | 0 .../com/minelittlepony/pony/meta/Size.java | 0 .../minelittlepony/pony/meta/TailLength.java | 0 .../pony/meta/TriggerPixels.java | 0 .../minelittlepony/pony/meta/Wearable.java | 0 .../pony/meta/package-info.java | 0 .../com/minelittlepony/pony/package-info.java | 0 .../minelittlepony/settings/PonyConfig.java | 7 +-- .../minelittlepony/settings/PonyLevel.java | 0 .../minelittlepony/settings/package-info.java | 0 .../animation/BasicEasingInterpolator.java | 0 .../util/animation/IInterpolator.java | 0 .../util/animation/package-info.java | 0 .../util/chron/ChronicCache.java | 0 .../minelittlepony/util/chron/Touchable.java | 0 .../util/chron/package-info.java | 0 .../minelittlepony/util/math/MathUtil.java | 0 .../util/math/package-info.java | 0 .../resources/FormattedTextureSupplier.java | 0 .../util/resources/ITextureSupplier.java | 0 .../util/resources/IntStringMapper.java | 0 .../util/resources/package-info.java | 0 .../util/transform/MotionCompositor.java | 0 .../util/transform/package-info.java | 0 73 files changed, 84 insertions(+), 19 deletions(-) rename src/{common/java/com/minelittlepony/hdskins/entity => client/java/com/minelittlepony/client/gui/hdskins}/EntityPonyModel.java (96%) create mode 100644 src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java rename src/{common/java/com/minelittlepony/hdskins/entity => client/java/com/minelittlepony/client/settings}/package-info.java (78%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/Button.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/Checkbox.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/GameGui.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/GuiHost.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IGuiAction.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IGuiCallback.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IGuiGuest.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IStyleFactory.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IconicButton.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/IconicToggle.java (96%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/Label.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/Slider.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/Style.java (100%) rename src/{client => common}/java/com/minelittlepony/common/client/gui/package-info.java (100%) rename src/{hdskins/java/com/minelittlepony/hdskins => common/java/com/minelittlepony/common}/util/MoreStreams.java (96%) rename src/{common => main}/java/com/minelittlepony/MineLittlePony.java (100%) rename src/{common => main}/java/com/minelittlepony/MissingRendererException.java (100%) rename src/{common => main}/java/com/minelittlepony/model/BodyPart.java (100%) rename src/{common => main}/java/com/minelittlepony/model/ICapitated.java (100%) rename src/{common => main}/java/com/minelittlepony/model/IModel.java (100%) rename src/{common => main}/java/com/minelittlepony/model/IPart.java (100%) rename src/{common => main}/java/com/minelittlepony/model/IPegasus.java (100%) rename src/{common => main}/java/com/minelittlepony/model/IUnicorn.java (100%) rename src/{common => main}/java/com/minelittlepony/model/PonyModelConstants.java (100%) rename src/{common => main}/java/com/minelittlepony/model/armour/ArmourLayer.java (100%) rename src/{common => main}/java/com/minelittlepony/model/armour/IArmour.java (100%) rename src/{common => main}/java/com/minelittlepony/model/armour/IArmourTextureResolver.java (100%) rename src/{common => main}/java/com/minelittlepony/model/armour/IEquestrianArmour.java (100%) rename src/{common => main}/java/com/minelittlepony/model/armour/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/model/capabilities/IModelWrapper.java (100%) rename src/{common => main}/java/com/minelittlepony/model/capabilities/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/model/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/IPony.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/IPonyData.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/IPonyManager.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/ITriggerPixelMapped.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/Gender.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/Race.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/Size.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/TailLength.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/TriggerPixels.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/Wearable.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/meta/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/pony/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/settings/PonyConfig.java (90%) rename src/{common => main}/java/com/minelittlepony/settings/PonyLevel.java (100%) rename src/{common => main}/java/com/minelittlepony/settings/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java (100%) rename src/{common => main}/java/com/minelittlepony/util/animation/IInterpolator.java (100%) rename src/{common => main}/java/com/minelittlepony/util/animation/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/util/chron/ChronicCache.java (100%) rename src/{common => main}/java/com/minelittlepony/util/chron/Touchable.java (100%) rename src/{common => main}/java/com/minelittlepony/util/chron/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/util/math/MathUtil.java (100%) rename src/{common => main}/java/com/minelittlepony/util/math/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java (100%) rename src/{common => main}/java/com/minelittlepony/util/resources/ITextureSupplier.java (100%) rename src/{common => main}/java/com/minelittlepony/util/resources/IntStringMapper.java (100%) rename src/{common => main}/java/com/minelittlepony/util/resources/package-info.java (100%) rename src/{common => main}/java/com/minelittlepony/util/transform/MotionCompositor.java (100%) rename src/{common => main}/java/com/minelittlepony/util/transform/package-info.java (100%) diff --git a/build.gradle b/build.gradle index 2d388b97..7c02f3d3 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { diff --git a/src/client/java/com/minelittlepony/client/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java index 27de151a..74b40e85 100644 --- a/src/client/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -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; diff --git a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java b/src/client/java/com/minelittlepony/client/gui/hdskins/EntityPonyModel.java similarity index 96% rename from src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/EntityPonyModel.java index 023e1903..1ee047ef 100644 --- a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/EntityPonyModel.java @@ -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; diff --git a/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java index 12823dd1..aba067a9 100644 --- a/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -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; diff --git a/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java index ba992239..fe75a2dd 100644 --- a/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java @@ -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; diff --git a/src/client/java/com/minelittlepony/client/pony/PonyManager.java b/src/client/java/com/minelittlepony/client/pony/PonyManager.java index bce90c4a..4c623a1a 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyManager.java @@ -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; diff --git a/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java b/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java new file mode 100644 index 00000000..6ab0c5fe --- /dev/null +++ b/src/client/java/com/minelittlepony/client/settings/ClientPonyConfig.java @@ -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); + } +} diff --git a/src/common/java/com/minelittlepony/hdskins/entity/package-info.java b/src/client/java/com/minelittlepony/client/settings/package-info.java similarity index 78% rename from src/common/java/com/minelittlepony/hdskins/entity/package-info.java rename to src/client/java/com/minelittlepony/client/settings/package-info.java index 08755de2..d3e9023d 100644 --- a/src/common/java/com/minelittlepony/hdskins/entity/package-info.java +++ b/src/client/java/com/minelittlepony/client/settings/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.hdskins.entity; +package com.minelittlepony.client.settings; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/common/client/gui/Button.java b/src/common/java/com/minelittlepony/common/client/gui/Button.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/Button.java rename to src/common/java/com/minelittlepony/common/client/gui/Button.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/Checkbox.java b/src/common/java/com/minelittlepony/common/client/gui/Checkbox.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/Checkbox.java rename to src/common/java/com/minelittlepony/common/client/gui/Checkbox.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/GameGui.java b/src/common/java/com/minelittlepony/common/client/gui/GameGui.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/GameGui.java rename to src/common/java/com/minelittlepony/common/client/gui/GameGui.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/GuiHost.java b/src/common/java/com/minelittlepony/common/client/gui/GuiHost.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/GuiHost.java rename to src/common/java/com/minelittlepony/common/client/gui/GuiHost.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IGuiAction.java b/src/common/java/com/minelittlepony/common/client/gui/IGuiAction.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IGuiAction.java rename to src/common/java/com/minelittlepony/common/client/gui/IGuiAction.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IGuiCallback.java b/src/common/java/com/minelittlepony/common/client/gui/IGuiCallback.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IGuiCallback.java rename to src/common/java/com/minelittlepony/common/client/gui/IGuiCallback.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java b/src/common/java/com/minelittlepony/common/client/gui/IGuiGuest.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java rename to src/common/java/com/minelittlepony/common/client/gui/IGuiGuest.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java b/src/common/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java rename to src/common/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IStyleFactory.java b/src/common/java/com/minelittlepony/common/client/gui/IStyleFactory.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IStyleFactory.java rename to src/common/java/com/minelittlepony/common/client/gui/IStyleFactory.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IconicButton.java b/src/common/java/com/minelittlepony/common/client/gui/IconicButton.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/IconicButton.java rename to src/common/java/com/minelittlepony/common/client/gui/IconicButton.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java b/src/common/java/com/minelittlepony/common/client/gui/IconicToggle.java similarity index 96% rename from src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java rename to src/common/java/com/minelittlepony/common/client/gui/IconicToggle.java index 6d8cf4b5..d4c60662 100644 --- a/src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java +++ b/src/common/java/com/minelittlepony/common/client/gui/IconicToggle.java @@ -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 { diff --git a/src/client/java/com/minelittlepony/common/client/gui/Label.java b/src/common/java/com/minelittlepony/common/client/gui/Label.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/Label.java rename to src/common/java/com/minelittlepony/common/client/gui/Label.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/Slider.java b/src/common/java/com/minelittlepony/common/client/gui/Slider.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/Slider.java rename to src/common/java/com/minelittlepony/common/client/gui/Slider.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/Style.java b/src/common/java/com/minelittlepony/common/client/gui/Style.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/Style.java rename to src/common/java/com/minelittlepony/common/client/gui/Style.java diff --git a/src/client/java/com/minelittlepony/common/client/gui/package-info.java b/src/common/java/com/minelittlepony/common/client/gui/package-info.java similarity index 100% rename from src/client/java/com/minelittlepony/common/client/gui/package-info.java rename to src/common/java/com/minelittlepony/common/client/gui/package-info.java diff --git a/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java b/src/common/java/com/minelittlepony/common/util/MoreStreams.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java rename to src/common/java/com/minelittlepony/common/util/MoreStreams.java index 8b583ff1..49b915fd 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java +++ b/src/common/java/com/minelittlepony/common/util/MoreStreams.java @@ -1,4 +1,4 @@ -package com.minelittlepony.hdskins.util; +package com.minelittlepony.common.util; import java.util.List; import java.util.function.Function; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java index be5f0ee5..92ab2a35 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java @@ -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; diff --git a/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java b/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java index 57d1011e..e071f74f 100644 --- a/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java +++ b/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java @@ -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); diff --git a/src/common/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java similarity index 100% rename from src/common/java/com/minelittlepony/MineLittlePony.java rename to src/main/java/com/minelittlepony/MineLittlePony.java diff --git a/src/common/java/com/minelittlepony/MissingRendererException.java b/src/main/java/com/minelittlepony/MissingRendererException.java similarity index 100% rename from src/common/java/com/minelittlepony/MissingRendererException.java rename to src/main/java/com/minelittlepony/MissingRendererException.java diff --git a/src/common/java/com/minelittlepony/model/BodyPart.java b/src/main/java/com/minelittlepony/model/BodyPart.java similarity index 100% rename from src/common/java/com/minelittlepony/model/BodyPart.java rename to src/main/java/com/minelittlepony/model/BodyPart.java diff --git a/src/common/java/com/minelittlepony/model/ICapitated.java b/src/main/java/com/minelittlepony/model/ICapitated.java similarity index 100% rename from src/common/java/com/minelittlepony/model/ICapitated.java rename to src/main/java/com/minelittlepony/model/ICapitated.java diff --git a/src/common/java/com/minelittlepony/model/IModel.java b/src/main/java/com/minelittlepony/model/IModel.java similarity index 100% rename from src/common/java/com/minelittlepony/model/IModel.java rename to src/main/java/com/minelittlepony/model/IModel.java diff --git a/src/common/java/com/minelittlepony/model/IPart.java b/src/main/java/com/minelittlepony/model/IPart.java similarity index 100% rename from src/common/java/com/minelittlepony/model/IPart.java rename to src/main/java/com/minelittlepony/model/IPart.java diff --git a/src/common/java/com/minelittlepony/model/IPegasus.java b/src/main/java/com/minelittlepony/model/IPegasus.java similarity index 100% rename from src/common/java/com/minelittlepony/model/IPegasus.java rename to src/main/java/com/minelittlepony/model/IPegasus.java diff --git a/src/common/java/com/minelittlepony/model/IUnicorn.java b/src/main/java/com/minelittlepony/model/IUnicorn.java similarity index 100% rename from src/common/java/com/minelittlepony/model/IUnicorn.java rename to src/main/java/com/minelittlepony/model/IUnicorn.java diff --git a/src/common/java/com/minelittlepony/model/PonyModelConstants.java b/src/main/java/com/minelittlepony/model/PonyModelConstants.java similarity index 100% rename from src/common/java/com/minelittlepony/model/PonyModelConstants.java rename to src/main/java/com/minelittlepony/model/PonyModelConstants.java diff --git a/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java b/src/main/java/com/minelittlepony/model/armour/ArmourLayer.java similarity index 100% rename from src/common/java/com/minelittlepony/model/armour/ArmourLayer.java rename to src/main/java/com/minelittlepony/model/armour/ArmourLayer.java diff --git a/src/common/java/com/minelittlepony/model/armour/IArmour.java b/src/main/java/com/minelittlepony/model/armour/IArmour.java similarity index 100% rename from src/common/java/com/minelittlepony/model/armour/IArmour.java rename to src/main/java/com/minelittlepony/model/armour/IArmour.java diff --git a/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java b/src/main/java/com/minelittlepony/model/armour/IArmourTextureResolver.java similarity index 100% rename from src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java rename to src/main/java/com/minelittlepony/model/armour/IArmourTextureResolver.java diff --git a/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java b/src/main/java/com/minelittlepony/model/armour/IEquestrianArmour.java similarity index 100% rename from src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java rename to src/main/java/com/minelittlepony/model/armour/IEquestrianArmour.java diff --git a/src/common/java/com/minelittlepony/model/armour/package-info.java b/src/main/java/com/minelittlepony/model/armour/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/model/armour/package-info.java rename to src/main/java/com/minelittlepony/model/armour/package-info.java diff --git a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java similarity index 100% rename from src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java rename to src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java diff --git a/src/common/java/com/minelittlepony/model/capabilities/package-info.java b/src/main/java/com/minelittlepony/model/capabilities/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/model/capabilities/package-info.java rename to src/main/java/com/minelittlepony/model/capabilities/package-info.java diff --git a/src/common/java/com/minelittlepony/model/package-info.java b/src/main/java/com/minelittlepony/model/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/model/package-info.java rename to src/main/java/com/minelittlepony/model/package-info.java diff --git a/src/common/java/com/minelittlepony/package-info.java b/src/main/java/com/minelittlepony/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/package-info.java rename to src/main/java/com/minelittlepony/package-info.java diff --git a/src/common/java/com/minelittlepony/pony/IPony.java b/src/main/java/com/minelittlepony/pony/IPony.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/IPony.java rename to src/main/java/com/minelittlepony/pony/IPony.java diff --git a/src/common/java/com/minelittlepony/pony/IPonyData.java b/src/main/java/com/minelittlepony/pony/IPonyData.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/IPonyData.java rename to src/main/java/com/minelittlepony/pony/IPonyData.java diff --git a/src/common/java/com/minelittlepony/pony/IPonyManager.java b/src/main/java/com/minelittlepony/pony/IPonyManager.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/IPonyManager.java rename to src/main/java/com/minelittlepony/pony/IPonyManager.java diff --git a/src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java b/src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java rename to src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java diff --git a/src/common/java/com/minelittlepony/pony/meta/Gender.java b/src/main/java/com/minelittlepony/pony/meta/Gender.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/Gender.java rename to src/main/java/com/minelittlepony/pony/meta/Gender.java diff --git a/src/common/java/com/minelittlepony/pony/meta/Race.java b/src/main/java/com/minelittlepony/pony/meta/Race.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/Race.java rename to src/main/java/com/minelittlepony/pony/meta/Race.java diff --git a/src/common/java/com/minelittlepony/pony/meta/Size.java b/src/main/java/com/minelittlepony/pony/meta/Size.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/Size.java rename to src/main/java/com/minelittlepony/pony/meta/Size.java diff --git a/src/common/java/com/minelittlepony/pony/meta/TailLength.java b/src/main/java/com/minelittlepony/pony/meta/TailLength.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/TailLength.java rename to src/main/java/com/minelittlepony/pony/meta/TailLength.java diff --git a/src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java b/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java rename to src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java diff --git a/src/common/java/com/minelittlepony/pony/meta/Wearable.java b/src/main/java/com/minelittlepony/pony/meta/Wearable.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/Wearable.java rename to src/main/java/com/minelittlepony/pony/meta/Wearable.java diff --git a/src/common/java/com/minelittlepony/pony/meta/package-info.java b/src/main/java/com/minelittlepony/pony/meta/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/meta/package-info.java rename to src/main/java/com/minelittlepony/pony/meta/package-info.java diff --git a/src/common/java/com/minelittlepony/pony/package-info.java b/src/main/java/com/minelittlepony/pony/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/pony/package-info.java rename to src/main/java/com/minelittlepony/pony/package-info.java diff --git a/src/common/java/com/minelittlepony/settings/PonyConfig.java b/src/main/java/com/minelittlepony/settings/PonyConfig.java similarity index 90% rename from src/common/java/com/minelittlepony/settings/PonyConfig.java rename to src/main/java/com/minelittlepony/settings/PonyConfig.java index 8ec7ffb1..dc17ebec 100644 --- a/src/common/java/com/minelittlepony/settings/PonyConfig.java +++ b/src/main/java/com/minelittlepony/settings/PonyConfig.java @@ -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) { diff --git a/src/common/java/com/minelittlepony/settings/PonyLevel.java b/src/main/java/com/minelittlepony/settings/PonyLevel.java similarity index 100% rename from src/common/java/com/minelittlepony/settings/PonyLevel.java rename to src/main/java/com/minelittlepony/settings/PonyLevel.java diff --git a/src/common/java/com/minelittlepony/settings/package-info.java b/src/main/java/com/minelittlepony/settings/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/settings/package-info.java rename to src/main/java/com/minelittlepony/settings/package-info.java diff --git a/src/common/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java b/src/main/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java similarity index 100% rename from src/common/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java rename to src/main/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java diff --git a/src/common/java/com/minelittlepony/util/animation/IInterpolator.java b/src/main/java/com/minelittlepony/util/animation/IInterpolator.java similarity index 100% rename from src/common/java/com/minelittlepony/util/animation/IInterpolator.java rename to src/main/java/com/minelittlepony/util/animation/IInterpolator.java diff --git a/src/common/java/com/minelittlepony/util/animation/package-info.java b/src/main/java/com/minelittlepony/util/animation/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/util/animation/package-info.java rename to src/main/java/com/minelittlepony/util/animation/package-info.java diff --git a/src/common/java/com/minelittlepony/util/chron/ChronicCache.java b/src/main/java/com/minelittlepony/util/chron/ChronicCache.java similarity index 100% rename from src/common/java/com/minelittlepony/util/chron/ChronicCache.java rename to src/main/java/com/minelittlepony/util/chron/ChronicCache.java diff --git a/src/common/java/com/minelittlepony/util/chron/Touchable.java b/src/main/java/com/minelittlepony/util/chron/Touchable.java similarity index 100% rename from src/common/java/com/minelittlepony/util/chron/Touchable.java rename to src/main/java/com/minelittlepony/util/chron/Touchable.java diff --git a/src/common/java/com/minelittlepony/util/chron/package-info.java b/src/main/java/com/minelittlepony/util/chron/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/util/chron/package-info.java rename to src/main/java/com/minelittlepony/util/chron/package-info.java diff --git a/src/common/java/com/minelittlepony/util/math/MathUtil.java b/src/main/java/com/minelittlepony/util/math/MathUtil.java similarity index 100% rename from src/common/java/com/minelittlepony/util/math/MathUtil.java rename to src/main/java/com/minelittlepony/util/math/MathUtil.java diff --git a/src/common/java/com/minelittlepony/util/math/package-info.java b/src/main/java/com/minelittlepony/util/math/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/util/math/package-info.java rename to src/main/java/com/minelittlepony/util/math/package-info.java diff --git a/src/common/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java b/src/main/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java similarity index 100% rename from src/common/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java rename to src/main/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java diff --git a/src/common/java/com/minelittlepony/util/resources/ITextureSupplier.java b/src/main/java/com/minelittlepony/util/resources/ITextureSupplier.java similarity index 100% rename from src/common/java/com/minelittlepony/util/resources/ITextureSupplier.java rename to src/main/java/com/minelittlepony/util/resources/ITextureSupplier.java diff --git a/src/common/java/com/minelittlepony/util/resources/IntStringMapper.java b/src/main/java/com/minelittlepony/util/resources/IntStringMapper.java similarity index 100% rename from src/common/java/com/minelittlepony/util/resources/IntStringMapper.java rename to src/main/java/com/minelittlepony/util/resources/IntStringMapper.java diff --git a/src/common/java/com/minelittlepony/util/resources/package-info.java b/src/main/java/com/minelittlepony/util/resources/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/util/resources/package-info.java rename to src/main/java/com/minelittlepony/util/resources/package-info.java diff --git a/src/common/java/com/minelittlepony/util/transform/MotionCompositor.java b/src/main/java/com/minelittlepony/util/transform/MotionCompositor.java similarity index 100% rename from src/common/java/com/minelittlepony/util/transform/MotionCompositor.java rename to src/main/java/com/minelittlepony/util/transform/MotionCompositor.java diff --git a/src/common/java/com/minelittlepony/util/transform/package-info.java b/src/main/java/com/minelittlepony/util/transform/package-info.java similarity index 100% rename from src/common/java/com/minelittlepony/util/transform/package-info.java rename to src/main/java/com/minelittlepony/util/transform/package-info.java