From 0cba35ec8938cf79c15837f823363c7c079d6a8f Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Mar 2019 19:48:20 +0200 Subject: [PATCH 001/104] Sort the classes into common/client sourcesets (minimal changes) --- .../java/com/minelittlepony/ForgeProxy.java | 0 .../minelittlepony/LiteModMineLittlePony.java | 24 +++++++++++--- .../com/minelittlepony/MineLittlePony.java | 31 +++++++------------ .../com/minelittlepony/PonyRenderManager.java | 0 .../com/minelittlepony/PonySkinModifier.java | 0 .../com/minelittlepony/PonySkinParser.java | 0 .../com/minelittlepony/ducks/IRenderItem.java | 0 .../com/minelittlepony/ducks/IRenderPony.java | 0 .../minelittlepony/ducks/package-info.java | 0 .../minelittlepony/gui/GuiPonySettings.java | 3 +- .../hdskins/gui/GuiSkinsMineLP.java | 0 .../hdskins/gui/RenderPonyModel.java | 0 .../hdskins/gui/package-info.java | 0 .../mixin/MixinDefaultPlayerSkin.java | 0 .../mixin/MixinGlStateManager.java | 0 .../mixin/MixinItemRenderer.java | 0 .../minelittlepony/mixin/MixinRenderItem.java | 0 .../mixin/MixinRenderManager.java | 0 .../mixin/MixinThreadDownloadImageData.java | 0 .../minelittlepony/mixin/package-info.java | 0 .../model/AbstractPonyModel.java | 0 .../minelittlepony/model/ModelMobPony.java | 0 .../minelittlepony/model/ModelWrapper.java | 6 ++-- .../java/com/minelittlepony/model/PMAPI.java | 0 .../DefaultPonyArmorTextureResolver.java | 7 ++--- .../model/armour/ModelPonyArmor.java | 4 +-- .../model/armour/PonyArmor.java | 6 ++-- .../model/capabilities/ICapitated.java | 0 .../model/capabilities/IModel.java | 4 +-- .../model/capabilities/IModelArmour.java} | 6 ++-- .../model/capabilities/IModelPart.java | 0 .../model/capabilities/IModelPegasus.java | 0 .../model/capabilities/IModelUnicorn.java | 0 .../model/capabilities/package-info.java | 0 .../model/components/BatWings.java | 0 .../model/components/BugWings.java | 0 .../model/components/ModelBatWing.java | 0 .../model/components/ModelBugWing.java | 0 .../model/components/ModelDeadMau5Ears.java | 0 .../model/components/ModelPonyHead.java | 0 .../model/components/ModelWing.java | 0 .../model/components/PegasusWings.java | 0 .../model/components/PonyElytra.java | 0 .../model/components/PonySnout.java | 0 .../model/components/PonyTail.java | 0 .../model/components/SeaponyTail.java | 0 .../model/components/UnicornHorn.java | 0 .../model/components/package-info.java | 0 .../model/gear/AbstractGear.java | 0 .../model/gear/ChristmasHat.java | 0 .../com/minelittlepony/model/gear/IGear.java | 0 .../minelittlepony/model/gear/IStackable.java | 0 .../com/minelittlepony/model/gear/Muffin.java | 0 .../minelittlepony/model/gear/SaddleBags.java | 0 .../minelittlepony/model/gear/Stetson.java | 0 .../minelittlepony/model/gear/WitchHat.java | 0 .../minelittlepony/model/package-info.java | 0 .../model/player/ModelAlicorn.java | 0 .../model/player/ModelBatpony.java | 0 .../model/player/ModelChangeling.java | 0 .../model/player/ModelEarthPony.java | 0 .../model/player/ModelPegasus.java | 0 .../model/player/ModelUnicorn.java | 0 .../model/player/ModelZebra.java | 0 .../model/player/PlayerModels.java | 0 .../model/player/package-info.java | 0 .../model/ponies/ModelBreezie.java | 0 .../model/ponies/ModelEnderStallion.java | 0 .../model/ponies/ModelIllagerPony.java | 0 .../model/ponies/ModelSeapony.java | 0 .../model/ponies/ModelSkeletonPony.java | 0 .../model/ponies/ModelVillagerPony.java | 0 .../model/ponies/ModelWitchPony.java | 0 .../model/ponies/ModelZombiePony.java | 0 .../model/ponies/ModelZombieVillagerPony.java | 0 .../model/ponies/package-info.java | 0 .../java/com/minelittlepony/package-info.java | 0 .../com/minelittlepony/pony/data/Pony.java | 2 +- .../minelittlepony/pony/data/PonyData.java | 4 ++- .../pony/data/PonyDataSerialiser.java | 2 +- .../minelittlepony/pony/data/PonyManager.java | 2 +- .../minelittlepony/pony/data/PonyRace.java | 0 .../pony/data/package-info.java | 0 .../render/DebugBoundingBoxRenderer.java | 0 .../minelittlepony/render/FrustrumCheck.java | 0 .../render/LevitatingItemRenderer.java | 0 .../com/minelittlepony/render/RenderPony.java | 0 .../minelittlepony/render/RenderPonyMob.java | 0 .../render/layer/AbstractPonyLayer.java | 0 .../render/layer/LayerDJPon3Head.java | 0 .../layer/LayerEntityOnPonyShoulder.java | 0 .../render/layer/LayerEyeGlow.java | 0 .../render/layer/LayerGear.java | 0 .../render/layer/LayerHeldItemIllager.java | 0 .../render/layer/LayerHeldPonyItem.java | 0 .../layer/LayerHeldPonyItemMagical.java | 0 .../render/layer/LayerOverlayBase.java | 0 .../render/layer/LayerPonyArmor.java | 30 +++++++++--------- .../render/layer/LayerPonyCape.java | 0 .../render/layer/LayerPonyCustomHead.java | 0 .../render/layer/LayerPonyElytra.java | 0 .../render/layer/LayerPonyStrayOverlay.java | 0 .../render/layer/package-info.java | 0 .../render/model/GlowRenderer.java | 0 .../render/model/ModelGlow.java | 0 .../render/model/ModelPlane.java | 0 .../minelittlepony/render/model/Plane.java | 0 .../render/model/PlaneRenderer.java | 0 .../render/model/PonyRenderer.java | 0 .../render/model/package-info.java | 0 .../minelittlepony/render/package-info.java | 0 .../render/player/RenderPonyPlayer.java | 0 .../render/player/RenderSeaponyPlayer.java | 0 .../render/player/package-info.java | 0 .../render/ponies/MobRenderers.java | 0 .../render/ponies/RenderEnderStallion.java | 0 .../render/ponies/RenderPonyGuardian.java | 0 .../render/ponies/RenderPonyIllager.java | 0 .../render/ponies/RenderPonyPigman.java | 0 .../render/ponies/RenderPonySkeleton.java | 0 .../render/ponies/RenderPonyVex.java | 0 .../render/ponies/RenderPonyVillager.java | 0 .../render/ponies/RenderPonyWitch.java | 0 .../render/ponies/RenderPonyZombie.java | 0 .../ponies/RenderPonyZombieVillager.java | 0 .../VillagerProfessionTextureCache.java | 0 .../render/ponies/package-info.java | 0 .../render/skull/PlayerSkullRenderer.java | 0 .../render/skull/PonySkull.java | 0 .../render/skull/PonySkullRenderer.java | 1 - .../render/skull/SkeletonSkullRenderer.java | 0 .../render/skull/WitherSkullRenderer.java | 0 .../render/skull/ZombieSkullRenderer.java | 0 .../render/skull/package-info.java | 0 .../minelittlepony/transform/PonyPosture.java | 0 .../transform/PonyTransformation.java | 0 .../transform/PostureElytra.java | 1 - .../transform/PostureFalling.java | 0 .../transform/PostureFlight.java | 0 .../transform/PostureSwimming.java | 0 .../transform/package-info.java | 0 .../util/render/AbstractBoxRenderer.java | 0 .../com/minelittlepony/util/render/Box.java | 0 .../com/minelittlepony/util/render/Color.java | 0 .../com/minelittlepony/util/render/Quad.java | 0 .../minelittlepony/util/render/Vertex.java | 0 .../util/render/package-info.java | 0 .../MissingRendererException.java | 0 .../java/com/minelittlepony/PonyConfig.java | 7 ++--- .../hdskins/gui/EntityPonyModel.java | 0 .../com/minelittlepony/model/BodyPart.java | 0 .../model/PonyModelConstants.java | 0 .../model/anim/BasicEasingInterpolator.java | 0 .../model/anim/IInterpolator.java | 0 .../model/anim/package-info.java | 0 .../model/armour/ArmourLayer.java | 15 +++++++++ .../model/armour/IArmourTextureResolver.java} | 6 ++-- .../model/armour/IEquestrianArmour.java | 11 +++++++ .../model/armour/package-info.java | 0 .../model/capabilities/IModelWrapper.java | 0 .../com/minelittlepony/pony/data/IPony.java | 8 ----- .../minelittlepony/pony/data/IPonyData.java | 4 +-- .../pony/data/ITriggerPixelMapped.java | 0 .../minelittlepony/pony/data/PonyGender.java | 0 .../minelittlepony/pony/data/PonyLevel.java | 0 .../minelittlepony/pony/data/PonySize.java | 0 .../pony/data/PonyWearable.java | 0 .../minelittlepony/pony/data/TailLengths.java | 0 .../pony/data/TriggerPixels.java | 0 .../settings/SensibleConfig.java | 5 +-- .../transform/MotionCompositor.java | 0 .../util/chron/ChronicCache.java | 0 .../minelittlepony/util/chron/Touchable.java | 0 .../minelittlepony/util/math/MathUtil.java | 0 .../util/math/package-info.java | 0 .../util/render/FormattedTextureSupplier.java | 0 .../util/render/ITextureSupplier.java | 0 .../util/render/IntStringMapper.java | 0 .../model/armour/IEquestrianArmor.java | 27 ---------------- 179 files changed, 102 insertions(+), 114 deletions(-) rename src/{main => client}/java/com/minelittlepony/ForgeProxy.java (100%) rename src/{main => client}/java/com/minelittlepony/LiteModMineLittlePony.java (59%) rename src/{main => client}/java/com/minelittlepony/MineLittlePony.java (88%) rename src/{main => client}/java/com/minelittlepony/PonyRenderManager.java (100%) rename src/{main => client}/java/com/minelittlepony/PonySkinModifier.java (100%) rename src/{main => client}/java/com/minelittlepony/PonySkinParser.java (100%) rename src/{main => client}/java/com/minelittlepony/ducks/IRenderItem.java (100%) rename src/{main => client}/java/com/minelittlepony/ducks/IRenderPony.java (100%) rename src/{main => client}/java/com/minelittlepony/ducks/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/gui/GuiPonySettings.java (97%) rename src/{main => client}/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java (100%) rename src/{main => client}/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java (100%) rename src/{main => client}/java/com/minelittlepony/hdskins/gui/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinGlStateManager.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinItemRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinRenderItem.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinRenderManager.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java (100%) rename src/{main => client}/java/com/minelittlepony/mixin/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/model/AbstractPonyModel.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ModelMobPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ModelWrapper.java (89%) rename src/{main => client}/java/com/minelittlepony/model/PMAPI.java (100%) rename src/{main => client}/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java (90%) rename src/{main => client}/java/com/minelittlepony/model/armour/ModelPonyArmor.java (97%) rename src/{main => client}/java/com/minelittlepony/model/armour/PonyArmor.java (78%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/ICapitated.java (100%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/IModel.java (96%) rename src/{main/java/com/minelittlepony/model/capabilities/IModelArmor.java => client/java/com/minelittlepony/model/capabilities/IModelArmour.java} (95%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/IModelPart.java (100%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/IModelPegasus.java (100%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/IModelUnicorn.java (100%) rename src/{main => client}/java/com/minelittlepony/model/capabilities/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/BatWings.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/BugWings.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/ModelBatWing.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/ModelBugWing.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/ModelPonyHead.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/ModelWing.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/PegasusWings.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/PonyElytra.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/PonySnout.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/PonyTail.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/SeaponyTail.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/UnicornHorn.java (100%) rename src/{main => client}/java/com/minelittlepony/model/components/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/AbstractGear.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/ChristmasHat.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/IGear.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/IStackable.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/Muffin.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/SaddleBags.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/Stetson.java (100%) rename src/{main => client}/java/com/minelittlepony/model/gear/WitchHat.java (100%) rename src/{main => client}/java/com/minelittlepony/model/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelAlicorn.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelBatpony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelChangeling.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelEarthPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelPegasus.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelUnicorn.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/ModelZebra.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/PlayerModels.java (100%) rename src/{main => client}/java/com/minelittlepony/model/player/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelBreezie.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelEnderStallion.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelIllagerPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelSeapony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelVillagerPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelWitchPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelZombiePony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java (100%) rename src/{main => client}/java/com/minelittlepony/model/ponies/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/pony/data/Pony.java (99%) rename src/{main => client}/java/com/minelittlepony/pony/data/PonyData.java (95%) rename src/{main => client}/java/com/minelittlepony/pony/data/PonyDataSerialiser.java (97%) rename src/{main => client}/java/com/minelittlepony/pony/data/PonyManager.java (99%) rename src/{main => client}/java/com/minelittlepony/pony/data/PonyRace.java (100%) rename src/{main => client}/java/com/minelittlepony/pony/data/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/FrustrumCheck.java (100%) rename src/{main => client}/java/com/minelittlepony/render/LevitatingItemRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/RenderPony.java (100%) rename src/{main => client}/java/com/minelittlepony/render/RenderPonyMob.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/AbstractPonyLayer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerDJPon3Head.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerEyeGlow.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerGear.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerOverlayBase.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerPonyArmor.java (70%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerPonyCape.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerPonyElytra.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java (100%) rename src/{main => client}/java/com/minelittlepony/render/layer/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/GlowRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/ModelGlow.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/ModelPlane.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/Plane.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/PlaneRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/PonyRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/model/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/player/RenderPonyPlayer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/player/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/MobRenderers.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderEnderStallion.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyIllager.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyPigman.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyVex.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyVillager.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyWitch.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyZombie.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java (100%) rename src/{main => client}/java/com/minelittlepony/render/ponies/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/PonySkull.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/PonySkullRenderer.java (99%) rename src/{main => client}/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/WitherSkullRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/render/skull/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/PonyPosture.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/PonyTransformation.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/PostureElytra.java (91%) rename src/{main => client}/java/com/minelittlepony/transform/PostureFalling.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/PostureFlight.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/PostureSwimming.java (100%) rename src/{main => client}/java/com/minelittlepony/transform/package-info.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/AbstractBoxRenderer.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/Box.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/Color.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/Quad.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/Vertex.java (100%) rename src/{main => client}/java/com/minelittlepony/util/render/package-info.java (100%) rename src/{main => common}/java/com/minelittlepony/MissingRendererException.java (100%) rename src/{main => common}/java/com/minelittlepony/PonyConfig.java (88%) rename src/{main => common}/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java (100%) rename src/{main => common}/java/com/minelittlepony/model/BodyPart.java (100%) rename src/{main => common}/java/com/minelittlepony/model/PonyModelConstants.java (100%) rename src/{main => common}/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java (100%) rename src/{main => common}/java/com/minelittlepony/model/anim/IInterpolator.java (100%) rename src/{main => common}/java/com/minelittlepony/model/anim/package-info.java (100%) create mode 100644 src/common/java/com/minelittlepony/model/armour/ArmourLayer.java rename src/{main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java => common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java} (57%) create mode 100644 src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java rename src/{main => common}/java/com/minelittlepony/model/armour/package-info.java (100%) rename src/{main => common}/java/com/minelittlepony/model/capabilities/IModelWrapper.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/IPony.java (91%) rename src/{main => common}/java/com/minelittlepony/pony/data/IPonyData.java (89%) rename src/{main => common}/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/PonyGender.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/PonyLevel.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/PonySize.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/PonyWearable.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/TailLengths.java (100%) rename src/{main => common}/java/com/minelittlepony/pony/data/TriggerPixels.java (100%) rename src/{main => common}/java/com/minelittlepony/settings/SensibleConfig.java (92%) rename src/{main => common}/java/com/minelittlepony/transform/MotionCompositor.java (100%) rename src/{main => common}/java/com/minelittlepony/util/chron/ChronicCache.java (100%) rename src/{main => common}/java/com/minelittlepony/util/chron/Touchable.java (100%) rename src/{main => common}/java/com/minelittlepony/util/math/MathUtil.java (100%) rename src/{main => common}/java/com/minelittlepony/util/math/package-info.java (100%) rename src/{main => common}/java/com/minelittlepony/util/render/FormattedTextureSupplier.java (100%) rename src/{main => common}/java/com/minelittlepony/util/render/ITextureSupplier.java (100%) rename src/{main => common}/java/com/minelittlepony/util/render/IntStringMapper.java (100%) delete mode 100644 src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java diff --git a/src/main/java/com/minelittlepony/ForgeProxy.java b/src/client/java/com/minelittlepony/ForgeProxy.java similarity index 100% rename from src/main/java/com/minelittlepony/ForgeProxy.java rename to src/client/java/com/minelittlepony/ForgeProxy.java diff --git a/src/main/java/com/minelittlepony/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java similarity index 59% rename from src/main/java/com/minelittlepony/LiteModMineLittlePony.java rename to src/client/java/com/minelittlepony/LiteModMineLittlePony.java index 2baf7712..06f1b250 100644 --- a/src/main/java/com/minelittlepony/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java @@ -6,6 +6,9 @@ import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.Tickable; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.modconfig.ConfigPanel; +import com.mumfrey.liteloader.modconfig.ConfigStrategy; +import com.mumfrey.liteloader.modconfig.Exposable; +import com.mumfrey.liteloader.modconfig.ExposableOptions; import net.minecraft.client.Minecraft; @@ -13,8 +16,6 @@ import java.io.File; public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Configurable { - private MineLittlePony mlp; - @Override public String getName() { return MineLittlePony.MOD_NAME; @@ -31,21 +32,34 @@ public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Co @Override public void init(File configPath) { - mlp = new MineLittlePony(); + Config config = new Config(); + + MineLittlePony.getInstance().init(config); + + LiteLoader.getInput().registerKeyBinding(MineLittlePony.SETTINGS_GUI); + LiteLoader.getInstance().registerExposable(config, null); } @Override public void onInitCompleted(Minecraft minecraft, LiteLoader loader) { - mlp.postInit(minecraft); + MineLittlePony.getInstance().postInit(minecraft); } @Override public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) { - mlp.onTick(minecraft, inGame); + MineLittlePony.getInstance().onTick(minecraft, inGame); } @Override public Class getConfigPanelClass() { return GuiPonySettings.class; } + + @ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) + class Config extends PonyConfig implements Exposable { + @Override + public void save() { + LiteLoader.getInstance().writeConfig(this); + } + } } diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/client/java/com/minelittlepony/MineLittlePony.java similarity index 88% rename from src/main/java/com/minelittlepony/MineLittlePony.java rename to src/client/java/com/minelittlepony/MineLittlePony.java index 98e6cffc..092713bd 100644 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ b/src/client/java/com/minelittlepony/MineLittlePony.java @@ -2,11 +2,10 @@ package com.minelittlepony; import com.minelittlepony.gui.GuiPonySettings; import com.minelittlepony.hdskins.gui.GuiSkinsMineLP; -import com.minelittlepony.pony.data.IPonyData; +import com.minelittlepony.pony.data.PonyData; import com.minelittlepony.pony.data.PonyDataSerialiser; import com.minelittlepony.pony.data.PonyManager; import com.minelittlepony.render.skull.PonySkullRenderer; -import com.mumfrey.liteloader.core.LiteLoader; import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.server.LegacySkinServer; import com.voxelmodpack.hdskins.server.SkinServer; @@ -40,35 +39,27 @@ public class MineLittlePony { private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com"; private static final String MINELP_LEGACY_GATEWAY = "http://minelpskinmanager.voxelmodpack.com"; - private static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); + static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); - private static MineLittlePony instance; - - private final PonyConfig config; - private final PonyManager ponyManager; - - private final PonyRenderManager renderManager; + private static final MineLittlePony instance = new MineLittlePony(); private static int modelUpdateCounter = 0; private static boolean reloadingModels = false; - MineLittlePony() { - instance = this; + private PonyConfig config; + private PonyManager ponyManager; - LiteLoader.getInput().registerKeyBinding(SETTINGS_GUI); + private final PonyRenderManager renderManager = new PonyRenderManager(); - config = new PonyConfig(); + void init(PonyConfig newConfig) { + config = newConfig; ponyManager = new PonyManager(config); - renderManager = new PonyRenderManager(); - - LiteLoader.getInstance().registerExposable(config, null); - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); irrm.registerReloadListener(ponyManager); MetadataSerializer ms = Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer; - ms.registerMetadataSectionType(new PonyDataSerialiser(), IPonyData.class); + ms.registerMetadataSectionType(new PonyDataSerialiser(), PonyData.class); // This also makes it the default gateway server. SkinServer.defaultServers.add(new LegacySkinServer(MINELP_LEGACY_SERVER, MINELP_LEGACY_GATEWAY)); @@ -124,11 +115,12 @@ public class MineLittlePony { PonySkullRenderer.resolve(); } + /** * Gets the global MineLP instance. */ public static MineLittlePony getInstance() { - return instance; + return MineLittlePony.instance; } /** @@ -155,5 +147,4 @@ public class MineLittlePony { public static PonyConfig getConfig() { return getInstance().config; } - } diff --git a/src/main/java/com/minelittlepony/PonyRenderManager.java b/src/client/java/com/minelittlepony/PonyRenderManager.java similarity index 100% rename from src/main/java/com/minelittlepony/PonyRenderManager.java rename to src/client/java/com/minelittlepony/PonyRenderManager.java diff --git a/src/main/java/com/minelittlepony/PonySkinModifier.java b/src/client/java/com/minelittlepony/PonySkinModifier.java similarity index 100% rename from src/main/java/com/minelittlepony/PonySkinModifier.java rename to src/client/java/com/minelittlepony/PonySkinModifier.java diff --git a/src/main/java/com/minelittlepony/PonySkinParser.java b/src/client/java/com/minelittlepony/PonySkinParser.java similarity index 100% rename from src/main/java/com/minelittlepony/PonySkinParser.java rename to src/client/java/com/minelittlepony/PonySkinParser.java diff --git a/src/main/java/com/minelittlepony/ducks/IRenderItem.java b/src/client/java/com/minelittlepony/ducks/IRenderItem.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/IRenderItem.java rename to src/client/java/com/minelittlepony/ducks/IRenderItem.java diff --git a/src/main/java/com/minelittlepony/ducks/IRenderPony.java b/src/client/java/com/minelittlepony/ducks/IRenderPony.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/IRenderPony.java rename to src/client/java/com/minelittlepony/ducks/IRenderPony.java diff --git a/src/main/java/com/minelittlepony/ducks/package-info.java b/src/client/java/com/minelittlepony/ducks/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/ducks/package-info.java rename to src/client/java/com/minelittlepony/ducks/package-info.java diff --git a/src/main/java/com/minelittlepony/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java similarity index 97% rename from src/main/java/com/minelittlepony/gui/GuiPonySettings.java rename to src/client/java/com/minelittlepony/gui/GuiPonySettings.java index b8ebb023..3edf3346 100644 --- a/src/main/java/com/minelittlepony/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java @@ -5,7 +5,6 @@ import com.minelittlepony.PonyConfig; import com.minelittlepony.PonyConfig.PonySettings; import com.minelittlepony.pony.data.PonyLevel; import com.minelittlepony.render.ponies.MobRenderers; -import com.mumfrey.liteloader.core.LiteLoader; /** * In-Game options menu. @@ -100,7 +99,7 @@ public class GuiPonySettings extends SettingsPanel { @Override public void onGuiClosed() { - LiteLoader.getInstance().writeConfig(config); + config.save(); } @Override diff --git a/src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java rename to src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java diff --git a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java rename to src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java diff --git a/src/main/java/com/minelittlepony/hdskins/gui/package-info.java b/src/client/java/com/minelittlepony/hdskins/gui/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/package-info.java rename to src/client/java/com/minelittlepony/hdskins/gui/package-info.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java rename to src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinGlStateManager.java b/src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinGlStateManager.java rename to src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java b/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinItemRenderer.java rename to src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderItem.java b/src/client/java/com/minelittlepony/mixin/MixinRenderItem.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinRenderItem.java rename to src/client/java/com/minelittlepony/mixin/MixinRenderItem.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderManager.java b/src/client/java/com/minelittlepony/mixin/MixinRenderManager.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinRenderManager.java rename to src/client/java/com/minelittlepony/mixin/MixinRenderManager.java diff --git a/src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java b/src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java rename to src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java diff --git a/src/main/java/com/minelittlepony/mixin/package-info.java b/src/client/java/com/minelittlepony/mixin/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/mixin/package-info.java rename to src/client/java/com/minelittlepony/mixin/package-info.java diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/model/AbstractPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/model/AbstractPonyModel.java rename to src/client/java/com/minelittlepony/model/AbstractPonyModel.java diff --git a/src/main/java/com/minelittlepony/model/ModelMobPony.java b/src/client/java/com/minelittlepony/model/ModelMobPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ModelMobPony.java rename to src/client/java/com/minelittlepony/model/ModelMobPony.java diff --git a/src/main/java/com/minelittlepony/model/ModelWrapper.java b/src/client/java/com/minelittlepony/model/ModelWrapper.java similarity index 89% rename from src/main/java/com/minelittlepony/model/ModelWrapper.java rename to src/client/java/com/minelittlepony/model/ModelWrapper.java index 3b7334ea..5d7e3241 100644 --- a/src/main/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/model/ModelWrapper.java @@ -1,7 +1,7 @@ package com.minelittlepony.model; import com.minelittlepony.MineLittlePony; -import com.minelittlepony.model.armour.IEquestrianArmor; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.pony.data.IPonyData; @@ -12,7 +12,7 @@ public class ModelWrapper implements IModelWrapper { private final AbstractPonyModel body; - private final IEquestrianArmor armor; + private final IEquestrianArmour armor; private int lastModelUpdate = 0; @@ -38,7 +38,7 @@ public class ModelWrapper implements IModelWrapper { /** * Returns the contained armour model. */ - public IEquestrianArmor getArmor() { + public IEquestrianArmour getArmor() { return armor; } diff --git a/src/main/java/com/minelittlepony/model/PMAPI.java b/src/client/java/com/minelittlepony/model/PMAPI.java similarity index 100% rename from src/main/java/com/minelittlepony/model/PMAPI.java rename to src/client/java/com/minelittlepony/model/PMAPI.java diff --git a/src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java similarity index 90% rename from src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java rename to src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java index 85e5dc18..44df7f5e 100644 --- a/src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java @@ -10,20 +10,19 @@ import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; import com.minelittlepony.ForgeProxy; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; import javax.annotation.Nullable; import java.io.IOException; import java.util.Map; -public class DefaultPonyArmorTextureResolver implements IArmorTextureResolver { +public class DefaultPonyArmorTextureResolver implements IArmourTextureResolver { private final Map HUMAN_ARMOUR = Maps.newHashMap(); private final Map PONY_ARMOUR = Maps.newHashMap(); @Override - public ResourceLocation getArmorTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, @Nullable String type) { + public ResourceLocation getArmourTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, @Nullable String type) { ItemArmor item = (ItemArmor) itemstack.getItem(); String texture = item.getArmorMaterial().getName(); @@ -38,7 +37,7 @@ public class DefaultPonyArmorTextureResolver impleme String customType = type == null ? "" : String.format("_%s", type); String ponyRes = String.format("%s:textures/models/armor/%s_layer_%s%s.png", domain, texture, layer.name().toLowerCase(), customType); - String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmorLayer.INNER ? 2 : 1, customType); + String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmourLayer.INNER ? 2 : 1, customType); ResourceLocation human = getArmorTexture(entity, itemstack, ponyRes, slot, type); ResourceLocation pony = ponifyResource(human); diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java similarity index 97% rename from src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java rename to src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java index d527bd9d..fe567afa 100644 --- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java @@ -5,10 +5,10 @@ import net.minecraft.entity.Entity; import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelArmor; +import com.minelittlepony.model.capabilities.IModelArmour; import com.minelittlepony.render.model.PonyRenderer; -public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor { +public class ModelPonyArmor extends AbstractPonyModel implements IModelArmour { public PonyRenderer chestPiece; diff --git a/src/main/java/com/minelittlepony/model/armour/PonyArmor.java b/src/client/java/com/minelittlepony/model/armour/PonyArmor.java similarity index 78% rename from src/main/java/com/minelittlepony/model/armour/PonyArmor.java rename to src/client/java/com/minelittlepony/model/armour/PonyArmor.java index 94dc05de..e630aab4 100644 --- a/src/main/java/com/minelittlepony/model/armour/PonyArmor.java +++ b/src/client/java/com/minelittlepony/model/armour/PonyArmor.java @@ -2,7 +2,7 @@ package com.minelittlepony.model.armour; import com.minelittlepony.pony.data.IPonyData; -public class PonyArmor implements IEquestrianArmor { +public class PonyArmor implements IEquestrianArmour { private final ModelPonyArmor outerLayer; private final ModelPonyArmor innerLayer; @@ -25,9 +25,9 @@ public class PonyArmor implements IEquestrianArmor { } @Override - public ModelPonyArmor getArmorForLayer(ArmorLayer layer) { + public ModelPonyArmor getArmorForLayer(ArmourLayer layer) { - if (layer == ArmorLayer.INNER) { + if (layer == ArmourLayer.INNER) { return innerLayer; } diff --git a/src/main/java/com/minelittlepony/model/capabilities/ICapitated.java b/src/client/java/com/minelittlepony/model/capabilities/ICapitated.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/ICapitated.java rename to src/client/java/com/minelittlepony/model/capabilities/ICapitated.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModel.java b/src/client/java/com/minelittlepony/model/capabilities/IModel.java similarity index 96% rename from src/main/java/com/minelittlepony/model/capabilities/IModel.java rename to src/client/java/com/minelittlepony/model/capabilities/IModel.java index 1a1fc419..d17cec5e 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModel.java +++ b/src/client/java/com/minelittlepony/model/capabilities/IModel.java @@ -1,7 +1,7 @@ package com.minelittlepony.model.capabilities; import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.armour.IEquestrianArmor; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.pony.data.IPonyData; import com.minelittlepony.pony.data.PonySize; import com.minelittlepony.pony.data.PonyWearable; @@ -32,7 +32,7 @@ public interface IModel extends ICapitated { /** * Returns a new pony armour to go with this model. Called on startup by a model wrapper. */ - IEquestrianArmor createArmour(); + IEquestrianArmour createArmour(); /** * Gets the skin metadata associated with this model. diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java b/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java similarity index 95% rename from src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java index 1a24fd94..714c9184 100644 --- a/src/main/java/com/minelittlepony/model/capabilities/IModelArmor.java +++ b/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java @@ -3,9 +3,9 @@ package com.minelittlepony.model.capabilities; import net.minecraft.client.model.ModelBiped; import net.minecraft.inventory.EntityEquipmentSlot; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; +import com.minelittlepony.model.armour.ArmourLayer; -public interface IModelArmor { +public interface IModelArmour { /** * Called to synchronise this model's legs with that of another. * @@ -26,7 +26,7 @@ public interface IModelArmor { * * @return false to skip this render pass. */ - default boolean prepareToRender(EntityEquipmentSlot slot, ArmorLayer layer) { + default boolean prepareToRender(EntityEquipmentSlot slot, ArmourLayer layer) { setInVisible(); switch (layer) { diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPart.java b/src/client/java/com/minelittlepony/model/capabilities/IModelPart.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelPart.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelPart.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelPegasus.java b/src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelPegasus.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java b/src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelUnicorn.java rename to src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/package-info.java b/src/client/java/com/minelittlepony/model/capabilities/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/package-info.java rename to src/client/java/com/minelittlepony/model/capabilities/package-info.java diff --git a/src/main/java/com/minelittlepony/model/components/BatWings.java b/src/client/java/com/minelittlepony/model/components/BatWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/BatWings.java rename to src/client/java/com/minelittlepony/model/components/BatWings.java diff --git a/src/main/java/com/minelittlepony/model/components/BugWings.java b/src/client/java/com/minelittlepony/model/components/BugWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/BugWings.java rename to src/client/java/com/minelittlepony/model/components/BugWings.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelBatWing.java b/src/client/java/com/minelittlepony/model/components/ModelBatWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelBatWing.java rename to src/client/java/com/minelittlepony/model/components/ModelBatWing.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelBugWing.java b/src/client/java/com/minelittlepony/model/components/ModelBugWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelBugWing.java rename to src/client/java/com/minelittlepony/model/components/ModelBugWing.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java b/src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java rename to src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/model/components/ModelPonyHead.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelPonyHead.java rename to src/client/java/com/minelittlepony/model/components/ModelPonyHead.java diff --git a/src/main/java/com/minelittlepony/model/components/ModelWing.java b/src/client/java/com/minelittlepony/model/components/ModelWing.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/ModelWing.java rename to src/client/java/com/minelittlepony/model/components/ModelWing.java diff --git a/src/main/java/com/minelittlepony/model/components/PegasusWings.java b/src/client/java/com/minelittlepony/model/components/PegasusWings.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PegasusWings.java rename to src/client/java/com/minelittlepony/model/components/PegasusWings.java diff --git a/src/main/java/com/minelittlepony/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/model/components/PonyElytra.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonyElytra.java rename to src/client/java/com/minelittlepony/model/components/PonyElytra.java diff --git a/src/main/java/com/minelittlepony/model/components/PonySnout.java b/src/client/java/com/minelittlepony/model/components/PonySnout.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonySnout.java rename to src/client/java/com/minelittlepony/model/components/PonySnout.java diff --git a/src/main/java/com/minelittlepony/model/components/PonyTail.java b/src/client/java/com/minelittlepony/model/components/PonyTail.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/PonyTail.java rename to src/client/java/com/minelittlepony/model/components/PonyTail.java diff --git a/src/main/java/com/minelittlepony/model/components/SeaponyTail.java b/src/client/java/com/minelittlepony/model/components/SeaponyTail.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/SeaponyTail.java rename to src/client/java/com/minelittlepony/model/components/SeaponyTail.java diff --git a/src/main/java/com/minelittlepony/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/model/components/UnicornHorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/UnicornHorn.java rename to src/client/java/com/minelittlepony/model/components/UnicornHorn.java diff --git a/src/main/java/com/minelittlepony/model/components/package-info.java b/src/client/java/com/minelittlepony/model/components/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/components/package-info.java rename to src/client/java/com/minelittlepony/model/components/package-info.java diff --git a/src/main/java/com/minelittlepony/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/model/gear/AbstractGear.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/AbstractGear.java rename to src/client/java/com/minelittlepony/model/gear/AbstractGear.java diff --git a/src/main/java/com/minelittlepony/model/gear/ChristmasHat.java b/src/client/java/com/minelittlepony/model/gear/ChristmasHat.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/ChristmasHat.java rename to src/client/java/com/minelittlepony/model/gear/ChristmasHat.java diff --git a/src/main/java/com/minelittlepony/model/gear/IGear.java b/src/client/java/com/minelittlepony/model/gear/IGear.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/IGear.java rename to src/client/java/com/minelittlepony/model/gear/IGear.java diff --git a/src/main/java/com/minelittlepony/model/gear/IStackable.java b/src/client/java/com/minelittlepony/model/gear/IStackable.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/IStackable.java rename to src/client/java/com/minelittlepony/model/gear/IStackable.java diff --git a/src/main/java/com/minelittlepony/model/gear/Muffin.java b/src/client/java/com/minelittlepony/model/gear/Muffin.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/Muffin.java rename to src/client/java/com/minelittlepony/model/gear/Muffin.java diff --git a/src/main/java/com/minelittlepony/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/model/gear/SaddleBags.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/SaddleBags.java rename to src/client/java/com/minelittlepony/model/gear/SaddleBags.java diff --git a/src/main/java/com/minelittlepony/model/gear/Stetson.java b/src/client/java/com/minelittlepony/model/gear/Stetson.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/Stetson.java rename to src/client/java/com/minelittlepony/model/gear/Stetson.java diff --git a/src/main/java/com/minelittlepony/model/gear/WitchHat.java b/src/client/java/com/minelittlepony/model/gear/WitchHat.java similarity index 100% rename from src/main/java/com/minelittlepony/model/gear/WitchHat.java rename to src/client/java/com/minelittlepony/model/gear/WitchHat.java diff --git a/src/main/java/com/minelittlepony/model/package-info.java b/src/client/java/com/minelittlepony/model/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/package-info.java rename to src/client/java/com/minelittlepony/model/package-info.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/client/java/com/minelittlepony/model/player/ModelAlicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelAlicorn.java rename to src/client/java/com/minelittlepony/model/player/ModelAlicorn.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelBatpony.java b/src/client/java/com/minelittlepony/model/player/ModelBatpony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelBatpony.java rename to src/client/java/com/minelittlepony/model/player/ModelBatpony.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelChangeling.java b/src/client/java/com/minelittlepony/model/player/ModelChangeling.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelChangeling.java rename to src/client/java/com/minelittlepony/model/player/ModelChangeling.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelEarthPony.java b/src/client/java/com/minelittlepony/model/player/ModelEarthPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelEarthPony.java rename to src/client/java/com/minelittlepony/model/player/ModelEarthPony.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelPegasus.java b/src/client/java/com/minelittlepony/model/player/ModelPegasus.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelPegasus.java rename to src/client/java/com/minelittlepony/model/player/ModelPegasus.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelUnicorn.java b/src/client/java/com/minelittlepony/model/player/ModelUnicorn.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelUnicorn.java rename to src/client/java/com/minelittlepony/model/player/ModelUnicorn.java diff --git a/src/main/java/com/minelittlepony/model/player/ModelZebra.java b/src/client/java/com/minelittlepony/model/player/ModelZebra.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/ModelZebra.java rename to src/client/java/com/minelittlepony/model/player/ModelZebra.java diff --git a/src/main/java/com/minelittlepony/model/player/PlayerModels.java b/src/client/java/com/minelittlepony/model/player/PlayerModels.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/PlayerModels.java rename to src/client/java/com/minelittlepony/model/player/PlayerModels.java diff --git a/src/main/java/com/minelittlepony/model/player/package-info.java b/src/client/java/com/minelittlepony/model/player/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/player/package-info.java rename to src/client/java/com/minelittlepony/model/player/package-info.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelBreezie.java b/src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelBreezie.java rename to src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java b/src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelEnderStallion.java rename to src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelIllagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelIllagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelSeapony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelVillagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java b/src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java b/src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java rename to src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java diff --git a/src/main/java/com/minelittlepony/model/ponies/package-info.java b/src/client/java/com/minelittlepony/model/ponies/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/ponies/package-info.java rename to src/client/java/com/minelittlepony/model/ponies/package-info.java diff --git a/src/main/java/com/minelittlepony/package-info.java b/src/client/java/com/minelittlepony/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/package-info.java rename to src/client/java/com/minelittlepony/package-info.java diff --git a/src/main/java/com/minelittlepony/pony/data/Pony.java b/src/client/java/com/minelittlepony/pony/data/Pony.java similarity index 99% rename from src/main/java/com/minelittlepony/pony/data/Pony.java rename to src/client/java/com/minelittlepony/pony/data/Pony.java index e70a15d9..bd4edd36 100644 --- a/src/main/java/com/minelittlepony/pony/data/Pony.java +++ b/src/client/java/com/minelittlepony/pony/data/Pony.java @@ -231,7 +231,7 @@ public class Pony extends Touchable implements IPony { return new AxisAlignedBB( - width, (entity.height * scale), -width, - width, 0, width).offset(pos); + width, 0, width).offset(pos); } @Override diff --git a/src/main/java/com/minelittlepony/pony/data/PonyData.java b/src/client/java/com/minelittlepony/pony/data/PonyData.java similarity index 95% rename from src/main/java/com/minelittlepony/pony/data/PonyData.java rename to src/client/java/com/minelittlepony/pony/data/PonyData.java index a8059de0..3582a845 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyData.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyData.java @@ -1,5 +1,7 @@ package com.minelittlepony.pony.data; +import net.minecraft.client.resources.data.IMetadataSection; + import com.google.common.base.MoreObjects; import com.minelittlepony.model.anim.BasicEasingInterpolator; import com.minelittlepony.model.anim.IInterpolator; @@ -15,7 +17,7 @@ import javax.annotation.concurrent.Immutable; * */ @Immutable -public class PonyData implements IPonyData { +public class PonyData implements IPonyData, IMetadataSection { private final PonyRace race; private final TailLengths tailSize; private final PonyGender gender; diff --git a/src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java b/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java similarity index 97% rename from src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java rename to src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java index 2397c129..0083e9c2 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyDataSerialiser.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java @@ -7,7 +7,7 @@ import net.minecraft.client.resources.data.IMetadataSectionSerializer; import java.lang.reflect.Type; -public class PonyDataSerialiser implements IMetadataSectionSerializer { +public class PonyDataSerialiser implements IMetadataSectionSerializer { public static final String NAME = "pony"; diff --git a/src/main/java/com/minelittlepony/pony/data/PonyManager.java b/src/client/java/com/minelittlepony/pony/data/PonyManager.java similarity index 99% rename from src/main/java/com/minelittlepony/pony/data/PonyManager.java rename to src/client/java/com/minelittlepony/pony/data/PonyManager.java index 27661205..139d44bf 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyManager.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyManager.java @@ -46,7 +46,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl */ private List backgroundPonyList = Lists.newArrayList(); - private PonyConfig config; + private final PonyConfig config; private final ChronicCache poniesCache = new ChronicCache<>(); diff --git a/src/main/java/com/minelittlepony/pony/data/PonyRace.java b/src/client/java/com/minelittlepony/pony/data/PonyRace.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyRace.java rename to src/client/java/com/minelittlepony/pony/data/PonyRace.java diff --git a/src/main/java/com/minelittlepony/pony/data/package-info.java b/src/client/java/com/minelittlepony/pony/data/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/package-info.java rename to src/client/java/com/minelittlepony/pony/data/package-info.java diff --git a/src/main/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java rename to src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java diff --git a/src/main/java/com/minelittlepony/render/FrustrumCheck.java b/src/client/java/com/minelittlepony/render/FrustrumCheck.java similarity index 100% rename from src/main/java/com/minelittlepony/render/FrustrumCheck.java rename to src/client/java/com/minelittlepony/render/FrustrumCheck.java diff --git a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java rename to src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java diff --git a/src/main/java/com/minelittlepony/render/RenderPony.java b/src/client/java/com/minelittlepony/render/RenderPony.java similarity index 100% rename from src/main/java/com/minelittlepony/render/RenderPony.java rename to src/client/java/com/minelittlepony/render/RenderPony.java diff --git a/src/main/java/com/minelittlepony/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/render/RenderPonyMob.java similarity index 100% rename from src/main/java/com/minelittlepony/render/RenderPonyMob.java rename to src/client/java/com/minelittlepony/render/RenderPonyMob.java diff --git a/src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java b/src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/AbstractPonyLayer.java rename to src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerDJPon3Head.java rename to src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java rename to src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerEyeGlow.java b/src/client/java/com/minelittlepony/render/layer/LayerEyeGlow.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerEyeGlow.java rename to src/client/java/com/minelittlepony/render/layer/LayerEyeGlow.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/render/layer/LayerGear.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerGear.java rename to src/client/java/com/minelittlepony/render/layer/LayerGear.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java rename to src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java b/src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerOverlayBase.java rename to src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java similarity index 70% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java index 4157f177..c60395eb 100644 --- a/src/main/java/com/minelittlepony/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java @@ -2,11 +2,11 @@ package com.minelittlepony.render.layer; import com.minelittlepony.ForgeProxy; import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.armour.IEquestrianArmor; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; -import com.minelittlepony.model.armour.IArmorTextureResolver; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.ArmourLayer; import com.minelittlepony.model.armour.DefaultPonyArmorTextureResolver; -import com.minelittlepony.model.capabilities.IModelArmor; +import com.minelittlepony.model.capabilities.IModelArmour; import com.minelittlepony.util.render.Color; import net.minecraft.client.model.ModelBase; @@ -24,7 +24,7 @@ import net.minecraft.util.ResourceLocation; public class LayerPonyArmor extends AbstractPonyLayer { - private static final IArmorTextureResolver textures = new DefaultPonyArmorTextureResolver<>(); + private static final IArmourTextureResolver textures = new DefaultPonyArmorTextureResolver<>(); private ModelWrapper pony; @@ -38,13 +38,13 @@ public class LayerPonyArmor extends AbstractPonyLaye for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) { if (i.getSlotType() == Type.ARMOR) { - renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmorLayer.INNER); - renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmorLayer.OUTER); + renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmourLayer.INNER); + renderArmor(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale, i, ArmourLayer.OUTER); } } } - private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmorLayer layer) { + private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmourLayer layer) { ItemStack itemstack = entity.getItemStackFromSlot(armorSlot); if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) { @@ -59,9 +59,9 @@ public class LayerPonyArmor extends AbstractPonyLaye armour.synchroniseLegs(pony.getBody()); @SuppressWarnings("unchecked") - IArmorTextureResolver resolver = armour instanceof IArmorTextureResolver ? (IArmorTextureResolver)armour : (IArmorTextureResolver)textures; + IArmourTextureResolver resolver = armour instanceof IArmourTextureResolver ? (IArmourTextureResolver)armour : (IArmourTextureResolver)textures; - ResourceLocation armourTexture = resolver.getArmorTexture(entity, itemstack, armorSlot, layer, null); + ResourceLocation armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, null); getRenderer().bindTexture(armourTexture); @@ -70,7 +70,7 @@ public class LayerPonyArmor extends AbstractPonyLaye if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) { Color.glColor(itemarmor.getColor(itemstack), 1); armour.render(entity, move, swing, ticks, headYaw, headPitch, scale); - armourTexture = resolver.getArmorTexture(entity, itemstack, armorSlot, layer, "overlay"); + armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, "overlay"); getRenderer().bindTexture(armourTexture); } @@ -85,15 +85,15 @@ public class LayerPonyArmor extends AbstractPonyLaye } @SuppressWarnings("unchecked") - private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, V def) { + private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, V def) { ModelBase model = ForgeProxy.getArmorModel(entity, itemstack, slot, def); - if (model instanceof IModelArmor) { + if (model instanceof IModelArmour) { return (V)model; } - if (model instanceof IEquestrianArmor) { - return ((IEquestrianArmor) model).getArmorForLayer(layer); + if (model instanceof IEquestrianArmour) { + return ((IEquestrianArmour) model).getArmorForLayer(layer); } return def; diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyCape.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyElytra.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java diff --git a/src/main/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java b/src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java rename to src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java diff --git a/src/main/java/com/minelittlepony/render/layer/package-info.java b/src/client/java/com/minelittlepony/render/layer/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/layer/package-info.java rename to src/client/java/com/minelittlepony/render/layer/package-info.java diff --git a/src/main/java/com/minelittlepony/render/model/GlowRenderer.java b/src/client/java/com/minelittlepony/render/model/GlowRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/GlowRenderer.java rename to src/client/java/com/minelittlepony/render/model/GlowRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/ModelGlow.java b/src/client/java/com/minelittlepony/render/model/ModelGlow.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/ModelGlow.java rename to src/client/java/com/minelittlepony/render/model/ModelGlow.java diff --git a/src/main/java/com/minelittlepony/render/model/ModelPlane.java b/src/client/java/com/minelittlepony/render/model/ModelPlane.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/ModelPlane.java rename to src/client/java/com/minelittlepony/render/model/ModelPlane.java diff --git a/src/main/java/com/minelittlepony/render/model/Plane.java b/src/client/java/com/minelittlepony/render/model/Plane.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/Plane.java rename to src/client/java/com/minelittlepony/render/model/Plane.java diff --git a/src/main/java/com/minelittlepony/render/model/PlaneRenderer.java b/src/client/java/com/minelittlepony/render/model/PlaneRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/PlaneRenderer.java rename to src/client/java/com/minelittlepony/render/model/PlaneRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/PonyRenderer.java b/src/client/java/com/minelittlepony/render/model/PonyRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/PonyRenderer.java rename to src/client/java/com/minelittlepony/render/model/PonyRenderer.java diff --git a/src/main/java/com/minelittlepony/render/model/package-info.java b/src/client/java/com/minelittlepony/render/model/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/model/package-info.java rename to src/client/java/com/minelittlepony/render/model/package-info.java diff --git a/src/main/java/com/minelittlepony/render/package-info.java b/src/client/java/com/minelittlepony/render/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/package-info.java rename to src/client/java/com/minelittlepony/render/package-info.java diff --git a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java rename to src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java diff --git a/src/main/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java rename to src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java diff --git a/src/main/java/com/minelittlepony/render/player/package-info.java b/src/client/java/com/minelittlepony/render/player/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/player/package-info.java rename to src/client/java/com/minelittlepony/render/player/package-info.java diff --git a/src/main/java/com/minelittlepony/render/ponies/MobRenderers.java b/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/MobRenderers.java rename to src/client/java/com/minelittlepony/render/ponies/MobRenderers.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderEnderStallion.java b/src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderEnderStallion.java rename to src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyIllager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyIllager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyPigman.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyPigman.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVex.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyVex.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyVillager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyWitch.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyWitch.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyZombie.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyZombie.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java diff --git a/src/main/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java rename to src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java diff --git a/src/main/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java b/src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java rename to src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java diff --git a/src/main/java/com/minelittlepony/render/ponies/package-info.java b/src/client/java/com/minelittlepony/render/ponies/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/ponies/package-info.java rename to src/client/java/com/minelittlepony/render/ponies/package-info.java diff --git a/src/main/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/PonySkull.java b/src/client/java/com/minelittlepony/render/skull/PonySkull.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/PonySkull.java rename to src/client/java/com/minelittlepony/render/skull/PonySkull.java diff --git a/src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java similarity index 99% rename from src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java index 08d8dfd9..791aefa5 100644 --- a/src/main/java/com/minelittlepony/render/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java @@ -162,7 +162,6 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende */ public interface ISkull { - void preRender(boolean transparency); void render(float animateTicks, float rotation, float scale); diff --git a/src/main/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/WitherSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/WitherSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java rename to src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java diff --git a/src/main/java/com/minelittlepony/render/skull/package-info.java b/src/client/java/com/minelittlepony/render/skull/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/render/skull/package-info.java rename to src/client/java/com/minelittlepony/render/skull/package-info.java diff --git a/src/main/java/com/minelittlepony/transform/PonyPosture.java b/src/client/java/com/minelittlepony/transform/PonyPosture.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PonyPosture.java rename to src/client/java/com/minelittlepony/transform/PonyPosture.java diff --git a/src/main/java/com/minelittlepony/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/transform/PonyTransformation.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PonyTransformation.java rename to src/client/java/com/minelittlepony/transform/PonyTransformation.java diff --git a/src/main/java/com/minelittlepony/transform/PostureElytra.java b/src/client/java/com/minelittlepony/transform/PostureElytra.java similarity index 91% rename from src/main/java/com/minelittlepony/transform/PostureElytra.java rename to src/client/java/com/minelittlepony/transform/PostureElytra.java index 7314c582..68769224 100644 --- a/src/main/java/com/minelittlepony/transform/PostureElytra.java +++ b/src/client/java/com/minelittlepony/transform/PostureElytra.java @@ -1,6 +1,5 @@ package com.minelittlepony.transform; -import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.capabilities.IModel; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/minelittlepony/transform/PostureFalling.java b/src/client/java/com/minelittlepony/transform/PostureFalling.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureFalling.java rename to src/client/java/com/minelittlepony/transform/PostureFalling.java diff --git a/src/main/java/com/minelittlepony/transform/PostureFlight.java b/src/client/java/com/minelittlepony/transform/PostureFlight.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureFlight.java rename to src/client/java/com/minelittlepony/transform/PostureFlight.java diff --git a/src/main/java/com/minelittlepony/transform/PostureSwimming.java b/src/client/java/com/minelittlepony/transform/PostureSwimming.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/PostureSwimming.java rename to src/client/java/com/minelittlepony/transform/PostureSwimming.java diff --git a/src/main/java/com/minelittlepony/transform/package-info.java b/src/client/java/com/minelittlepony/transform/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/package-info.java rename to src/client/java/com/minelittlepony/transform/package-info.java diff --git a/src/main/java/com/minelittlepony/util/render/AbstractBoxRenderer.java b/src/client/java/com/minelittlepony/util/render/AbstractBoxRenderer.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/AbstractBoxRenderer.java rename to src/client/java/com/minelittlepony/util/render/AbstractBoxRenderer.java diff --git a/src/main/java/com/minelittlepony/util/render/Box.java b/src/client/java/com/minelittlepony/util/render/Box.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Box.java rename to src/client/java/com/minelittlepony/util/render/Box.java diff --git a/src/main/java/com/minelittlepony/util/render/Color.java b/src/client/java/com/minelittlepony/util/render/Color.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Color.java rename to src/client/java/com/minelittlepony/util/render/Color.java diff --git a/src/main/java/com/minelittlepony/util/render/Quad.java b/src/client/java/com/minelittlepony/util/render/Quad.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Quad.java rename to src/client/java/com/minelittlepony/util/render/Quad.java diff --git a/src/main/java/com/minelittlepony/util/render/Vertex.java b/src/client/java/com/minelittlepony/util/render/Vertex.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/Vertex.java rename to src/client/java/com/minelittlepony/util/render/Vertex.java diff --git a/src/main/java/com/minelittlepony/util/render/package-info.java b/src/client/java/com/minelittlepony/util/render/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/package-info.java rename to src/client/java/com/minelittlepony/util/render/package-info.java diff --git a/src/main/java/com/minelittlepony/MissingRendererException.java b/src/common/java/com/minelittlepony/MissingRendererException.java similarity index 100% rename from src/main/java/com/minelittlepony/MissingRendererException.java rename to src/common/java/com/minelittlepony/MissingRendererException.java diff --git a/src/main/java/com/minelittlepony/PonyConfig.java b/src/common/java/com/minelittlepony/PonyConfig.java similarity index 88% rename from src/main/java/com/minelittlepony/PonyConfig.java rename to src/common/java/com/minelittlepony/PonyConfig.java index efa6dd23..d17f66be 100644 --- a/src/main/java/com/minelittlepony/PonyConfig.java +++ b/src/common/java/com/minelittlepony/PonyConfig.java @@ -5,16 +5,13 @@ import net.minecraft.util.math.MathHelper; import com.google.gson.annotations.Expose; import com.minelittlepony.pony.data.PonyLevel; import com.minelittlepony.settings.SensibleConfig; -import com.mumfrey.liteloader.modconfig.ConfigStrategy; -import com.mumfrey.liteloader.modconfig.Exposable; -import com.mumfrey.liteloader.modconfig.ExposableOptions; + import com.voxelmodpack.hdskins.HDSkinManager; /** * Storage container for MineLP client settings. */ -@ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) -public class PonyConfig extends SensibleConfig implements Exposable { +public abstract class PonyConfig extends SensibleConfig { @Expose private PonyLevel ponylevel = PonyLevel.PONIES; diff --git a/src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java b/src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java similarity index 100% rename from src/main/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java rename to src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java diff --git a/src/main/java/com/minelittlepony/model/BodyPart.java b/src/common/java/com/minelittlepony/model/BodyPart.java similarity index 100% rename from src/main/java/com/minelittlepony/model/BodyPart.java rename to src/common/java/com/minelittlepony/model/BodyPart.java diff --git a/src/main/java/com/minelittlepony/model/PonyModelConstants.java b/src/common/java/com/minelittlepony/model/PonyModelConstants.java similarity index 100% rename from src/main/java/com/minelittlepony/model/PonyModelConstants.java rename to src/common/java/com/minelittlepony/model/PonyModelConstants.java diff --git a/src/main/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java b/src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java rename to src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java diff --git a/src/main/java/com/minelittlepony/model/anim/IInterpolator.java b/src/common/java/com/minelittlepony/model/anim/IInterpolator.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/IInterpolator.java rename to src/common/java/com/minelittlepony/model/anim/IInterpolator.java diff --git a/src/main/java/com/minelittlepony/model/anim/package-info.java b/src/common/java/com/minelittlepony/model/anim/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/anim/package-info.java rename to src/common/java/com/minelittlepony/model/anim/package-info.java diff --git a/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java new file mode 100644 index 00000000..c12457d4 --- /dev/null +++ b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java @@ -0,0 +1,15 @@ +package com.minelittlepony.model.armour; + +/** + * The layer used to render a given armour piece. + */ +public enum ArmourLayer { + /** + * Fits snugly to the player's model. + */ + INNER, + /** + * Hanging loose and sagging free + */ + OUTER +} \ No newline at end of file diff --git a/src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java similarity index 57% rename from src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java rename to src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java index 0e84ca88..800a1be9 100644 --- a/src/main/java/com/minelittlepony/model/armour/IArmorTextureResolver.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java @@ -5,14 +5,12 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; - import javax.annotation.Nullable; -public interface IArmorTextureResolver { +public interface IArmourTextureResolver { /** * Gets the armour texture to be used for the given entity, armour piece, slot, and render layer. */ - ResourceLocation getArmorTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmorLayer layer, @Nullable String type); + ResourceLocation getArmourTexture(T entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, @Nullable String type); } diff --git a/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java new file mode 100644 index 00000000..981f8c9c --- /dev/null +++ b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java @@ -0,0 +1,11 @@ +package com.minelittlepony.model.armour; + +import com.minelittlepony.model.capabilities.IModelArmour; +import com.minelittlepony.model.capabilities.IModelWrapper; + +public interface IEquestrianArmour extends IModelWrapper { + /** + * Gets the armour model to render for the given layer. + */ + V getArmorForLayer(ArmourLayer layer); +} diff --git a/src/main/java/com/minelittlepony/model/armour/package-info.java b/src/common/java/com/minelittlepony/model/armour/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/model/armour/package-info.java rename to src/common/java/com/minelittlepony/model/armour/package-info.java diff --git a/src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java similarity index 100% rename from src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java rename to src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java diff --git a/src/main/java/com/minelittlepony/pony/data/IPony.java b/src/common/java/com/minelittlepony/pony/data/IPony.java similarity index 91% rename from src/main/java/com/minelittlepony/pony/data/IPony.java rename to src/common/java/com/minelittlepony/pony/data/IPony.java index 54e6123f..3f560051 100644 --- a/src/main/java/com/minelittlepony/pony/data/IPony.java +++ b/src/common/java/com/minelittlepony/pony/data/IPony.java @@ -1,6 +1,5 @@ package com.minelittlepony.pony.data; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -9,13 +8,6 @@ import net.minecraft.util.math.Vec3d; import com.minelittlepony.MineLittlePony; public interface IPony { - /** - * Gets or creates a new pony associated with the provided player. - * The results of this method should not be cached. - */ - static IPony forPlayer(AbstractClientPlayer player) { - return MineLittlePony.getInstance().getManager().getPony(player); - } /** * Gets or creates a new pony associated with the provided resource location. diff --git a/src/main/java/com/minelittlepony/pony/data/IPonyData.java b/src/common/java/com/minelittlepony/pony/data/IPonyData.java similarity index 89% rename from src/main/java/com/minelittlepony/pony/data/IPonyData.java rename to src/common/java/com/minelittlepony/pony/data/IPonyData.java index 317deb5e..6dc10227 100644 --- a/src/main/java/com/minelittlepony/pony/data/IPonyData.java +++ b/src/common/java/com/minelittlepony/pony/data/IPonyData.java @@ -4,12 +4,10 @@ import com.minelittlepony.model.anim.IInterpolator; import java.util.UUID; -import net.minecraft.client.resources.data.IMetadataSection; - /** * Metadata for a pony. */ -public interface IPonyData extends IMetadataSection { +public interface IPonyData { /** * Gets this pony's race. */ diff --git a/src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java b/src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java rename to src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyGender.java b/src/common/java/com/minelittlepony/pony/data/PonyGender.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyGender.java rename to src/common/java/com/minelittlepony/pony/data/PonyGender.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyLevel.java b/src/common/java/com/minelittlepony/pony/data/PonyLevel.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyLevel.java rename to src/common/java/com/minelittlepony/pony/data/PonyLevel.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonySize.java b/src/common/java/com/minelittlepony/pony/data/PonySize.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonySize.java rename to src/common/java/com/minelittlepony/pony/data/PonySize.java diff --git a/src/main/java/com/minelittlepony/pony/data/PonyWearable.java b/src/common/java/com/minelittlepony/pony/data/PonyWearable.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/PonyWearable.java rename to src/common/java/com/minelittlepony/pony/data/PonyWearable.java diff --git a/src/main/java/com/minelittlepony/pony/data/TailLengths.java b/src/common/java/com/minelittlepony/pony/data/TailLengths.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/TailLengths.java rename to src/common/java/com/minelittlepony/pony/data/TailLengths.java diff --git a/src/main/java/com/minelittlepony/pony/data/TriggerPixels.java b/src/common/java/com/minelittlepony/pony/data/TriggerPixels.java similarity index 100% rename from src/main/java/com/minelittlepony/pony/data/TriggerPixels.java rename to src/common/java/com/minelittlepony/pony/data/TriggerPixels.java diff --git a/src/main/java/com/minelittlepony/settings/SensibleConfig.java b/src/common/java/com/minelittlepony/settings/SensibleConfig.java similarity index 92% rename from src/main/java/com/minelittlepony/settings/SensibleConfig.java rename to src/common/java/com/minelittlepony/settings/SensibleConfig.java index d3210663..c8bdb91f 100644 --- a/src/main/java/com/minelittlepony/settings/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/settings/SensibleConfig.java @@ -3,7 +3,7 @@ package com.minelittlepony.settings; import com.minelittlepony.gui.IGuiCallback; /** - * A sensible config container that actually lets us programatically index values by a key. + * A sensible config container that actually lets us programmatically index values by a key. * * Reflection because Mumfrey pls. * @@ -17,6 +17,8 @@ public abstract class SensibleConfig { instance = this; } + public abstract void save(); + public interface Setting extends IGuiCallback { String name(); @@ -27,7 +29,6 @@ public abstract class SensibleConfig { return instance.getValue(this); } - /** * Sets the config value associated with this entry. */ diff --git a/src/main/java/com/minelittlepony/transform/MotionCompositor.java b/src/common/java/com/minelittlepony/transform/MotionCompositor.java similarity index 100% rename from src/main/java/com/minelittlepony/transform/MotionCompositor.java rename to src/common/java/com/minelittlepony/transform/MotionCompositor.java diff --git a/src/main/java/com/minelittlepony/util/chron/ChronicCache.java b/src/common/java/com/minelittlepony/util/chron/ChronicCache.java similarity index 100% rename from src/main/java/com/minelittlepony/util/chron/ChronicCache.java rename to src/common/java/com/minelittlepony/util/chron/ChronicCache.java diff --git a/src/main/java/com/minelittlepony/util/chron/Touchable.java b/src/common/java/com/minelittlepony/util/chron/Touchable.java similarity index 100% rename from src/main/java/com/minelittlepony/util/chron/Touchable.java rename to src/common/java/com/minelittlepony/util/chron/Touchable.java diff --git a/src/main/java/com/minelittlepony/util/math/MathUtil.java b/src/common/java/com/minelittlepony/util/math/MathUtil.java similarity index 100% rename from src/main/java/com/minelittlepony/util/math/MathUtil.java rename to src/common/java/com/minelittlepony/util/math/MathUtil.java diff --git a/src/main/java/com/minelittlepony/util/math/package-info.java b/src/common/java/com/minelittlepony/util/math/package-info.java similarity index 100% rename from src/main/java/com/minelittlepony/util/math/package-info.java rename to src/common/java/com/minelittlepony/util/math/package-info.java diff --git a/src/main/java/com/minelittlepony/util/render/FormattedTextureSupplier.java b/src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/FormattedTextureSupplier.java rename to src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java diff --git a/src/main/java/com/minelittlepony/util/render/ITextureSupplier.java b/src/common/java/com/minelittlepony/util/render/ITextureSupplier.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/ITextureSupplier.java rename to src/common/java/com/minelittlepony/util/render/ITextureSupplier.java diff --git a/src/main/java/com/minelittlepony/util/render/IntStringMapper.java b/src/common/java/com/minelittlepony/util/render/IntStringMapper.java similarity index 100% rename from src/main/java/com/minelittlepony/util/render/IntStringMapper.java rename to src/common/java/com/minelittlepony/util/render/IntStringMapper.java diff --git a/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java b/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java deleted file mode 100644 index 44df57f0..00000000 --- a/src/main/java/com/minelittlepony/model/armour/IEquestrianArmor.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.minelittlepony.model.armour; - -import net.minecraft.client.model.ModelBiped; - -import com.minelittlepony.model.capabilities.IModelArmor; -import com.minelittlepony.model.capabilities.IModelWrapper; - -public interface IEquestrianArmor extends IModelWrapper { - /** - * Gets the armour model to render for the given layer. - */ - V getArmorForLayer(ArmorLayer layer); - - /** - * The layer used to render a given armour piece. - */ - enum ArmorLayer { - /** - * Fits snugly to the player's model. - */ - INNER, - /** - * Hanging loose and sagging free - */ - OUTER - } -} From edc70b302e814fc2f785bf7005e60e08d5dbf2c9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Mar 2019 20:17:46 +0200 Subject: [PATCH 002/104] Further decouple client/common code --- .../minelittlepony/LiteModMineLittlePony.java | 10 ++- ...{MineLittlePony.java => MineLPClient.java} | 41 +++------- .../com/minelittlepony/PonyRenderManager.java | 9 +++ .../minelittlepony/gui/GuiPonySettings.java | 2 +- .../hdskins/gui/GuiSkinsMineLP.java | 4 +- .../mixin/MixinDefaultPlayerSkin.java | 16 ++-- .../mixin/MixinItemRenderer.java | 4 +- .../minelittlepony/model/ModelWrapper.java | 2 +- .../model/components/PonySnout.java | 2 +- .../com/minelittlepony/pony/data/Pony.java | 5 +- .../minelittlepony/pony/data/PonyManager.java | 78 ++++++------------- .../minelittlepony/pony/data/PonyRace.java | 5 +- .../render/LevitatingItemRenderer.java | 2 +- .../com/minelittlepony/render/RenderPony.java | 5 +- .../layer/LayerHeldPonyItemMagical.java | 4 +- .../render/ponies/MobRenderers.java | 2 +- .../render/skull/PonySkullRenderer.java | 4 +- .../com/minelittlepony/MineLittlePony.java | 43 ++++++++++ .../pony/data/IPonyManager.java | 77 ++++++++++++++++++ .../minelittlepony/pony/data/PonySize.java | 6 +- 20 files changed, 200 insertions(+), 121 deletions(-) rename src/client/java/com/minelittlepony/{MineLittlePony.java => MineLPClient.java} (82%) create mode 100644 src/common/java/com/minelittlepony/MineLittlePony.java create mode 100644 src/common/java/com/minelittlepony/pony/data/IPonyManager.java diff --git a/src/client/java/com/minelittlepony/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java index 06f1b250..e1e7b9c8 100644 --- a/src/client/java/com/minelittlepony/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/LiteModMineLittlePony.java @@ -16,6 +16,8 @@ import java.io.File; public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Configurable { + private final MineLPClient mlp = new MineLPClient(); + @Override public String getName() { return MineLittlePony.MOD_NAME; @@ -34,20 +36,20 @@ public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Co public void init(File configPath) { Config config = new Config(); - MineLittlePony.getInstance().init(config); + mlp.init(config); - LiteLoader.getInput().registerKeyBinding(MineLittlePony.SETTINGS_GUI); + LiteLoader.getInput().registerKeyBinding(MineLPClient.SETTINGS_GUI); LiteLoader.getInstance().registerExposable(config, null); } @Override public void onInitCompleted(Minecraft minecraft, LiteLoader loader) { - MineLittlePony.getInstance().postInit(minecraft); + mlp.postInit(minecraft); } @Override public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) { - MineLittlePony.getInstance().onTick(minecraft, inGame); + mlp.onTick(minecraft, inGame); } @Override diff --git a/src/client/java/com/minelittlepony/MineLittlePony.java b/src/client/java/com/minelittlepony/MineLPClient.java similarity index 82% rename from src/client/java/com/minelittlepony/MineLittlePony.java rename to src/client/java/com/minelittlepony/MineLPClient.java index 092713bd..c6bac6d7 100644 --- a/src/client/java/com/minelittlepony/MineLittlePony.java +++ b/src/client/java/com/minelittlepony/MineLPClient.java @@ -21,19 +21,12 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; /** * Static MineLittlePony singleton class. Everything's controlled from up here. */ -public class MineLittlePony { - - public static final Logger logger = LogManager.getLogger("MineLittlePony"); - - public static final String MOD_NAME = "Mine Little Pony"; - public static final String MOD_VERSION = "@VERSION@"; +public class MineLPClient extends MineLittlePony { private static final String MINELP_VALHALLA_SERVER = "http://skins.minelittlepony-mod.com"; private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com"; @@ -41,15 +34,13 @@ public class MineLittlePony { static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); - private static final MineLittlePony instance = new MineLittlePony(); - private static int modelUpdateCounter = 0; private static boolean reloadingModels = false; private PonyConfig config; private PonyManager ponyManager; - private final PonyRenderManager renderManager = new PonyRenderManager(); + private final PonyRenderManager renderManager = PonyRenderManager.getInstance(); void init(PonyConfig newConfig) { config = newConfig; @@ -82,6 +73,7 @@ public class MineLittlePony { manager.setSkinsGui(GuiSkinsMineLP::new); RenderManager rm = minecraft.getRenderManager(); + renderManager.initialisePlayerRenderers(rm); renderManager.initializeMobRenderers(rm, config); } @@ -115,36 +107,21 @@ public class MineLittlePony { PonySkullRenderer.resolve(); } - - /** - * Gets the global MineLP instance. - */ - public static MineLittlePony getInstance() { - return MineLittlePony.instance; - } - - /** - * Gets the static pony manager instance. - */ + @Override public PonyManager getManager() { return ponyManager; } - /** - * Gets the static pony render manager responsible for all entity renderers. - */ - public PonyRenderManager getRenderManager() { - return renderManager; - } - - public static int getModelRevisionNumber() { + @Override + public int getModelRevisionNumber() { return modelUpdateCounter; } /** * Gets the global MineLP client configuration. */ - public static PonyConfig getConfig() { - return getInstance().config; + @Override + public PonyConfig getConfig() { + return config; } } diff --git a/src/client/java/com/minelittlepony/PonyRenderManager.java b/src/client/java/com/minelittlepony/PonyRenderManager.java index 318cc2dd..5340753b 100644 --- a/src/client/java/com/minelittlepony/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/PonyRenderManager.java @@ -28,6 +28,15 @@ import net.minecraft.entity.EntityLivingBase; */ public class PonyRenderManager { + private static final PonyRenderManager renderManager = new PonyRenderManager(); + + /** + * Gets the static pony render manager responsible for all entity renderers. + */ + public static PonyRenderManager getInstance() { + return renderManager; + } + private LevitatingItemRenderer magicRenderer = new LevitatingItemRenderer(); diff --git a/src/client/java/com/minelittlepony/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java index 3edf3346..271889d7 100644 --- a/src/client/java/com/minelittlepony/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/gui/GuiPonySettings.java @@ -21,7 +21,7 @@ public class GuiPonySettings extends SettingsPanel { private PonyConfig config; public GuiPonySettings() { - config = MineLittlePony.getConfig(); + config = MineLittlePony.getInstance().getConfig(); } @Override diff --git a/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java index f36ef107..40b9e259 100644 --- a/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java @@ -3,7 +3,7 @@ package com.minelittlepony.hdskins.gui; import com.minelittlepony.MineLittlePony; import com.minelittlepony.gui.IconicToggle; import com.minelittlepony.gui.Style; -import com.minelittlepony.pony.data.PonyManager; +import com.minelittlepony.pony.data.IPonyManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; @@ -23,7 +23,7 @@ import java.util.List; */ public class GuiSkinsMineLP extends GuiSkins { - private PonyManager ponyManager = MineLittlePony.getInstance().getManager(); + private IPonyManager ponyManager = MineLittlePony.getInstance().getManager(); private boolean isWet = false; diff --git a/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java index bc5af1ac..62414a7e 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java +++ b/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java @@ -1,8 +1,8 @@ package com.minelittlepony.mixin; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.data.IPonyManager; import com.minelittlepony.pony.data.PonyLevel; -import com.minelittlepony.pony.data.PonyManager; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; @@ -18,27 +18,27 @@ public abstract class MixinDefaultPlayerSkin { @Inject(method = "getDefaultSkinLegacy", at = @At("HEAD"), cancellable = true) private static void legacySkin(CallbackInfoReturnable cir) { - if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) { - cir.setReturnValue(PonyManager.STEVE); + if (MineLittlePony.getInstance().getConfig().getPonyLevel() == PonyLevel.PONIES) { + cir.setReturnValue(IPonyManager.STEVE); } } @Inject(method = "getDefaultSkin", at = @At("HEAD"), cancellable = true) private static void defaultSkin(UUID uuid, CallbackInfoReturnable cir) { - if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) { - cir.setReturnValue(PonyManager.getDefaultSkin(uuid)); + if (MineLittlePony.getInstance().getConfig().getPonyLevel() == PonyLevel.PONIES) { + cir.setReturnValue(IPonyManager.getDefaultSkin(uuid)); } } @Inject(method = "getSkinType", at = @At("HEAD"), cancellable = true) private static void skinType(UUID uuid, CallbackInfoReturnable cir) { - if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) { + if (MineLittlePony.getInstance().getConfig().getPonyLevel() == PonyLevel.PONIES) { cir.setReturnValue(MineLittlePony.getInstance().getManager() - .getPony(PonyManager.getDefaultSkin(uuid), uuid) + .getPony(IPonyManager.getDefaultSkin(uuid), uuid) .getRace(false) .getModel() - .getId(PonyManager.isSlimSkin(uuid))); + .getId(IPonyManager.isSlimSkin(uuid))); } } diff --git a/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java b/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java index 72f53464..cd82d98d 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java +++ b/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java @@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyRenderManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.ItemRenderer; @@ -27,6 +27,6 @@ public class MixinItemRenderer { at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemSide(" + EntityLivingBase + ItemStack + TransformType + "Z)V")) private void redirectRenderItemSide(ItemRenderer self, EntityLivingBase entity, ItemStack stack, TransformType transform, boolean left) { - MineLittlePony.getInstance().getRenderManager().getMagicRenderer().renderItemInFirstPerson(self, (AbstractClientPlayer)entity, stack, transform, left); + PonyRenderManager.getInstance().getMagicRenderer().renderItemInFirstPerson(self, (AbstractClientPlayer)entity, stack, transform, left); } } diff --git a/src/client/java/com/minelittlepony/model/ModelWrapper.java b/src/client/java/com/minelittlepony/model/ModelWrapper.java index 5d7e3241..ea91436a 100644 --- a/src/client/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/model/ModelWrapper.java @@ -44,7 +44,7 @@ public class ModelWrapper implements IModelWrapper { @Override public void apply(IPonyData meta) { - int modelRevision = MineLittlePony.getModelRevisionNumber(); + int modelRevision = MineLittlePony.getInstance().getModelRevisionNumber(); if (modelRevision != lastModelUpdate) { lastModelUpdate = modelRevision; diff --git a/src/client/java/com/minelittlepony/model/components/PonySnout.java b/src/client/java/com/minelittlepony/model/components/PonySnout.java index d6f9d009..bf5602fd 100644 --- a/src/client/java/com/minelittlepony/model/components/PonySnout.java +++ b/src/client/java/com/minelittlepony/model/components/PonySnout.java @@ -59,7 +59,7 @@ public class PonySnout { } public void setGender(PonyGender gender) { - boolean show = !head.hasHeadGear() && !isHidden && MineLittlePony.getConfig().snuzzles; + boolean show = !head.hasHeadGear() && !isHidden && MineLittlePony.getInstance().getConfig().snuzzles; mare.isHidden = !(show && gender.isMare()); stallion.isHidden = !(show && gender.isStallion()); diff --git a/src/client/java/com/minelittlepony/pony/data/Pony.java b/src/client/java/com/minelittlepony/pony/data/Pony.java index bd4edd36..f3d54d22 100644 --- a/src/client/java/com/minelittlepony/pony/data/Pony.java +++ b/src/client/java/com/minelittlepony/pony/data/Pony.java @@ -2,6 +2,7 @@ package com.minelittlepony.pony.data; import com.google.common.base.MoreObjects; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyRenderManager; import com.minelittlepony.ducks.IRenderPony; import com.minelittlepony.util.chron.Touchable; import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; @@ -190,14 +191,14 @@ public class Pony extends Touchable implements IPony { @Override public boolean isRidingInteractive(EntityLivingBase entity) { - return MineLittlePony.getInstance().getRenderManager().getPonyRenderer(entity.getRidingEntity()) != null; + return PonyRenderManager.getInstance().getPonyRenderer(entity.getRidingEntity()) != null; } @Override public IPony getMountedPony(EntityLivingBase entity) { Entity mount = entity.getRidingEntity(); - IRenderPony render = MineLittlePony.getInstance().getRenderManager().getPonyRenderer(mount); + IRenderPony render = PonyRenderManager.getInstance().getPonyRenderer(mount); return render == null ? null : render.getEntityPony((EntityLivingBase)mount); } diff --git a/src/client/java/com/minelittlepony/pony/data/PonyManager.java b/src/client/java/com/minelittlepony/pony/data/PonyManager.java index 139d44bf..5bcc3ab3 100644 --- a/src/client/java/com/minelittlepony/pony/data/PonyManager.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyManager.java @@ -10,6 +10,8 @@ import com.minelittlepony.util.math.MathUtil; import com.voxelmodpack.hdskins.ISkinCacheClearListener; import com.voxelmodpack.hdskins.util.MoreStreams; +import javax.annotation.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; @@ -17,6 +19,7 @@ import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import java.io.IOException; @@ -32,12 +35,7 @@ import java.util.UUID; * The PonyManager is responsible for reading and recoding all the pony data associated with an entity of skin. * */ -public class PonyManager implements IResourceManagerReloadListener, ISkinCacheClearListener { - - 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"); - - public static final String BGPONIES_JSON = "textures/entity/pony/bgponies.json"; +public class PonyManager implements IPonyManager, IResourceManagerReloadListener, ISkinCacheClearListener { private static final Gson GSON = new Gson(); @@ -54,23 +52,14 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl this.config = config; } - /** - * Gets or creates a pony for the given skin resource and vanilla model type. - * - * @param resource A texture resource - */ + @Override public IPony getPony(ResourceLocation resource) { return poniesCache.retrieve(resource, Pony::new); } - /** - * Gets or creates a pony for the given player. - * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. - * - * @param player the player - */ - public IPony getPony(AbstractClientPlayer player) { - ResourceLocation skin = player.getLocationSkin(); + @Override + public IPony getPony(EntityPlayer player) { + ResourceLocation skin = getSkin(player); UUID uuid = player.getGameProfile().getId(); if (Pony.getBufferedImage(skin) == null) { @@ -80,6 +69,15 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return getPony(skin, uuid); } + @Nullable + ResourceLocation getSkin(EntityPlayer player) { + if (player instanceof AbstractClientPlayer) { + return ((AbstractClientPlayer)player).getLocationSkin(); + } + + return null; + } + public IPony getPony(NetworkPlayerInfo playerInfo) { ResourceLocation skin = playerInfo.getLocationSkin(); UUID uuid = playerInfo.getGameProfile().getId(); @@ -91,16 +89,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return getPony(skin, uuid); } - /** - * Gets or creates a pony for the given skin resource and entity id. - * - * Whether is has slim arms is determined by the id. - * - * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. - * - * @param resource A texture resource - * @param uuid id of a player or entity - */ + @Override public IPony getPony(ResourceLocation resource, UUID uuid) { IPony pony = getPony(resource); @@ -111,11 +100,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return pony; } - /** - * Gets the default pony. Either STEVE/ALEX, or a background pony based on client settings. - * - * @param uuid id of a player or entity - */ + @Override public IPony getDefaultPony(UUID uuid) { if (config.getPonyLevel() != PonyLevel.PONIES) { return getPony(DefaultPlayerSkin.getDefaultSkin(uuid)); @@ -124,16 +109,10 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return getBackgroundPony(uuid); } - /** - * Gets a random background pony determined by the given uuid. - * - * Useful for mods that offer customisation, especially ones that have a whole lot of NPCs. - * - * @param uuid A UUID. Either a user or an entity. - */ + @Override public IPony getBackgroundPony(UUID uuid) { if (getNumberOfPonies() == 0 || isUser(uuid)) { - return getPony(getDefaultSkin(uuid)); + return getPony(IPonyManager.getDefaultSkin(uuid)); } int bgi = MathUtil.mod(uuid.hashCode(), getNumberOfPonies()); @@ -145,9 +124,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return Minecraft.getMinecraft().player != null && Minecraft.getMinecraft().player.getUniqueID().equals(uuid); } - /** - * De-registers a pony from the cache. - */ + @Override public IPony removePony(ResourceLocation resource) { return poniesCache.remove(resource); } @@ -216,17 +193,6 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl return collectedPonies; } - public static ResourceLocation getDefaultSkin(UUID uuid) { - return isSlimSkin(uuid) ? ALEX : STEVE; - } - - /** - * Returns true if the given uuid is of a player would would use the ALEX skin type. - */ - public static boolean isSlimSkin(UUID uuid) { - return (uuid.hashCode() & 1) == 1; - } - private int getNumberOfPonies() { return backgroundPonyList.size(); } diff --git a/src/client/java/com/minelittlepony/pony/data/PonyRace.java b/src/client/java/com/minelittlepony/pony/data/PonyRace.java index b820c199..dd1cb966 100644 --- a/src/client/java/com/minelittlepony/pony/data/PonyRace.java +++ b/src/client/java/com/minelittlepony/pony/data/PonyRace.java @@ -69,7 +69,10 @@ public enum PonyRace implements ITriggerPixelMapped { * PonyLevel.PONIES (should) return a pony if this is a human. Don't be fooled, though. It doesn't. */ public PonyRace getEffectiveRace(boolean ignorePony) { - if (MineLittlePony.getConfig().getEffectivePonyLevel(ignorePony) == PonyLevel.HUMANS) return HUMAN; + if (MineLittlePony.getInstance().getConfig().getEffectivePonyLevel(ignorePony) == PonyLevel.HUMANS) { + return HUMAN; + } + return this; } diff --git a/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java index 4cd291f4..b943d4b8 100644 --- a/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java @@ -75,7 +75,7 @@ public class LevitatingItemRenderer { pushMatrix(); - boolean doMagic = MineLittlePony.getConfig().fpsmagic && pony.getMetadata().hasMagic(); + boolean doMagic = MineLittlePony.getInstance().getConfig().fpsmagic && pony.getMetadata().hasMagic(); if (doMagic) { setupPerspective(entity, stack, left); diff --git a/src/client/java/com/minelittlepony/render/RenderPony.java b/src/client/java/com/minelittlepony/render/RenderPony.java index 319eca1a..3256cda4 100644 --- a/src/client/java/com/minelittlepony/render/RenderPony.java +++ b/src/client/java/com/minelittlepony/render/RenderPony.java @@ -1,6 +1,7 @@ package com.minelittlepony.render; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyRenderManager; import com.minelittlepony.ducks.IRenderPony; import com.minelittlepony.model.AbstractPonyModel; import com.minelittlepony.model.ModelWrapper; @@ -40,7 +41,7 @@ public class RenderPony { } public ICamera getFrustrum(T entity, ICamera vanilla) { - if (entity.isPlayerSleeping() || !MineLittlePony.getConfig().frustrum) { + if (entity.isPlayerSleeping() || !MineLittlePony.getInstance().getConfig().frustrum) { return vanilla; } return frustrum.withCamera(entity, vanilla); @@ -74,7 +75,7 @@ public class RenderPony { Entity ridingEntity = entity.getRidingEntity(); if (ridingEntity instanceof EntityLivingBase) { - IRenderPony renderer = MineLittlePony.getInstance().getRenderManager().getPonyRenderer((EntityLivingBase)ridingEntity); + IRenderPony renderer = PonyRenderManager.getInstance().getPonyRenderer((EntityLivingBase)ridingEntity); if (renderer != null) { // negate vanilla translations so the rider begins at the ridees feet. diff --git a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java index dddc71c1..78fc5537 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java +++ b/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java @@ -1,6 +1,6 @@ package com.minelittlepony.render.layer; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.PonyRenderManager; import com.minelittlepony.model.capabilities.IModelUnicorn; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -31,7 +31,7 @@ public class LayerHeldPonyItemMagical extends LayerH @Override protected void postItemRender(T entity, ItemStack drop, TransformType transform, EnumHandSide hand) { if (isUnicorn()) { - MineLittlePony.getInstance().getRenderManager().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, this.getPonyModel().getMagicColor()); + PonyRenderManager.getInstance().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, this.getPonyModel().getMagicColor()); } } diff --git a/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java b/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java index 886922b5..c23610a5 100644 --- a/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java +++ b/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java @@ -71,7 +71,7 @@ public enum MobRenderers implements Setting { @Override public void set(boolean value) { Setting.super.set(value); - apply(MineLittlePony.getInstance().getRenderManager(), Minecraft.getMinecraft().getRenderManager()); + apply(PonyRenderManager.getInstance(), Minecraft.getMinecraft().getRenderManager()); } public void apply(PonyRenderManager pony, RenderManager manager) { diff --git a/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java index 791aefa5..b11ec7b7 100644 --- a/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java @@ -48,7 +48,7 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende * Original/Existing renderer is stored to a backup variable as a fallback in case of mods. */ public static TileEntitySkullRenderer resolve() { - if (MineLittlePony.getConfig().ponyskulls) { + if (MineLittlePony.getInstance().getConfig().ponyskulls) { if (!(instance instanceof PonySkullRenderer)) { backup = instance; ModUtilities.addRenderer(TileEntitySkull.class, ponyInstance); @@ -75,7 +75,7 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende ISkull skull = skullMap.get(skullType); - if (skull == null || !skull.canRender(MineLittlePony.getConfig())) { + if (skull == null || !skull.canRender(MineLittlePony.getInstance().getConfig())) { if (backup != null) { backup.renderSkull(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); } else { diff --git a/src/common/java/com/minelittlepony/MineLittlePony.java b/src/common/java/com/minelittlepony/MineLittlePony.java new file mode 100644 index 00000000..e337e878 --- /dev/null +++ b/src/common/java/com/minelittlepony/MineLittlePony.java @@ -0,0 +1,43 @@ +package com.minelittlepony; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.minelittlepony.pony.data.IPonyManager; + +public abstract class MineLittlePony { + + private static MineLittlePony instance; + + public static final Logger logger = LogManager.getLogger("MineLittlePony"); + + public static final String MOD_NAME = "Mine Little Pony"; + public static final String MOD_VERSION = "@VERSION@"; + + MineLittlePony() { + instance = this; + } + + /** + * Gets the global MineLP instance. + */ + public static MineLittlePony getInstance() { + return instance; + } + + /** + * Gets the global MineLP client configuration. + */ + public abstract PonyConfig getConfig(); + + /** + * Gets the static pony manager instance. + */ + public abstract IPonyManager getManager(); + + /** + * Gets the global revision number, used for reloading models on demand. + */ + public abstract int getModelRevisionNumber(); +} + diff --git a/src/common/java/com/minelittlepony/pony/data/IPonyManager.java b/src/common/java/com/minelittlepony/pony/data/IPonyManager.java new file mode 100644 index 00000000..1465c49e --- /dev/null +++ b/src/common/java/com/minelittlepony/pony/data/IPonyManager.java @@ -0,0 +1,77 @@ +package com.minelittlepony.pony.data; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; + +import java.util.UUID; + +/** + * The PonyManager is responsible for reading and recoding all the pony data associated with an entity of skin. + * + */ +public interface IPonyManager { + + 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"); + + public static final String BGPONIES_JSON = "textures/entity/pony/bgponies.json"; + + /** + * Gets or creates a pony for the given player. + * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. + * + * @param player the player + */ + public IPony getPony(EntityPlayer player); + + /** + * Gets or creates a pony for the given skin resource and vanilla model type. + * + * @param resource A texture resource + */ + public IPony getPony(ResourceLocation resource); + + /** + * Gets or creates a pony for the given skin resource and entity id. + * + * Whether is has slim arms is determined by the id. + * + * Delegates to the background-ponies registry if no pony skins were available and client settings allows it. + * + * @param resource A texture resource + * @param uuid id of a player or entity + */ + IPony getPony(ResourceLocation resource, UUID uuid); + + /** + * Gets the default pony. Either STEVE/ALEX, or a background pony based on client settings. + * + * @param uuid id of a player or entity + */ + IPony getDefaultPony(UUID uuid); + + /** + * Gets a random background pony determined by the given uuid. + * + * Useful for mods that offer customisation, especially ones that have a whole lot of NPCs. + * + * @param uuid A UUID. Either a user or an entity. + */ + IPony getBackgroundPony(UUID uuid); + + /** + * De-registers a pony from the cache. + */ + IPony removePony(ResourceLocation resource); + + public static ResourceLocation getDefaultSkin(UUID uuid) { + return isSlimSkin(uuid) ? ALEX : STEVE; + } + + /** + * Returns true if the given uuid is of a player would would use the ALEX skin type. + */ + public static boolean isSlimSkin(UUID uuid) { + return (uuid.hashCode() & 1) == 1; + } +} diff --git a/src/common/java/com/minelittlepony/pony/data/PonySize.java b/src/common/java/com/minelittlepony/pony/data/PonySize.java index cc7bf6af..315b4c0e 100644 --- a/src/common/java/com/minelittlepony/pony/data/PonySize.java +++ b/src/common/java/com/minelittlepony/pony/data/PonySize.java @@ -26,11 +26,11 @@ public enum PonySize implements ITriggerPixelMapped { } public float getShadowSize() { - return shadowSize * MineLittlePony.getConfig().getGlobalScaleFactor(); + return shadowSize * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); } public float getScaleFactor() { - return scale * MineLittlePony.getConfig().getGlobalScaleFactor(); + return scale * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); } public PonyTransformation getTranformation() { @@ -43,6 +43,6 @@ public enum PonySize implements ITriggerPixelMapped { } public PonySize getEffectiveSize() { - return MineLittlePony.getConfig().sizes ? this : PonySize.NORMAL; + return MineLittlePony.getInstance().getConfig().sizes ? this : PonySize.NORMAL; } } From ccd95827c2bfd6f646c0e104589782b000e75e3c Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Mar 2019 21:49:34 +0200 Subject: [PATCH 003/104] Finish the split up --- .../{ => client}/ForgeProxy.java | 2 +- .../{ => client}/LiteModMineLittlePony.java | 6 +- .../{ => client}/MineLPClient.java | 16 +-- .../{ => client}/PonyRenderManager.java | 19 ++-- .../{ => client}/PonySkinModifier.java | 2 +- .../{ => client}/PonySkinParser.java | 9 +- .../{ => client}/ducks/IRenderItem.java | 2 +- .../{ => client}/ducks/IRenderPony.java | 16 +-- .../{ => client}/ducks/package-info.java | 2 +- .../{ => client}/gui/GuiPonySettings.java | 16 ++- .../mixin/MixinDefaultPlayerSkin.java | 14 +-- .../mixin/MixinGlStateManager.java | 6 +- .../{ => client}/mixin/MixinItemRenderer.java | 4 +- .../{ => client}/mixin/MixinRenderItem.java | 6 +- .../mixin/MixinRenderManager.java | 2 +- .../mixin/MixinThreadDownloadImageData.java | 2 +- .../gui => client/mixin}/package-info.java | 2 +- .../{ => client}/model/AbstractPonyModel.java | 53 +++++---- .../client/model/IClientModel.java | 10 ++ .../{ => client}/model/ModelMobPony.java | 6 +- .../{ => client}/model/ModelWrapper.java | 10 +- .../DefaultPonyArmorTextureResolver.java | 6 +- .../model/armour/ModelPonyArmor.java | 28 +++-- .../{ => client}/model/armour/PonyArmor.java | 6 +- .../client/model/armour/package-info.java | 7 ++ .../model/components/BatWings.java | 8 +- .../model/components/BugWings.java | 8 +- .../model/components/ModelBatWing.java | 10 +- .../model/components/ModelBugWing.java | 10 +- .../model/components/ModelDeadMau5Ears.java | 2 +- .../model/components/ModelPonyHead.java | 12 +- .../model/components/ModelWing.java | 16 +-- .../model/components/PegasusWings.java | 20 ++-- .../model/components/PonyElytra.java | 7 +- .../model/components/PonySnout.java | 22 ++-- .../model/components/PonyTail.java | 14 +-- .../model/components/SeaponyTail.java | 20 ++-- .../model/components/UnicornHorn.java | 20 ++-- .../client/model/components/package-info.java | 7 ++ .../model/entities}/ModelBreezie.java | 6 +- .../model/entities}/ModelEnderStallion.java | 6 +- .../model/entities}/ModelIllagerPony.java | 6 +- .../model/entities}/ModelSeapony.java | 21 ++-- .../model/entities}/ModelSkeletonPony.java | 6 +- .../model/entities}/ModelVillagerPony.java | 14 +-- .../model/entities}/ModelWitchPony.java | 12 +- .../model/entities}/ModelZombiePony.java | 10 +- .../entities}/ModelZombieVillagerPony.java | 8 +- .../client/model/entities/package-info.java | 7 ++ .../{ => client}/model/gear/AbstractGear.java | 6 +- .../{ => client}/model/gear/ChristmasHat.java | 18 +-- .../{ => client}/model/gear/IGear.java | 16 +-- .../{ => client}/model/gear/IStackable.java | 2 +- .../{ => client}/model/gear/Muffin.java | 14 +-- .../{ => client}/model/gear/SaddleBags.java | 28 ++--- .../{ => client}/model/gear/Stetson.java | 16 +-- .../{ => client}/model/gear/WitchHat.java | 14 +-- .../client/model/package-info.java | 7 ++ .../model/races}/ModelAlicorn.java | 10 +- .../model/races}/ModelBatpony.java | 12 +- .../model/races}/ModelChangeling.java | 10 +- .../model/races}/ModelEarthPony.java | 6 +- .../model/races}/ModelPegasus.java | 10 +- .../model/races}/ModelUnicorn.java | 11 +- .../model/races}/ModelZebra.java | 13 ++- .../client/model/races/PlayerModels.java | 102 +++++++++++++++++ .../model/races}/package-info.java | 2 +- .../{mixin => client}/package-info.java | 2 +- .../{pony/data => client/pony}/Pony.java | 19 ++-- .../{pony/data => client/pony}/PonyData.java | 43 ++++--- .../pony}/PonyDataSerialiser.java | 2 +- .../data => client/pony}/PonyManager.java | 9 +- .../{model => client/pony}/package-info.java | 2 +- .../render/DebugBoundingBoxRenderer.java | 4 +- .../{ => client}/render/FrustrumCheck.java | 4 +- .../render/LevitatingItemRenderer.java | 12 +- .../{ => client}/render/RenderPony.java | 16 +-- .../{ => client}/render/RenderPonyMob.java | 22 ++-- .../render/entities}/MobRenderers.java | 10 +- .../render/entities}/RenderEnderStallion.java | 20 ++-- .../render/entities}/RenderPonyGuardian.java | 13 ++- .../render/entities}/RenderPonyIllager.java | 15 ++- .../render/entities}/RenderPonySkeleton.java | 14 ++- .../render/entities}/RenderPonyVex.java | 6 +- .../render/entities}/RenderPonyVillager.java | 17 +-- .../render/entities}/RenderPonyWitch.java | 13 ++- .../render/entities}/RenderPonyZombie.java | 28 ++++- .../entities}/RenderPonyZombieVillager.java | 17 +-- .../VillagerProfessionTextureCache.java | 6 +- .../client/render/entities/package-info.java | 7 ++ .../entities}/player/RenderPonyPlayer.java | 30 ++--- .../entities}/player/RenderSeaponyPlayer.java | 6 +- .../render/entities/player/package-info.java | 7 ++ .../render/layer/AbstractPonyLayer.java | 20 ++-- .../render/layer/LayerDJPon3Head.java | 8 +- .../layer/LayerEntityOnPonyShoulder.java | 8 +- .../render/layer/LayerEyeGlow.java | 4 +- .../{ => client}/render/layer/LayerGear.java | 28 ++--- .../render/layer/LayerHeldItemIllager.java | 10 +- .../render/layer/LayerHeldPonyItem.java | 10 +- .../layer/LayerHeldPonyItemMagical.java | 14 ++- .../render/layer/LayerOverlayBase.java | 2 +- .../render/layer/LayerPonyArmor.java | 26 ++--- .../render/layer/LayerPonyCape.java | 10 +- .../render/layer/LayerPonyCustomHead.java | 16 +-- .../render/layer/LayerPonyElytra.java | 8 +- .../render/layer/LayerPonyStrayOverlay.java | 6 +- .../client/render/layer/package-info.java | 7 ++ .../client/render/package-info.java | 7 ++ .../skull/PlayerSkullRenderer.java | 12 +- .../render/tileentities}/skull/PonySkull.java | 8 +- .../skull/PonySkullRenderer.java | 10 +- .../skull/SkeletonSkullRenderer.java | 6 +- .../skull/WitherSkullRenderer.java | 6 +- .../skull/ZombieSkullRenderer.java | 6 +- .../tileentities/skull/package-info.java | 7 ++ .../{ => client}/transform/PonyPosture.java | 8 +- .../transform/PonyTransformation.java | 42 +++++-- .../{ => client}/transform/PostureElytra.java | 8 +- .../client/transform/PostureFalling.java | 12 ++ .../{ => client}/transform/PostureFlight.java | 7 +- .../transform/PostureSwimming.java | 2 +- .../{ => client}/transform/package-info.java | 2 +- .../util/render/AbstractRenderer.java} | 8 +- .../{ => client}/util/render/Box.java | 2 +- .../{ => client}/util/render/Color.java | 2 +- .../util/render}/GlowRenderer.java | 9 +- .../util/render/HornGlow.java} | 10 +- .../util/render}/PonyRenderer.java | 6 +- .../{ => client}/util/render/Quad.java | 2 +- .../{ => client}/util/render/Vertex.java | 2 +- .../client/util/render/package-info.java | 7 ++ .../util/render/plane}/ModelPlane.java | 8 +- .../util/render/plane}/Plane.java | 2 +- .../util/render/plane}/PlaneRenderer.java | 6 +- .../util/render/plane/package-info.java | 7 ++ .../{ => client}/gui/GuiSkinsMineLP.java | 7 +- .../{ => client}/gui/RenderPonyModel.java | 31 ++--- .../hdskins/client/gui/package-info.java | 7 ++ .../java/com/minelittlepony/model/PMAPI.java | 43 ------- .../model/components/package-info.java | 7 -- .../model/player/PlayerModels.java | 65 ----------- .../model/player/package-info.java | 7 -- .../model/ponies/package-info.java | 7 -- .../java/com/minelittlepony/package-info.java | 7 -- .../minelittlepony/pony/data/PonyRace.java | 83 -------------- .../pony/data/package-info.java | 7 -- .../render/layer/package-info.java | 7 -- .../render/model/package-info.java | 7 -- .../minelittlepony/render/package-info.java | 7 -- .../render/player/package-info.java | 7 -- .../render/ponies/RenderPonyPigman.java | 23 ---- .../render/ponies/package-info.java | 7 -- .../render/skull/package-info.java | 7 -- .../transform/PostureFalling.java | 12 -- .../util/render/package-info.java | 7 -- .../{ => common}/MineLittlePony.java | 7 +- .../MissingRendererException.java | 2 +- .../{ => common}/model/BodyPart.java | 2 +- .../common/model}/ICapitated.java | 6 +- .../minelittlepony/common/model}/IModel.java | 18 +-- .../minelittlepony/common/model/IPart.java} | 4 +- .../common/model/IPegasus.java} | 10 +- .../common/model/IUnicorn.java} | 8 +- .../model/PonyModelConstants.java | 2 +- .../model/armour/ArmourLayer.java | 2 +- .../common/model/armour/IArmour.java} | 9 +- .../model/armour/IArmourTextureResolver.java | 2 +- .../model/armour/IEquestrianArmour.java | 5 +- .../common/model/armour/package-info.java | 7 ++ .../{pony/data => common/pony}/IPony.java | 7 +- .../{pony/data => common/pony}/IPonyData.java | 19 ++-- .../data => common/pony}/IPonyManager.java | 2 +- .../pony}/ITriggerPixelMapped.java | 2 +- .../pony/meta/Gender.java} | 8 +- .../minelittlepony/common/pony/meta/Race.java | 107 ++++++++++++++++++ .../minelittlepony/common/pony/meta/Size.java | 41 +++++++ .../pony/meta/TailLength.java} | 8 +- .../pony/meta}/TriggerPixels.java | 14 ++- .../pony/meta/Wearable.java} | 16 +-- .../{ => common/settings}/PonyConfig.java | 5 +- .../data => common/settings}/PonyLevel.java | 2 +- .../{ => common}/settings/SensibleConfig.java | 2 +- .../{gui => entity}/EntityPonyModel.java | 2 +- .../model/anim/package-info.java | 7 -- .../model/armour/package-info.java | 7 -- .../model/capabilities/IModelWrapper.java | 2 +- .../minelittlepony/pony/data/PonySize.java | 48 -------- .../animation}/BasicEasingInterpolator.java | 2 +- .../animation}/IInterpolator.java | 2 +- .../util/animation/package-info.java | 7 ++ .../FormattedTextureSupplier.java | 2 +- .../ITextureSupplier.java | 2 +- .../IntStringMapper.java | 2 +- .../transform/MotionCompositor.java | 2 +- .../hdskins/gui/RenderPlayerModel.java | 2 +- 196 files changed, 1205 insertions(+), 1110 deletions(-) rename src/client/java/com/minelittlepony/{ => client}/ForgeProxy.java (98%) rename src/client/java/com/minelittlepony/{ => client}/LiteModMineLittlePony.java (90%) rename src/client/java/com/minelittlepony/{ => client}/MineLPClient.java (90%) rename src/client/java/com/minelittlepony/{ => client}/PonyRenderManager.java (87%) rename src/client/java/com/minelittlepony/{ => client}/PonySkinModifier.java (97%) rename src/client/java/com/minelittlepony/{ => client}/PonySkinParser.java (73%) rename src/client/java/com/minelittlepony/{ => client}/ducks/IRenderItem.java (79%) rename src/client/java/com/minelittlepony/{ => client}/ducks/IRenderPony.java (72%) rename src/client/java/com/minelittlepony/{ => client}/ducks/package-info.java (79%) rename src/client/java/com/minelittlepony/{ => client}/gui/GuiPonySettings.java (86%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinDefaultPlayerSkin.java (79%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinGlStateManager.java (81%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinItemRenderer.java (95%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinRenderItem.java (92%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinRenderManager.java (89%) rename src/client/java/com/minelittlepony/{ => client}/mixin/MixinThreadDownloadImageData.java (91%) rename src/client/java/com/minelittlepony/{hdskins/gui => client/mixin}/package-info.java (79%) rename src/client/java/com/minelittlepony/{ => client}/model/AbstractPonyModel.java (95%) create mode 100644 src/client/java/com/minelittlepony/client/model/IClientModel.java rename src/client/java/com/minelittlepony/{ => client}/model/ModelMobPony.java (92%) rename src/client/java/com/minelittlepony/{ => client}/model/ModelWrapper.java (83%) rename src/client/java/com/minelittlepony/{ => client}/model/armour/DefaultPonyArmorTextureResolver.java (94%) rename src/client/java/com/minelittlepony/{ => client}/model/armour/ModelPonyArmor.java (77%) rename src/client/java/com/minelittlepony/{ => client}/model/armour/PonyArmor.java (77%) create mode 100644 src/client/java/com/minelittlepony/client/model/armour/package-info.java rename src/client/java/com/minelittlepony/{ => client}/model/components/BatWings.java (75%) rename src/client/java/com/minelittlepony/{ => client}/model/components/BugWings.java (63%) rename src/client/java/com/minelittlepony/{ => client}/model/components/ModelBatWing.java (86%) rename src/client/java/com/minelittlepony/{ => client}/model/components/ModelBugWing.java (80%) rename src/client/java/com/minelittlepony/{ => client}/model/components/ModelDeadMau5Ears.java (90%) rename src/client/java/com/minelittlepony/{ => client}/model/components/ModelPonyHead.java (85%) rename src/client/java/com/minelittlepony/{ => client}/model/components/ModelWing.java (82%) rename src/client/java/com/minelittlepony/{ => client}/model/components/PegasusWings.java (77%) rename src/client/java/com/minelittlepony/{ => client}/model/components/PonyElytra.java (93%) rename src/client/java/com/minelittlepony/{ => client}/model/components/PonySnout.java (74%) rename src/client/java/com/minelittlepony/{ => client}/model/components/PonyTail.java (89%) rename src/client/java/com/minelittlepony/{ => client}/model/components/SeaponyTail.java (79%) rename src/client/java/com/minelittlepony/{ => client}/model/components/UnicornHorn.java (70%) create mode 100644 src/client/java/com/minelittlepony/client/model/components/package-info.java rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelBreezie.java (97%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelEnderStallion.java (96%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelIllagerPony.java (95%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelSeapony.java (90%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelSkeletonPony.java (96%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelVillagerPony.java (87%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelWitchPony.java (88%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelZombiePony.java (75%) rename src/client/java/com/minelittlepony/{model/ponies => client/model/entities}/ModelZombieVillagerPony.java (71%) create mode 100644 src/client/java/com/minelittlepony/client/model/entities/package-info.java rename src/client/java/com/minelittlepony/{ => client}/model/gear/AbstractGear.java (87%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/ChristmasHat.java (83%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/IGear.java (72%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/IStackable.java (58%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/Muffin.java (76%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/SaddleBags.java (82%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/Stetson.java (76%) rename src/client/java/com/minelittlepony/{ => client}/model/gear/WitchHat.java (80%) create mode 100644 src/client/java/com/minelittlepony/client/model/package-info.java rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelAlicorn.java (83%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelBatpony.java (74%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelChangeling.java (74%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelEarthPony.java (90%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelPegasus.java (81%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelUnicorn.java (94%) rename src/client/java/com/minelittlepony/{model/player => client/model/races}/ModelZebra.java (81%) create mode 100644 src/client/java/com/minelittlepony/client/model/races/PlayerModels.java rename src/client/java/com/minelittlepony/{model/capabilities => client/model/races}/package-info.java (77%) rename src/client/java/com/minelittlepony/{mixin => client}/package-info.java (82%) rename src/client/java/com/minelittlepony/{pony/data => client/pony}/Pony.java (92%) rename src/client/java/com/minelittlepony/{pony/data => client/pony}/PonyData.java (66%) rename src/client/java/com/minelittlepony/{pony/data => client/pony}/PonyDataSerialiser.java (94%) rename src/client/java/com/minelittlepony/{pony/data => client/pony}/PonyManager.java (96%) rename src/client/java/com/minelittlepony/{model => client/pony}/package-info.java (80%) rename src/client/java/com/minelittlepony/{ => client}/render/DebugBoundingBoxRenderer.java (94%) rename src/client/java/com/minelittlepony/{ => client}/render/FrustrumCheck.java (91%) rename src/client/java/com/minelittlepony/{ => client}/render/LevitatingItemRenderer.java (94%) rename src/client/java/com/minelittlepony/{ => client}/render/RenderPony.java (93%) rename src/client/java/com/minelittlepony/{ => client}/render/RenderPonyMob.java (86%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/MobRenderers.java (93%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderEnderStallion.java (78%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyGuardian.java (84%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyIllager.java (86%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonySkeleton.java (81%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyVex.java (90%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyVillager.java (76%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyWitch.java (76%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyZombie.java (66%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/RenderPonyZombieVillager.java (76%) rename src/client/java/com/minelittlepony/{render/ponies => client/render/entities}/VillagerProfessionTextureCache.java (92%) create mode 100644 src/client/java/com/minelittlepony/client/render/entities/package-info.java rename src/client/java/com/minelittlepony/{render => client/render/entities}/player/RenderPonyPlayer.java (86%) rename src/client/java/com/minelittlepony/{render => client/render/entities}/player/RenderSeaponyPlayer.java (90%) create mode 100644 src/client/java/com/minelittlepony/client/render/entities/player/package-info.java rename src/client/java/com/minelittlepony/{ => client}/render/layer/AbstractPonyLayer.java (72%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerDJPon3Head.java (76%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerEntityOnPonyShoulder.java (91%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerEyeGlow.java (88%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerGear.java (72%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerHeldItemIllager.java (67%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerHeldPonyItem.java (89%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerHeldPonyItemMagical.java (71%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerOverlayBase.java (96%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerPonyArmor.java (76%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerPonyCape.java (88%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerPonyCustomHead.java (90%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerPonyElytra.java (90%) rename src/client/java/com/minelittlepony/{ => client}/render/layer/LayerPonyStrayOverlay.java (88%) create mode 100644 src/client/java/com/minelittlepony/client/render/layer/package-info.java create mode 100644 src/client/java/com/minelittlepony/client/render/package-info.java rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/PlayerSkullRenderer.java (87%) rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/PonySkull.java (67%) rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/PonySkullRenderer.java (95%) rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/SkeletonSkullRenderer.java (69%) rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/WitherSkullRenderer.java (69%) rename src/client/java/com/minelittlepony/{render => client/render/tileentities}/skull/ZombieSkullRenderer.java (69%) create mode 100644 src/client/java/com/minelittlepony/client/render/tileentities/skull/package-info.java rename src/client/java/com/minelittlepony/{ => client}/transform/PonyPosture.java (68%) rename src/client/java/com/minelittlepony/{ => client}/transform/PonyTransformation.java (88%) rename src/client/java/com/minelittlepony/{ => client}/transform/PostureElytra.java (56%) create mode 100644 src/client/java/com/minelittlepony/client/transform/PostureFalling.java rename src/client/java/com/minelittlepony/{ => client}/transform/PostureFlight.java (72%) rename src/client/java/com/minelittlepony/{ => client}/transform/PostureSwimming.java (94%) rename src/client/java/com/minelittlepony/{ => client}/transform/package-info.java (78%) rename src/client/java/com/minelittlepony/{util/render/AbstractBoxRenderer.java => client/util/render/AbstractRenderer.java} (95%) rename src/client/java/com/minelittlepony/{ => client}/util/render/Box.java (96%) rename src/client/java/com/minelittlepony/{ => client}/util/render/Color.java (96%) rename src/client/java/com/minelittlepony/{render/model => client/util/render}/GlowRenderer.java (75%) rename src/client/java/com/minelittlepony/{render/model/ModelGlow.java => client/util/render/HornGlow.java} (84%) rename src/client/java/com/minelittlepony/{render/model => client/util/render}/PonyRenderer.java (67%) rename src/client/java/com/minelittlepony/{ => client}/util/render/Quad.java (95%) rename src/client/java/com/minelittlepony/{ => client}/util/render/Vertex.java (92%) create mode 100644 src/client/java/com/minelittlepony/client/util/render/package-info.java rename src/client/java/com/minelittlepony/{render/model => client/util/render/plane}/ModelPlane.java (92%) rename src/client/java/com/minelittlepony/{render/model => client/util/render/plane}/Plane.java (57%) rename src/client/java/com/minelittlepony/{render/model => client/util/render/plane}/PlaneRenderer.java (92%) create mode 100644 src/client/java/com/minelittlepony/client/util/render/plane/package-info.java rename src/client/java/com/minelittlepony/hdskins/{ => client}/gui/GuiSkinsMineLP.java (93%) rename src/client/java/com/minelittlepony/hdskins/{ => client}/gui/RenderPonyModel.java (79%) create mode 100644 src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java delete mode 100644 src/client/java/com/minelittlepony/model/PMAPI.java delete mode 100644 src/client/java/com/minelittlepony/model/components/package-info.java delete mode 100644 src/client/java/com/minelittlepony/model/player/PlayerModels.java delete mode 100644 src/client/java/com/minelittlepony/model/player/package-info.java delete mode 100644 src/client/java/com/minelittlepony/model/ponies/package-info.java delete mode 100644 src/client/java/com/minelittlepony/package-info.java delete mode 100644 src/client/java/com/minelittlepony/pony/data/PonyRace.java delete mode 100644 src/client/java/com/minelittlepony/pony/data/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/layer/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/model/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/player/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java delete mode 100644 src/client/java/com/minelittlepony/render/ponies/package-info.java delete mode 100644 src/client/java/com/minelittlepony/render/skull/package-info.java delete mode 100644 src/client/java/com/minelittlepony/transform/PostureFalling.java delete mode 100644 src/client/java/com/minelittlepony/util/render/package-info.java rename src/common/java/com/minelittlepony/{ => common}/MineLittlePony.java (83%) rename src/common/java/com/minelittlepony/{ => common}/MissingRendererException.java (88%) rename src/common/java/com/minelittlepony/{ => common}/model/BodyPart.java (67%) rename src/{client/java/com/minelittlepony/model/capabilities => common/java/com/minelittlepony/common/model}/ICapitated.java (72%) rename src/{client/java/com/minelittlepony/model/capabilities => common/java/com/minelittlepony/common/model}/IModel.java (85%) rename src/{client/java/com/minelittlepony/model/capabilities/IModelPart.java => common/java/com/minelittlepony/common/model/IPart.java} (90%) rename src/{client/java/com/minelittlepony/model/capabilities/IModelPegasus.java => common/java/com/minelittlepony/common/model/IPegasus.java} (73%) rename src/{client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java => common/java/com/minelittlepony/common/model/IUnicorn.java} (69%) rename src/common/java/com/minelittlepony/{ => common}/model/PonyModelConstants.java (97%) rename src/common/java/com/minelittlepony/{ => common}/model/armour/ArmourLayer.java (81%) rename src/{client/java/com/minelittlepony/model/capabilities/IModelArmour.java => common/java/com/minelittlepony/common/model/armour/IArmour.java} (90%) rename src/common/java/com/minelittlepony/{ => common}/model/armour/IArmourTextureResolver.java (91%) rename src/common/java/com/minelittlepony/{ => common}/model/armour/IEquestrianArmour.java (50%) create mode 100644 src/common/java/com/minelittlepony/common/model/armour/package-info.java rename src/common/java/com/minelittlepony/{pony/data => common/pony}/IPony.java (95%) rename src/common/java/com/minelittlepony/{pony/data => common/pony}/IPonyData.java (61%) rename src/common/java/com/minelittlepony/{pony/data => common/pony}/IPonyManager.java (98%) rename src/common/java/com/minelittlepony/{pony/data => common/pony}/ITriggerPixelMapped.java (95%) rename src/common/java/com/minelittlepony/{pony/data/PonyGender.java => common/pony/meta/Gender.java} (65%) create mode 100644 src/common/java/com/minelittlepony/common/pony/meta/Race.java create mode 100644 src/common/java/com/minelittlepony/common/pony/meta/Size.java rename src/common/java/com/minelittlepony/{pony/data/TailLengths.java => common/pony/meta/TailLength.java} (56%) rename src/common/java/com/minelittlepony/{pony/data => common/pony/meta}/TriggerPixels.java (88%) rename src/common/java/com/minelittlepony/{pony/data/PonyWearable.java => common/pony/meta/Wearable.java} (51%) rename src/common/java/com/minelittlepony/{ => common/settings}/PonyConfig.java (95%) rename src/common/java/com/minelittlepony/{pony/data => common/settings}/PonyLevel.java (86%) rename src/common/java/com/minelittlepony/{ => common}/settings/SensibleConfig.java (97%) rename src/common/java/com/minelittlepony/hdskins/{gui => entity}/EntityPonyModel.java (96%) delete mode 100644 src/common/java/com/minelittlepony/model/anim/package-info.java delete mode 100644 src/common/java/com/minelittlepony/model/armour/package-info.java delete mode 100644 src/common/java/com/minelittlepony/pony/data/PonySize.java rename src/common/java/com/minelittlepony/{model/anim => util/animation}/BasicEasingInterpolator.java (97%) rename src/common/java/com/minelittlepony/{model/anim => util/animation}/IInterpolator.java (92%) create mode 100644 src/common/java/com/minelittlepony/util/animation/package-info.java rename src/common/java/com/minelittlepony/util/{render => resources}/FormattedTextureSupplier.java (92%) rename src/common/java/com/minelittlepony/util/{render => resources}/ITextureSupplier.java (88%) rename src/common/java/com/minelittlepony/util/{render => resources}/IntStringMapper.java (96%) rename src/common/java/com/minelittlepony/{ => util}/transform/MotionCompositor.java (97%) diff --git a/src/client/java/com/minelittlepony/ForgeProxy.java b/src/client/java/com/minelittlepony/client/ForgeProxy.java similarity index 98% rename from src/client/java/com/minelittlepony/ForgeProxy.java rename to src/client/java/com/minelittlepony/client/ForgeProxy.java index 09d5b6a5..fe4b5690 100644 --- a/src/client/java/com/minelittlepony/ForgeProxy.java +++ b/src/client/java/com/minelittlepony/client/ForgeProxy.java @@ -1,4 +1,4 @@ -package com.minelittlepony; +package com.minelittlepony.client; import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.model.ModelBiped; diff --git a/src/client/java/com/minelittlepony/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java similarity index 90% rename from src/client/java/com/minelittlepony/LiteModMineLittlePony.java rename to src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java index e1e7b9c8..66566c2a 100644 --- a/src/client/java/com/minelittlepony/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java @@ -1,6 +1,8 @@ -package com.minelittlepony; +package com.minelittlepony.client; -import com.minelittlepony.gui.GuiPonySettings; +import com.minelittlepony.client.gui.GuiPonySettings; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.settings.PonyConfig; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.Tickable; diff --git a/src/client/java/com/minelittlepony/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java similarity index 90% rename from src/client/java/com/minelittlepony/MineLPClient.java rename to src/client/java/com/minelittlepony/client/MineLPClient.java index c6bac6d7..8b04218f 100644 --- a/src/client/java/com/minelittlepony/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -1,11 +1,13 @@ -package com.minelittlepony; +package com.minelittlepony.client; -import com.minelittlepony.gui.GuiPonySettings; -import com.minelittlepony.hdskins.gui.GuiSkinsMineLP; -import com.minelittlepony.pony.data.PonyData; -import com.minelittlepony.pony.data.PonyDataSerialiser; -import com.minelittlepony.pony.data.PonyManager; -import com.minelittlepony.render.skull.PonySkullRenderer; +import com.minelittlepony.client.gui.GuiPonySettings; +import com.minelittlepony.client.pony.PonyData; +import com.minelittlepony.client.pony.PonyDataSerialiser; +import com.minelittlepony.client.pony.PonyManager; +import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.hdskins.client.gui.GuiSkinsMineLP; import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.server.LegacySkinServer; import com.voxelmodpack.hdskins.server.SkinServer; diff --git a/src/client/java/com/minelittlepony/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java similarity index 87% rename from src/client/java/com/minelittlepony/PonyRenderManager.java rename to src/client/java/com/minelittlepony/client/PonyRenderManager.java index 5340753b..47d9ce2a 100644 --- a/src/client/java/com/minelittlepony/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -1,16 +1,17 @@ -package com.minelittlepony; +package com.minelittlepony.client; import java.util.Map; import com.google.common.collect.Maps; -import com.minelittlepony.mixin.MixinRenderManager; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.hdskins.gui.EntityPonyModel; -import com.minelittlepony.hdskins.gui.RenderPonyModel; -import com.minelittlepony.model.player.PlayerModels; -import com.minelittlepony.render.LevitatingItemRenderer; -import com.minelittlepony.render.player.RenderPonyPlayer; -import com.minelittlepony.render.ponies.MobRenderers; +import com.minelittlepony.client.ducks.IRenderPony; +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.common.settings.PonyConfig; +import com.minelittlepony.hdskins.client.gui.RenderPonyModel; +import com.minelittlepony.hdskins.entity.EntityPonyModel; import com.mumfrey.liteloader.util.ModUtilities; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/PonySkinModifier.java b/src/client/java/com/minelittlepony/client/PonySkinModifier.java similarity index 97% rename from src/client/java/com/minelittlepony/PonySkinModifier.java rename to src/client/java/com/minelittlepony/client/PonySkinModifier.java index 845208f5..f14d58ce 100644 --- a/src/client/java/com/minelittlepony/PonySkinModifier.java +++ b/src/client/java/com/minelittlepony/client/PonySkinModifier.java @@ -1,4 +1,4 @@ -package com.minelittlepony; +package com.minelittlepony.client; import com.voxelmodpack.hdskins.ISkinModifier; diff --git a/src/client/java/com/minelittlepony/PonySkinParser.java b/src/client/java/com/minelittlepony/client/PonySkinParser.java similarity index 73% rename from src/client/java/com/minelittlepony/PonySkinParser.java rename to src/client/java/com/minelittlepony/client/PonySkinParser.java index 75be1684..1e8cda09 100644 --- a/src/client/java/com/minelittlepony/PonySkinParser.java +++ b/src/client/java/com/minelittlepony/client/PonySkinParser.java @@ -1,5 +1,7 @@ -package com.minelittlepony; +package com.minelittlepony.client; +import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.common.MineLittlePony; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.voxelmodpack.hdskins.ISkinParser; @@ -18,10 +20,9 @@ public class PonySkinParser implements ISkinParser { boolean slim = VanillaModels.isSlim(metadata.get("model")); // TODO use proper model metadata system - metadata.put("model", MineLittlePony.getInstance().getManager() + metadata.put("model", PlayerModels.forRace(MineLittlePony.getInstance().getManager() .getPony(resource, profile.getId()) - .getRace(false) - .getModel() + .getRace(false)) .getId(slim)); } diff --git a/src/client/java/com/minelittlepony/ducks/IRenderItem.java b/src/client/java/com/minelittlepony/client/ducks/IRenderItem.java similarity index 79% rename from src/client/java/com/minelittlepony/ducks/IRenderItem.java rename to src/client/java/com/minelittlepony/client/ducks/IRenderItem.java index ebd69469..6430bd47 100644 --- a/src/client/java/com/minelittlepony/ducks/IRenderItem.java +++ b/src/client/java/com/minelittlepony/client/ducks/IRenderItem.java @@ -1,4 +1,4 @@ -package com.minelittlepony.ducks; +package com.minelittlepony.client.ducks; public interface IRenderItem { diff --git a/src/client/java/com/minelittlepony/ducks/IRenderPony.java b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java similarity index 72% rename from src/client/java/com/minelittlepony/ducks/IRenderPony.java rename to src/client/java/com/minelittlepony/client/ducks/IRenderPony.java index b6cc0503..7cd64eb3 100644 --- a/src/client/java/com/minelittlepony/ducks/IRenderPony.java +++ b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java @@ -1,11 +1,11 @@ -package com.minelittlepony.ducks; +package com.minelittlepony.client.ducks; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.PonyModelConstants; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.RenderPony; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.render.RenderPony; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.PonyModelConstants; +import com.minelittlepony.common.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.entity.EntityLivingBase; @@ -35,7 +35,7 @@ public interface IRenderPony extends PonyModelConsta float yaw = MathUtil.interpolateDegress(entity.prevRenderYawOffset, entity.renderYawOffset, ticks); getModelWrapper().apply(entityPony.getMetadata()); - IModel model = getModelWrapper().getBody(); + IClientModel model = getModelWrapper().getBody(); model.transform(BodyPart.BACK); diff --git a/src/client/java/com/minelittlepony/ducks/package-info.java b/src/client/java/com/minelittlepony/client/ducks/package-info.java similarity index 79% rename from src/client/java/com/minelittlepony/ducks/package-info.java rename to src/client/java/com/minelittlepony/client/ducks/package-info.java index b0c986c7..90f115b8 100644 --- a/src/client/java/com/minelittlepony/ducks/package-info.java +++ b/src/client/java/com/minelittlepony/client/ducks/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.ducks; +package com.minelittlepony.client.ducks; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java similarity index 86% rename from src/client/java/com/minelittlepony/gui/GuiPonySettings.java rename to src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java index 271889d7..5334e1f9 100644 --- a/src/client/java/com/minelittlepony/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,10 +1,14 @@ -package com.minelittlepony.gui; +package com.minelittlepony.client.gui; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.PonyConfig.PonySettings; -import com.minelittlepony.pony.data.PonyLevel; -import com.minelittlepony.render.ponies.MobRenderers; +import com.minelittlepony.client.render.entities.MobRenderers; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.common.settings.PonyConfig.PonySettings; +import com.minelittlepony.gui.Checkbox; +import com.minelittlepony.gui.Label; +import com.minelittlepony.gui.SettingsPanel; +import com.minelittlepony.gui.Slider; /** * In-Game options menu. diff --git a/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java similarity index 79% rename from src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java rename to src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index 62414a7e..68a195d9 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -1,8 +1,9 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.pony.data.IPonyManager; -import com.minelittlepony.pony.data.PonyLevel; +import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPonyManager; +import com.minelittlepony.common.settings.PonyLevel; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; @@ -34,10 +35,9 @@ public abstract class MixinDefaultPlayerSkin { private static void skinType(UUID uuid, CallbackInfoReturnable cir) { if (MineLittlePony.getInstance().getConfig().getPonyLevel() == PonyLevel.PONIES) { - cir.setReturnValue(MineLittlePony.getInstance().getManager() + cir.setReturnValue(PlayerModels.forRace(MineLittlePony.getInstance().getManager() .getPony(IPonyManager.getDefaultSkin(uuid), uuid) - .getRace(false) - .getModel() + .getRace(false)) .getId(IPonyManager.isSlimSkin(uuid))); } } diff --git a/src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java b/src/client/java/com/minelittlepony/client/mixin/MixinGlStateManager.java similarity index 81% rename from src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java rename to src/client/java/com/minelittlepony/client/mixin/MixinGlStateManager.java index d0c42fe8..2e4d27de 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinGlStateManager.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinGlStateManager.java @@ -1,12 +1,12 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.minelittlepony.render.LevitatingItemRenderer; -import com.minelittlepony.render.skull.PonySkullRenderer; +import com.minelittlepony.client.render.LevitatingItemRenderer; +import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java b/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java similarity index 95% rename from src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java rename to src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java index cd82d98d..ab5b8bef 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java @@ -1,10 +1,10 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.minelittlepony.PonyRenderManager; +import com.minelittlepony.client.PonyRenderManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/client/java/com/minelittlepony/mixin/MixinRenderItem.java b/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java similarity index 92% rename from src/client/java/com/minelittlepony/mixin/MixinRenderItem.java rename to src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java index cb0c810d..e36f9b53 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinRenderItem.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java @@ -1,7 +1,7 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; -import com.minelittlepony.ducks.IRenderItem; -import com.minelittlepony.render.LevitatingItemRenderer; +import com.minelittlepony.client.ducks.IRenderItem; +import com.minelittlepony.client.render.LevitatingItemRenderer; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.IBakedModel; diff --git a/src/client/java/com/minelittlepony/mixin/MixinRenderManager.java b/src/client/java/com/minelittlepony/client/mixin/MixinRenderManager.java similarity index 89% rename from src/client/java/com/minelittlepony/mixin/MixinRenderManager.java rename to src/client/java/com/minelittlepony/client/mixin/MixinRenderManager.java index 5f200841..75c32106 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinRenderManager.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinRenderManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; import java.util.Map; diff --git a/src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java similarity index 91% rename from src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java rename to src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java index e24286a8..86d0a178 100644 --- a/src/client/java/com/minelittlepony/mixin/MixinThreadDownloadImageData.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java @@ -1,4 +1,4 @@ -package com.minelittlepony.mixin; +package com.minelittlepony.client.mixin; import net.minecraft.client.renderer.ThreadDownloadImageData; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/client/java/com/minelittlepony/hdskins/gui/package-info.java b/src/client/java/com/minelittlepony/client/mixin/package-info.java similarity index 79% rename from src/client/java/com/minelittlepony/hdskins/gui/package-info.java rename to src/client/java/com/minelittlepony/client/mixin/package-info.java index be234747..90e22dda 100644 --- a/src/client/java/com/minelittlepony/hdskins/gui/package-info.java +++ b/src/client/java/com/minelittlepony/client/mixin/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.hdskins.gui; +package com.minelittlepony.client.mixin; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java similarity index 95% rename from src/client/java/com/minelittlepony/model/AbstractPonyModel.java rename to src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java index 0df37d63..0a6d22e9 100644 --- a/src/client/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -1,19 +1,22 @@ -package com.minelittlepony.model; +package com.minelittlepony.client.model; -import com.minelittlepony.model.armour.ModelPonyArmor; -import com.minelittlepony.model.armour.PonyArmor; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelPart; -import com.minelittlepony.model.components.PonySnout; -import com.minelittlepony.model.components.PonyTail; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.pony.data.IPonyData; -import com.minelittlepony.pony.data.PonyData; -import com.minelittlepony.pony.data.PonySize; -import com.minelittlepony.render.model.PlaneRenderer; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.armour.ModelPonyArmor; +import com.minelittlepony.client.model.armour.PonyArmor; +import com.minelittlepony.client.model.components.PonySnout; +import com.minelittlepony.client.model.components.PonyTail; +import com.minelittlepony.client.pony.PonyData; +import com.minelittlepony.client.transform.PonyTransformation; +import com.minelittlepony.client.util.render.AbstractRenderer; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.IPart; +import com.minelittlepony.common.model.PonyModelConstants; +import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.util.math.MathUtil; -import com.minelittlepony.util.render.AbstractBoxRenderer; import javax.annotation.Nullable; @@ -34,7 +37,7 @@ import static net.minecraft.client.renderer.GlStateManager.*; /** * Foundation class for all types of ponies. */ -public abstract class AbstractPonyModel extends ModelPlayer implements IModel, PonyModelConstants { +public abstract class AbstractPonyModel extends ModelPlayer implements IClientModel, PonyModelConstants { public boolean isSleeping; public boolean isFlying; @@ -64,7 +67,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P public PlaneRenderer upperTorso; public PlaneRenderer neck; - public IModelPart tail; + public IPart tail; public PonySnout snout; public UUID interpolatorId; @@ -74,7 +77,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P } @Override - public PonyArmor createArmour() { + public IEquestrianArmour createArmour() { return new PonyArmor(new ModelPonyArmor(), new ModelPonyArmor()); } @@ -191,10 +194,10 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P setHead(1, 2, isSneak ? -1 : 1); - AbstractBoxRenderer.shiftRotationPoint(bipedRightArm, 0, 2, 6); - AbstractBoxRenderer.shiftRotationPoint(bipedLeftArm, 0, 2, 6); - AbstractBoxRenderer.shiftRotationPoint(bipedRightLeg, 0, 2, -8); - AbstractBoxRenderer.shiftRotationPoint(bipedLeftLeg, 0, 2, -8); + AbstractRenderer.shiftRotationPoint(bipedRightArm, 0, 2, 6); + AbstractRenderer.shiftRotationPoint(bipedLeftArm, 0, 2, 6); + AbstractRenderer.shiftRotationPoint(bipedRightLeg, 0, 2, -8); + AbstractRenderer.shiftRotationPoint(bipedLeftLeg, 0, 2, -8); } protected void ponyRide() { @@ -803,12 +806,12 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P @Override public boolean isChild() { - return getSize() == PonySize.FOAL; + return getSize() == Size.FOAL; } @Override - public PonySize getSize() { - return isChild ? PonySize.FOAL : getMetadata().getSize(); + public Size getSize() { + return isChild ? Size.FOAL : getMetadata().getSize(); } @Override @@ -935,7 +938,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P rotate(motionPitch, 1, 0, 0); } - getSize().getTranformation().transform(this, part); + PonyTransformation.forSize(getSize()).transform(this, part); } /** diff --git a/src/client/java/com/minelittlepony/client/model/IClientModel.java b/src/client/java/com/minelittlepony/client/model/IClientModel.java new file mode 100644 index 00000000..2f696cb9 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/IClientModel.java @@ -0,0 +1,10 @@ +package com.minelittlepony.client.model; + +import net.minecraft.client.model.ModelRenderer; + +import com.minelittlepony.common.model.ICapitated; +import com.minelittlepony.common.model.IModel; + +public interface IClientModel extends IModel, ICapitated { + +} diff --git a/src/client/java/com/minelittlepony/model/ModelMobPony.java b/src/client/java/com/minelittlepony/client/model/ModelMobPony.java similarity index 92% rename from src/client/java/com/minelittlepony/model/ModelMobPony.java rename to src/client/java/com/minelittlepony/client/model/ModelMobPony.java index 1b196f1d..9283d1e6 100644 --- a/src/client/java/com/minelittlepony/model/ModelMobPony.java +++ b/src/client/java/com/minelittlepony/client/model/ModelMobPony.java @@ -1,10 +1,10 @@ -package com.minelittlepony.model; - -import com.minelittlepony.model.player.ModelAlicorn; +package com.minelittlepony.client.model; import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.math.MathHelper; +import com.minelittlepony.client.model.races.ModelAlicorn; + /** * Common class for all humanoid (ponioid?) non-player enemies. * diff --git a/src/client/java/com/minelittlepony/model/ModelWrapper.java b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java similarity index 83% rename from src/client/java/com/minelittlepony/model/ModelWrapper.java rename to src/client/java/com/minelittlepony/client/model/ModelWrapper.java index ea91436a..07b22853 100644 --- a/src/client/java/com/minelittlepony/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java @@ -1,9 +1,9 @@ -package com.minelittlepony.model; +package com.minelittlepony.client.model; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.common.pony.IPonyData; import com.minelittlepony.model.capabilities.IModelWrapper; -import com.minelittlepony.pony.data.IPonyData; /** * Container class for the various models and their associated piece of armour. @@ -19,7 +19,7 @@ public class ModelWrapper implements IModelWrapper { /** * Creates a new model wrapper to contain the given pony. */ - ModelWrapper(AbstractPonyModel model) { + public ModelWrapper(AbstractPonyModel model) { body = model; armor = model.createArmour(); armor.apply(model.getMetadata()); diff --git a/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java similarity index 94% rename from src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java rename to src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java index 44df7f5e..dbb5f752 100644 --- a/src/client/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.client.model.armour; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.ResourcePackRepository; @@ -9,7 +9,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; -import com.minelittlepony.ForgeProxy; +import com.minelittlepony.client.ForgeProxy; +import com.minelittlepony.common.model.armour.ArmourLayer; +import com.minelittlepony.common.model.armour.IArmourTextureResolver; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java similarity index 77% rename from src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java rename to src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java index fe567afa..b920bed0 100644 --- a/src/client/java/com/minelittlepony/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java @@ -1,14 +1,14 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.client.model.armour; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelArmour; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.IModel; +import com.minelittlepony.common.model.armour.IArmour; -public class ModelPonyArmor extends AbstractPonyModel implements IModelArmour { +public class ModelPonyArmor extends AbstractPonyModel implements IArmour { public PonyRenderer chestPiece; @@ -32,12 +32,16 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmour { } @Override - public void synchroniseLegs(T mainModel) { - copyModelAngles(mainModel.bipedBody, bipedBody); - copyModelAngles(mainModel.bipedRightArm, bipedRightArm); - copyModelAngles(mainModel.bipedLeftArm, bipedLeftArm); - copyModelAngles(mainModel.bipedRightLeg, bipedRightLeg); - copyModelAngles(mainModel.bipedLeftLeg, bipedLeftLeg); + public void synchroniseLegs(IModel model) { + + if (model instanceof ModelBiped) { + ModelBiped mainModel = (ModelBiped)model; + copyModelAngles(mainModel.bipedBody, bipedBody); + copyModelAngles(mainModel.bipedRightArm, bipedRightArm); + copyModelAngles(mainModel.bipedLeftArm, bipedLeftArm); + copyModelAngles(mainModel.bipedRightLeg, bipedRightLeg); + copyModelAngles(mainModel.bipedLeftLeg, bipedLeftLeg); + } } @Override diff --git a/src/client/java/com/minelittlepony/model/armour/PonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java similarity index 77% rename from src/client/java/com/minelittlepony/model/armour/PonyArmor.java rename to src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java index e630aab4..23bf380c 100644 --- a/src/client/java/com/minelittlepony/model/armour/PonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java @@ -1,6 +1,8 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.client.model.armour; -import com.minelittlepony.pony.data.IPonyData; +import com.minelittlepony.common.model.armour.ArmourLayer; +import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.common.pony.IPonyData; public class PonyArmor implements IEquestrianArmour { diff --git a/src/client/java/com/minelittlepony/client/model/armour/package-info.java b/src/client/java/com/minelittlepony/client/model/armour/package-info.java new file mode 100644 index 00000000..f8eaa580 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/armour/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.model.armour; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/components/BatWings.java b/src/client/java/com/minelittlepony/client/model/components/BatWings.java similarity index 75% rename from src/client/java/com/minelittlepony/model/components/BatWings.java rename to src/client/java/com/minelittlepony/client/model/components/BatWings.java index 25b66891..e62565e0 100644 --- a/src/client/java/com/minelittlepony/model/components/BatWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BatWings.java @@ -1,13 +1,13 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; import net.minecraft.client.renderer.GlStateManager; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPegasus; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.IPegasus; import java.util.UUID; -public class BatWings extends PegasusWings { +public class BatWings extends PegasusWings { public BatWings(T model, float yOffset, float stretch) { super(model, yOffset, stretch); diff --git a/src/client/java/com/minelittlepony/model/components/BugWings.java b/src/client/java/com/minelittlepony/client/model/components/BugWings.java similarity index 63% rename from src/client/java/com/minelittlepony/model/components/BugWings.java rename to src/client/java/com/minelittlepony/client/model/components/BugWings.java index ca51ee29..55fa6c1f 100644 --- a/src/client/java/com/minelittlepony/model/components/BugWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BugWings.java @@ -1,9 +1,9 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPegasus; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.IPegasus; -public class BugWings extends PegasusWings { +public class BugWings extends PegasusWings { public BugWings(T model, float yOffset, float stretch) { super(model, yOffset, stretch); diff --git a/src/client/java/com/minelittlepony/model/components/ModelBatWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java similarity index 86% rename from src/client/java/com/minelittlepony/model/components/ModelBatWing.java rename to src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java index 272ca830..9cfc40c9 100644 --- a/src/client/java/com/minelittlepony/model/components/ModelBatWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java @@ -1,10 +1,10 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPegasus; -import com.minelittlepony.render.model.PlaneRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.IPegasus; -public class ModelBatWing extends ModelWing { +public class ModelBatWing extends ModelWing { public ModelBatWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) { super(pegasus, right, legacy, y, scale, texY); diff --git a/src/client/java/com/minelittlepony/model/components/ModelBugWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java similarity index 80% rename from src/client/java/com/minelittlepony/model/components/ModelBugWing.java rename to src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java index 0dc71cc1..695cf5ed 100644 --- a/src/client/java/com/minelittlepony/model/components/ModelBugWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java @@ -1,10 +1,10 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPegasus; -import com.minelittlepony.render.model.PlaneRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.IPegasus; -public class ModelBugWing extends ModelWing { +public class ModelBugWing extends ModelWing { public ModelBugWing(T pegasus, boolean right, boolean legacy, float y, float scale, int texY) { super(pegasus, right, legacy, y, scale, texY); diff --git a/src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java b/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java similarity index 90% rename from src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java rename to src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java index 0cf549a4..dbcccff9 100644 --- a/src/client/java/com/minelittlepony/model/components/ModelDeadMau5Ears.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelSkeletonHead; diff --git a/src/client/java/com/minelittlepony/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java similarity index 85% rename from src/client/java/com/minelittlepony/model/components/ModelPonyHead.java rename to src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java index 322ca435..92a1e9de 100644 --- a/src/client/java/com/minelittlepony/model/components/ModelPonyHead.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java @@ -1,9 +1,9 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.capabilities.ICapitated; -import com.minelittlepony.pony.data.IPonyData; -import com.minelittlepony.pony.data.PonyData; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.pony.PonyData; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.ICapitated; +import com.minelittlepony.common.pony.IPonyData; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.client.model.ModelHumanoidHead; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelPonyHead extends ModelHumanoidHead implements ICapitated { +public class ModelPonyHead extends ModelHumanoidHead implements ICapitated { private PonySnout snout; diff --git a/src/client/java/com/minelittlepony/model/components/ModelWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java similarity index 82% rename from src/client/java/com/minelittlepony/model/components/ModelWing.java rename to src/client/java/com/minelittlepony/client/model/components/ModelWing.java index d8a9b1f3..84d3d344 100644 --- a/src/client/java/com/minelittlepony/model/components/ModelWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java @@ -1,14 +1,14 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.PonyModelConstants; -import com.minelittlepony.model.capabilities.IModelPegasus; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.common.model.PonyModelConstants; +import com.minelittlepony.common.pony.meta.Wearable; import net.minecraft.client.renderer.GlStateManager; -public class ModelWing implements PonyModelConstants { +public class ModelWing implements PonyModelConstants { protected final T pegasus; @@ -64,7 +64,7 @@ public class ModelWing implements P if (pegasus.wingsAreOpen()) { extended.render(scale); } else { - boolean bags = pegasus.isWearing(PonyWearable.SADDLE_BAGS); + boolean bags = pegasus.isWearing(Wearable.SADDLE_BAGS); if (bags) { GlStateManager.pushMatrix(); GlStateManager.translate(0, 0, 0.198F); diff --git a/src/client/java/com/minelittlepony/model/components/PegasusWings.java b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java similarity index 77% rename from src/client/java/com/minelittlepony/model/components/PegasusWings.java rename to src/client/java/com/minelittlepony/client/model/components/PegasusWings.java index 4897360c..a984efee 100644 --- a/src/client/java/com/minelittlepony/model/components/PegasusWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java @@ -1,17 +1,17 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.model.PonyModelConstants.*; - -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPart; -import com.minelittlepony.model.capabilities.IModelPegasus; -import com.minelittlepony.pony.data.PonyWearable; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.IPart; +import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.UUID; -public class PegasusWings implements IModelPart { +import static com.minelittlepony.common.model.PonyModelConstants.*; + +public class PegasusWings implements IPart { protected final T pegasus; @@ -39,7 +39,7 @@ public class PegasusWings implement } public ModelWing getRight() { - return pegasus.isWearing(PonyWearable.SADDLE_BAGS) ? legacyWing : rightWing; + return pegasus.isWearing(Wearable.SADDLE_BAGS) ? legacyWing : rightWing; } @Override @@ -65,7 +65,7 @@ public class PegasusWings implement if (pegasus.wingsAreOpen()) { flapAngle = pegasus.getWingRotationFactor(ticks); - if (!pegasus.isCrouching() && pegasus.isWearing(PonyWearable.SADDLE_BAGS)) { + if (!pegasus.isCrouching() && pegasus.isWearing(Wearable.SADDLE_BAGS)) { flapAngle -= 1F; } } diff --git a/src/client/java/com/minelittlepony/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java similarity index 93% rename from src/client/java/com/minelittlepony/model/components/PonyElytra.java rename to src/client/java/com/minelittlepony/client/model/components/PonyElytra.java index fa5cd151..2d7fc889 100644 --- a/src/client/java/com/minelittlepony/model/components/PonyElytra.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; @@ -7,9 +7,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.model.PonyModelConstants.*; +import static com.minelittlepony.common.model.PonyModelConstants.*; /** * Modified from ModelElytra. diff --git a/src/client/java/com/minelittlepony/model/components/PonySnout.java b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java similarity index 74% rename from src/client/java/com/minelittlepony/model/components/PonySnout.java rename to src/client/java/com/minelittlepony/client/model/components/PonySnout.java index bf5602fd..c98371de 100644 --- a/src/client/java/com/minelittlepony/model/components/PonySnout.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java @@ -1,14 +1,14 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.pony.data.PonyGender; -import com.minelittlepony.render.model.PlaneRenderer; +import static com.minelittlepony.common.model.PonyModelConstants.*; import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; -import static com.minelittlepony.model.PonyModelConstants.*; - -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.model.capabilities.ICapitated; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.model.ICapitated; +import com.minelittlepony.common.pony.meta.Gender; public class PonySnout { @@ -17,13 +17,13 @@ public class PonySnout { private PlaneRenderer mare; private PlaneRenderer stallion; - private final ICapitated head; + private final ICapitated head; - public PonySnout(T pony) { + public > PonySnout(T pony) { this(pony, 0, 0, 0); } - public PonySnout(T pony, int x, int y, int z) { + public > PonySnout(T pony, int x, int y, int z) { head = pony; mare = new PlaneRenderer(pony).offset(HEAD_CENTRE_X + x, HEAD_CENTRE_Y + y, HEAD_CENTRE_Z + z + 0.25F); @@ -58,7 +58,7 @@ public class PonySnout { .tex(13, 13) .east( 2, 1, -5, 3, 1, stretch); } - public void setGender(PonyGender gender) { + public void setGender(Gender gender) { boolean show = !head.hasHeadGear() && !isHidden && MineLittlePony.getInstance().getConfig().snuzzles; mare.isHidden = !(show && gender.isMare()); diff --git a/src/client/java/com/minelittlepony/model/components/PonyTail.java b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java similarity index 89% rename from src/client/java/com/minelittlepony/model/components/PonyTail.java rename to src/client/java/com/minelittlepony/client/model/components/PonyTail.java index 14e325b3..50afe4e9 100644 --- a/src/client/java/com/minelittlepony/model/components/PonyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java @@ -1,17 +1,17 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; import net.minecraft.client.model.ModelBase; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.model.PonyModelConstants.*; - -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModelPart; -import com.minelittlepony.render.model.PlaneRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.IPart; import java.util.UUID; -public class PonyTail extends PlaneRenderer implements IModelPart { +import static com.minelittlepony.common.model.PonyModelConstants.*; + +public class PonyTail extends PlaneRenderer implements IPart { private static final int SEGMENTS = 4; diff --git a/src/client/java/com/minelittlepony/model/components/SeaponyTail.java b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java similarity index 79% rename from src/client/java/com/minelittlepony/model/components/SeaponyTail.java rename to src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java index a850e80a..e2098b82 100644 --- a/src/client/java/com/minelittlepony/model/components/SeaponyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java @@ -1,21 +1,21 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelPart; -import com.minelittlepony.render.model.PlaneRenderer; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.IPart; import java.util.UUID; +import static com.minelittlepony.common.model.PonyModelConstants.*; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; -import static com.minelittlepony.model.PonyModelConstants.*; - -public class SeaponyTail implements IModelPart { +public class SeaponyTail implements IPart { private static final float TAIL_ROTX = PI / 2; @@ -24,7 +24,7 @@ public class SeaponyTail implements IModelPart { private PlaneRenderer tailTip; private PlaneRenderer tailFins; - private IModel model; + private IClientModel model; public SeaponyTail(AbstractPonyModel model) { this.model = model; diff --git a/src/client/java/com/minelittlepony/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java similarity index 70% rename from src/client/java/com/minelittlepony/model/components/UnicornHorn.java rename to src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java index 6cd3d6f6..cc6bfc83 100644 --- a/src/client/java/com/minelittlepony/model/components/UnicornHorn.java +++ b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java @@ -1,30 +1,32 @@ -package com.minelittlepony.model.components; +package com.minelittlepony.client.model.components; -import com.minelittlepony.model.capabilities.ICapitated; -import com.minelittlepony.model.capabilities.IModelPart; -import com.minelittlepony.render.model.GlowRenderer; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.util.render.GlowRenderer; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.ICapitated; +import com.minelittlepony.common.model.IPart; import java.util.UUID; +import static com.minelittlepony.common.model.PonyModelConstants.*; + import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; import static org.lwjgl.opengl.GL11.*; import static net.minecraft.client.renderer.GlStateManager.*; -import static com.minelittlepony.model.PonyModelConstants.*; -public class UnicornHorn implements IModelPart { +public class UnicornHorn implements IPart { protected PonyRenderer horn; protected GlowRenderer glow; protected boolean isVisible = true; - public UnicornHorn(T pony, float yOffset, float stretch) { + public > UnicornHorn(T pony, float yOffset, float stretch) { this(pony, yOffset, stretch, 0, 0, 0); } - public UnicornHorn(T pony, float yOffset, float stretch, int x, int y, int z) { + public > UnicornHorn(T pony, float yOffset, float stretch, int x, int y, int z) { horn = new PonyRenderer(pony, 0, 3); glow = new GlowRenderer(pony, 0, 3); diff --git a/src/client/java/com/minelittlepony/client/model/components/package-info.java b/src/client/java/com/minelittlepony/client/model/components/package-info.java new file mode 100644 index 00000000..5e9811f5 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/components/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.model.components; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java similarity index 97% rename from src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java index 079b62f6..cd331b48 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelBreezie.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; @@ -6,9 +6,9 @@ import net.minecraft.entity.Entity; import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.model.PonyModelConstants.PI; +import static com.minelittlepony.common.model.PonyModelConstants.PI; public class ModelBreezie extends ModelBiped { diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java b/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java similarity index 96% rename from src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java index 13b3bd09..288b6397 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelEnderStallion.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -6,8 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.model.components.PonySnout; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.components.PonySnout; +import com.minelittlepony.client.util.render.PonyRenderer; public class ModelEnderStallion extends ModelSkeletonPony { diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java similarity index 95% rename from src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java index 342d4dfc..31c2a235 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelIllagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java @@ -1,6 +1,4 @@ -package com.minelittlepony.model.ponies; - -import com.minelittlepony.model.ModelMobPony; +package com.minelittlepony.client.model.entities; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -9,6 +7,8 @@ import net.minecraft.entity.monster.AbstractIllager.IllagerArmPose; import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.MathHelper; +import com.minelittlepony.client.model.ModelMobPony; + public class ModelIllagerPony extends ModelMobPony { @Override diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java similarity index 90% rename from src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java index 03e5dc4c..4583d574 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelSeapony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java @@ -1,13 +1,14 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.armour.ModelPonyArmor; -import com.minelittlepony.model.armour.PonyArmor; -import com.minelittlepony.model.components.SeaponyTail; -import com.minelittlepony.model.player.ModelUnicorn; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.model.PlaneRenderer; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.armour.ModelPonyArmor; +import com.minelittlepony.client.model.armour.PonyArmor; +import com.minelittlepony.client.model.components.SeaponyTail; +import com.minelittlepony.client.model.races.ModelUnicorn; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.common.pony.IPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; @@ -30,7 +31,7 @@ public class ModelSeapony extends ModelUnicorn { } @Override - public PonyArmor createArmour() { + public IEquestrianArmour createArmour() { return new PonyArmor(new Armour(), new Armour()); } diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java similarity index 96% rename from src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java index 9f0f9f43..c06be481 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelSkeletonPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java @@ -1,6 +1,4 @@ -package com.minelittlepony.model.ponies; - -import com.minelittlepony.model.ModelMobPony; +package com.minelittlepony.client.model.entities; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -11,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHandSide; +import com.minelittlepony.client.model.ModelMobPony; + public class ModelSkeletonPony extends ModelMobPony { public boolean isUnicorn; diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java similarity index 87% rename from src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java index cd050023..7a81d2ec 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelVillagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java @@ -1,13 +1,13 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityZombieVillager; import net.minecraft.entity.passive.EntityVillager; -import com.minelittlepony.model.ModelMobPony; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PlaneRenderer; +import com.minelittlepony.client.model.ModelMobPony; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.pony.meta.Wearable; public class ModelVillagerPony extends ModelMobPony { @@ -52,12 +52,12 @@ public class ModelVillagerPony extends ModelMobPony { } @Override - public boolean isWearing(PonyWearable wearable) { - if (wearable == PonyWearable.SADDLE_BAGS) { + public boolean isWearing(Wearable wearable) { + if (wearable == Wearable.SADDLE_BAGS) { return !special && profession > -1 && profession < 2; } - if (wearable == PonyWearable.MUFFIN) { + if (wearable == Wearable.MUFFIN) { return special2; } diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java similarity index 88% rename from src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java index 43cb080a..409ddb39 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelWitchPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java @@ -1,13 +1,13 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.model.player.ModelZebra; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.pony.data.PonyWearable; +import com.minelittlepony.client.model.races.ModelZebra; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.pony.meta.Wearable; public class ModelWitchPony extends ModelZebra { @@ -77,8 +77,8 @@ public class ModelWitchPony extends ModelZebra { } @Override - public boolean isWearing(PonyWearable wearable) { - if (wearable == PonyWearable.HAT) { + public boolean isWearing(Wearable wearable) { + if (wearable == Wearable.HAT) { return true; } return super.isWearing(wearable); diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelZombiePony.java similarity index 75% rename from src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelZombiePony.java index 1dbcbacb..aa71dd6f 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelZombiePony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelZombiePony.java @@ -1,7 +1,7 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; -import com.minelittlepony.model.ModelMobPony; -import com.minelittlepony.util.render.AbstractBoxRenderer; +import com.minelittlepony.client.model.ModelMobPony; +import com.minelittlepony.client.util.render.AbstractRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -23,10 +23,10 @@ public class ModelZombiePony extends ModelMobPony { if (islookAngleRight(move)) { rotateArmHolding(bipedRightArm, 1, swingProgress, ticks); - AbstractBoxRenderer.shiftRotationPoint(bipedRightArm, 0.5F, 1.5F, 3); + AbstractRenderer.shiftRotationPoint(bipedRightArm, 0.5F, 1.5F, 3); } else { rotateArmHolding(bipedLeftArm, -1, swingProgress, ticks); - AbstractBoxRenderer.shiftRotationPoint(bipedLeftArm, -0.5F, 1.5F, 3); + AbstractRenderer.shiftRotationPoint(bipedLeftArm, -0.5F, 1.5F, 3); } } diff --git a/src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java similarity index 71% rename from src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java rename to src/client/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java index 526702c9..7e362500 100644 --- a/src/client/java/com/minelittlepony/model/ponies/ModelZombieVillagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java @@ -1,9 +1,9 @@ -package com.minelittlepony.model.ponies; +package com.minelittlepony.client.model.entities; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.util.render.AbstractBoxRenderer; +import com.minelittlepony.client.util.render.AbstractRenderer; public class ModelZombieVillagerPony extends ModelVillagerPony { @@ -14,10 +14,10 @@ public class ModelZombieVillagerPony extends ModelVillagerPony { if (islookAngleRight(move)) { rotateArmHolding(bipedRightArm, 1, swingProgress, ticks); - AbstractBoxRenderer.shiftRotationPoint(bipedRightArm, 0.5F, 1.5F, 3); + AbstractRenderer.shiftRotationPoint(bipedRightArm, 0.5F, 1.5F, 3); } else { rotateArmHolding(bipedLeftArm, -1, swingProgress, ticks); - AbstractBoxRenderer.shiftRotationPoint(bipedLeftArm, -0.5F, 1.5F, 3); + AbstractRenderer.shiftRotationPoint(bipedLeftArm, -0.5F, 1.5F, 3); } } diff --git a/src/client/java/com/minelittlepony/client/model/entities/package-info.java b/src/client/java/com/minelittlepony/client/model/entities/package-info.java new file mode 100644 index 00000000..ce06723a --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/entities/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.model.entities; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java similarity index 87% rename from src/client/java/com/minelittlepony/model/gear/AbstractGear.java rename to src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java index fc70fb6c..7f6a3a3a 100644 --- a/src/client/java/com/minelittlepony/model/gear/AbstractGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; @@ -8,8 +8,8 @@ import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.PonyModelConstants; public abstract class AbstractGear extends ModelBase implements IGear, PonyModelConstants { diff --git a/src/client/java/com/minelittlepony/model/gear/ChristmasHat.java b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java similarity index 83% rename from src/client/java/com/minelittlepony/model/gear/ChristmasHat.java rename to src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java index 4b9b26fa..5ccd8fa4 100644 --- a/src/client/java/com/minelittlepony/model/gear/ChristmasHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -6,11 +6,11 @@ import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PonyRenderer; -import com.minelittlepony.util.render.Color; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.Color; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.Calendar; import java.util.UUID; @@ -48,12 +48,12 @@ public class ChristmasHat extends AbstractGear { } @Override - public boolean canRender(IModel model, Entity entity) { - return isChristmasDay() || model.isWearing(PonyWearable.ANTLERS); + public boolean canRender(IClientModel model, Entity entity) { + return isChristmasDay() || model.isWearing(Wearable.ANTLERS); } @Override - public void setLivingAnimations(IModel model, Entity entity) { + public void setLivingAnimations(IClientModel model, Entity entity) { tint = model.getMetadata().getGlowColor(); } diff --git a/src/client/java/com/minelittlepony/model/gear/IGear.java b/src/client/java/com/minelittlepony/client/model/gear/IGear.java similarity index 72% rename from src/client/java/com/minelittlepony/model/gear/IGear.java rename to src/client/java/com/minelittlepony/client/model/gear/IGear.java index 8f7ae609..3e77c8a8 100644 --- a/src/client/java/com/minelittlepony/model/gear/IGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/IGear.java @@ -1,18 +1,18 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelPart; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.IPart; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public interface IGear extends IModelPart { +public interface IGear extends IPart { /** * Determines if this wearable can and is worn by the selected entity. @@ -22,7 +22,7 @@ public interface IGear extends IModelPart { * * @return True to render this wearable */ - boolean canRender(IModel model, Entity entity); + boolean canRender(IClientModel model, Entity entity); /** * Gets the body location that this wearable appears on. @@ -45,7 +45,7 @@ public interface IGear extends IModelPart { /** * Orients this wearable. */ - default void setLivingAnimations(IModel model, Entity entity) { + default void setLivingAnimations(IClientModel model, Entity entity) { } diff --git a/src/client/java/com/minelittlepony/model/gear/IStackable.java b/src/client/java/com/minelittlepony/client/model/gear/IStackable.java similarity index 58% rename from src/client/java/com/minelittlepony/model/gear/IStackable.java rename to src/client/java/com/minelittlepony/client/model/gear/IStackable.java index 8d6e913f..beb01503 100644 --- a/src/client/java/com/minelittlepony/model/gear/IStackable.java +++ b/src/client/java/com/minelittlepony/client/model/gear/IStackable.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; public interface IStackable { float getStackingOffset(); diff --git a/src/client/java/com/minelittlepony/model/gear/Muffin.java b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java similarity index 76% rename from src/client/java/com/minelittlepony/model/gear/Muffin.java rename to src/client/java/com/minelittlepony/client/model/gear/Muffin.java index c4e93083..24eb0bb1 100644 --- a/src/client/java/com/minelittlepony/model/gear/Muffin.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java @@ -1,12 +1,12 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.UUID; @@ -33,8 +33,8 @@ public class Muffin extends AbstractGear implements IStackable { } @Override - public boolean canRender(IModel model, Entity entity) { - return model.isWearing(PonyWearable.MUFFIN); + public boolean canRender(IClientModel model, Entity entity) { + return model.isWearing(Wearable.MUFFIN); } @Override diff --git a/src/client/java/com/minelittlepony/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java similarity index 82% rename from src/client/java/com/minelittlepony/model/gear/SaddleBags.java rename to src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java index b47ea328..91a368fe 100644 --- a/src/client/java/com/minelittlepony/model/gear/SaddleBags.java +++ b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java @@ -1,10 +1,10 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.capabilities.IModelPegasus; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PlaneRenderer; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.UUID; @@ -25,7 +25,7 @@ public class SaddleBags extends AbstractGear { float dropAmount = 0; - private IModel model; + private IClientModel model; @Override public void init(float yOffset, float stretch) { @@ -73,13 +73,13 @@ public class SaddleBags extends AbstractGear { } @Override - public void setLivingAnimations(IModel model, Entity entity) { + public void setLivingAnimations(IClientModel model, Entity entity) { this.model = model; hangLow = false; - if (model instanceof IModelPegasus) { - hangLow = model.canFly() && ((IModelPegasus)model).wingsAreOpen(); + if (model instanceof IPegasus) { + hangLow = model.canFly() && ((IPegasus)model).wingsAreOpen(); } } @@ -95,8 +95,8 @@ public class SaddleBags extends AbstractGear { leftBag.rotateAngleX = bodySwing; rightBag.rotateAngleX = bodySwing; - if (model instanceof IModelPegasus && model.isFlying()) { - bodySwing = ((IModelPegasus)model).getWingRotationFactor(ticks) - ROTATE_270; + if (model instanceof IPegasus && model.isFlying()) { + bodySwing = ((IPegasus)model).getWingRotationFactor(ticks) - ROTATE_270; bodySwing /= 10; } @@ -126,8 +126,8 @@ public class SaddleBags extends AbstractGear { } @Override - public boolean canRender(IModel model, Entity entity) { - return model.isWearing(PonyWearable.SADDLE_BAGS); + public boolean canRender(IClientModel model, Entity entity) { + return model.isWearing(Wearable.SADDLE_BAGS); } @Override diff --git a/src/client/java/com/minelittlepony/model/gear/Stetson.java b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java similarity index 76% rename from src/client/java/com/minelittlepony/model/gear/Stetson.java rename to src/client/java/com/minelittlepony/client/model/gear/Stetson.java index 3041fa72..22d22934 100644 --- a/src/client/java/com/minelittlepony/model/gear/Stetson.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java @@ -1,13 +1,13 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PlaneRenderer; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.client.util.render.plane.PlaneRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.UUID; @@ -48,8 +48,8 @@ public class Stetson extends AbstractGear implements IStackable { } @Override - public boolean canRender(IModel model, Entity entity) { - return model.isWearing(PonyWearable.STETSON); + public boolean canRender(IClientModel model, Entity entity) { + return model.isWearing(Wearable.STETSON); } @Override diff --git a/src/client/java/com/minelittlepony/model/gear/WitchHat.java b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java similarity index 80% rename from src/client/java/com/minelittlepony/model/gear/WitchHat.java rename to src/client/java/com/minelittlepony/client/model/gear/WitchHat.java index 10d423a6..b1450d65 100644 --- a/src/client/java/com/minelittlepony/model/gear/WitchHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java @@ -1,12 +1,12 @@ -package com.minelittlepony.model.gear; +package com.minelittlepony.client.model.gear; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.pony.meta.Wearable; import java.util.UUID; @@ -39,8 +39,8 @@ public class WitchHat extends AbstractGear implements IStackable { @Override - public boolean canRender(IModel model, Entity entity) { - return model.isWearing(PonyWearable.HAT); + public boolean canRender(IClientModel model, Entity entity) { + return model.isWearing(Wearable.HAT); } @Override diff --git a/src/client/java/com/minelittlepony/client/model/package-info.java b/src/client/java/com/minelittlepony/client/model/package-info.java new file mode 100644 index 00000000..e757659e --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.model; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java similarity index 83% rename from src/client/java/com/minelittlepony/model/player/ModelAlicorn.java rename to src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java index 6b975d5a..e73d0d77 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelAlicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java @@ -1,11 +1,11 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; + +import com.minelittlepony.client.model.components.PegasusWings; +import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.model.components.PegasusWings; import net.minecraft.entity.Entity; -import com.minelittlepony.model.capabilities.IModelPegasus; - -public class ModelAlicorn extends ModelUnicorn implements IModelPegasus { +public class ModelAlicorn extends ModelUnicorn implements IPegasus { public PegasusWings wings; diff --git a/src/client/java/com/minelittlepony/model/player/ModelBatpony.java b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java similarity index 74% rename from src/client/java/com/minelittlepony/model/player/ModelBatpony.java rename to src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java index aa13a9c7..749125ec 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelBatpony.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java @@ -1,8 +1,8 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; -import com.minelittlepony.model.components.BatWings; -import com.minelittlepony.pony.data.PonyWearable; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.components.BatWings; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.pony.meta.Wearable; public class ModelBatpony extends ModelPegasus { @@ -29,8 +29,8 @@ public class ModelBatpony extends ModelPegasus { } @Override - public boolean isWearing(PonyWearable wearable) { - if (wearable == PonyWearable.SADDLE_BAGS) { + public boolean isWearing(Wearable wearable) { + if (wearable == Wearable.SADDLE_BAGS) { return false; } diff --git a/src/client/java/com/minelittlepony/model/player/ModelChangeling.java b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java similarity index 74% rename from src/client/java/com/minelittlepony/model/player/ModelChangeling.java rename to src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java index 8b722e07..cdbefb9a 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelChangeling.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java @@ -1,9 +1,9 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; -import com.minelittlepony.pony.data.PonyWearable; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.model.components.BugWings; +import com.minelittlepony.client.model.components.BugWings; +import com.minelittlepony.common.pony.meta.Wearable; public class ModelChangeling extends ModelAlicorn { @@ -30,8 +30,8 @@ public class ModelChangeling extends ModelAlicorn { } @Override - public boolean isWearing(PonyWearable wearable) { - if (wearable == PonyWearable.SADDLE_BAGS) { + public boolean isWearing(Wearable wearable) { + if (wearable == Wearable.SADDLE_BAGS) { return false; } diff --git a/src/client/java/com/minelittlepony/model/player/ModelEarthPony.java b/src/client/java/com/minelittlepony/client/model/races/ModelEarthPony.java similarity index 90% rename from src/client/java/com/minelittlepony/model/player/ModelEarthPony.java rename to src/client/java/com/minelittlepony/client/model/races/ModelEarthPony.java index ed7625e9..cd6e714f 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelEarthPony.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelEarthPony.java @@ -1,7 +1,7 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.util.render.PonyRenderer; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/model/player/ModelPegasus.java b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java similarity index 81% rename from src/client/java/com/minelittlepony/model/player/ModelPegasus.java rename to src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java index 523bed4e..981ac926 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelPegasus.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java @@ -1,11 +1,11 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; + +import com.minelittlepony.client.model.components.PegasusWings; +import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.model.components.PegasusWings; import net.minecraft.entity.Entity; -import com.minelittlepony.model.capabilities.IModelPegasus; - -public class ModelPegasus extends ModelEarthPony implements IModelPegasus { +public class ModelPegasus extends ModelEarthPony implements IPegasus { public PegasusWings wings; diff --git a/src/client/java/com/minelittlepony/model/player/ModelUnicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java similarity index 94% rename from src/client/java/com/minelittlepony/model/player/ModelUnicorn.java rename to src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java index 658696b8..f5116f63 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelUnicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java @@ -1,18 +1,17 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; -import com.minelittlepony.model.components.UnicornHorn; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.components.UnicornHorn; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.IUnicorn; import net.minecraft.entity.Entity; import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.model.capabilities.IModelUnicorn; - /** * Used for both unicorns and alicorns since there's no logical way to keep them distinct and not duplicate stuff. */ -public class ModelUnicorn extends ModelEarthPony implements IModelUnicorn { +public class ModelUnicorn extends ModelEarthPony implements IUnicorn { public PonyRenderer unicornArmRight; public PonyRenderer unicornArmLeft; diff --git a/src/client/java/com/minelittlepony/model/player/ModelZebra.java b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java similarity index 81% rename from src/client/java/com/minelittlepony/model/player/ModelZebra.java rename to src/client/java/com/minelittlepony/client/model/races/ModelZebra.java index 53edb567..5bc05671 100644 --- a/src/client/java/com/minelittlepony/model/player/ModelZebra.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java @@ -1,11 +1,12 @@ -package com.minelittlepony.model.player; +package com.minelittlepony.client.model.races; import net.minecraft.client.renderer.GlStateManager; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.armour.ModelPonyArmor; -import com.minelittlepony.model.armour.PonyArmor; -import com.minelittlepony.render.model.PonyRenderer; +import com.minelittlepony.client.model.armour.ModelPonyArmor; +import com.minelittlepony.client.model.armour.PonyArmor; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.armour.IEquestrianArmour; public class ModelZebra extends ModelEarthPony { @@ -16,7 +17,7 @@ public class ModelZebra extends ModelEarthPony { } @Override - public PonyArmor createArmour() { + public IEquestrianArmour createArmour() { return new PonyArmor(new Armour(), new Armour()); } diff --git a/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java new file mode 100644 index 00000000..6a0e805a --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java @@ -0,0 +1,102 @@ +package com.minelittlepony.client.model.races; + +import com.google.common.collect.Maps; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelSeapony; +import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; +import com.minelittlepony.client.render.entities.player.RenderSeaponyPlayer; +import com.minelittlepony.common.pony.meta.Race; + +import net.minecraft.client.renderer.entity.RenderManager; + +import com.voxelmodpack.hdskins.VanillaModels; + +import java.util.Map; + +public enum PlayerModels { + /** + * The default non-pony model. This is typically handled my the vanilla renderer. + */ + HUMAN(VanillaModels.DEFAULT, Race.HUMAN, ModelEarthPony::new), + EARTH("earthpony", Race.EARTH, ModelEarthPony::new), + PEGASUS("pegasus", Race.PEGASUS, ModelPegasus::new), + BATPONY("batpony", Race.BATPONY, ModelBatpony::new), + UNICORN("unicorn", Race.UNICORN, ModelUnicorn::new), + ALICORN("alicorn", Race.ALICORN, ModelAlicorn::new), + CHANGELING("changeling", Race.CHANGELING, ModelChangeling::new), + ZEBRA("zebra", Race.ZEBRA, ModelZebra::new), + SEAPONY("seapony", Race.SEAPONY, a -> new ModelSeapony()) { + @Override + public RenderPonyPlayer createRenderer(RenderManager manager, boolean slimArms) { + return new RenderSeaponyPlayer(manager, slimArms, PlayerModels.UNICORN.getModel(slimArms), getModel(slimArms)); + } + }; + + private static Map raceModelsMap = Maps.newEnumMap(Race.class); + + static { + for (PlayerModels i : values()) { + raceModelsMap.put(i.race, i); + } + } + + private final ModelResolver resolver; + + private ModelWrapper normal; + private ModelWrapper slim; + + private final String normalKey, slimKey; + + private final Race race; + + PlayerModels(String key, Race race, ModelResolver resolver) { + this(key, VanillaModels.SLIM + key, race, resolver); + } + + PlayerModels(String normalKey, String slimKey, Race race, ModelResolver resolver) { + this.normalKey = normalKey; + this.slimKey = slimKey; + + this.resolver = resolver; + + this.race = race; + } + + public ModelWrapper getModel(boolean isSlim) { + + if (isSlim) { + if (slim == null) { + slim = new ModelWrapper(resolver.resolve(isSlim)); + } + + return slim; + } + + if (normal == null) { + normal = new ModelWrapper(resolver.resolve(isSlim)); + } + + return normal; + } + + public String getId(boolean useSlimArms) { + return useSlimArms ? slimKey : normalKey; + } + + public RenderPonyPlayer createRenderer(RenderManager manager, boolean slimArms) { + return new RenderPonyPlayer(manager, slimArms, getModel(slimArms)); + } + + public static PlayerModels forRace(Race race) { + return raceModelsMap.getOrDefault(race.getAlias(), HUMAN); + } + + /** + * FIXME: PMAPI fields are null when the game starts. + */ + @FunctionalInterface + static interface ModelResolver { + AbstractPonyModel resolve(boolean slim); + } +} diff --git a/src/client/java/com/minelittlepony/model/capabilities/package-info.java b/src/client/java/com/minelittlepony/client/model/races/package-info.java similarity index 77% rename from src/client/java/com/minelittlepony/model/capabilities/package-info.java rename to src/client/java/com/minelittlepony/client/model/races/package-info.java index 85345172..d10e7ce3 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/package-info.java +++ b/src/client/java/com/minelittlepony/client/model/races/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.model.capabilities; +package com.minelittlepony.client.model.races; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/mixin/package-info.java b/src/client/java/com/minelittlepony/client/package-info.java similarity index 82% rename from src/client/java/com/minelittlepony/mixin/package-info.java rename to src/client/java/com/minelittlepony/client/package-info.java index 22cdf129..a25a75c9 100644 --- a/src/client/java/com/minelittlepony/mixin/package-info.java +++ b/src/client/java/com/minelittlepony/client/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.mixin; +package com.minelittlepony.client; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/pony/data/Pony.java b/src/client/java/com/minelittlepony/client/pony/Pony.java similarity index 92% rename from src/client/java/com/minelittlepony/pony/data/Pony.java rename to src/client/java/com/minelittlepony/client/pony/Pony.java index f3d54d22..d019a056 100644 --- a/src/client/java/com/minelittlepony/pony/data/Pony.java +++ b/src/client/java/com/minelittlepony/client/pony/Pony.java @@ -1,9 +1,14 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.client.pony; import com.google.common.base.MoreObjects; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyRenderManager; -import com.minelittlepony.ducks.IRenderPony; +import com.minelittlepony.client.PonyRenderManager; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.transform.PonyTransformation; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.common.pony.meta.Size; import com.minelittlepony.util.chron.Touchable; import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture; @@ -156,7 +161,7 @@ public class Pony extends Touchable implements IPony { } protected Vec3d getVisualEyePosition(EntityLivingBase entity) { - PonySize size = entity.isChild() ? PonySize.FOAL : metadata.getSize(); + Size size = entity.isChild() ? Size.FOAL : metadata.getSize(); return new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight() * size.getScaleFactor(), entity.posZ); } @@ -175,7 +180,7 @@ public class Pony extends Touchable implements IPony { } @Override - public PonyRace getRace(boolean ignorePony) { + public Race getRace(boolean ignorePony) { return metadata.getRace().getEffectiveRace(ignorePony); } @@ -212,7 +217,7 @@ public class Pony extends Touchable implements IPony { if (ridingPony != null) { EntityLivingBase ridee = (EntityLivingBase)entity.getRidingEntity(); - Vec3d offset = ridingPony.getMetadata().getSize().getTranformation().getRiderOffset(); + Vec3d offset = PonyTransformation.forSize(ridingPony.getMetadata().getSize()).getRiderOffset(); float scale = ridingPony.getMetadata().getSize().getScaleFactor(); return ridingPony.getAbsoluteRidingOffset(ridee) diff --git a/src/client/java/com/minelittlepony/pony/data/PonyData.java b/src/client/java/com/minelittlepony/client/pony/PonyData.java similarity index 66% rename from src/client/java/com/minelittlepony/pony/data/PonyData.java rename to src/client/java/com/minelittlepony/client/pony/PonyData.java index 3582a845..ea2bbc86 100644 --- a/src/client/java/com/minelittlepony/pony/data/PonyData.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyData.java @@ -1,10 +1,17 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.client.pony; import net.minecraft.client.resources.data.IMetadataSection; import com.google.common.base.MoreObjects; -import com.minelittlepony.model.anim.BasicEasingInterpolator; -import com.minelittlepony.model.anim.IInterpolator; +import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.common.pony.meta.Gender; +import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.common.pony.meta.TailLength; +import com.minelittlepony.common.pony.meta.TriggerPixels; +import com.minelittlepony.util.animation.BasicEasingInterpolator; +import com.minelittlepony.util.animation.IInterpolator; import java.awt.image.BufferedImage; import java.util.UUID; @@ -18,22 +25,22 @@ import javax.annotation.concurrent.Immutable; */ @Immutable public class PonyData implements IPonyData, IMetadataSection { - private final PonyRace race; - private final TailLengths tailSize; - private final PonyGender gender; - private final PonySize size; + private final Race race; + private final TailLength tailSize; + private final Gender gender; + private final Size size; private final int glowColor; private final boolean[] wearables; public PonyData() { - race = PonyRace.HUMAN; - tailSize = TailLengths.FULL; - gender = PonyGender.MARE; - size = PonySize.NORMAL; + race = Race.HUMAN; + tailSize = TailLength.FULL; + gender = Gender.MARE; + size = Size.NORMAL; glowColor = 0x4444aa; - wearables = new boolean[PonyWearable.values().length]; + wearables = new boolean[Wearable.values().length]; } private PonyData(BufferedImage image) { @@ -47,22 +54,22 @@ public class PonyData implements IPonyData, IMetadataSection { } @Override - public PonyRace getRace() { + public Race getRace() { return race; } @Override - public TailLengths getTail() { + public TailLength getTail() { return tailSize; } @Override - public PonyGender getGender() { + public Gender getGender() { return gender; } @Override - public PonySize getSize() { + public Size getSize() { return size.getEffectiveSize(); } @@ -77,7 +84,7 @@ public class PonyData implements IPonyData, IMetadataSection { } @Override - public boolean isWearing(PonyWearable wearable) { + public boolean isWearing(Wearable wearable) { return wearables[wearable.ordinal()]; } @@ -88,7 +95,7 @@ public class PonyData implements IPonyData, IMetadataSection { .add("tailSize", tailSize) .add("gender", gender) .add("size", size) - .add("wearables", PonyWearable.flags(wearables)) + .add("wearables", Wearable.flags(wearables)) .add("glowColor", "#" + Integer.toHexString(glowColor)) .toString(); } diff --git a/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java b/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java similarity index 94% rename from src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java rename to src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java index 0083e9c2..7ec677f4 100644 --- a/src/client/java/com/minelittlepony/pony/data/PonyDataSerialiser.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java @@ -1,4 +1,4 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.client.pony; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; diff --git a/src/client/java/com/minelittlepony/pony/data/PonyManager.java b/src/client/java/com/minelittlepony/client/pony/PonyManager.java similarity index 96% rename from src/client/java/com/minelittlepony/pony/data/PonyManager.java rename to src/client/java/com/minelittlepony/client/pony/PonyManager.java index 5bcc3ab3..56a1948c 100644 --- a/src/client/java/com/minelittlepony/pony/data/PonyManager.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyManager.java @@ -1,10 +1,13 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.client.pony; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyConfig; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.pony.IPonyManager; +import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.common.settings.PonyLevel; import com.minelittlepony.util.chron.ChronicCache; import com.minelittlepony.util.math.MathUtil; import com.voxelmodpack.hdskins.ISkinCacheClearListener; diff --git a/src/client/java/com/minelittlepony/model/package-info.java b/src/client/java/com/minelittlepony/client/pony/package-info.java similarity index 80% rename from src/client/java/com/minelittlepony/model/package-info.java rename to src/client/java/com/minelittlepony/client/pony/package-info.java index 6dc6a541..02842e96 100644 --- a/src/client/java/com/minelittlepony/model/package-info.java +++ b/src/client/java/com/minelittlepony/client/pony/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.model; +package com.minelittlepony.client.pony; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java similarity index 94% rename from src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java rename to src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java index fdebe5ae..68a84c9b 100644 --- a/src/client/java/com/minelittlepony/render/DebugBoundingBoxRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.render; +package com.minelittlepony.client.render; import net.minecraft.client.Minecraft; @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.pony.data.IPony; +import com.minelittlepony.common.pony.IPony; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/client/java/com/minelittlepony/render/FrustrumCheck.java b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java similarity index 91% rename from src/client/java/com/minelittlepony/render/FrustrumCheck.java rename to src/client/java/com/minelittlepony/client/render/FrustrumCheck.java index 175cf1a8..5e0eda87 100644 --- a/src/client/java/com/minelittlepony/render/FrustrumCheck.java +++ b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render; +package com.minelittlepony.client.render; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.pony.data.IPony; +import com.minelittlepony.common.pony.IPony; public class FrustrumCheck implements ICamera { diff --git a/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java similarity index 94% rename from src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java rename to src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index b943d4b8..bd8027ea 100644 --- a/src/client/java/com/minelittlepony/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -1,12 +1,12 @@ -package com.minelittlepony.render; +package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.ducks.IRenderItem; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.skull.PonySkullRenderer; -import com.minelittlepony.util.render.Color; +import com.minelittlepony.client.ducks.IRenderItem; +import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; +import com.minelittlepony.client.util.render.Color; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; import com.mumfrey.liteloader.client.overlays.IMinecraft; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/render/RenderPony.java b/src/client/java/com/minelittlepony/client/render/RenderPony.java similarity index 93% rename from src/client/java/com/minelittlepony/render/RenderPony.java rename to src/client/java/com/minelittlepony/client/render/RenderPony.java index 3256cda4..5bab850d 100644 --- a/src/client/java/com/minelittlepony/render/RenderPony.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPony.java @@ -1,12 +1,12 @@ -package com.minelittlepony.render; +package com.minelittlepony.client.render; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyRenderManager; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.transform.PonyPosture; +import com.minelittlepony.client.PonyRenderManager; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.transform.PonyPosture; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java similarity index 86% rename from src/client/java/com/minelittlepony/render/RenderPonyMob.java rename to src/client/java/com/minelittlepony/client/render/RenderPonyMob.java index 5758c573..cb80ab0f 100644 --- a/src/client/java/com/minelittlepony/render/RenderPonyMob.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java @@ -1,15 +1,15 @@ -package com.minelittlepony.render; +package com.minelittlepony.client.render; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.layer.LayerGear; -import com.minelittlepony.render.layer.LayerHeldPonyItem; -import com.minelittlepony.render.layer.LayerHeldPonyItemMagical; -import com.minelittlepony.render.layer.LayerPonyArmor; -import com.minelittlepony.render.layer.LayerPonyCustomHead; -import com.minelittlepony.render.layer.LayerPonyElytra; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.render.layer.LayerGear; +import com.minelittlepony.client.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.layer.LayerPonyArmor; +import com.minelittlepony.client.render.layer.LayerPonyCustomHead; +import com.minelittlepony.client.render.layer.LayerPonyElytra; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; import com.voxelmodpack.hdskins.HDSkinManager; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java similarity index 93% rename from src/client/java/com/minelittlepony/render/ponies/MobRenderers.java rename to src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java index c23610a5..dea67d51 100644 --- a/src/client/java/com/minelittlepony/render/ponies/MobRenderers.java +++ b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -1,8 +1,8 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyRenderManager; -import com.minelittlepony.settings.SensibleConfig.Setting; +import com.minelittlepony.client.PonyRenderManager; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.settings.SensibleConfig.Setting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; @@ -34,7 +34,7 @@ public enum MobRenderers implements Setting { PIGZOMBIES { @Override public void register(boolean state, PonyRenderManager pony, RenderManager manager) { - pony.switchRenderer(state, manager, EntityPigZombie.class, new RenderPonyPigman(manager)); + pony.switchRenderer(state, manager, EntityPigZombie.class, new RenderPonyZombie.Pigman(manager)); } }, SKELETONS { diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java similarity index 78% rename from src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java index f09c727d..b5a09d62 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderEnderStallion.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java @@ -1,12 +1,12 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.model.ponies.ModelEnderStallion; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.render.layer.LayerEyeGlow; -import com.minelittlepony.render.layer.LayerHeldPonyItem; -import com.minelittlepony.render.layer.LayerHeldPonyItemMagical; -import com.minelittlepony.render.layer.LayerEyeGlow.IGlowingRenderer; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelEnderStallion; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.client.render.layer.LayerEyeGlow; +import com.minelittlepony.client.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.layer.LayerEyeGlow.IGlowingRenderer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; @@ -24,8 +24,10 @@ public class RenderEnderStallion extends RenderPonyMob implement private final Random rnd = new Random(); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelEnderStallion()); + public RenderEnderStallion(RenderManager manager) { - super(manager, PMAPI.enderman); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java similarity index 84% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java index 977fd048..473b8e92 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyGuardian.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java @@ -1,9 +1,10 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; import javax.annotation.Nonnull; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelSeapony; +import com.minelittlepony.client.render.RenderPonyMob; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderGuardian; @@ -16,13 +17,15 @@ public class RenderPonyGuardian extends RenderGuardian { public static final ResourceLocation SEAPONY = new ResourceLocation("minelittlepony", "textures/entity/seapony.png"); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelSeapony()); + private RenderPonyMob.Proxy ponyRenderer; public RenderPonyGuardian(RenderManager manager) { super(manager); - mainModel = PMAPI.seapony.getBody(); + mainModel = MODEL_WRAPPER.getBody(); - ponyRenderer = new RenderPonyMob.Proxy(layerRenderers, manager, PMAPI.seapony) { + ponyRenderer = new RenderPonyMob.Proxy(layerRenderers, manager, MODEL_WRAPPER) { @Override public ResourceLocation getTexture(EntityGuardian entity) { return RenderPonyGuardian.this.getTexture(entity); diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java similarity index 86% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java index f21ae79d..7836b5e4 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyIllager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java @@ -1,9 +1,10 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.render.layer.LayerHeldItemIllager; -import com.minelittlepony.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelIllagerPony; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.client.render.layer.LayerHeldItemIllager; +import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; @@ -21,8 +22,10 @@ public abstract class RenderPonyIllager extends Rende public static final ResourceLocation EVOKER = new ResourceLocation("minelittlepony", "textures/entity/illager/evoker_pony.png"); public static final ResourceLocation VINDICATOR = new ResourceLocation("minelittlepony", "textures/entity/illager/vindicator_pony.png"); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelIllagerPony()); + public RenderPonyIllager(RenderManager manager) { - super(manager, PMAPI.illager); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java similarity index 81% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java index 6faa5751..9c7b9307 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonySkeleton.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java @@ -1,8 +1,10 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; + +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelSkeletonPony; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.client.render.layer.LayerPonyStrayOverlay; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.render.layer.LayerPonyStrayOverlay; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.AbstractSkeleton; @@ -16,8 +18,10 @@ public class RenderPonySkeleton extends Rende public static final ResourceLocation WITHER = new ResourceLocation("minelittlepony", "textures/entity/skeleton/skeleton_wither_pony.png"); public static final ResourceLocation STRAY = new ResourceLocation("minelittlepony", "textures/entity/skeleton/stray_pony.png"); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelSkeletonPony()); + public RenderPonySkeleton(RenderManager manager) { - super(manager, PMAPI.skeleton); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java similarity index 90% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java index 7341de76..66b4c120 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyVex.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java @@ -1,6 +1,4 @@ -package com.minelittlepony.render.ponies; - -import com.minelittlepony.model.ponies.ModelBreezie; +package com.minelittlepony.client.render.entities; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderBiped; @@ -8,6 +6,8 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityVex; import net.minecraft.util.ResourceLocation; +import com.minelittlepony.client.model.entities.ModelBreezie; + /** * AKA a breezie :D */ diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java similarity index 76% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java index 90a0ea16..811ea80a 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyVillager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java @@ -1,10 +1,11 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.util.render.FormattedTextureSupplier; -import com.minelittlepony.util.render.ITextureSupplier; -import com.minelittlepony.util.render.IntStringMapper; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelVillagerPony; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.util.resources.FormattedTextureSupplier; +import com.minelittlepony.util.resources.ITextureSupplier; +import com.minelittlepony.util.resources.IntStringMapper; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; @@ -26,8 +27,10 @@ public class RenderPonyVillager extends RenderPonyMob { private static final ITextureSupplier PROFESSIONS = new VillagerProfessionTextureCache(FORMATTER, MAPPER, DEFAULT); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelVillagerPony()); + public RenderPonyVillager(RenderManager manager) { - super(manager, PMAPI.villager); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java similarity index 76% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java index 76890f1c..e70e19b0 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyWitch.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java @@ -1,8 +1,9 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelWitchPony; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -16,8 +17,10 @@ public class RenderPonyWitch extends RenderPonyMob { private static final ResourceLocation WITCH_TEXTURES = new ResourceLocation("minelittlepony", "textures/entity/witch_pony.png"); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelWitchPony()); + public RenderPonyWitch(RenderManager manager) { - super(manager, PMAPI.witch); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java similarity index 66% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java index 08233027..91702804 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombie.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java @@ -1,11 +1,14 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; + +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelZombiePony; +import com.minelittlepony.client.render.RenderPonyMob; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityGiantZombie; import net.minecraft.entity.monster.EntityHusk; +import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.util.ResourceLocation; @@ -13,9 +16,12 @@ public class RenderPonyZombie extends RenderPonyMob public static final ResourceLocation ZOMBIE = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pony.png"); public static final ResourceLocation HUSK = new ResourceLocation("minelittlepony", "textures/entity/zombie/husk_pony.png"); + public static final ResourceLocation PIGMAN = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pigman_pony.png"); + + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelZombiePony()); public RenderPonyZombie(RenderManager manager) { - super(manager, PMAPI.zombie); + super(manager, MODEL_WRAPPER); } @Override @@ -23,6 +29,18 @@ public class RenderPonyZombie extends RenderPonyMob return ZOMBIE; } + public static class Pigman extends RenderPonyZombie { + + public Pigman(RenderManager manager) { + super(manager); + } + + @Override + public ResourceLocation getTexture(EntityPigZombie entity) { + return PIGMAN; + } + } + public static class Husk extends RenderPonyZombie { public Husk(RenderManager manager) { @@ -45,7 +63,7 @@ public class RenderPonyZombie extends RenderPonyMob public static class Giant extends RenderPonyMob { public Giant(RenderManager manager) { - super(manager, PMAPI.zombie); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java similarity index 76% rename from src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java rename to src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java index dc98e5d4..2b091201 100644 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyZombieVillager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java @@ -1,10 +1,11 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; -import com.minelittlepony.util.render.FormattedTextureSupplier; -import com.minelittlepony.util.render.ITextureSupplier; -import com.minelittlepony.util.render.IntStringMapper; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.entities.ModelZombieVillagerPony; +import com.minelittlepony.client.render.RenderPonyMob; +import com.minelittlepony.util.resources.FormattedTextureSupplier; +import com.minelittlepony.util.resources.ITextureSupplier; +import com.minelittlepony.util.resources.IntStringMapper; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityZombieVillager; @@ -26,8 +27,10 @@ public class RenderPonyZombieVillager extends RenderPonyMob PROFESSIONS = new VillagerProfessionTextureCache(FORMATTER, MAPPER, DEFAULT); + private static final ModelWrapper MODEL_WRAPPER = new ModelWrapper(new ModelZombieVillagerPony()); + public RenderPonyZombieVillager(RenderManager manager) { - super(manager, PMAPI.zombieVillager); + super(manager, MODEL_WRAPPER); } @Override diff --git a/src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java similarity index 92% rename from src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java rename to src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java index 99e0fa6e..fd308f57 100644 --- a/src/client/java/com/minelittlepony/render/ponies/VillagerProfessionTextureCache.java +++ b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render.ponies; +package com.minelittlepony.client.render.entities; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.util.render.ITextureSupplier; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.util.resources.ITextureSupplier; import java.io.IOException; import java.util.HashMap; diff --git a/src/client/java/com/minelittlepony/client/render/entities/package-info.java b/src/client/java/com/minelittlepony/client/render/entities/package-info.java new file mode 100644 index 00000000..588ac2fa --- /dev/null +++ b/src/client/java/com/minelittlepony/client/render/entities/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render.entities; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java similarity index 86% rename from src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java rename to src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java index 46bc2942..dc5e89ad 100644 --- a/src/client/java/com/minelittlepony/render/player/RenderPonyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java @@ -1,19 +1,19 @@ -package com.minelittlepony.render.player; +package com.minelittlepony.client.render.entities.player; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.DebugBoundingBoxRenderer; -import com.minelittlepony.render.RenderPony; -import com.minelittlepony.render.layer.LayerDJPon3Head; -import com.minelittlepony.render.layer.LayerEntityOnPonyShoulder; -import com.minelittlepony.render.layer.LayerGear; -import com.minelittlepony.render.layer.LayerHeldPonyItemMagical; -import com.minelittlepony.render.layer.LayerPonyArmor; -import com.minelittlepony.render.layer.LayerPonyCape; -import com.minelittlepony.render.layer.LayerPonyCustomHead; -import com.minelittlepony.render.layer.LayerPonyElytra; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.render.DebugBoundingBoxRenderer; +import com.minelittlepony.client.render.RenderPony; +import com.minelittlepony.client.render.layer.LayerDJPon3Head; +import com.minelittlepony.client.render.layer.LayerEntityOnPonyShoulder; +import com.minelittlepony.client.render.layer.LayerGear; +import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.layer.LayerPonyArmor; +import com.minelittlepony.client.render.layer.LayerPonyCape; +import com.minelittlepony.client.render.layer.LayerPonyCustomHead; +import com.minelittlepony.client.render.layer.LayerPonyElytra; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; import net.minecraft.block.BlockBed; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java similarity index 90% rename from src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java rename to src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java index 5f848091..9caa7fc6 100644 --- a/src/client/java/com/minelittlepony/render/player/RenderSeaponyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.player; +package com.minelittlepony.client.render.entities.player; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.pony.data.IPony; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.common.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/package-info.java b/src/client/java/com/minelittlepony/client/render/entities/player/package-info.java new file mode 100644 index 00000000..c5350cee --- /dev/null +++ b/src/client/java/com/minelittlepony/client/render/entities/player/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render.entities.player; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java similarity index 72% rename from src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java rename to src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java index 0fecf8d6..b16964ba 100644 --- a/src/client/java/com/minelittlepony/render/layer/AbstractPonyLayer.java +++ b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java @@ -1,15 +1,15 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.capabilities.IModel; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.IModel; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.entity.EntityLivingBase; -public abstract class AbstractPonyLayer implements LayerRenderer { +public abstract class AbstractPonyLayer implements LayerRenderer { private final RenderLivingBase renderer; @@ -17,13 +17,6 @@ public abstract class AbstractPonyLayer implements L this.renderer = renderer; } - @SuppressWarnings("unchecked") - @Override - public final void doRenderLayer(EntityLivingBase entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { - // render the pony layer - doPonyRender((T)entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale); - } - /** * Renders this layer. * @@ -36,7 +29,8 @@ public abstract class AbstractPonyLayer implements L * @param headPitch Vertical head motion in radians. * @param scale Scaling factor used to render this model. Determined by the return value of {@link RenderLivingBase.prepareScale}. Usually {@code 0.0625F}. */ - protected abstract void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale); + @Override + public abstract void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale); protected RenderLivingBase getRenderer() { return renderer; diff --git a/src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java similarity index 76% rename from src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java index adc19269..894c820a 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerDJPon3Head.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java @@ -1,11 +1,11 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.components.ModelDeadMau5Ears; +import com.minelittlepony.client.model.components.ModelDeadMau5Ears; +import com.minelittlepony.common.model.BodyPart; public class LayerDJPon3Head extends AbstractPonyLayer { @@ -16,7 +16,7 @@ public class LayerDJPon3Head extends AbstractPonyLayer { } @Override - protected void doPonyRender(AbstractClientPlayer entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(AbstractClientPlayer entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { if ("deadmau5".equals(entity.getName())) { getRenderer().bindTexture(entity.getLocationSkin()); diff --git a/src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java similarity index 91% rename from src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java index bf3bffda..13491767 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java @@ -1,6 +1,4 @@ -package com.minelittlepony.render.layer; - -import com.minelittlepony.model.BodyPart; +package com.minelittlepony.client.render.layer; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; @@ -12,6 +10,8 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; +import com.minelittlepony.common.model.BodyPart; + import javax.annotation.Nullable; public class LayerEntityOnPonyShoulder extends AbstractPonyLayer { @@ -27,7 +27,7 @@ public class LayerEntityOnPonyShoulder extends AbstractPonyLayer extends AbstractPonyLayer { } @Override - protected void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { getRenderer().bindTexture(eyeTexture); enableBlend(); diff --git a/src/client/java/com/minelittlepony/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java similarity index 72% rename from src/client/java/com/minelittlepony/render/layer/LayerGear.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerGear.java index b7a22690..c85276f0 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerGear.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java @@ -1,4 +1,4 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; @@ -8,17 +8,17 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import com.google.common.collect.Lists; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.model.gear.ChristmasHat; -import com.minelittlepony.model.gear.IGear; -import com.minelittlepony.model.gear.IStackable; -import com.minelittlepony.model.gear.Muffin; -import com.minelittlepony.model.gear.SaddleBags; -import com.minelittlepony.model.gear.Stetson; -import com.minelittlepony.model.gear.WitchHat; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.model.gear.ChristmasHat; +import com.minelittlepony.client.model.gear.IGear; +import com.minelittlepony.client.model.gear.IStackable; +import com.minelittlepony.client.model.gear.Muffin; +import com.minelittlepony.client.model.gear.SaddleBags; +import com.minelittlepony.client.model.gear.Stetson; +import com.minelittlepony.client.model.gear.WitchHat; +import com.minelittlepony.common.model.BodyPart; import java.util.HashMap; import java.util.List; @@ -39,7 +39,7 @@ public class LayerGear extends AbstractPonyLayer } @Override - protected void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { if (entity.isInvisible()) { return; @@ -73,7 +73,7 @@ public class LayerGear extends AbstractPonyLayer } } - private void renderGear(IModel model, T entity, IGear gear, float move, float swing, float scale, float ticks) { + private void renderGear(IClientModel model, T entity, IGear gear, float move, float swing, float scale, float ticks) { GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); ResourceLocation texture = gear.getTexture(entity); diff --git a/src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java similarity index 67% rename from src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java index c301e574..9207fd7a 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerHeldItemIllager.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java @@ -1,12 +1,12 @@ -package com.minelittlepony.render.layer; - -import com.minelittlepony.model.ponies.ModelIllagerPony; +package com.minelittlepony.client.render.layer; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.entity.monster.AbstractIllager; import net.minecraft.entity.monster.AbstractIllager.IllagerArmPose; import net.minecraft.util.EnumHandSide; +import com.minelittlepony.client.model.entities.ModelIllagerPony; + public class LayerHeldItemIllager extends LayerHeldPonyItem { public LayerHeldItemIllager(RenderLivingBase livingPony) { @@ -14,9 +14,9 @@ public class LayerHeldItemIllager extends LayerHeldPo } @Override - public void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { if (shouldRender(entity)) { - super.doPonyRender(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale); + super.doRenderLayer(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale); } } diff --git a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java similarity index 89% rename from src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java index f63c9b1d..4343ee53 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItem.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.common.model.BodyPart; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; @@ -32,13 +32,13 @@ public class LayerHeldPonyItem extends AbstractPonyL } @Override - public void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { ItemStack left = getLeftItem(entity); ItemStack right = getRightItem(entity); if (!left.isEmpty() || !right.isEmpty()) { - IModel model = getMainModel(); + IClientModel model = getMainModel(); pushMatrix(); diff --git a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java similarity index 71% rename from src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java index 78fc5537..3c8e4856 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerHeldPonyItemMagical.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java @@ -1,7 +1,9 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; + +import com.minelittlepony.client.PonyRenderManager; +import com.minelittlepony.client.util.render.PonyRenderer; +import com.minelittlepony.common.model.IUnicorn; -import com.minelittlepony.PonyRenderManager; -import com.minelittlepony.model.capabilities.IModelUnicorn; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.entity.RenderLivingBase; @@ -16,7 +18,7 @@ public class LayerHeldPonyItemMagical extends LayerH } protected boolean isUnicorn() { - return getMainModel() instanceof IModelUnicorn && this.getPonyModel().canCast(); + return getMainModel() instanceof IUnicorn && this.>getPonyModel().canCast(); } @Override @@ -31,14 +33,14 @@ public class LayerHeldPonyItemMagical extends LayerH @Override protected void postItemRender(T entity, ItemStack drop, TransformType transform, EnumHandSide hand) { if (isUnicorn()) { - PonyRenderManager.getInstance().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, this.getPonyModel().getMagicColor()); + PonyRenderManager.getInstance().getMagicRenderer().renderItemGlow(entity, drop, transform, hand, this.>getPonyModel().getMagicColor()); } } @Override protected void renderArm(EnumHandSide side) { if (isUnicorn()) { - this.getPonyModel().getUnicornArmForSide(side).postRender(0.0625F); + this.>getPonyModel().getUnicornArmForSide(side).postRender(0.0625F); } else { super.renderArm(side); } diff --git a/src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java b/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java similarity index 96% rename from src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java index 779f8f0d..43748def 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerOverlayBase.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java @@ -1,4 +1,4 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java similarity index 76% rename from src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java index c60395eb..e1d722db 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java @@ -1,13 +1,13 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; -import com.minelittlepony.ForgeProxy; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.armour.IEquestrianArmour; -import com.minelittlepony.model.armour.IArmourTextureResolver; -import com.minelittlepony.model.armour.ArmourLayer; -import com.minelittlepony.model.armour.DefaultPonyArmorTextureResolver; -import com.minelittlepony.model.capabilities.IModelArmour; -import com.minelittlepony.util.render.Color; +import com.minelittlepony.client.ForgeProxy; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.armour.DefaultPonyArmorTextureResolver; +import com.minelittlepony.client.util.render.Color; +import com.minelittlepony.common.model.armour.ArmourLayer; +import com.minelittlepony.common.model.armour.IArmour; +import com.minelittlepony.common.model.armour.IArmourTextureResolver; +import com.minelittlepony.common.model.armour.IEquestrianArmour; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; @@ -33,7 +33,7 @@ public class LayerPonyArmor extends AbstractPonyLaye } @Override - public void doPonyRender(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { pony = getPonyRenderer().getModelWrapper(); for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) { @@ -44,7 +44,7 @@ public class LayerPonyArmor extends AbstractPonyLaye } } - private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmourLayer layer) { + private void renderArmor(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale, EntityEquipmentSlot armorSlot, ArmourLayer layer) { ItemStack itemstack = entity.getItemStackFromSlot(armorSlot); if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) { @@ -85,10 +85,10 @@ public class LayerPonyArmor extends AbstractPonyLaye } @SuppressWarnings("unchecked") - private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, V def) { + private static V getArmorModel(EntityLivingBase entity, ItemStack itemstack, EntityEquipmentSlot slot, ArmourLayer layer, V def) { ModelBase model = ForgeProxy.getArmorModel(entity, itemstack, slot, def); - if (model instanceof IModelArmour) { + if (model instanceof IArmour) { return (V)model; } diff --git a/src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java similarity index 88% rename from src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java index 29505034..bc985cb6 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerPonyCape.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.BodyPart; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.common.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderLivingBase; @@ -12,8 +12,8 @@ import net.minecraft.util.math.MathHelper; import javax.annotation.Nonnull; +import static com.minelittlepony.common.model.PonyModelConstants.PI; import static net.minecraft.client.renderer.GlStateManager.*; -import static com.minelittlepony.model.PonyModelConstants.PI; public class LayerPonyCape extends AbstractPonyLayer { @@ -22,7 +22,7 @@ public class LayerPonyCape extends AbstractPonyLayer { } @Override - public void doPonyRender(@Nonnull AbstractClientPlayer player, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void doRenderLayer(@Nonnull AbstractClientPlayer player, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { AbstractPonyModel model = getPlayerModel(); if (player.hasPlayerInfo() && !player.isInvisible() diff --git a/src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java similarity index 90% rename from src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java index 63540118..c21543e2 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerPonyCustomHead.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java @@ -1,4 +1,4 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; import static net.minecraft.client.renderer.GlStateManager.color; import static net.minecraft.client.renderer.GlStateManager.popMatrix; @@ -7,12 +7,12 @@ import static net.minecraft.client.renderer.GlStateManager.rotate; import static net.minecraft.client.renderer.GlStateManager.scale; import static net.minecraft.client.renderer.GlStateManager.translate; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.AbstractPonyModel; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.capabilities.IModel; -import com.minelittlepony.render.skull.PonySkullRenderer; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.AbstractPonyModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; +import com.minelittlepony.common.model.BodyPart; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -43,7 +43,7 @@ public class LayerPonyCustomHead implements LayerRen public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { ItemStack itemstack = entity.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if (!itemstack.isEmpty()) { - IModel model = getModel().getBody(); + IClientModel model = getModel().getBody(); Item item = itemstack.getItem(); pushMatrix(); diff --git a/src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java similarity index 90% rename from src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java index a1d73b49..520537ad 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerPonyElytra.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.layer; +package com.minelittlepony.client.render.layer; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.components.PonyElytra; +import com.minelittlepony.client.model.components.PonyElytra; +import com.minelittlepony.common.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; @@ -28,7 +28,7 @@ public class LayerPonyElytra extends AbstractPonyLay } @Override - public void doPonyRender(@Nonnull T entity, float move, float swing, float partialTicks, float ticks, float yaw, float head, float scale) { + public void doRenderLayer(@Nonnull T entity, float move, float swing, float partialTicks, float ticks, float yaw, float head, float scale) { ItemStack itemstack = entity.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (itemstack.getItem() == Items.ELYTRA) { diff --git a/src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java similarity index 88% rename from src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java rename to src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java index b58d5213..a06da7b6 100644 --- a/src/client/java/com/minelittlepony/render/layer/LayerPonyStrayOverlay.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java @@ -1,12 +1,12 @@ -package com.minelittlepony.render.layer; - -import com.minelittlepony.model.ponies.ModelSkeletonPony; +package com.minelittlepony.client.render.layer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.entity.monster.EntityStray; import net.minecraft.util.ResourceLocation; +import com.minelittlepony.client.model.entities.ModelSkeletonPony; + public class LayerPonyStrayOverlay extends LayerOverlayBase { public static final ResourceLocation STRAY_SKELETON_OVERLAY = new ResourceLocation("minelittlepony", "textures/entity/skeleton/stray_pony_overlay.png"); diff --git a/src/client/java/com/minelittlepony/client/render/layer/package-info.java b/src/client/java/com/minelittlepony/client/render/layer/package-info.java new file mode 100644 index 00000000..ed667bf7 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/render/layer/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render.layer; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/client/render/package-info.java b/src/client/java/com/minelittlepony/client/render/package-info.java new file mode 100644 index 00000000..19921488 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/render/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java similarity index 87% rename from src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java index 9128791b..1378f3aa 100644 --- a/src/client/java/com/minelittlepony/render/skull/PlayerSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.model.components.ModelDeadMau5Ears; -import com.minelittlepony.pony.data.Pony; -import com.minelittlepony.pony.data.PonyLevel; -import com.minelittlepony.render.RenderPony; +import com.minelittlepony.client.model.components.ModelDeadMau5Ears; +import com.minelittlepony.client.pony.Pony; +import com.minelittlepony.client.render.RenderPony; +import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.common.settings.PonyLevel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.voxelmodpack.hdskins.HDSkinManager; diff --git a/src/client/java/com/minelittlepony/render/skull/PonySkull.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java similarity index 67% rename from src/client/java/com/minelittlepony/render/skull/PonySkull.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java index 468c7f3c..314412aa 100644 --- a/src/client/java/com/minelittlepony/render/skull/PonySkull.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; import net.minecraft.client.Minecraft; -import com.minelittlepony.model.components.ModelPonyHead; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.render.skull.PonySkullRenderer.ISkull; +import com.minelittlepony.client.model.components.ModelPonyHead; +import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull; +import com.minelittlepony.common.pony.IPony; public abstract class PonySkull implements ISkull { diff --git a/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java similarity index 95% rename from src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index b11ec7b7..4a61d0bb 100644 --- a/src/client/java/com/minelittlepony/render/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -1,9 +1,9 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.ducks.IRenderItem; -import com.minelittlepony.pony.data.IPony; +import com.minelittlepony.client.ducks.IRenderItem; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.settings.PonyConfig; import com.mojang.authlib.GameProfile; import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java similarity index 69% rename from src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java index 497a1825..39e493c0 100644 --- a/src/client/java/com/minelittlepony/render/skull/SkeletonSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.render.ponies.RenderPonySkeleton; +import com.minelittlepony.client.render.entities.RenderPonySkeleton; +import com.minelittlepony.common.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java similarity index 69% rename from src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java index a13b5159..6fc2ab14 100644 --- a/src/client/java/com/minelittlepony/render/skull/WitherSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.render.ponies.RenderPonySkeleton; +import com.minelittlepony.client.render.entities.RenderPonySkeleton; +import com.minelittlepony.common.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java similarity index 69% rename from src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java rename to src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java index 1cd00aeb..25c14599 100644 --- a/src/client/java/com/minelittlepony/render/skull/ZombieSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.render.skull; +package com.minelittlepony.client.render.tileentities.skull; -import com.minelittlepony.PonyConfig; -import com.minelittlepony.render.ponies.RenderPonyZombie; +import com.minelittlepony.client.render.entities.RenderPonyZombie; +import com.minelittlepony.common.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/package-info.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/package-info.java new file mode 100644 index 00000000..52827962 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render.tileentities.skull; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/transform/PonyPosture.java b/src/client/java/com/minelittlepony/client/transform/PonyPosture.java similarity index 68% rename from src/client/java/com/minelittlepony/transform/PonyPosture.java rename to src/client/java/com/minelittlepony/client/transform/PonyPosture.java index 6b4ab7b2..09fcae72 100644 --- a/src/client/java/com/minelittlepony/transform/PonyPosture.java +++ b/src/client/java/com/minelittlepony/client/transform/PonyPosture.java @@ -1,9 +1,9 @@ -package com.minelittlepony.transform; - -import com.minelittlepony.model.capabilities.IModel; +package com.minelittlepony.client.transform; import net.minecraft.entity.EntityLivingBase; +import com.minelittlepony.client.model.IClientModel; + public interface PonyPosture { PonyPosture ELYTRA = new PostureElytra(); PonyPosture FLIGHT = new PostureFlight(); @@ -14,5 +14,5 @@ public interface PonyPosture { return true; } - void transform(IModel model, T entity, double motionX, double motionY, double motionZ, float yaw, float ticks); + void transform(IClientModel model, T entity, double motionX, double motionY, double motionZ, float yaw, float ticks); } diff --git a/src/client/java/com/minelittlepony/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java similarity index 88% rename from src/client/java/com/minelittlepony/transform/PonyTransformation.java rename to src/client/java/com/minelittlepony/client/transform/PonyTransformation.java index beab8b1e..5eadaa63 100644 --- a/src/client/java/com/minelittlepony/transform/PonyTransformation.java +++ b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -1,16 +1,20 @@ -package com.minelittlepony.transform; +package com.minelittlepony.client.transform; import static net.minecraft.client.renderer.GlStateManager.scale; import static net.minecraft.client.renderer.GlStateManager.translate; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.capabilities.IModel; +import com.google.common.collect.Maps; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.IModel; +import com.minelittlepony.common.pony.meta.Size; + +import java.util.Map; public enum PonyTransformation { - NORMAL(0, 3F, 0.75F) { + NORMAL(Size.NORMAL, 0, 3F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.2F, 0); @@ -31,7 +35,7 @@ public enum PonyTransformation { } } }, - LANKY(0, 2.6F, 0.75F) { + LANKY(Size.LANKY, 0, 2.6F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.15F, 0); @@ -65,7 +69,7 @@ public enum PonyTransformation { } } }, - BULKY(0, 2.3F, 0.75F) { + BULKY(Size.BULKY, 0, 2.3F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.15F, 0); @@ -99,7 +103,7 @@ public enum PonyTransformation { } } }, - FOAL(0, 3.8F, 0.75F) { + FOAL(Size.FOAL, 0, 3.8F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.3F, 0); @@ -128,7 +132,7 @@ public enum PonyTransformation { } } }, - TALL(0, 2.2F, 0.75F) { + TALL(Size.TALL, 0, 2.2F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.15F, 0); @@ -161,7 +165,7 @@ public enum PonyTransformation { } } }, - YEARLING(0, 3.8F, 0.75F) { + YEARLING(Size.YEARLING, 0, 3.8F, 0.75F) { @Override public void transform(IModel model, BodyPart part) { if (model.isCrouching()) translate(0, -0.15F, 0); @@ -195,9 +199,20 @@ public enum PonyTransformation { } }; + private static final Map sizeToTransform = Maps.newEnumMap(Size.class); + + static { + for (PonyTransformation i : values()) { + sizeToTransform.put(i.size, i); + } + } + protected Vec3d riderOffset; - PonyTransformation(float rX, float rY, float rZ) { + private final Size size; + + PonyTransformation(Size size, float rX, float rY, float rZ) { + this.size = size; riderOffset = new Vec3d(rX, rY, rZ); } @@ -210,4 +225,11 @@ public enum PonyTransformation { } public abstract void transform(IModel model, BodyPart part); + + + + + public static PonyTransformation forSize(Size size) { + return sizeToTransform.getOrDefault(size, NORMAL); + } } diff --git a/src/client/java/com/minelittlepony/transform/PostureElytra.java b/src/client/java/com/minelittlepony/client/transform/PostureElytra.java similarity index 56% rename from src/client/java/com/minelittlepony/transform/PostureElytra.java rename to src/client/java/com/minelittlepony/client/transform/PostureElytra.java index 68769224..a681ca11 100644 --- a/src/client/java/com/minelittlepony/transform/PostureElytra.java +++ b/src/client/java/com/minelittlepony/client/transform/PostureElytra.java @@ -1,13 +1,13 @@ -package com.minelittlepony.transform; - -import com.minelittlepony.model.capabilities.IModel; +package com.minelittlepony.client.transform; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.EntityLivingBase; +import com.minelittlepony.client.model.IClientModel; + public class PostureElytra implements PonyPosture { @Override - public void transform(IModel model, EntityLivingBase entity, double motionX, double motionY, double motionZ, float yaw, float ticks) { + public void transform(IClientModel model, EntityLivingBase entity, double motionX, double motionY, double motionZ, float yaw, float ticks) { GlStateManager.rotate(90, 1, 0, 0); GlStateManager.translate(0, entity.isSneaking() ? 0.2F : -1, 0); } diff --git a/src/client/java/com/minelittlepony/client/transform/PostureFalling.java b/src/client/java/com/minelittlepony/client/transform/PostureFalling.java new file mode 100644 index 00000000..1c9b293f --- /dev/null +++ b/src/client/java/com/minelittlepony/client/transform/PostureFalling.java @@ -0,0 +1,12 @@ +package com.minelittlepony.client.transform; + +import net.minecraft.entity.EntityLivingBase; + +import com.minelittlepony.client.model.IClientModel; + +public class PostureFalling implements PonyPosture { + @Override + public void transform(IClientModel model, EntityLivingBase entity, double motionX, double motionY, double motionZ, float yaw, float ticks) { + model.setPitch(0); + } +} diff --git a/src/client/java/com/minelittlepony/transform/PostureFlight.java b/src/client/java/com/minelittlepony/client/transform/PostureFlight.java similarity index 72% rename from src/client/java/com/minelittlepony/transform/PostureFlight.java rename to src/client/java/com/minelittlepony/client/transform/PostureFlight.java index a4d7b500..15109883 100644 --- a/src/client/java/com/minelittlepony/transform/PostureFlight.java +++ b/src/client/java/com/minelittlepony/client/transform/PostureFlight.java @@ -1,6 +1,7 @@ -package com.minelittlepony.transform; +package com.minelittlepony.client.transform; -import com.minelittlepony.model.capabilities.IModel; +import com.minelittlepony.client.model.IClientModel; +import com.minelittlepony.util.transform.MotionCompositor; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; @@ -13,7 +14,7 @@ public class PostureFlight extends MotionCompositor implements PonyPosture> extends ModelRenderer { +public abstract class AbstractRenderer> extends ModelRenderer { protected final ModelBase baseModel; @@ -17,12 +17,12 @@ public abstract class AbstractBoxRenderer> exte protected float modelOffsetY; protected float modelOffsetZ; - public AbstractBoxRenderer(ModelBase model) { + public AbstractRenderer(ModelBase model) { super(model); baseModel = model; } - public AbstractBoxRenderer(ModelBase model, int texX, int texY) { + public AbstractRenderer(ModelBase model, int texX, int texY) { super(model, texX, texY); baseModel = model; } diff --git a/src/client/java/com/minelittlepony/util/render/Box.java b/src/client/java/com/minelittlepony/client/util/render/Box.java similarity index 96% rename from src/client/java/com/minelittlepony/util/render/Box.java rename to src/client/java/com/minelittlepony/client/util/render/Box.java index 0c4ad8f6..eb9dd164 100644 --- a/src/client/java/com/minelittlepony/util/render/Box.java +++ b/src/client/java/com/minelittlepony/client/util/render/Box.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.client.util.render; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; diff --git a/src/client/java/com/minelittlepony/util/render/Color.java b/src/client/java/com/minelittlepony/client/util/render/Color.java similarity index 96% rename from src/client/java/com/minelittlepony/util/render/Color.java rename to src/client/java/com/minelittlepony/client/util/render/Color.java index 907c6e7e..9f162c95 100644 --- a/src/client/java/com/minelittlepony/util/render/Color.java +++ b/src/client/java/com/minelittlepony/client/util/render/Color.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.client.util.render; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/render/model/GlowRenderer.java b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java similarity index 75% rename from src/client/java/com/minelittlepony/render/model/GlowRenderer.java rename to src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java index 0e9becb5..903b5104 100644 --- a/src/client/java/com/minelittlepony/render/model/GlowRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java @@ -1,14 +1,11 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import org.lwjgl.opengl.GL11; -import com.minelittlepony.util.render.AbstractBoxRenderer; -import com.minelittlepony.util.render.Color; - -public class GlowRenderer extends AbstractBoxRenderer { +public class GlowRenderer extends AbstractRenderer { int tint; float alpha = 1; @@ -35,7 +32,7 @@ public class GlowRenderer extends AbstractBoxRenderer { @Override public void createBox(float offX, float offY, float offZ, int width, int height, int depth, float scaleFactor, boolean mirrored) { - cubeList.add(new ModelGlow(this, textureOffsetX, textureOffsetY, offX, offY, offZ, width, height, depth, scaleFactor, alpha)); + cubeList.add(new HornGlow(this, textureOffsetX, textureOffsetY, offX, offY, offZ, width, height, depth, scaleFactor, alpha)); } @Override diff --git a/src/client/java/com/minelittlepony/render/model/ModelGlow.java b/src/client/java/com/minelittlepony/client/util/render/HornGlow.java similarity index 84% rename from src/client/java/com/minelittlepony/render/model/ModelGlow.java rename to src/client/java/com/minelittlepony/client/util/render/HornGlow.java index 54289295..3ab95085 100644 --- a/src/client/java/com/minelittlepony/render/model/ModelGlow.java +++ b/src/client/java/com/minelittlepony/client/util/render/HornGlow.java @@ -1,21 +1,17 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render; import net.minecraft.client.renderer.BufferBuilder; -import com.minelittlepony.util.render.Box; -import com.minelittlepony.util.render.Quad; -import com.minelittlepony.util.render.Vertex; - /** * Like a normal box, but with the top narrowed a bit. */ -public class ModelGlow extends Box { +public class HornGlow extends Box { private final float alpha; private Quad[] quadList; - public ModelGlow(GlowRenderer renderer, int texX, int texY, float xMin, float yMin, float zMin, int w, int h, int d, float scale, float alpha) { + public HornGlow(GlowRenderer renderer, int texX, int texY, float xMin, float yMin, float zMin, int w, int h, int d, float scale, float alpha) { super(renderer, texX, texY, xMin, yMin, zMin, w, h, d, scale); this.alpha = alpha; diff --git a/src/client/java/com/minelittlepony/render/model/PonyRenderer.java b/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java similarity index 67% rename from src/client/java/com/minelittlepony/render/model/PonyRenderer.java rename to src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java index d656eb10..338e3c1f 100644 --- a/src/client/java/com/minelittlepony/render/model/PonyRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java @@ -1,10 +1,8 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render; import net.minecraft.client.model.ModelBase; -import com.minelittlepony.util.render.AbstractBoxRenderer; - -public class PonyRenderer extends AbstractBoxRenderer { +public class PonyRenderer extends AbstractRenderer { public PonyRenderer(ModelBase model) { super(model); diff --git a/src/client/java/com/minelittlepony/util/render/Quad.java b/src/client/java/com/minelittlepony/client/util/render/Quad.java similarity index 95% rename from src/client/java/com/minelittlepony/util/render/Quad.java rename to src/client/java/com/minelittlepony/client/util/render/Quad.java index 217ac3ae..ef3b03ad 100644 --- a/src/client/java/com/minelittlepony/util/render/Quad.java +++ b/src/client/java/com/minelittlepony/client/util/render/Quad.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.client.util.render; import net.minecraft.client.model.TexturedQuad; diff --git a/src/client/java/com/minelittlepony/util/render/Vertex.java b/src/client/java/com/minelittlepony/client/util/render/Vertex.java similarity index 92% rename from src/client/java/com/minelittlepony/util/render/Vertex.java rename to src/client/java/com/minelittlepony/client/util/render/Vertex.java index dbfb36e3..f1b6110f 100644 --- a/src/client/java/com/minelittlepony/util/render/Vertex.java +++ b/src/client/java/com/minelittlepony/client/util/render/Vertex.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.client.util.render; import net.minecraft.client.model.PositionTextureVertex; diff --git a/src/client/java/com/minelittlepony/client/util/render/package-info.java b/src/client/java/com/minelittlepony/client/util/render/package-info.java new file mode 100644 index 00000000..906e6df7 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/util/render/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.util.render; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/model/ModelPlane.java b/src/client/java/com/minelittlepony/client/util/render/plane/ModelPlane.java similarity index 92% rename from src/client/java/com/minelittlepony/render/model/ModelPlane.java rename to src/client/java/com/minelittlepony/client/util/render/plane/ModelPlane.java index 444325a2..2924b26b 100644 --- a/src/client/java/com/minelittlepony/render/model/ModelPlane.java +++ b/src/client/java/com/minelittlepony/client/util/render/plane/ModelPlane.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render.plane; import net.minecraft.client.renderer.BufferBuilder; -import com.minelittlepony.util.render.Box; -import com.minelittlepony.util.render.Quad; -import com.minelittlepony.util.render.Vertex; +import com.minelittlepony.client.util.render.Box; +import com.minelittlepony.client.util.render.Quad; +import com.minelittlepony.client.util.render.Vertex; import javax.annotation.Nonnull; diff --git a/src/client/java/com/minelittlepony/render/model/Plane.java b/src/client/java/com/minelittlepony/client/util/render/plane/Plane.java similarity index 57% rename from src/client/java/com/minelittlepony/render/model/Plane.java rename to src/client/java/com/minelittlepony/client/util/render/plane/Plane.java index 9e509117..228182f3 100644 --- a/src/client/java/com/minelittlepony/render/model/Plane.java +++ b/src/client/java/com/minelittlepony/client/util/render/plane/Plane.java @@ -1,4 +1,4 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render.plane; enum Plane { NORTH, diff --git a/src/client/java/com/minelittlepony/render/model/PlaneRenderer.java b/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java similarity index 92% rename from src/client/java/com/minelittlepony/render/model/PlaneRenderer.java rename to src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java index e738e396..b426993c 100644 --- a/src/client/java/com/minelittlepony/render/model/PlaneRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java @@ -1,10 +1,10 @@ -package com.minelittlepony.render.model; +package com.minelittlepony.client.util.render.plane; import net.minecraft.client.model.ModelBase; -import com.minelittlepony.util.render.AbstractBoxRenderer; +import com.minelittlepony.client.util.render.AbstractRenderer; -public class PlaneRenderer extends AbstractBoxRenderer { +public class PlaneRenderer extends AbstractRenderer { public boolean mirrory, mirrorz; diff --git a/src/client/java/com/minelittlepony/client/util/render/plane/package-info.java b/src/client/java/com/minelittlepony/client/util/render/plane/package-info.java new file mode 100644 index 00000000..5c5766a7 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/util/render/plane/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.util.render.plane; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java similarity index 93% rename from src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java rename to src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java index 40b9e259..040c19ac 100644 --- a/src/client/java/com/minelittlepony/hdskins/gui/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java @@ -1,9 +1,10 @@ -package com.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.client.gui; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.IPonyManager; import com.minelittlepony.gui.IconicToggle; import com.minelittlepony.gui.Style; -import com.minelittlepony.pony.data.IPonyManager; +import com.minelittlepony.hdskins.entity.EntityPonyModel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; diff --git a/src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java similarity index 79% rename from src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java rename to src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java index e1c9c967..d4418d1b 100644 --- a/src/client/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java +++ b/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java @@ -1,15 +1,16 @@ -package com.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.client.gui; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.ducks.IRenderPony; -import com.minelittlepony.model.ModelWrapper; -import com.minelittlepony.model.player.PlayerModels; -import com.minelittlepony.pony.data.IPony; -import com.minelittlepony.pony.data.Pony; -import com.minelittlepony.pony.data.PonyRace; -import com.minelittlepony.render.layer.LayerGear; -import com.minelittlepony.render.layer.LayerPonyElytra; -import com.minelittlepony.render.RenderPony; +import com.minelittlepony.client.ducks.IRenderPony; +import com.minelittlepony.client.model.ModelWrapper; +import com.minelittlepony.client.model.races.PlayerModels; +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.common.MineLittlePony; +import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.hdskins.entity.EntityPonyModel; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.voxelmodpack.hdskins.gui.RenderPlayerModel; @@ -72,15 +73,15 @@ public class RenderPonyModel extends RenderPlayerModel implemen IPony thePony = MineLittlePony.getInstance().getManager().getPony(loc); - PonyRace race = thePony.getRace(false); + Race race = thePony.getRace(false); if (race.isHuman()) { return super.getEntityModel(playermodel); } - boolean canWet = playermodel.wet && (loc == playermodel.getBlankSkin(Type.SKIN) || race == PonyRace.SEAPONY); + boolean canWet = playermodel.wet && (loc == playermodel.getBlankSkin(Type.SKIN) || race == Race.SEAPONY); - playerModel = canWet ? PlayerModels.SEAPONY.getModel(slim) : thePony.getRace(true).getModel().getModel(slim); + playerModel = canWet ? PlayerModels.SEAPONY.getModel(slim) : PlayerModels.forRace(thePony.getRace(true)).getModel(slim); playerModel.apply(thePony.getMetadata()); renderPony.setPonyModel(playerModel); @@ -91,7 +92,7 @@ public class RenderPonyModel extends RenderPlayerModel implemen } @Override - protected LayerRenderer getElytraLayer() { + protected LayerRenderer getElytraLayer() { return new LayerPonyElytra(this) { private final ModelElytra modelElytra = new ModelElytra(); diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java b/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java new file mode 100644 index 00000000..3e29ba42 --- /dev/null +++ b/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.client.gui; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/PMAPI.java b/src/client/java/com/minelittlepony/model/PMAPI.java deleted file mode 100644 index 6f2f1b1d..00000000 --- a/src/client/java/com/minelittlepony/model/PMAPI.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.minelittlepony.model; - -import com.minelittlepony.model.player.*; -import com.minelittlepony.model.ponies.*; - -/** - * PMAPI - Pony Models API? - * - * TODO: Remove this, move the models to where they're being used. - */ -public interface PMAPI { - - ModelWrapper earthpony = new ModelWrapper(new ModelEarthPony(false)); - ModelWrapper earthponySmall = new ModelWrapper(new ModelEarthPony(true)); - - ModelWrapper pegasus = new ModelWrapper(new ModelPegasus(false)); - ModelWrapper pegasusSmall = new ModelWrapper(new ModelPegasus(true)); - - ModelWrapper bat = new ModelWrapper(new ModelBatpony(false)); - ModelWrapper batSmall = new ModelWrapper(new ModelBatpony(true)); - - ModelWrapper unicorn = new ModelWrapper(new ModelUnicorn(false)); - ModelWrapper unicornSmall = new ModelWrapper(new ModelUnicorn(true)); - - ModelWrapper alicorn = new ModelWrapper(new ModelAlicorn(false)); - ModelWrapper alicornSmall = new ModelWrapper(new ModelAlicorn(true)); - - ModelWrapper zebra = new ModelWrapper(new ModelZebra(false)); - ModelWrapper zebraSmall = new ModelWrapper(new ModelZebra(true)); - - ModelWrapper bug = new ModelWrapper(new ModelChangeling(false)); - ModelWrapper bugSmall = new ModelWrapper(new ModelChangeling(true)); - - ModelWrapper seapony = new ModelWrapper(new ModelSeapony()); - - ModelWrapper zombie = new ModelWrapper(new ModelZombiePony()); - ModelWrapper skeleton = new ModelWrapper(new ModelSkeletonPony()); - ModelWrapper villager = new ModelWrapper(new ModelVillagerPony()); - ModelWrapper zombieVillager = new ModelWrapper(new ModelZombieVillagerPony()); - ModelWrapper illager = new ModelWrapper(new ModelIllagerPony()); - ModelWrapper witch = new ModelWrapper(new ModelWitchPony()); - ModelWrapper enderman = new ModelWrapper(new ModelEnderStallion()); -} diff --git a/src/client/java/com/minelittlepony/model/components/package-info.java b/src/client/java/com/minelittlepony/model/components/package-info.java deleted file mode 100644 index 34123d53..00000000 --- a/src/client/java/com/minelittlepony/model/components/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.model.components; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/player/PlayerModels.java b/src/client/java/com/minelittlepony/model/player/PlayerModels.java deleted file mode 100644 index e0516bf2..00000000 --- a/src/client/java/com/minelittlepony/model/player/PlayerModels.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.minelittlepony.model.player; - -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.player.RenderPonyPlayer; -import com.minelittlepony.render.player.RenderSeaponyPlayer; - -import net.minecraft.client.renderer.entity.RenderManager; - -import com.minelittlepony.model.ModelWrapper; -import com.voxelmodpack.hdskins.VanillaModels; - -public enum PlayerModels { - /** - * The default non-pony model. This is typically handled my the vanilla renderer. - */ - DEFAULT(VanillaModels.DEFAULT, VanillaModels.SLIM, () -> PMAPI.earthpony, () -> PMAPI.earthponySmall), - EARTH("earthpony", () -> PMAPI.earthpony, () -> PMAPI.earthponySmall), - PEGASUS("pegasus", () -> PMAPI.pegasus, () -> PMAPI.pegasusSmall), - BATPONY("batpony", () -> PMAPI.bat, () -> PMAPI.batSmall), - UNICORN("unicorn", () -> PMAPI.unicorn, () -> PMAPI.unicornSmall), - ALICORN("alicorn", () -> PMAPI.alicorn, () -> PMAPI.alicornSmall), - CHANGELING("changeling", () -> PMAPI.bug, () -> PMAPI.bugSmall), - ZEBRA("zebra", () -> PMAPI.zebra, () -> PMAPI.zebraSmall), - SEAPONY("seapony", () -> PMAPI.seapony, () -> PMAPI.seapony) { - @Override - public RenderPonyPlayer createRenderer(RenderManager manager, boolean slimArms) { - return new RenderSeaponyPlayer(manager, slimArms, PlayerModels.UNICORN.getModel(slimArms), getModel(slimArms)); - } - }; - - private final ModelResolver normal, slim; - - private final String normalKey, slimKey; - - PlayerModels(String key, ModelResolver normal, ModelResolver slim) { - this(key, VanillaModels.SLIM + key, normal, slim); - } - - PlayerModels(String normalKey, String slimKey, ModelResolver normal, ModelResolver slim) { - this.normalKey = normalKey; - this.slimKey = slimKey; - - this.normal = normal; - this.slim = slim; - } - - public ModelWrapper getModel(boolean slim) { - return slim ? this.slim.resolve() : normal.resolve(); - } - - public String getId(boolean useSlimArms) { - return useSlimArms ? slimKey : normalKey; - } - - public RenderPonyPlayer createRenderer(RenderManager manager, boolean slimArms) { - return new RenderPonyPlayer(manager, slimArms, getModel(slimArms)); - } - - /** - * FIXME: PMAPI fields are null when the game starts. - */ - static interface ModelResolver { - ModelWrapper resolve(); - } -} diff --git a/src/client/java/com/minelittlepony/model/player/package-info.java b/src/client/java/com/minelittlepony/model/player/package-info.java deleted file mode 100644 index fefa925a..00000000 --- a/src/client/java/com/minelittlepony/model/player/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.model.player; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/model/ponies/package-info.java b/src/client/java/com/minelittlepony/model/ponies/package-info.java deleted file mode 100644 index 576187ce..00000000 --- a/src/client/java/com/minelittlepony/model/ponies/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.model.ponies; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/package-info.java b/src/client/java/com/minelittlepony/package-info.java deleted file mode 100644 index a1d3fc42..00000000 --- a/src/client/java/com/minelittlepony/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/pony/data/PonyRace.java b/src/client/java/com/minelittlepony/pony/data/PonyRace.java deleted file mode 100644 index dd1cb966..00000000 --- a/src/client/java/com/minelittlepony/pony/data/PonyRace.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.minelittlepony.pony.data; - -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.model.player.PlayerModels; - -public enum PonyRace implements ITriggerPixelMapped { - - HUMAN(0, PlayerModels.DEFAULT, false, false), - EARTH(0xf9b131, PlayerModels.EARTH, false, false), - PEGASUS(0x88caf0, PlayerModels.PEGASUS, true, false), - UNICORN(0xd19fe4, PlayerModels.UNICORN, false, true), - ALICORN(0xfef9fc, PlayerModels.ALICORN, true, true), - CHANGELING(0x282b29, PlayerModels.CHANGELING, true, true), - ZEBRA(0xd0cccf, PlayerModels.ZEBRA, false, false), - REFORMED_CHANGELING(0xcaed5a, PlayerModels.CHANGELING, true, true), - GRIFFIN(0xae9145, PlayerModels.PEGASUS, true, false), - HIPPOGRIFF(0xd6ddac, PlayerModels.PEGASUS, true, false), - BATPONY(0xeeeeee, PlayerModels.BATPONY, true, false), - SEAPONY(0x3655dd, PlayerModels.SEAPONY, false, true); - - private boolean wings; - private boolean horn; - - private int triggerPixel; - - private PlayerModels model; - - PonyRace(int triggerPixel, PlayerModels model, boolean wings, boolean horn) { - this.triggerPixel = triggerPixel; - - this.wings = wings; - this.horn = horn; - this.model = model; - } - - /** - * Returns true if this pony has a horn (and by extension can cast magic). - * @return - */ - public boolean hasHorn() { - return horn; - } - - /** - * Returns true if this pony has wings. If it has wings, it can fly, of course. - */ - public boolean hasWings() { - return wings; - } - - /** - * Returns true if this is a human. - */ - public boolean isHuman() { - return this == HUMAN; - } - - /** - * Gets the model type associated with this species. - */ - public PlayerModels getModel() { - return model; - } - - /** - * Gets the actual race determined by the given pony level. - * PonyLevel.HUMANS would force all races to be humans. - * PonyLevel.BOTH is no change. - * PonyLevel.PONIES (should) return a pony if this is a human. Don't be fooled, though. It doesn't. - */ - public PonyRace getEffectiveRace(boolean ignorePony) { - if (MineLittlePony.getInstance().getConfig().getEffectivePonyLevel(ignorePony) == PonyLevel.HUMANS) { - return HUMAN; - } - - return this; - } - - @Override - public int getTriggerPixel() { - return triggerPixel; - } -} diff --git a/src/client/java/com/minelittlepony/pony/data/package-info.java b/src/client/java/com/minelittlepony/pony/data/package-info.java deleted file mode 100644 index 31822866..00000000 --- a/src/client/java/com/minelittlepony/pony/data/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.pony.data; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/layer/package-info.java b/src/client/java/com/minelittlepony/render/layer/package-info.java deleted file mode 100644 index d6daad76..00000000 --- a/src/client/java/com/minelittlepony/render/layer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render.layer; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/model/package-info.java b/src/client/java/com/minelittlepony/render/model/package-info.java deleted file mode 100644 index 79bb8ff0..00000000 --- a/src/client/java/com/minelittlepony/render/model/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render.model; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/package-info.java b/src/client/java/com/minelittlepony/render/package-info.java deleted file mode 100644 index 4e9d38ab..00000000 --- a/src/client/java/com/minelittlepony/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/player/package-info.java b/src/client/java/com/minelittlepony/render/player/package-info.java deleted file mode 100644 index ee1504e8..00000000 --- a/src/client/java/com/minelittlepony/render/player/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render.player; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java b/src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java deleted file mode 100644 index 695ae40e..00000000 --- a/src/client/java/com/minelittlepony/render/ponies/RenderPonyPigman.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.minelittlepony.render.ponies; - -import com.minelittlepony.model.PMAPI; -import com.minelittlepony.render.RenderPonyMob; - -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.util.ResourceLocation; - -public class RenderPonyPigman extends RenderPonyMob { - - private static final ResourceLocation PIGMAN = new ResourceLocation("minelittlepony", "textures/entity/zombie/zombie_pigman_pony.png"); - - public RenderPonyPigman(RenderManager manager) { - super(manager, PMAPI.zombie); - } - - @Override - public ResourceLocation getTexture(EntityPigZombie entity) { - return PIGMAN; - } - -} diff --git a/src/client/java/com/minelittlepony/render/ponies/package-info.java b/src/client/java/com/minelittlepony/render/ponies/package-info.java deleted file mode 100644 index 5ecb94c1..00000000 --- a/src/client/java/com/minelittlepony/render/ponies/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render.ponies; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/render/skull/package-info.java b/src/client/java/com/minelittlepony/render/skull/package-info.java deleted file mode 100644 index 0c4d7a0a..00000000 --- a/src/client/java/com/minelittlepony/render/skull/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.render.skull; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/transform/PostureFalling.java b/src/client/java/com/minelittlepony/transform/PostureFalling.java deleted file mode 100644 index 6d7de7f7..00000000 --- a/src/client/java/com/minelittlepony/transform/PostureFalling.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.minelittlepony.transform; - -import com.minelittlepony.model.capabilities.IModel; - -import net.minecraft.entity.EntityLivingBase; - -public class PostureFalling implements PonyPosture { - @Override - public void transform(IModel model, EntityLivingBase entity, double motionX, double motionY, double motionZ, float yaw, float ticks) { - model.setPitch(0); - } -} diff --git a/src/client/java/com/minelittlepony/util/render/package-info.java b/src/client/java/com/minelittlepony/util/render/package-info.java deleted file mode 100644 index 4e9d3c08..00000000 --- a/src/client/java/com/minelittlepony/util/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.util.render; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/MineLittlePony.java b/src/common/java/com/minelittlepony/common/MineLittlePony.java similarity index 83% rename from src/common/java/com/minelittlepony/MineLittlePony.java rename to src/common/java/com/minelittlepony/common/MineLittlePony.java index e337e878..c9d893d6 100644 --- a/src/common/java/com/minelittlepony/MineLittlePony.java +++ b/src/common/java/com/minelittlepony/common/MineLittlePony.java @@ -1,9 +1,10 @@ -package com.minelittlepony; +package com.minelittlepony.common; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.minelittlepony.pony.data.IPonyManager; +import com.minelittlepony.common.pony.IPonyManager; +import com.minelittlepony.common.settings.PonyConfig; public abstract class MineLittlePony { @@ -14,7 +15,7 @@ public abstract class MineLittlePony { public static final String MOD_NAME = "Mine Little Pony"; public static final String MOD_VERSION = "@VERSION@"; - MineLittlePony() { + protected MineLittlePony() { instance = this; } diff --git a/src/common/java/com/minelittlepony/MissingRendererException.java b/src/common/java/com/minelittlepony/common/MissingRendererException.java similarity index 88% rename from src/common/java/com/minelittlepony/MissingRendererException.java rename to src/common/java/com/minelittlepony/common/MissingRendererException.java index 4ae09414..8081ca66 100644 --- a/src/common/java/com/minelittlepony/MissingRendererException.java +++ b/src/common/java/com/minelittlepony/common/MissingRendererException.java @@ -1,4 +1,4 @@ -package com.minelittlepony; +package com.minelittlepony.common; public class MissingRendererException extends RuntimeException { private static final long serialVersionUID = -6059469512902628663L; diff --git a/src/common/java/com/minelittlepony/model/BodyPart.java b/src/common/java/com/minelittlepony/common/model/BodyPart.java similarity index 67% rename from src/common/java/com/minelittlepony/model/BodyPart.java rename to src/common/java/com/minelittlepony/common/model/BodyPart.java index 12a7bdfe..a6003f74 100644 --- a/src/common/java/com/minelittlepony/model/BodyPart.java +++ b/src/common/java/com/minelittlepony/common/model/BodyPart.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model; +package com.minelittlepony.common.model; public enum BodyPart { HEAD, diff --git a/src/client/java/com/minelittlepony/model/capabilities/ICapitated.java b/src/common/java/com/minelittlepony/common/model/ICapitated.java similarity index 72% rename from src/client/java/com/minelittlepony/model/capabilities/ICapitated.java rename to src/common/java/com/minelittlepony/common/model/ICapitated.java index 1b586428..272a4dfa 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/ICapitated.java +++ b/src/common/java/com/minelittlepony/common/model/ICapitated.java @@ -1,10 +1,8 @@ -package com.minelittlepony.model.capabilities; - -import net.minecraft.client.model.ModelRenderer; +package com.minelittlepony.common.model; import javax.annotation.Nullable; -public interface ICapitated { +public interface ICapitated { /** * Gets the head of this capitated object. */ diff --git a/src/client/java/com/minelittlepony/model/capabilities/IModel.java b/src/common/java/com/minelittlepony/common/model/IModel.java similarity index 85% rename from src/client/java/com/minelittlepony/model/capabilities/IModel.java rename to src/common/java/com/minelittlepony/common/model/IModel.java index d17cec5e..1bb1e984 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/IModel.java +++ b/src/common/java/com/minelittlepony/common/model/IModel.java @@ -1,12 +1,12 @@ -package com.minelittlepony.model.capabilities; +package com.minelittlepony.common.model; -import com.minelittlepony.model.BodyPart; -import com.minelittlepony.model.armour.IEquestrianArmour; -import com.minelittlepony.pony.data.IPonyData; -import com.minelittlepony.pony.data.PonySize; -import com.minelittlepony.pony.data.PonyWearable; +import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.common.pony.meta.Size; -public interface IModel extends ICapitated { +public interface IModel { /** * Sets up this model's initial values, like a constructor... @@ -27,7 +27,7 @@ public interface IModel extends ICapitated { /** * Gets the active scaling profile used to lay out this model's parts. */ - PonySize getSize(); + Size getSize(); /** * Returns a new pony armour to go with this model. Called on startup by a model wrapper. @@ -110,7 +110,7 @@ public interface IModel extends ICapitated { /** * Tests if this model is wearing the given piece of gear. */ - default boolean isWearing(PonyWearable wearable) { + default boolean isWearing(Wearable wearable) { return getMetadata().isWearing(wearable); } } diff --git a/src/client/java/com/minelittlepony/model/capabilities/IModelPart.java b/src/common/java/com/minelittlepony/common/model/IPart.java similarity index 90% rename from src/client/java/com/minelittlepony/model/capabilities/IModelPart.java rename to src/common/java/com/minelittlepony/common/model/IPart.java index 0bd835f7..a6ea504b 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/IModelPart.java +++ b/src/common/java/com/minelittlepony/common/model/IPart.java @@ -1,8 +1,8 @@ -package com.minelittlepony.model.capabilities; +package com.minelittlepony.common.model; import java.util.UUID; -public interface IModelPart { +public interface IPart { /** * Initialises all of the boxes in this modelpart. * @param yOffset diff --git a/src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java b/src/common/java/com/minelittlepony/common/model/IPegasus.java similarity index 73% rename from src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java rename to src/common/java/com/minelittlepony/common/model/IPegasus.java index c73ca487..a0b24015 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/IModelPegasus.java +++ b/src/common/java/com/minelittlepony/common/model/IPegasus.java @@ -1,11 +1,11 @@ -package com.minelittlepony.model.capabilities; - -import static com.minelittlepony.model.PonyModelConstants.WING_ROT_Z_SNEAK; -import static com.minelittlepony.model.PonyModelConstants.ROTATE_270; +package com.minelittlepony.common.model; import net.minecraft.util.math.MathHelper; -public interface IModelPegasus extends IModel { +import static com.minelittlepony.common.model.PonyModelConstants.ROTATE_270; +import static com.minelittlepony.common.model.PonyModelConstants.WING_ROT_Z_SNEAK; + +public interface IPegasus extends IModel { /** * Returns true if the wings are spread. diff --git a/src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java b/src/common/java/com/minelittlepony/common/model/IUnicorn.java similarity index 69% rename from src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java rename to src/common/java/com/minelittlepony/common/model/IUnicorn.java index 61751bd7..74692b3b 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/IModelUnicorn.java +++ b/src/common/java/com/minelittlepony/common/model/IUnicorn.java @@ -1,14 +1,12 @@ -package com.minelittlepony.model.capabilities; +package com.minelittlepony.common.model; import net.minecraft.util.EnumHandSide; -import com.minelittlepony.render.model.PonyRenderer; - -public interface IModelUnicorn extends IModel { +public interface IUnicorn extends IModel { /** * Gets the arm used for holding items in their magic. */ - PonyRenderer getUnicornArmForSide(EnumHandSide side); + Arm getUnicornArmForSide(EnumHandSide side); /** * Returns true if this model is being applied to a race that can use magic. diff --git a/src/common/java/com/minelittlepony/model/PonyModelConstants.java b/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java similarity index 97% rename from src/common/java/com/minelittlepony/model/PonyModelConstants.java rename to src/common/java/com/minelittlepony/common/model/PonyModelConstants.java index ce620e7d..804dcf15 100644 --- a/src/common/java/com/minelittlepony/model/PonyModelConstants.java +++ b/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model; +package com.minelittlepony.common.model; public interface PonyModelConstants { diff --git a/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java b/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java similarity index 81% rename from src/common/java/com/minelittlepony/model/armour/ArmourLayer.java rename to src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java index c12457d4..3d55980c 100644 --- a/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java +++ b/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.common.model.armour; /** * The layer used to render a given armour piece. diff --git a/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java b/src/common/java/com/minelittlepony/common/model/armour/IArmour.java similarity index 90% rename from src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java rename to src/common/java/com/minelittlepony/common/model/armour/IArmour.java index 714c9184..95f78586 100644 --- a/src/client/java/com/minelittlepony/model/capabilities/IModelArmour.java +++ b/src/common/java/com/minelittlepony/common/model/armour/IArmour.java @@ -1,17 +1,16 @@ -package com.minelittlepony.model.capabilities; +package com.minelittlepony.common.model.armour; -import net.minecraft.client.model.ModelBiped; import net.minecraft.inventory.EntityEquipmentSlot; -import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.common.model.IModel; -public interface IModelArmour { +public interface IArmour { /** * Called to synchronise this model's legs with that of another. * * @param model The other model to mimic */ - void synchroniseLegs(T model); + void synchroniseLegs(IModel model); /** * Resets the state of this model to all invisible. diff --git a/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java b/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java similarity index 91% rename from src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java rename to src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java index 800a1be9..46263470 100644 --- a/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java +++ b/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.common.model.armour; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java b/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java similarity index 50% rename from src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java rename to src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java index 981f8c9c..a8d771f8 100644 --- a/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java +++ b/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java @@ -1,9 +1,8 @@ -package com.minelittlepony.model.armour; +package com.minelittlepony.common.model.armour; -import com.minelittlepony.model.capabilities.IModelArmour; import com.minelittlepony.model.capabilities.IModelWrapper; -public interface IEquestrianArmour extends IModelWrapper { +public interface IEquestrianArmour extends IModelWrapper { /** * Gets the armour model to render for the given layer. */ diff --git a/src/common/java/com/minelittlepony/common/model/armour/package-info.java b/src/common/java/com/minelittlepony/common/model/armour/package-info.java new file mode 100644 index 00000000..9aea6ba1 --- /dev/null +++ b/src/common/java/com/minelittlepony/common/model/armour/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.common.model.armour; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/pony/data/IPony.java b/src/common/java/com/minelittlepony/common/pony/IPony.java similarity index 95% rename from src/common/java/com/minelittlepony/pony/data/IPony.java rename to src/common/java/com/minelittlepony/common/pony/IPony.java index 3f560051..19bf163d 100644 --- a/src/common/java/com/minelittlepony/pony/data/IPony.java +++ b/src/common/java/com/minelittlepony/common/pony/IPony.java @@ -1,11 +1,12 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.meta.Race; public interface IPony { @@ -76,7 +77,7 @@ public interface IPony { * * @param ignorePony True to ignore the client's current pony level setting. */ - PonyRace getRace(boolean ignorePony); + Race getRace(boolean ignorePony); /** * Returns true if an entity is riding a pony or other sentient life-form. diff --git a/src/common/java/com/minelittlepony/pony/data/IPonyData.java b/src/common/java/com/minelittlepony/common/pony/IPonyData.java similarity index 61% rename from src/common/java/com/minelittlepony/pony/data/IPonyData.java rename to src/common/java/com/minelittlepony/common/pony/IPonyData.java index 6dc10227..69e8b288 100644 --- a/src/common/java/com/minelittlepony/pony/data/IPonyData.java +++ b/src/common/java/com/minelittlepony/common/pony/IPonyData.java @@ -1,6 +1,11 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony; -import com.minelittlepony.model.anim.IInterpolator; +import com.minelittlepony.common.pony.meta.Gender; +import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.common.pony.meta.TailLength; +import com.minelittlepony.util.animation.IInterpolator; import java.util.UUID; @@ -11,22 +16,22 @@ public interface IPonyData { /** * Gets this pony's race. */ - PonyRace getRace(); + Race getRace(); /** * Gets the length of the pony's tail. */ - TailLengths getTail(); + TailLength getTail(); /** * Get the pony's gender (usually female). */ - PonyGender getGender(); + Gender getGender(); /** * Gets the current pony size. */ - PonySize getSize(); + Size getSize(); /** * Gets the magical glow colour for magic-casting races. Returns 0 otherwise. @@ -41,7 +46,7 @@ public interface IPonyData { /** * Checks it this pony is wearing the given accessory. */ - boolean isWearing(PonyWearable wearable); + boolean isWearing(Wearable wearable); /** * Gets an interpolator for interpolating values. diff --git a/src/common/java/com/minelittlepony/pony/data/IPonyManager.java b/src/common/java/com/minelittlepony/common/pony/IPonyManager.java similarity index 98% rename from src/common/java/com/minelittlepony/pony/data/IPonyManager.java rename to src/common/java/com/minelittlepony/common/pony/IPonyManager.java index 1465c49e..57db4402 100644 --- a/src/common/java/com/minelittlepony/pony/data/IPonyManager.java +++ b/src/common/java/com/minelittlepony/common/pony/IPonyManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java b/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java similarity index 95% rename from src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java rename to src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java index 3ea2bd15..73df1965 100644 --- a/src/common/java/com/minelittlepony/pony/data/ITriggerPixelMapped.java +++ b/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony; /** * Interface for enums that can be parsed from an image trigger pixel value. diff --git a/src/common/java/com/minelittlepony/pony/data/PonyGender.java b/src/common/java/com/minelittlepony/common/pony/meta/Gender.java similarity index 65% rename from src/common/java/com/minelittlepony/pony/data/PonyGender.java rename to src/common/java/com/minelittlepony/common/pony/meta/Gender.java index 7514d2a7..624dad67 100644 --- a/src/common/java/com/minelittlepony/pony/data/PonyGender.java +++ b/src/common/java/com/minelittlepony/common/pony/meta/Gender.java @@ -1,13 +1,15 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony.meta; -public enum PonyGender implements ITriggerPixelMapped { +import com.minelittlepony.common.pony.ITriggerPixelMapped; + +public enum Gender implements ITriggerPixelMapped { MARE(0), STALLION(0xffffff), ABOMONATION(0x888888); private int triggerValue; - PonyGender(int pixel) { + Gender(int pixel) { triggerValue = pixel; } diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Race.java b/src/common/java/com/minelittlepony/common/pony/meta/Race.java new file mode 100644 index 00000000..734ec0a1 --- /dev/null +++ b/src/common/java/com/minelittlepony/common/pony/meta/Race.java @@ -0,0 +1,107 @@ +package com.minelittlepony.common.pony.meta; + +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.common.settings.PonyLevel; + +import javax.annotation.Nonnull; + +public enum Race implements ITriggerPixelMapped { + + HUMAN(0, false, false), + EARTH(0xf9b131, false, false), + PEGASUS(0x88caf0, true, false), + UNICORN(0xd19fe4, false, true), + ALICORN(0xfef9fc, true, true), + CHANGELING(0x282b29, true, true), + ZEBRA(0xd0cccf, false, false), + REFORMED_CHANGELING(0xcaed5a, CHANGELING), + GRIFFIN(0xae9145, PEGASUS), + HIPPOGRIFF(0xd6ddac, PEGASUS), + BATPONY(0xeeeeee, true, false), + SEAPONY(0x3655dd, false, true); + + private boolean wings; + private boolean horn; + + private int triggerPixel; + + private final Race original; + + Race(int triggerPixel, boolean wings, boolean horn) { + this.triggerPixel = triggerPixel; + + this.wings = wings; + this.horn = horn; + + original = this; + } + + Race(int triggerPixel, Race cloneOf) { + cloneOf = cloneOf.getAlias(); + + this.triggerPixel = triggerPixel; + + this.wings = cloneOf.wings; + this.horn = cloneOf.horn; + + original = cloneOf; + } + + /** + * Returns true if this pony has a horn (and by extension can cast magic). + * @return + */ + public boolean hasHorn() { + return horn; + } + + /** + * Returns true if this pony has wings. If it has wings, it can fly, of course. + */ + public boolean hasWings() { + return wings; + } + + /** + * Returns true if this is a human. + */ + public boolean isHuman() { + return this == HUMAN; + } + + /** + * Gets the original race that this one is an alias for, if one exists. + * Otherwise returns this race. + */ + @Nonnull + public Race getAlias() { + return original; + } + + /** + * Returns true if this race is a virtual one. + */ + public boolean isVirtual() { + return getAlias() != this; + } + + /** + * Gets the actual race determined by the given pony level. + * PonyLevel.HUMANS would force all races to be humans. + * PonyLevel.BOTH is no change. + * PonyLevel.PONIES (should) return a pony if this is a human. Don't be fooled, though. It doesn't. + */ + public Race getEffectiveRace(boolean ignorePony) { + if (MineLittlePony.getInstance().getConfig().getEffectivePonyLevel(ignorePony) == PonyLevel.HUMANS) { + return HUMAN; + } + + return this; + } + + @Override + public int getTriggerPixel() { + return triggerPixel; + } +} diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Size.java b/src/common/java/com/minelittlepony/common/pony/meta/Size.java new file mode 100644 index 00000000..5dc82fd1 --- /dev/null +++ b/src/common/java/com/minelittlepony/common/pony/meta/Size.java @@ -0,0 +1,41 @@ +package com.minelittlepony.common.pony.meta; + +import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.common.pony.ITriggerPixelMapped; + +public enum Size implements ITriggerPixelMapped { + TALL(0x534b76, 0.45f, 1.1F), + BULKY(0xce3254, 0.5f, 1), + LANKY(0x3254ce, 0.45F, 0.85F), + NORMAL(0, 0.4f, 0.8F), + YEARLING(0x53beff, 0.4F, 0.6F), + FOAL(0xffbe53, 0.25f, 0.6F); + + private int triggerValue; + + private float shadowSize; + private float scale; + + Size(int pixel, float shadowSz, float scaleF) { + triggerValue = pixel; + shadowSize = shadowSz; + scale = scaleF; + } + + public float getShadowSize() { + return shadowSize * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); + } + + public float getScaleFactor() { + return scale * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); + } + + @Override + public int getTriggerPixel() { + return triggerValue; + } + + public Size getEffectiveSize() { + return MineLittlePony.getInstance().getConfig().sizes ? this : Size.NORMAL; + } +} diff --git a/src/common/java/com/minelittlepony/pony/data/TailLengths.java b/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java similarity index 56% rename from src/common/java/com/minelittlepony/pony/data/TailLengths.java rename to src/common/java/com/minelittlepony/common/pony/meta/TailLength.java index 4e71f467..87f95934 100644 --- a/src/common/java/com/minelittlepony/pony/data/TailLengths.java +++ b/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java @@ -1,6 +1,8 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony.meta; -public enum TailLengths implements ITriggerPixelMapped { +import com.minelittlepony.common.pony.ITriggerPixelMapped; + +public enum TailLength implements ITriggerPixelMapped { STUB(0x425844), QUARTER(0xd19fe4), @@ -10,7 +12,7 @@ public enum TailLengths implements ITriggerPixelMapped { private int triggerValue; - TailLengths(int pixel) { + TailLength(int pixel) { triggerValue = pixel; } diff --git a/src/common/java/com/minelittlepony/pony/data/TriggerPixels.java b/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java similarity index 88% rename from src/common/java/com/minelittlepony/pony/data/TriggerPixels.java rename to src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java index c277f982..5ee79956 100644 --- a/src/common/java/com/minelittlepony/pony/data/TriggerPixels.java +++ b/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java @@ -1,4 +1,6 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony.meta; + +import com.minelittlepony.common.pony.ITriggerPixelMapped; import java.awt.image.BufferedImage; @@ -8,12 +10,12 @@ import java.awt.image.BufferedImage; */ @SuppressWarnings("unchecked") public enum TriggerPixels { - RACE(PonyRace.HUMAN, Channel.ALL, 0, 0), - TAIL(TailLengths.FULL, Channel.ALL, 1, 0), - GENDER(PonyGender.MARE, Channel.ALL, 2, 0), - SIZE(PonySize.NORMAL, Channel.ALL, 3, 0), + RACE(Race.HUMAN, Channel.ALL, 0, 0), + TAIL(TailLength.FULL, Channel.ALL, 1, 0), + GENDER(Gender.MARE, Channel.ALL, 2, 0), + SIZE(Size.NORMAL, Channel.ALL, 3, 0), GLOW(null, Channel.RAW, 0, 1), - WEARABLES(PonyWearable.NONE, Channel.RAW, 1, 1); + WEARABLES(Wearable.NONE, Channel.RAW, 1, 1); private int x; private int y; diff --git a/src/common/java/com/minelittlepony/pony/data/PonyWearable.java b/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java similarity index 51% rename from src/common/java/com/minelittlepony/pony/data/PonyWearable.java rename to src/common/java/com/minelittlepony/common/pony/meta/Wearable.java index f2d2a419..33478f24 100644 --- a/src/common/java/com/minelittlepony/pony/data/PonyWearable.java +++ b/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java @@ -1,9 +1,11 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.pony.meta; + +import com.minelittlepony.common.pony.ITriggerPixelMapped; import java.util.ArrayList; import java.util.List; -public enum PonyWearable implements ITriggerPixelMapped { +public enum Wearable implements ITriggerPixelMapped { NONE(0), MUFFIN(50), HAT(100), @@ -13,7 +15,7 @@ public enum PonyWearable implements ITriggerPixelMapped { private int triggerValue; - PonyWearable(int pixel) { + Wearable(int pixel) { triggerValue = pixel; } @@ -22,12 +24,12 @@ public enum PonyWearable implements ITriggerPixelMapped { return triggerValue; } - public static PonyWearable[] flags(boolean[] flags) { - List wears = new ArrayList(); - PonyWearable[] values = values(); + public static Wearable[] flags(boolean[] flags) { + List wears = new ArrayList(); + Wearable[] values = values(); for (int i = 0; i < values.length; i++) { if (flags[i]) wears.add(values[i]); } - return wears.toArray(new PonyWearable[wears.size()]); + return wears.toArray(new Wearable[wears.size()]); } } diff --git a/src/common/java/com/minelittlepony/PonyConfig.java b/src/common/java/com/minelittlepony/common/settings/PonyConfig.java similarity index 95% rename from src/common/java/com/minelittlepony/PonyConfig.java rename to src/common/java/com/minelittlepony/common/settings/PonyConfig.java index d17f66be..d3999818 100644 --- a/src/common/java/com/minelittlepony/PonyConfig.java +++ b/src/common/java/com/minelittlepony/common/settings/PonyConfig.java @@ -1,11 +1,8 @@ -package com.minelittlepony; +package com.minelittlepony.common.settings; import net.minecraft.util.math.MathHelper; import com.google.gson.annotations.Expose; -import com.minelittlepony.pony.data.PonyLevel; -import com.minelittlepony.settings.SensibleConfig; - import com.voxelmodpack.hdskins.HDSkinManager; /** diff --git a/src/common/java/com/minelittlepony/pony/data/PonyLevel.java b/src/common/java/com/minelittlepony/common/settings/PonyLevel.java similarity index 86% rename from src/common/java/com/minelittlepony/pony/data/PonyLevel.java rename to src/common/java/com/minelittlepony/common/settings/PonyLevel.java index cf26cde3..117136bf 100644 --- a/src/common/java/com/minelittlepony/pony/data/PonyLevel.java +++ b/src/common/java/com/minelittlepony/common/settings/PonyLevel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.pony.data; +package com.minelittlepony.common.settings; public enum PonyLevel { PONIES, diff --git a/src/common/java/com/minelittlepony/settings/SensibleConfig.java b/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java similarity index 97% rename from src/common/java/com/minelittlepony/settings/SensibleConfig.java rename to src/common/java/com/minelittlepony/common/settings/SensibleConfig.java index c8bdb91f..4d175482 100644 --- a/src/common/java/com/minelittlepony/settings/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java @@ -1,4 +1,4 @@ -package com.minelittlepony.settings; +package com.minelittlepony.common.settings; import com.minelittlepony.gui.IGuiCallback; diff --git a/src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java similarity index 96% rename from src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java rename to src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java index 843fdc7c..6f8a9919 100644 --- a/src/common/java/com/minelittlepony/hdskins/gui/EntityPonyModel.java +++ b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.hdskins.gui; +package com.minelittlepony.hdskins.entity; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; diff --git a/src/common/java/com/minelittlepony/model/anim/package-info.java b/src/common/java/com/minelittlepony/model/anim/package-info.java deleted file mode 100644 index cfa76076..00000000 --- a/src/common/java/com/minelittlepony/model/anim/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.model.anim; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/armour/package-info.java b/src/common/java/com/minelittlepony/model/armour/package-info.java deleted file mode 100644 index ce1fed56..00000000 --- a/src/common/java/com/minelittlepony/model/armour/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.model.armour; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java index 96212bc8..a927eeb5 100644 --- a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java +++ b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java @@ -1,6 +1,6 @@ package com.minelittlepony.model.capabilities; -import com.minelittlepony.pony.data.IPonyData; +import com.minelittlepony.common.pony.IPonyData; public interface IModelWrapper { /** diff --git a/src/common/java/com/minelittlepony/pony/data/PonySize.java b/src/common/java/com/minelittlepony/pony/data/PonySize.java deleted file mode 100644 index 315b4c0e..00000000 --- a/src/common/java/com/minelittlepony/pony/data/PonySize.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.minelittlepony.pony.data; - -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.transform.PonyTransformation; - -public enum PonySize implements ITriggerPixelMapped { - TALL(0x534b76, 0.45f, 1.1F, PonyTransformation.TALL), - BULKY(0xce3254, 0.5f, 1, PonyTransformation.BULKY), - LANKY(0x3254ce, 0.45F, 0.85F, PonyTransformation.LANKY), - NORMAL(0, 0.4f, 0.8F, PonyTransformation.NORMAL), - YEARLING(0x53beff, 0.4F, 0.6F, PonyTransformation.YEARLING), - FOAL(0xffbe53, 0.25f, 0.6F, PonyTransformation.FOAL); - - private int triggerValue; - - private float shadowSize; - private float scale; - - private PonyTransformation transform; - - PonySize(int pixel, float shadowSz, float scaleF, PonyTransformation transformation) { - triggerValue = pixel; - shadowSize = shadowSz; - scale = scaleF; - transform = transformation; - } - - public float getShadowSize() { - return shadowSize * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); - } - - public float getScaleFactor() { - return scale * MineLittlePony.getInstance().getConfig().getGlobalScaleFactor(); - } - - public PonyTransformation getTranformation() { - return transform; - } - - @Override - public int getTriggerPixel() { - return triggerValue; - } - - public PonySize getEffectiveSize() { - return MineLittlePony.getInstance().getConfig().sizes ? this : PonySize.NORMAL; - } -} diff --git a/src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java b/src/common/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java similarity index 97% rename from src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java rename to src/common/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java index 2ee1d450..48874279 100644 --- a/src/common/java/com/minelittlepony/model/anim/BasicEasingInterpolator.java +++ b/src/common/java/com/minelittlepony/util/animation/BasicEasingInterpolator.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.anim; +package com.minelittlepony.util.animation; import com.minelittlepony.util.chron.ChronicCache; import com.minelittlepony.util.chron.Touchable; diff --git a/src/common/java/com/minelittlepony/model/anim/IInterpolator.java b/src/common/java/com/minelittlepony/util/animation/IInterpolator.java similarity index 92% rename from src/common/java/com/minelittlepony/model/anim/IInterpolator.java rename to src/common/java/com/minelittlepony/util/animation/IInterpolator.java index ad271b70..156da133 100644 --- a/src/common/java/com/minelittlepony/model/anim/IInterpolator.java +++ b/src/common/java/com/minelittlepony/util/animation/IInterpolator.java @@ -1,4 +1,4 @@ -package com.minelittlepony.model.anim; +package com.minelittlepony.util.animation; /** * Interpolator function for handling transitions between animation states. diff --git a/src/common/java/com/minelittlepony/util/animation/package-info.java b/src/common/java/com/minelittlepony/util/animation/package-info.java new file mode 100644 index 00000000..6251f69b --- /dev/null +++ b/src/common/java/com/minelittlepony/util/animation/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.util.animation; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java b/src/common/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java similarity index 92% rename from src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java rename to src/common/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java index bf8fc7e2..90f79c4e 100644 --- a/src/common/java/com/minelittlepony/util/render/FormattedTextureSupplier.java +++ b/src/common/java/com/minelittlepony/util/resources/FormattedTextureSupplier.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.util.resources; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/util/render/ITextureSupplier.java b/src/common/java/com/minelittlepony/util/resources/ITextureSupplier.java similarity index 88% rename from src/common/java/com/minelittlepony/util/render/ITextureSupplier.java rename to src/common/java/com/minelittlepony/util/resources/ITextureSupplier.java index 2e47649d..1a66a904 100644 --- a/src/common/java/com/minelittlepony/util/render/ITextureSupplier.java +++ b/src/common/java/com/minelittlepony/util/resources/ITextureSupplier.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.util.resources; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/util/render/IntStringMapper.java b/src/common/java/com/minelittlepony/util/resources/IntStringMapper.java similarity index 96% rename from src/common/java/com/minelittlepony/util/render/IntStringMapper.java rename to src/common/java/com/minelittlepony/util/resources/IntStringMapper.java index 5dcda33a..17303fa2 100644 --- a/src/common/java/com/minelittlepony/util/render/IntStringMapper.java +++ b/src/common/java/com/minelittlepony/util/resources/IntStringMapper.java @@ -1,4 +1,4 @@ -package com.minelittlepony.util.render; +package com.minelittlepony.util.resources; import com.google.common.collect.Maps; diff --git a/src/common/java/com/minelittlepony/transform/MotionCompositor.java b/src/common/java/com/minelittlepony/util/transform/MotionCompositor.java similarity index 97% rename from src/common/java/com/minelittlepony/transform/MotionCompositor.java rename to src/common/java/com/minelittlepony/util/transform/MotionCompositor.java index 3d29aeea..4c008a38 100644 --- a/src/common/java/com/minelittlepony/transform/MotionCompositor.java +++ b/src/common/java/com/minelittlepony/util/transform/MotionCompositor.java @@ -1,4 +1,4 @@ -package com.minelittlepony.transform; +package com.minelittlepony.util.transform; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.MathHelper; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java index fd442771..b27de299 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java @@ -45,7 +45,7 @@ public class RenderPlayerModel extends RenderLiving this.addLayer(this.getElytraLayer()); } - protected LayerRenderer getElytraLayer() { + protected LayerRenderer getElytraLayer() { final ModelElytra modelElytra = new ModelElytra(); return new LayerRenderer() { @Override From fa2c8b075b949ac75a9993ce0381816caf8c818e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Mar 2019 21:58:32 +0200 Subject: [PATCH 004/104] Move all the resources to the client sourceset --- .../resources/assets/minelittlepony/lang/de_de.lang | 0 .../resources/assets/minelittlepony/lang/en_us.lang | 0 .../resources/assets/minelittlepony/lang/fr_fr.lang | 0 .../resources/assets/minelittlepony/lang/ru_ru.lang | 0 .../textures/cubemap/quillsandsofas_0.png | Bin .../textures/cubemap/quillsandsofas_1.png | Bin .../textures/cubemap/quillsandsofas_2.png | Bin .../textures/cubemap/quillsandsofas_3.png | Bin .../textures/cubemap/quillsandsofas_4.png | Bin .../textures/cubemap/quillsandsofas_5.png | Bin .../textures/cubemap/sugarcubecorner_0.png | Bin .../textures/cubemap/sugarcubecorner_1.png | Bin .../textures/cubemap/sugarcubecorner_2.png | Bin .../textures/cubemap/sugarcubecorner_3.png | Bin .../textures/cubemap/sugarcubecorner_4.png | Bin .../textures/cubemap/sugarcubecorner_5.png | Bin .../textures/cubemap/sweetappleacres_0.png | Bin .../textures/cubemap/sweetappleacres_1.png | Bin .../textures/cubemap/sweetappleacres_2.png | Bin .../textures/cubemap/sweetappleacres_3.png | Bin .../textures/cubemap/sweetappleacres_4.png | Bin .../textures/cubemap/sweetappleacres_5.png | Bin .../minelittlepony/textures/entity/alex_pony.png | Bin .../textures/entity/enderman/enderman_pony.png | Bin .../textures/entity/enderman/enderman_pony_eyes.png | Bin .../textures/entity/illager/evoker_pony.png | Bin .../textures/entity/illager/illusionist_pony.png | Bin .../textures/entity/illager/vex_charging_pony.png | Bin .../textures/entity/illager/vex_pony.png | Bin .../textures/entity/illager/vindicator_pony.png | Bin .../textures/entity/pony/bgponies.json | 0 .../textures/entity/pony/the_dude.png | Bin .../minelittlepony/textures/entity/seapony.png | Bin .../textures/entity/skeleton/skeleton_pony.png | Bin .../entity/skeleton/skeleton_wither_pony.png | Bin .../textures/entity/skeleton/stray_pony.png | Bin .../textures/entity/skeleton/stray_pony_overlay.png | Bin .../minelittlepony/textures/entity/steve_pony.png | Bin .../textures/entity/villager/butcher_pony.png | Bin .../textures/entity/villager/farmer_pony.png | Bin .../textures/entity/villager/librarian_pony.png | Bin .../textures/entity/villager/priest_pony.png | Bin .../textures/entity/villager/silly_pony.png | Bin .../textures/entity/villager/smith_pony.png | Bin .../textures/entity/villager/tiny_silly_pony.png | Bin .../textures/entity/villager/villager_pony.png | Bin .../minelittlepony/textures/entity/witch_pony.png | Bin .../textures/entity/zombie/husk_pony.png | Bin .../textures/entity/zombie/zombie_pigman_pony.png | Bin .../textures/entity/zombie/zombie_pony.png | Bin .../entity/zombie_villager/zombie_butcher_pony.png | Bin .../entity/zombie_villager/zombie_farmer_pony.png | Bin .../zombie_villager/zombie_librarian_pony.png | Bin .../entity/zombie_villager/zombie_priest_pony.png | Bin .../entity/zombie_villager/zombie_silly_pony.png | Bin .../entity/zombie_villager/zombie_smith_pony.png | Bin .../zombie_villager/zombie_tiny_silly_pony.png | Bin .../entity/zombie_villager/zombie_villager_pony.png | Bin .../assets/minelittlepony/textures/mob/noskin.png | Bin .../minelittlepony/textures/mob/noskin_seapony.png | Bin .../minelittlepony/textures/models/antlers.png | Bin .../models/armor/chainmail_layer_inner_pony.png | Bin .../models/armor/chainmail_layer_outer_pony.png | Bin .../models/armor/diamond_layer_inner_pony.png | Bin .../models/armor/diamond_layer_outer_pony.png | Bin .../textures/models/armor/gold_layer_inner_pony.png | Bin .../textures/models/armor/gold_layer_outer_pony.png | Bin .../textures/models/armor/iron_layer_inner_pony.png | Bin .../textures/models/armor/iron_layer_outer_pony.png | Bin .../armor/leather_layer_inner_overlay_pony.png | Bin .../models/armor/leather_layer_inner_pony.png | Bin .../armor/leather_layer_outer_overlay_pony.png | Bin .../models/armor/leather_layer_outer_pony.png | Bin .../minelittlepony/textures/models/muffin.png | Bin .../minelittlepony/textures/models/stetson.png | Bin src/{main => client}/resources/litemod.json | 0 src/{main => client}/resources/minelp.mixin.json | 0 77 files changed, 0 insertions(+), 0 deletions(-) rename src/{main => client}/resources/assets/minelittlepony/lang/de_de.lang (100%) rename src/{main => client}/resources/assets/minelittlepony/lang/en_us.lang (100%) rename src/{main => client}/resources/assets/minelittlepony/lang/fr_fr.lang (100%) rename src/{main => client}/resources/assets/minelittlepony/lang/ru_ru.lang (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_0.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_1.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_2.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_3.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_4.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_5.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_0.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_1.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_2.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_3.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_4.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_5.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_0.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_1.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_2.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_3.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_4.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_5.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/alex_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony_eyes.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/illager/evoker_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/illager/illusionist_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/illager/vindicator_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/pony/bgponies.json (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/pony/the_dude.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/seapony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_wither_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony_overlay.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/steve_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/butcher_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/farmer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/librarian_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/priest_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/smith_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/villager/villager_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/witch_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie/husk_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie/zombie_pigman_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_silly_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_tiny_silly_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/mob/noskin.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/mob/noskin_seapony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/antlers.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_inner_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_outer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/diamond_layer_inner_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/diamond_layer_outer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/gold_layer_inner_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/gold_layer_outer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/iron_layer_inner_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/iron_layer_outer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_overlay_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_overlay_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_pony.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/muffin.png (100%) rename src/{main => client}/resources/assets/minelittlepony/textures/models/stetson.png (100%) rename src/{main => client}/resources/litemod.json (100%) rename src/{main => client}/resources/minelp.mixin.json (100%) diff --git a/src/main/resources/assets/minelittlepony/lang/de_de.lang b/src/client/resources/assets/minelittlepony/lang/de_de.lang similarity index 100% rename from src/main/resources/assets/minelittlepony/lang/de_de.lang rename to src/client/resources/assets/minelittlepony/lang/de_de.lang diff --git a/src/main/resources/assets/minelittlepony/lang/en_us.lang b/src/client/resources/assets/minelittlepony/lang/en_us.lang similarity index 100% rename from src/main/resources/assets/minelittlepony/lang/en_us.lang rename to src/client/resources/assets/minelittlepony/lang/en_us.lang diff --git a/src/main/resources/assets/minelittlepony/lang/fr_fr.lang b/src/client/resources/assets/minelittlepony/lang/fr_fr.lang similarity index 100% rename from src/main/resources/assets/minelittlepony/lang/fr_fr.lang rename to src/client/resources/assets/minelittlepony/lang/fr_fr.lang diff --git a/src/main/resources/assets/minelittlepony/lang/ru_ru.lang b/src/client/resources/assets/minelittlepony/lang/ru_ru.lang similarity index 100% rename from src/main/resources/assets/minelittlepony/lang/ru_ru.lang rename to src/client/resources/assets/minelittlepony/lang/ru_ru.lang diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_0.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_0.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_0.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_0.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_1.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_1.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_1.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_1.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_2.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_2.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_2.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_2.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_3.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_3.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_3.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_3.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_4.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_4.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_4.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_4.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_5.png b/src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_5.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_5.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/quillsandsofas_5.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_0.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_0.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_0.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_0.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_1.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_1.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_1.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_1.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_2.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_2.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_2.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_2.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_3.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_3.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_3.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_3.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_4.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_4.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_4.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_4.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_5.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_5.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_5.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sugarcubecorner_5.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_0.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_0.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_0.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_0.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_1.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_1.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_1.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_1.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_2.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_2.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_2.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_2.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_3.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_3.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_3.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_3.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_4.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_4.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_4.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_4.png diff --git a/src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_5.png b/src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_5.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_5.png rename to src/client/resources/assets/minelittlepony/textures/cubemap/sweetappleacres_5.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/alex_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/alex_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/alex_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/alex_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony_eyes.png b/src/client/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony_eyes.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony_eyes.png rename to src/client/resources/assets/minelittlepony/textures/entity/enderman/enderman_pony_eyes.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/evoker_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/illager/evoker_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/illager/evoker_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/illager/evoker_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/illusionist_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/illager/illusionist_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/illager/illusionist_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/illager/illusionist_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/vindicator_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/illager/vindicator_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/illager/vindicator_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/illager/vindicator_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json b/src/client/resources/assets/minelittlepony/textures/entity/pony/bgponies.json similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json rename to src/client/resources/assets/minelittlepony/textures/entity/pony/bgponies.json diff --git a/src/main/resources/assets/minelittlepony/textures/entity/pony/the_dude.png b/src/client/resources/assets/minelittlepony/textures/entity/pony/the_dude.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/pony/the_dude.png rename to src/client/resources/assets/minelittlepony/textures/entity/pony/the_dude.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/seapony.png b/src/client/resources/assets/minelittlepony/textures/entity/seapony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/seapony.png rename to src/client/resources/assets/minelittlepony/textures/entity/seapony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_wither_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_wither_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_wither_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/skeleton/skeleton_wither_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony_overlay.png b/src/client/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony_overlay.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony_overlay.png rename to src/client/resources/assets/minelittlepony/textures/entity/skeleton/stray_pony_overlay.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/steve_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/steve_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/steve_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/steve_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/butcher_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/butcher_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/butcher_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/butcher_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/farmer_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/farmer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/farmer_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/farmer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/librarian_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/librarian_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/librarian_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/librarian_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/priest_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/priest_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/priest_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/priest_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/silly_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/smith_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/smith_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/smith_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/smith_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/tiny_silly_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/villager/villager_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/villager/villager_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/villager/villager_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/villager/villager_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/witch_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/witch_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/witch_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/witch_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/husk_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie/husk_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/husk_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie/husk_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pigman_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie/zombie_pigman_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pigman_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie/zombie_pigman_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_butcher_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_farmer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_librarian_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_priest_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_silly_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_silly_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_silly_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_silly_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_smith_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_tiny_silly_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_tiny_silly_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_tiny_silly_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_tiny_silly_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png b/src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png rename to src/client/resources/assets/minelittlepony/textures/entity/zombie_villager/zombie_villager_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/mob/noskin.png b/src/client/resources/assets/minelittlepony/textures/mob/noskin.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/mob/noskin.png rename to src/client/resources/assets/minelittlepony/textures/mob/noskin.png diff --git a/src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png b/src/client/resources/assets/minelittlepony/textures/mob/noskin_seapony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/mob/noskin_seapony.png rename to src/client/resources/assets/minelittlepony/textures/mob/noskin_seapony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/antlers.png b/src/client/resources/assets/minelittlepony/textures/models/antlers.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/antlers.png rename to src/client/resources/assets/minelittlepony/textures/models/antlers.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_inner_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_inner_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_inner_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_inner_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_outer_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_outer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_outer_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/chainmail_layer_outer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/diamond_layer_inner_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/diamond_layer_inner_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/diamond_layer_inner_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/diamond_layer_inner_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/diamond_layer_outer_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/diamond_layer_outer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/diamond_layer_outer_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/diamond_layer_outer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/gold_layer_inner_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/gold_layer_inner_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/gold_layer_inner_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/gold_layer_inner_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/gold_layer_outer_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/gold_layer_outer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/gold_layer_outer_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/gold_layer_outer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/iron_layer_inner_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/iron_layer_inner_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/iron_layer_inner_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/iron_layer_inner_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/iron_layer_outer_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/iron_layer_outer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/iron_layer_outer_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/iron_layer_outer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_overlay_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_overlay_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_overlay_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_overlay_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_inner_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_overlay_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_overlay_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_overlay_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_overlay_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_pony.png b/src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_pony.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_pony.png rename to src/client/resources/assets/minelittlepony/textures/models/armor/leather_layer_outer_pony.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/muffin.png b/src/client/resources/assets/minelittlepony/textures/models/muffin.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/muffin.png rename to src/client/resources/assets/minelittlepony/textures/models/muffin.png diff --git a/src/main/resources/assets/minelittlepony/textures/models/stetson.png b/src/client/resources/assets/minelittlepony/textures/models/stetson.png similarity index 100% rename from src/main/resources/assets/minelittlepony/textures/models/stetson.png rename to src/client/resources/assets/minelittlepony/textures/models/stetson.png diff --git a/src/main/resources/litemod.json b/src/client/resources/litemod.json similarity index 100% rename from src/main/resources/litemod.json rename to src/client/resources/litemod.json diff --git a/src/main/resources/minelp.mixin.json b/src/client/resources/minelp.mixin.json similarity index 100% rename from src/main/resources/minelp.mixin.json rename to src/client/resources/minelp.mixin.json From 711a5c6ff3e8eb084b979462c2a44d95af310dcf Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Mar 2019 21:58:50 +0200 Subject: [PATCH 005/104] Move hdskins to the minelittlepony group --- .../client/LiteModMineLittlePony.java | 4 +-- .../minelittlepony/client/MineLPClient.java | 14 ++++---- .../client/PonyRenderManager.java | 4 +-- .../client/PonySkinModifier.java | 2 +- .../minelittlepony/client/PonySkinParser.java | 6 ++-- .../client/ducks/IRenderPony.java | 6 ++-- .../client/gui/GuiPonySettings.java | 16 ++++----- .../gui/hdskins}/GuiSkinsMineLP.java | 16 ++++----- .../gui/hdskins}/RenderPonyModel.java | 10 +++--- .../gui/hdskins}/package-info.java | 2 +- .../client/mixin/MixinDefaultPlayerSkin.java | 6 ++-- .../mixin/MixinThreadDownloadImageData.java | 2 +- .../client/model/AbstractPonyModel.java | 14 ++++---- .../client/model/IClientModel.java | 4 +-- .../client/model/ModelWrapper.java | 6 ++-- .../DefaultPonyArmorTextureResolver.java | 4 +-- .../client/model/armour/ModelPonyArmor.java | 4 +-- .../client/model/armour/PonyArmor.java | 6 ++-- .../client/model/components/BatWings.java | 2 +- .../client/model/components/BugWings.java | 2 +- .../client/model/components/ModelBatWing.java | 2 +- .../client/model/components/ModelBugWing.java | 2 +- .../model/components/ModelPonyHead.java | 4 +-- .../client/model/components/ModelWing.java | 6 ++-- .../client/model/components/PegasusWings.java | 8 ++--- .../client/model/components/PonyElytra.java | 2 +- .../client/model/components/PonySnout.java | 10 +++--- .../client/model/components/PonyTail.java | 4 +-- .../client/model/components/SeaponyTail.java | 4 +-- .../client/model/components/UnicornHorn.java | 6 ++-- .../client/model/entities/ModelBreezie.java | 2 +- .../client/model/entities/ModelSeapony.java | 6 ++-- .../model/entities/ModelVillagerPony.java | 2 +- .../client/model/entities/ModelWitchPony.java | 4 +-- .../client/model/gear/AbstractGear.java | 2 +- .../client/model/gear/ChristmasHat.java | 4 +-- .../client/model/gear/IGear.java | 4 +-- .../client/model/gear/Muffin.java | 4 +-- .../client/model/gear/SaddleBags.java | 6 ++-- .../client/model/gear/Stetson.java | 4 +-- .../client/model/gear/WitchHat.java | 4 +-- .../client/model/races/ModelAlicorn.java | 2 +- .../client/model/races/ModelBatpony.java | 2 +- .../client/model/races/ModelChangeling.java | 2 +- .../client/model/races/ModelPegasus.java | 2 +- .../client/model/races/ModelUnicorn.java | 2 +- .../client/model/races/ModelZebra.java | 4 +-- .../client/model/races/PlayerModels.java | 5 ++- .../com/minelittlepony/client/pony/Pony.java | 16 ++++----- .../minelittlepony/client/pony/PonyData.java | 14 ++++---- .../client/pony/PonyManager.java | 14 ++++---- .../render/DebugBoundingBoxRenderer.java | 2 +- .../client/render/FrustrumCheck.java | 2 +- .../client/render/LevitatingItemRenderer.java | 4 +-- .../client/render/RenderPony.java | 4 +-- .../client/render/RenderPonyMob.java | 6 ++-- .../client/render/entities/MobRenderers.java | 4 +-- .../VillagerProfessionTextureCache.java | 2 +- .../entities/player/RenderPonyPlayer.java | 4 +-- .../entities/player/RenderSeaponyPlayer.java | 2 +- .../render/layer/AbstractPonyLayer.java | 2 +- .../client/render/layer/LayerDJPon3Head.java | 2 +- .../layer/LayerEntityOnPonyShoulder.java | 2 +- .../client/render/layer/LayerGear.java | 2 +- .../render/layer/LayerHeldPonyItem.java | 2 +- .../layer/LayerHeldPonyItemMagical.java | 2 +- .../client/render/layer/LayerPonyArmor.java | 8 ++--- .../client/render/layer/LayerPonyCape.java | 4 +-- .../render/layer/LayerPonyCustomHead.java | 2 +- .../client/render/layer/LayerPonyElytra.java | 2 +- .../skull/PlayerSkullRenderer.java | 7 ++-- .../render/tileentities/skull/PonySkull.java | 2 +- .../tileentities/skull/PonySkullRenderer.java | 6 ++-- .../skull/SkeletonSkullRenderer.java | 2 +- .../skull/WitherSkullRenderer.java | 2 +- .../skull/ZombieSkullRenderer.java | 2 +- .../client/transform/PonyTransformation.java | 6 ++-- .../{common => }/MineLittlePony.java | 6 ++-- .../MissingRendererException.java | 2 +- .../common/{settings => }/SensibleConfig.java | 4 +-- .../common/model/armour/package-info.java | 7 ---- .../hdskins/entity/EntityPonyModel.java | 2 +- .../{common => }/model/BodyPart.java | 2 +- .../{common => }/model/ICapitated.java | 2 +- .../{common => }/model/IModel.java | 12 +++---- .../{common => }/model/IPart.java | 2 +- .../{common => }/model/IPegasus.java | 6 ++-- .../{common => }/model/IUnicorn.java | 2 +- .../model/PonyModelConstants.java | 2 +- .../model/armour/ArmourLayer.java | 2 +- .../{common => }/model/armour/IArmour.java | 4 +-- .../model/armour/IArmourTextureResolver.java | 2 +- .../model/armour/IEquestrianArmour.java | 2 +- .../model/armour}/package-info.java | 2 +- .../model/capabilities/IModelWrapper.java | 2 +- .../{common => }/pony/IPony.java | 6 ++-- .../{common => }/pony/IPonyData.java | 12 +++---- .../{common => }/pony/IPonyManager.java | 2 +- .../pony/ITriggerPixelMapped.java | 2 +- .../{common => }/pony/meta/Gender.java | 4 +-- .../{common => }/pony/meta/Race.java | 8 ++--- .../{common => }/pony/meta/Size.java | 6 ++-- .../{common => }/pony/meta/TailLength.java | 4 +-- .../{common => }/pony/meta/TriggerPixels.java | 4 +-- .../{common => }/pony/meta/Wearable.java | 4 +-- .../{common => }/settings/PonyConfig.java | 5 +-- .../{common => }/settings/PonyLevel.java | 2 +- .../{ => common}/gui/Button.java | 2 +- .../{ => common}/gui/Checkbox.java | 2 +- .../{ => common}/gui/GameGui.java | 2 +- .../{ => common}/gui/IGuiAction.java | 2 +- .../{ => common}/gui/IGuiCallback.java | 2 +- .../{ => common}/gui/IGuiTooltipped.java | 2 +- .../{ => common}/gui/IStyleFactory.java | 2 +- .../{ => common}/gui/IconicButton.java | 2 +- .../{ => common}/gui/IconicToggle.java | 4 +-- .../{ => common}/gui/Label.java | 2 +- .../{ => common}/gui/SettingsPanel.java | 2 +- .../{ => common}/gui/Slider.java | 2 +- .../{ => common}/gui/Style.java | 2 +- .../hdskins/HDSkinManager.java | 31 +++++++++-------- .../hdskins/ISkinCacheClearListener.java | 2 +- .../hdskins/ISkinModifier.java | 2 +- .../hdskins/ISkinParser.java | 2 +- .../hdskins/LiteModHDSkins.java | 14 ++++---- .../hdskins/SkinChooser.java | 10 +++--- .../hdskins/SkinUploader.java | 16 ++++----- .../hdskins/VanillaModels.java | 2 +- .../hdskins/ducks/INetworkPlayerInfo.java | 2 +- .../hdskins/gui/CubeMap.java | 2 +- .../hdskins/gui/DummyWorld.java | 2 +- .../hdskins/gui/EntityPlayerModel.java | 8 ++--- .../hdskins/gui/Feature.java | 2 +- .../hdskins/gui/GuiSkins.java | 34 +++++++++---------- .../hdskins/gui/HDSkinsConfigPanel.java | 10 +++--- .../hdskins/gui/RenderPlayerModel.java | 2 +- .../hdskins/gui}/package-info.java | 2 +- .../hdskins/mixin/MixinGuiMainMenu.java | 6 ++-- .../mixin/MixinImageBufferDownload.java | 5 +-- .../hdskins/mixin/MixinMinecraft.java | 4 +-- .../hdskins/mixin/MixinNetworkPlayerInfo.java | 7 ++-- .../hdskins/mixin/MixinSkullRenderer.java | 5 +-- .../hdskins/mixin}/package-info.java | 2 +- .../hdskins/package-info.java | 2 +- .../hdskins/resources/AsyncCacheLoader.java | 2 +- .../hdskins/resources/ImageLoader.java | 8 ++--- .../hdskins/resources/LocalTexture.java | 6 ++-- .../hdskins/resources/PreviewTexture.java | 4 +-- .../resources/PreviewTextureManager.java | 6 ++-- .../hdskins/resources/SkinData.java | 2 +- .../resources/SkinResourceManager.java | 2 +- .../hdskins/resources/TextureLoader.java | 2 +- .../hdskins/resources/package-info.java | 2 +- .../texture/DynamicTextureImage.java | 2 +- .../resources/texture/IBufferedTexture.java | 2 +- .../texture/ISkinAvailableCallback.java | 2 +- .../texture/ImageBufferDownloadHD.java | 4 +-- .../texture/ThreadDownloadImageETag.java | 5 +-- .../hdskins/server/BethlehemSkinServer.java | 10 +++--- .../hdskins/server/LegacySkinServer.java | 17 +++++----- .../hdskins/server/ServerType.java | 2 +- .../hdskins/server/SkinServer.java | 9 ++--- .../hdskins/server/SkinServerSerializer.java | 4 +-- .../hdskins/server/SkinUpload.java | 2 +- .../hdskins/server/SkinUploadResponse.java | 2 +- .../hdskins/server/ValhallaSkinServer.java | 11 +++--- .../hdskins/server/package-info.java | 7 ++++ .../hdskins/upload/FileDropListener.java | 2 +- .../hdskins/upload/FileDropper.java | 2 +- .../hdskins/upload/GLWindow.java | 2 +- .../hdskins/upload/IFileCallback.java | 2 +- .../hdskins/upload/IFileDialog.java | 2 +- .../hdskins/upload/InternalDialog.java | 2 +- .../hdskins/upload/ThreadOpenFile.java | 5 +-- .../hdskins/upload/ThreadOpenFilePNG.java | 2 +- .../hdskins/upload/ThreadSaveFile.java | 2 +- .../hdskins/upload/ThreadSaveFilePNG.java | 2 +- .../hdskins/upload/package-info.java | 7 ++++ .../hdskins/util/CallableFutures.java | 2 +- .../hdskins/util/Edge.java | 2 +- .../hdskins/util/IndentedToStringStyle.java | 2 +- .../hdskins/util/MoreHttpResponses.java | 4 +-- .../hdskins/util/MoreStreams.java | 2 +- .../hdskins/util/NetClient.java | 5 +-- .../hdskins/util/PlayerUtil.java | 2 +- .../hdskins/util/ProfileTextureUtil.java | 2 +- .../hdskins/util/TexturesPayloadBuilder.java | 2 +- .../hdskins/upload/package-info.java | 7 ---- 188 files changed, 438 insertions(+), 427 deletions(-) rename src/client/java/com/minelittlepony/{hdskins/client/gui => client/gui/hdskins}/GuiSkinsMineLP.java (87%) rename src/client/java/com/minelittlepony/{hdskins/client/gui => client/gui/hdskins}/RenderPonyModel.java (94%) rename src/client/java/com/minelittlepony/{hdskins/client/gui => client/gui/hdskins}/package-info.java (77%) rename src/common/java/com/minelittlepony/{common => }/MineLittlePony.java (87%) rename src/common/java/com/minelittlepony/{common => }/MissingRendererException.java (88%) rename src/common/java/com/minelittlepony/common/{settings => }/SensibleConfig.java (94%) delete mode 100644 src/common/java/com/minelittlepony/common/model/armour/package-info.java rename src/common/java/com/minelittlepony/{common => }/model/BodyPart.java (67%) rename src/common/java/com/minelittlepony/{common => }/model/ICapitated.java (90%) rename src/common/java/com/minelittlepony/{common => }/model/IModel.java (89%) rename src/common/java/com/minelittlepony/{common => }/model/IPart.java (94%) rename src/common/java/com/minelittlepony/{common => }/model/IPegasus.java (78%) rename src/common/java/com/minelittlepony/{common => }/model/IUnicorn.java (93%) rename src/common/java/com/minelittlepony/{common => }/model/PonyModelConstants.java (97%) rename src/common/java/com/minelittlepony/{common => }/model/armour/ArmourLayer.java (81%) rename src/common/java/com/minelittlepony/{common => }/model/armour/IArmour.java (96%) rename src/common/java/com/minelittlepony/{common => }/model/armour/IArmourTextureResolver.java (91%) rename src/common/java/com/minelittlepony/{common => }/model/armour/IEquestrianArmour.java (84%) rename src/{hdskins/java/com/voxelmodpack/hdskins/server => common/java/com/minelittlepony/model/armour}/package-info.java (79%) rename src/common/java/com/minelittlepony/{common => }/pony/IPony.java (96%) rename src/common/java/com/minelittlepony/{common => }/pony/IPonyData.java (76%) rename src/common/java/com/minelittlepony/{common => }/pony/IPonyManager.java (98%) rename src/common/java/com/minelittlepony/{common => }/pony/ITriggerPixelMapped.java (95%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/Gender.java (81%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/Race.java (92%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/Size.java (86%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/TailLength.java (77%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/TriggerPixels.java (96%) rename src/common/java/com/minelittlepony/{common => }/pony/meta/Wearable.java (87%) rename src/common/java/com/minelittlepony/{common => }/settings/PonyConfig.java (94%) rename src/common/java/com/minelittlepony/{common => }/settings/PonyLevel.java (86%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/Button.java (97%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/Checkbox.java (97%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/GameGui.java (98%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IGuiAction.java (88%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IGuiCallback.java (88%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IGuiTooltipped.java (96%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IStyleFactory.java (66%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IconicButton.java (95%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/IconicToggle.java (93%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/Label.java (96%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/SettingsPanel.java (98%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/Slider.java (96%) rename src/hdskins/java/com/minelittlepony/{ => common}/gui/Style.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/HDSkinManager.java (93%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/ISkinCacheClearListener.java (73%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/ISkinModifier.java (83%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/ISkinParser.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/LiteModHDSkins.java (89%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/SkinChooser.java (92%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/SkinUploader.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/VanillaModels.java (93%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/ducks/INetworkPlayerInfo.java (62%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/CubeMap.java (99%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/DummyWorld.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/EntityPlayerModel.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/Feature.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/GuiSkins.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/HDSkinsConfigPanel.java (74%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/gui/RenderPlayerModel.java (99%) rename src/hdskins/java/com/{voxelmodpack/hdskins/mixin => minelittlepony/hdskins/gui}/package-info.java (80%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/mixin/MixinGuiMainMenu.java (84%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/mixin/MixinImageBufferDownload.java (92%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/mixin/MixinMinecraft.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/mixin/MixinNetworkPlayerInfo.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/mixin/MixinSkullRenderer.java (93%) rename src/hdskins/java/com/{voxelmodpack/hdskins/gui => minelittlepony/hdskins/mixin}/package-info.java (79%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/package-info.java (81%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/AsyncCacheLoader.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/ImageLoader.java (91%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/LocalTexture.java (94%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/PreviewTexture.java (91%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/PreviewTextureManager.java (88%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/SkinData.java (89%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/SkinResourceManager.java (98%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/TextureLoader.java (91%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/package-info.java (77%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/texture/DynamicTextureImage.java (91%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/texture/IBufferedTexture.java (75%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/texture/ISkinAvailableCallback.java (83%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/texture/ImageBufferDownloadHD.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/resources/texture/ThreadDownloadImageETag.java (98%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/BethlehemSkinServer.java (92%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/LegacySkinServer.java (94%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/ServerType.java (90%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/SkinServer.java (94%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/SkinServerSerializer.java (93%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/SkinUpload.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/SkinUploadResponse.java (91%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/server/ValhallaSkinServer.java (96%) create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/FileDropListener.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/FileDropper.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/GLWindow.java (99%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/IFileCallback.java (75%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/IFileDialog.java (61%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/InternalDialog.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/ThreadOpenFile.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/ThreadOpenFilePNG.java (95%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/ThreadSaveFile.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/upload/ThreadSaveFilePNG.java (95%) create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/CallableFutures.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/Edge.java (93%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/IndentedToStringStyle.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/MoreHttpResponses.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/MoreStreams.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/NetClient.java (96%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/PlayerUtil.java (94%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/ProfileTextureUtil.java (97%) rename src/hdskins/java/com/{voxelmodpack => minelittlepony}/hdskins/util/TexturesPayloadBuilder.java (97%) delete mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java diff --git a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java index 66566c2a..bcb54573 100644 --- a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java +++ b/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java @@ -1,8 +1,8 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.Tickable; diff --git a/src/client/java/com/minelittlepony/client/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java index 8b04218f..98cccef9 100644 --- a/src/client/java/com/minelittlepony/client/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -1,17 +1,17 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; +import com.minelittlepony.client.gui.hdskins.GuiSkinsMineLP; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.pony.PonyDataSerialiser; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.hdskins.client.gui.GuiSkinsMineLP; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.server.LegacySkinServer; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.server.LegacySkinServer; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.ValhallaSkinServer; +import com.minelittlepony.settings.PonyConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/client/java/com/minelittlepony/client/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java index 47d9ce2a..49f0e4f0 100644 --- a/src/client/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -4,14 +4,14 @@ import java.util.Map; import com.google.common.collect.Maps; import com.minelittlepony.client.ducks.IRenderPony; +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.common.settings.PonyConfig; -import com.minelittlepony.hdskins.client.gui.RenderPonyModel; import com.minelittlepony.hdskins.entity.EntityPonyModel; +import com.minelittlepony.settings.PonyConfig; import com.mumfrey.liteloader.util.ModUtilities; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/PonySkinModifier.java b/src/client/java/com/minelittlepony/client/PonySkinModifier.java index f14d58ce..ce98efa8 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinModifier.java +++ b/src/client/java/com/minelittlepony/client/PonySkinModifier.java @@ -1,6 +1,6 @@ package com.minelittlepony.client; -import com.voxelmodpack.hdskins.ISkinModifier; +import com.minelittlepony.hdskins.ISkinModifier; import java.awt.Graphics; import java.awt.Image; diff --git a/src/client/java/com/minelittlepony/client/PonySkinParser.java b/src/client/java/com/minelittlepony/client/PonySkinParser.java index 1e8cda09..b9fd0536 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinParser.java +++ b/src/client/java/com/minelittlepony/client/PonySkinParser.java @@ -1,11 +1,11 @@ package com.minelittlepony.client; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.model.races.PlayerModels; -import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.hdskins.ISkinParser; +import com.minelittlepony.hdskins.VanillaModels; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.voxelmodpack.hdskins.ISkinParser; -import com.voxelmodpack.hdskins.VanillaModels; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java index 7cd64eb3..0b79ddf6 100644 --- a/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java +++ b/src/client/java/com/minelittlepony/client/ducks/IRenderPony.java @@ -3,9 +3,9 @@ package com.minelittlepony.client.ducks; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.RenderPony; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.entity.EntityLivingBase; diff --git a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java index 5334e1f9..1222242c 100644 --- a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.gui; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; -import com.minelittlepony.common.settings.PonyConfig.PonySettings; -import com.minelittlepony.gui.Checkbox; -import com.minelittlepony.gui.Label; -import com.minelittlepony.gui.SettingsPanel; -import com.minelittlepony.gui.Slider; +import com.minelittlepony.common.gui.Checkbox; +import com.minelittlepony.common.gui.Label; +import com.minelittlepony.common.gui.SettingsPanel; +import com.minelittlepony.common.gui.Slider; +import com.minelittlepony.settings.PonyConfig; +import com.minelittlepony.settings.PonyLevel; +import com.minelittlepony.settings.PonyConfig.PonySettings; /** * In-Game options menu. diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java similarity index 87% rename from src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java index 040c19ac..e5613af5 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -1,16 +1,16 @@ -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.gui.IconicToggle; -import com.minelittlepony.gui.Style; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.common.gui.IconicToggle; +import com.minelittlepony.common.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; +import com.minelittlepony.pony.IPonyManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.GuiSkins; -import com.voxelmodpack.hdskins.server.SkinServer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java similarity index 94% rename from src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java index d4418d1b..ba992239 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/RenderPonyModel.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java @@ -1,5 +1,6 @@ -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.races.PlayerModels; @@ -7,12 +8,11 @@ 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.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.meta.Race; import com.minelittlepony.hdskins.entity.EntityPonyModel; +import com.minelittlepony.hdskins.gui.RenderPlayerModel; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.meta.Race; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.RenderPlayerModel; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelElytra; diff --git a/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java b/src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java similarity index 77% rename from src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java rename to src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java index 3e29ba42..6d929f54 100644 --- a/src/client/java/com/minelittlepony/hdskins/client/gui/package-info.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.minelittlepony.hdskins.client.gui; +package com.minelittlepony.client.gui.hdskins; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index 68a195d9..d7da649b 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.mixin; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.model.races.PlayerModels; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.pony.IPonyManager; +import com.minelittlepony.settings.PonyLevel; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java index 86d0a178..37b11984 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.ThreadDownloadImageData; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture; +import com.minelittlepony.hdskins.resources.texture.IBufferedTexture; import java.awt.image.BufferedImage; diff --git a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java index 0a6d22e9..6bd63628 100644 --- a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -9,13 +9,13 @@ import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.client.util.render.AbstractRenderer; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPart; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPart; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Size; import com.minelittlepony.util.math.MathUtil; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/IClientModel.java b/src/client/java/com/minelittlepony/client/model/IClientModel.java index 2f696cb9..a844f68a 100644 --- a/src/client/java/com/minelittlepony/client/model/IClientModel.java +++ b/src/client/java/com/minelittlepony/client/model/IClientModel.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.model; import net.minecraft.client.model.ModelRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.model.IModel; public interface IClientModel extends IModel, ICapitated { diff --git a/src/client/java/com/minelittlepony/client/model/ModelWrapper.java b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java index 07b22853..8a9ab0aa 100644 --- a/src/client/java/com/minelittlepony/client/model/ModelWrapper.java +++ b/src/client/java/com/minelittlepony/client/model/ModelWrapper.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.model; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.model.capabilities.IModelWrapper; +import com.minelittlepony.pony.IPonyData; /** * Container class for the various models and their associated piece of armour. diff --git a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java index dbb5f752..6fec91f8 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java @@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; import com.minelittlepony.client.ForgeProxy; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IArmourTextureResolver; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java index b920bed0..e9fdb9dc 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java @@ -5,8 +5,8 @@ import net.minecraft.entity.Entity; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IModel; -import com.minelittlepony.common.model.armour.IArmour; +import com.minelittlepony.model.IModel; +import com.minelittlepony.model.armour.IArmour; public class ModelPonyArmor extends AbstractPonyModel implements IArmour { diff --git a/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java index 23bf380c..e0669358 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/PonyArmor.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.model.armour; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPonyData; public class PonyArmor implements IEquestrianArmour { diff --git a/src/client/java/com/minelittlepony/client/model/components/BatWings.java b/src/client/java/com/minelittlepony/client/model/components/BatWings.java index e62565e0..f6f7a221 100644 --- a/src/client/java/com/minelittlepony/client/model/components/BatWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BatWings.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.model.components; import net.minecraft.client.renderer.GlStateManager; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/components/BugWings.java b/src/client/java/com/minelittlepony/client/model/components/BugWings.java index 55fa6c1f..3076e8f8 100644 --- a/src/client/java/com/minelittlepony/client/model/components/BugWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BugWings.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class BugWings extends PegasusWings { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java index 9cfc40c9..912dae62 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBatWing.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class ModelBatWing extends ModelWing { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java index 695cf5ed..41d8da96 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelBugWing.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; public class ModelBugWing extends ModelWing { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java index 92a1e9de..d36c1e41 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java @@ -2,8 +2,8 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.pony.IPonyData; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java index 84d3d344..f465a1f5 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java @@ -2,9 +2,9 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.model.PonyModelConstants; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.model.PonyModelConstants; +import com.minelittlepony.pony.meta.Wearable; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java index a984efee..b7a40a25 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/PegasusWings.java @@ -3,13 +3,13 @@ package com.minelittlepony.client.model.components; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IPart; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.IPart; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; public class PegasusWings implements IPart { diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java index 2d7fc889..a4e6a7eb 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.Vec3d; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; /** * Modified from ModelElytra. diff --git a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java index c98371de..4caa6c7f 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java @@ -1,14 +1,14 @@ package com.minelittlepony.client.model.components; -import static com.minelittlepony.common.model.PonyModelConstants.*; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.pony.meta.Gender; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.pony.meta.Gender; + +import static com.minelittlepony.model.PonyModelConstants.*; public class PonySnout { diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java index 50afe4e9..2ab3057c 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java @@ -5,11 +5,11 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; public class PonyTail extends PlaneRenderer implements IPart { diff --git a/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java index e2098b82..44878ca6 100644 --- a/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/SeaponyTail.java @@ -4,11 +4,11 @@ import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.math.MathHelper; diff --git a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java index cc6bfc83..20599373 100644 --- a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java +++ b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java @@ -2,12 +2,12 @@ package com.minelittlepony.client.model.components; import com.minelittlepony.client.util.render.GlowRenderer; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.ICapitated; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.ICapitated; +import com.minelittlepony.model.IPart; import java.util.UUID; -import static com.minelittlepony.common.model.PonyModelConstants.*; +import static com.minelittlepony.model.PonyModelConstants.*; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java index cd331b48..8b665de6 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java @@ -8,7 +8,7 @@ import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.util.render.PonyRenderer; -import static com.minelittlepony.common.model.PonyModelConstants.PI; +import static com.minelittlepony.model.PonyModelConstants.PI; public class ModelBreezie extends ModelBiped { diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java index 4583d574..9376d877 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java @@ -6,9 +6,9 @@ import com.minelittlepony.client.model.components.SeaponyTail; import com.minelittlepony.client.model.races.ModelUnicorn; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java index 7a81d2ec..d0a9b75f 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java @@ -7,7 +7,7 @@ import net.minecraft.entity.passive.EntityVillager; import com.minelittlepony.client.model.ModelMobPony; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelVillagerPony extends ModelMobPony { diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java index 409ddb39..c06f4ec0 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java @@ -6,8 +6,8 @@ import net.minecraft.entity.monster.EntityWitch; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.races.ModelZebra; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.meta.Wearable; public class ModelWitchPony extends ModelZebra { diff --git a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java index 7f6a3a3a..4d12823a 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java @@ -9,7 +9,7 @@ import net.minecraft.entity.Entity; import org.lwjgl.opengl.GL11; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.PonyModelConstants; +import com.minelittlepony.model.PonyModelConstants; public abstract class AbstractGear extends ModelBase implements IGear, PonyModelConstants { diff --git a/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java index 5ccd8fa4..41e1eb08 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/ChristmasHat.java @@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.Color; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.Calendar; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/IGear.java b/src/client/java/com/minelittlepony/client/model/gear/IGear.java index 3e77c8a8..6da7757c 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/IGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/IGear.java @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPart; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPart; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/model/gear/Muffin.java b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java index 24eb0bb1..c4143f79 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/Muffin.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Muffin.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java index 91a368fe..fc726f2f 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java +++ b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java @@ -2,9 +2,9 @@ package com.minelittlepony.client.model.gear; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IPegasus; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IPegasus; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/Stetson.java b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java index 22d22934..cecb665c 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/Stetson.java +++ b/src/client/java/com/minelittlepony/client/model/gear/Stetson.java @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.client.util.render.plane.PlaneRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java index b1450d65..31cd1479 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java +++ b/src/client/java/com/minelittlepony/client/model/gear/WitchHat.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.pony.meta.Wearable; import java.util.UUID; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java index e73d0d77..596f41b8 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelAlicorn.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.PegasusWings; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java index 749125ec..d2bd7cb3 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelBatpony.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.BatWings; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelBatpony extends ModelPegasus { diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java index cdbefb9a..c477c89d 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelChangeling.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.model.races; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.components.BugWings; -import com.minelittlepony.common.pony.meta.Wearable; +import com.minelittlepony.pony.meta.Wearable; public class ModelChangeling extends ModelAlicorn { diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java index 981ac926..fbd25102 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelPegasus.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.PegasusWings; -import com.minelittlepony.common.model.IPegasus; +import com.minelittlepony.model.IPegasus; import net.minecraft.entity.Entity; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java index f5116f63..1cba3bff 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelUnicorn.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model.races; import com.minelittlepony.client.model.components.UnicornHorn; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IUnicorn; +import com.minelittlepony.model.IUnicorn; import net.minecraft.entity.Entity; import net.minecraft.util.EnumHandSide; diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java index 5bc05671..3c18b44b 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.GlStateManager; import com.minelittlepony.client.model.armour.ModelPonyArmor; import com.minelittlepony.client.model.armour.PonyArmor; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; public class ModelZebra extends ModelEarthPony { diff --git a/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java index 6a0e805a..d8cef749 100644 --- a/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java +++ b/src/client/java/com/minelittlepony/client/model/races/PlayerModels.java @@ -6,12 +6,11 @@ import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.entities.ModelSeapony; import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; import com.minelittlepony.client.render.entities.player.RenderSeaponyPlayer; -import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.hdskins.VanillaModels; +import com.minelittlepony.pony.meta.Race; import net.minecraft.client.renderer.entity.RenderManager; -import com.voxelmodpack.hdskins.VanillaModels; - import java.util.Map; public enum PlayerModels { diff --git a/src/client/java/com/minelittlepony/client/pony/Pony.java b/src/client/java/com/minelittlepony/client/pony/Pony.java index d019a056..ef7a1683 100644 --- a/src/client/java/com/minelittlepony/client/pony/Pony.java +++ b/src/client/java/com/minelittlepony/client/pony/Pony.java @@ -1,18 +1,18 @@ package com.minelittlepony.client.pony; import com.google.common.base.MoreObjects; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.transform.PonyTransformation; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.IBufferedTexture; +import com.minelittlepony.hdskins.util.ProfileTextureUtil; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; import com.minelittlepony.util.chron.Touchable; -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.IBufferedTexture; -import com.voxelmodpack.hdskins.util.ProfileTextureUtil; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/pony/PonyData.java b/src/client/java/com/minelittlepony/client/pony/PonyData.java index ea2bbc86..a2d29c70 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyData.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyData.java @@ -3,13 +3,13 @@ package com.minelittlepony.client.pony; import net.minecraft.client.resources.data.IMetadataSection; import com.google.common.base.MoreObjects; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Gender; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; -import com.minelittlepony.common.pony.meta.TailLength; -import com.minelittlepony.common.pony.meta.TriggerPixels; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Gender; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.TailLength; +import com.minelittlepony.pony.meta.TriggerPixels; +import com.minelittlepony.pony.meta.Wearable; import com.minelittlepony.util.animation.BasicEasingInterpolator; import com.minelittlepony.util.animation.IInterpolator; diff --git a/src/client/java/com/minelittlepony/client/pony/PonyManager.java b/src/client/java/com/minelittlepony/client/pony/PonyManager.java index 56a1948c..bce90c4a 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyManager.java @@ -3,15 +3,15 @@ package com.minelittlepony.client.pony; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.MineLittlePony; +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; +import com.minelittlepony.settings.PonyLevel; import com.minelittlepony.util.chron.ChronicCache; import com.minelittlepony.util.math.MathUtil; -import com.voxelmodpack.hdskins.ISkinCacheClearListener; -import com.voxelmodpack.hdskins.util.MoreStreams; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java index 68a84c9b..cccbeb5d 100644 --- a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java index 5e0eda87..bfb8e8f0 100644 --- a/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java +++ b/src/client/java/com/minelittlepony/client/render/FrustrumCheck.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; public class FrustrumCheck implements ICamera { diff --git a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index bd8027ea..bd0ea2c7 100644 --- a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -2,11 +2,11 @@ package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.client.util.render.Color; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.mumfrey.liteloader.client.overlays.IMinecraft; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/render/RenderPony.java b/src/client/java/com/minelittlepony/client/render/RenderPony.java index 5bab850d..3cc464f4 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPony.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPony.java @@ -1,12 +1,12 @@ package com.minelittlepony.client.render; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.transform.PonyPosture; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java index cb80ab0f..e660cfa2 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java @@ -1,5 +1,6 @@ package com.minelittlepony.client.render; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.layer.LayerGear; @@ -8,9 +9,8 @@ import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.pony.IPony; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.culling.ICamera; diff --git a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java index dea67d51..f4630712 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.render.entities; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.settings.SensibleConfig.Setting; +import com.minelittlepony.common.SensibleConfig.Setting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java index fd308f57..bbd5b6a8 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java +++ b/src/client/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.render.entities; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -import com.minelittlepony.common.MineLittlePony; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.util.resources.ITextureSupplier; import java.io.IOException; diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java index dc5e89ad..6241f54e 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java @@ -1,5 +1,6 @@ package com.minelittlepony.client.render.entities.player; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.DebugBoundingBoxRenderer; @@ -12,8 +13,7 @@ import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyCape; import com.minelittlepony.client.render.layer.LayerPonyCustomHead; import com.minelittlepony.client.render.layer.LayerPonyElytra; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import net.minecraft.block.BlockBed; import net.minecraft.client.Minecraft; diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java index 9caa7fc6..b7d64563 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entities.player; import com.minelittlepony.client.model.ModelWrapper; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java index b16964ba..d65685ae 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java +++ b/src/client/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.IModel; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java index 894c820a..411f4027 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; import com.minelittlepony.client.model.components.ModelDeadMau5Ears; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; public class LayerDJPon3Head extends AbstractPonyLayer { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java index 13491767..798cdac4 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java @@ -10,7 +10,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import javax.annotation.Nullable; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java index c85276f0..8417e02e 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java @@ -18,7 +18,7 @@ import com.minelittlepony.client.model.gear.Muffin; import com.minelittlepony.client.model.gear.SaddleBags; import com.minelittlepony.client.model.gear.Stetson; import com.minelittlepony.client.model.gear.WitchHat; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import java.util.HashMap; import java.util.List; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java index 4343ee53..14462e65 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.IClientModel; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java index 3c8e4856..c2fa9bcb 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.util.render.PonyRenderer; -import com.minelittlepony.common.model.IUnicorn; +import com.minelittlepony.model.IUnicorn; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java index e1d722db..9f5f5d12 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java @@ -4,10 +4,10 @@ import com.minelittlepony.client.ForgeProxy; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.armour.DefaultPonyArmorTextureResolver; import com.minelittlepony.client.util.render.Color; -import com.minelittlepony.common.model.armour.ArmourLayer; -import com.minelittlepony.common.model.armour.IArmour; -import com.minelittlepony.common.model.armour.IArmourTextureResolver; -import com.minelittlepony.common.model.armour.IEquestrianArmour; +import com.minelittlepony.model.armour.ArmourLayer; +import com.minelittlepony.model.armour.IArmour; +import com.minelittlepony.model.armour.IArmourTextureResolver; +import com.minelittlepony.model.armour.IEquestrianArmour; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java index bc985cb6..20164c9a 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.AbstractPonyModel; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderLivingBase; @@ -12,7 +12,7 @@ import net.minecraft.util.math.MathHelper; import javax.annotation.Nonnull; -import static com.minelittlepony.common.model.PonyModelConstants.PI; +import static com.minelittlepony.model.PonyModelConstants.PI; import static net.minecraft.client.renderer.GlStateManager.*; public class LayerPonyCape extends AbstractPonyLayer { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java index c21543e2..18be4670 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java @@ -12,7 +12,7 @@ import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java index 520537ad..8d0f0446 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.layer; import com.minelittlepony.client.model.components.PonyElytra; -import com.minelittlepony.common.model.BodyPart; +import com.minelittlepony.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java index 1378f3aa..b9a94c97 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java @@ -3,11 +3,12 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.model.components.ModelDeadMau5Ears; import com.minelittlepony.client.pony.Pony; import com.minelittlepony.client.render.RenderPony; -import com.minelittlepony.common.settings.PonyConfig; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.settings.PonyConfig; +import com.minelittlepony.settings.PonyLevel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.voxelmodpack.hdskins.HDSkinManager; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.DefaultPlayerSkin; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java index 314412aa..e767abf2 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import com.minelittlepony.client.model.components.ModelPonyHead; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull; -import com.minelittlepony.common.pony.IPony; +import com.minelittlepony.pony.IPony; public abstract class PonySkull implements ISkull { diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 4a61d0bb..0179a2d8 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -1,9 +1,9 @@ package com.minelittlepony.client.render.tileentities.skull; +import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.ducks.IRenderItem; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.IPony; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.pony.IPony; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java index 39e493c0..90274fa2 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonySkeleton; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java index 6fc2ab14..330892d9 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonySkeleton; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java index 25c14599..95116790 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.client.render.entities.RenderPonyZombie; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java index 5eadaa63..372ece64 100644 --- a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java +++ b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -6,9 +6,9 @@ import static net.minecraft.client.renderer.GlStateManager.translate; import net.minecraft.util.math.Vec3d; import com.google.common.collect.Maps; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.IModel; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.IModel; +import com.minelittlepony.pony.meta.Size; import java.util.Map; diff --git a/src/common/java/com/minelittlepony/common/MineLittlePony.java b/src/common/java/com/minelittlepony/MineLittlePony.java similarity index 87% rename from src/common/java/com/minelittlepony/common/MineLittlePony.java rename to src/common/java/com/minelittlepony/MineLittlePony.java index c9d893d6..1e58f5eb 100644 --- a/src/common/java/com/minelittlepony/common/MineLittlePony.java +++ b/src/common/java/com/minelittlepony/MineLittlePony.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common; +package com.minelittlepony; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.minelittlepony.common.pony.IPonyManager; -import com.minelittlepony.common.settings.PonyConfig; +import com.minelittlepony.pony.IPonyManager; +import com.minelittlepony.settings.PonyConfig; public abstract class MineLittlePony { diff --git a/src/common/java/com/minelittlepony/common/MissingRendererException.java b/src/common/java/com/minelittlepony/MissingRendererException.java similarity index 88% rename from src/common/java/com/minelittlepony/common/MissingRendererException.java rename to src/common/java/com/minelittlepony/MissingRendererException.java index 8081ca66..4ae09414 100644 --- a/src/common/java/com/minelittlepony/common/MissingRendererException.java +++ b/src/common/java/com/minelittlepony/MissingRendererException.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common; +package com.minelittlepony; public class MissingRendererException extends RuntimeException { private static final long serialVersionUID = -6059469512902628663L; diff --git a/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java b/src/common/java/com/minelittlepony/common/SensibleConfig.java similarity index 94% rename from src/common/java/com/minelittlepony/common/settings/SensibleConfig.java rename to src/common/java/com/minelittlepony/common/SensibleConfig.java index 4d175482..b9d35b51 100644 --- a/src/common/java/com/minelittlepony/common/settings/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/common/SensibleConfig.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.common; -import com.minelittlepony.gui.IGuiCallback; +import com.minelittlepony.common.gui.IGuiCallback; /** * A sensible config container that actually lets us programmatically index values by a key. diff --git a/src/common/java/com/minelittlepony/common/model/armour/package-info.java b/src/common/java/com/minelittlepony/common/model/armour/package-info.java deleted file mode 100644 index 9aea6ba1..00000000 --- a/src/common/java/com/minelittlepony/common/model/armour/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.minelittlepony.common.model.armour; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java index 6f8a9919..023e1903 100644 --- a/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java +++ b/src/common/java/com/minelittlepony/hdskins/entity/EntityPonyModel.java @@ -1,8 +1,8 @@ package com.minelittlepony.hdskins.entity; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/common/model/BodyPart.java b/src/common/java/com/minelittlepony/model/BodyPart.java similarity index 67% rename from src/common/java/com/minelittlepony/common/model/BodyPart.java rename to src/common/java/com/minelittlepony/model/BodyPart.java index a6003f74..12a7bdfe 100644 --- a/src/common/java/com/minelittlepony/common/model/BodyPart.java +++ b/src/common/java/com/minelittlepony/model/BodyPart.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; public enum BodyPart { HEAD, diff --git a/src/common/java/com/minelittlepony/common/model/ICapitated.java b/src/common/java/com/minelittlepony/model/ICapitated.java similarity index 90% rename from src/common/java/com/minelittlepony/common/model/ICapitated.java rename to src/common/java/com/minelittlepony/model/ICapitated.java index 272a4dfa..3b607e6c 100644 --- a/src/common/java/com/minelittlepony/common/model/ICapitated.java +++ b/src/common/java/com/minelittlepony/model/ICapitated.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import javax.annotation.Nullable; diff --git a/src/common/java/com/minelittlepony/common/model/IModel.java b/src/common/java/com/minelittlepony/model/IModel.java similarity index 89% rename from src/common/java/com/minelittlepony/common/model/IModel.java rename to src/common/java/com/minelittlepony/model/IModel.java index 1bb1e984..319ed481 100644 --- a/src/common/java/com/minelittlepony/common/model/IModel.java +++ b/src/common/java/com/minelittlepony/model/IModel.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; -import com.minelittlepony.common.model.BodyPart; -import com.minelittlepony.common.model.armour.IEquestrianArmour; -import com.minelittlepony.common.pony.IPonyData; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; +import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.IEquestrianArmour; +import com.minelittlepony.pony.IPonyData; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.Wearable; public interface IModel { diff --git a/src/common/java/com/minelittlepony/common/model/IPart.java b/src/common/java/com/minelittlepony/model/IPart.java similarity index 94% rename from src/common/java/com/minelittlepony/common/model/IPart.java rename to src/common/java/com/minelittlepony/model/IPart.java index a6ea504b..ff61ef9e 100644 --- a/src/common/java/com/minelittlepony/common/model/IPart.java +++ b/src/common/java/com/minelittlepony/model/IPart.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import java.util.UUID; diff --git a/src/common/java/com/minelittlepony/common/model/IPegasus.java b/src/common/java/com/minelittlepony/model/IPegasus.java similarity index 78% rename from src/common/java/com/minelittlepony/common/model/IPegasus.java rename to src/common/java/com/minelittlepony/model/IPegasus.java index a0b24015..2329662f 100644 --- a/src/common/java/com/minelittlepony/common/model/IPegasus.java +++ b/src/common/java/com/minelittlepony/model/IPegasus.java @@ -1,9 +1,9 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import net.minecraft.util.math.MathHelper; -import static com.minelittlepony.common.model.PonyModelConstants.ROTATE_270; -import static com.minelittlepony.common.model.PonyModelConstants.WING_ROT_Z_SNEAK; +import static com.minelittlepony.model.PonyModelConstants.ROTATE_270; +import static com.minelittlepony.model.PonyModelConstants.WING_ROT_Z_SNEAK; public interface IPegasus extends IModel { diff --git a/src/common/java/com/minelittlepony/common/model/IUnicorn.java b/src/common/java/com/minelittlepony/model/IUnicorn.java similarity index 93% rename from src/common/java/com/minelittlepony/common/model/IUnicorn.java rename to src/common/java/com/minelittlepony/model/IUnicorn.java index 74692b3b..bbeefb3a 100644 --- a/src/common/java/com/minelittlepony/common/model/IUnicorn.java +++ b/src/common/java/com/minelittlepony/model/IUnicorn.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; import net.minecraft.util.EnumHandSide; diff --git a/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java b/src/common/java/com/minelittlepony/model/PonyModelConstants.java similarity index 97% rename from src/common/java/com/minelittlepony/common/model/PonyModelConstants.java rename to src/common/java/com/minelittlepony/model/PonyModelConstants.java index 804dcf15..ce620e7d 100644 --- a/src/common/java/com/minelittlepony/common/model/PonyModelConstants.java +++ b/src/common/java/com/minelittlepony/model/PonyModelConstants.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model; +package com.minelittlepony.model; public interface PonyModelConstants { diff --git a/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java similarity index 81% rename from src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java rename to src/common/java/com/minelittlepony/model/armour/ArmourLayer.java index 3d55980c..c12457d4 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/ArmourLayer.java +++ b/src/common/java/com/minelittlepony/model/armour/ArmourLayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; /** * The layer used to render a given armour piece. diff --git a/src/common/java/com/minelittlepony/common/model/armour/IArmour.java b/src/common/java/com/minelittlepony/model/armour/IArmour.java similarity index 96% rename from src/common/java/com/minelittlepony/common/model/armour/IArmour.java rename to src/common/java/com/minelittlepony/model/armour/IArmour.java index 95f78586..51bb5492 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IArmour.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmour.java @@ -1,8 +1,8 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import net.minecraft.inventory.EntityEquipmentSlot; -import com.minelittlepony.common.model.IModel; +import com.minelittlepony.model.IModel; public interface IArmour { /** diff --git a/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java similarity index 91% rename from src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java rename to src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java index 46263470..800a1be9 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IArmourTextureResolver.java +++ b/src/common/java/com/minelittlepony/model/armour/IArmourTextureResolver.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java similarity index 84% rename from src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java rename to src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java index a8d771f8..f15fd821 100644 --- a/src/common/java/com/minelittlepony/common/model/armour/IEquestrianArmour.java +++ b/src/common/java/com/minelittlepony/model/armour/IEquestrianArmour.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.model.armour; +package com.minelittlepony.model.armour; import com.minelittlepony.model.capabilities.IModelWrapper; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java b/src/common/java/com/minelittlepony/model/armour/package-info.java similarity index 79% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java rename to src/common/java/com/minelittlepony/model/armour/package-info.java index 997d41b5..ce1fed56 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/package-info.java +++ b/src/common/java/com/minelittlepony/model/armour/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.model.armour; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java index a927eeb5..7de7ba93 100644 --- a/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java +++ b/src/common/java/com/minelittlepony/model/capabilities/IModelWrapper.java @@ -1,6 +1,6 @@ package com.minelittlepony.model.capabilities; -import com.minelittlepony.common.pony.IPonyData; +import com.minelittlepony.pony.IPonyData; public interface IModelWrapper { /** diff --git a/src/common/java/com/minelittlepony/common/pony/IPony.java b/src/common/java/com/minelittlepony/pony/IPony.java similarity index 96% rename from src/common/java/com/minelittlepony/common/pony/IPony.java rename to src/common/java/com/minelittlepony/pony/IPony.java index 19bf163d..d588d6cd 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPony.java +++ b/src/common/java/com/minelittlepony/pony/IPony.java @@ -1,12 +1,12 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.meta.Race; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.meta.Race; public interface IPony { diff --git a/src/common/java/com/minelittlepony/common/pony/IPonyData.java b/src/common/java/com/minelittlepony/pony/IPonyData.java similarity index 76% rename from src/common/java/com/minelittlepony/common/pony/IPonyData.java rename to src/common/java/com/minelittlepony/pony/IPonyData.java index 69e8b288..c532fde4 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPonyData.java +++ b/src/common/java/com/minelittlepony/pony/IPonyData.java @@ -1,10 +1,10 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; -import com.minelittlepony.common.pony.meta.Gender; -import com.minelittlepony.common.pony.meta.Race; -import com.minelittlepony.common.pony.meta.Wearable; -import com.minelittlepony.common.pony.meta.Size; -import com.minelittlepony.common.pony.meta.TailLength; +import com.minelittlepony.pony.meta.Gender; +import com.minelittlepony.pony.meta.Race; +import com.minelittlepony.pony.meta.Size; +import com.minelittlepony.pony.meta.TailLength; +import com.minelittlepony.pony.meta.Wearable; import com.minelittlepony.util.animation.IInterpolator; import java.util.UUID; diff --git a/src/common/java/com/minelittlepony/common/pony/IPonyManager.java b/src/common/java/com/minelittlepony/pony/IPonyManager.java similarity index 98% rename from src/common/java/com/minelittlepony/common/pony/IPonyManager.java rename to src/common/java/com/minelittlepony/pony/IPonyManager.java index 57db4402..51258f1f 100644 --- a/src/common/java/com/minelittlepony/common/pony/IPonyManager.java +++ b/src/common/java/com/minelittlepony/pony/IPonyManager.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java b/src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java similarity index 95% rename from src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java rename to src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java index 73df1965..8249dce9 100644 --- a/src/common/java/com/minelittlepony/common/pony/ITriggerPixelMapped.java +++ b/src/common/java/com/minelittlepony/pony/ITriggerPixelMapped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.pony; +package com.minelittlepony.pony; /** * Interface for enums that can be parsed from an image trigger pixel value. diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Gender.java b/src/common/java/com/minelittlepony/pony/meta/Gender.java similarity index 81% rename from src/common/java/com/minelittlepony/common/pony/meta/Gender.java rename to src/common/java/com/minelittlepony/pony/meta/Gender.java index 624dad67..3faac243 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Gender.java +++ b/src/common/java/com/minelittlepony/pony/meta/Gender.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum Gender implements ITriggerPixelMapped { MARE(0), diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Race.java b/src/common/java/com/minelittlepony/pony/meta/Race.java similarity index 92% rename from src/common/java/com/minelittlepony/common/pony/meta/Race.java rename to src/common/java/com/minelittlepony/pony/meta/Race.java index 734ec0a1..f8ee6271 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Race.java +++ b/src/common/java/com/minelittlepony/pony/meta/Race.java @@ -1,8 +1,8 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.ITriggerPixelMapped; -import com.minelittlepony.common.settings.PonyLevel; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.ITriggerPixelMapped; +import com.minelittlepony.settings.PonyLevel; import javax.annotation.Nonnull; diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Size.java b/src/common/java/com/minelittlepony/pony/meta/Size.java similarity index 86% rename from src/common/java/com/minelittlepony/common/pony/meta/Size.java rename to src/common/java/com/minelittlepony/pony/meta/Size.java index 5dc82fd1..89441a53 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Size.java +++ b/src/common/java/com/minelittlepony/pony/meta/Size.java @@ -1,7 +1,7 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.MineLittlePony; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.MineLittlePony; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum Size implements ITriggerPixelMapped { TALL(0x534b76, 0.45f, 1.1F), diff --git a/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java b/src/common/java/com/minelittlepony/pony/meta/TailLength.java similarity index 77% rename from src/common/java/com/minelittlepony/common/pony/meta/TailLength.java rename to src/common/java/com/minelittlepony/pony/meta/TailLength.java index 87f95934..49cbce2b 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/TailLength.java +++ b/src/common/java/com/minelittlepony/pony/meta/TailLength.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; public enum TailLength implements ITriggerPixelMapped { diff --git a/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java b/src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java similarity index 96% rename from src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java rename to src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java index 5ee79956..0790ccd5 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/TriggerPixels.java +++ b/src/common/java/com/minelittlepony/pony/meta/TriggerPixels.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; import java.awt.image.BufferedImage; diff --git a/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java b/src/common/java/com/minelittlepony/pony/meta/Wearable.java similarity index 87% rename from src/common/java/com/minelittlepony/common/pony/meta/Wearable.java rename to src/common/java/com/minelittlepony/pony/meta/Wearable.java index 33478f24..b6cbaffe 100644 --- a/src/common/java/com/minelittlepony/common/pony/meta/Wearable.java +++ b/src/common/java/com/minelittlepony/pony/meta/Wearable.java @@ -1,6 +1,6 @@ -package com.minelittlepony.common.pony.meta; +package com.minelittlepony.pony.meta; -import com.minelittlepony.common.pony.ITriggerPixelMapped; +import com.minelittlepony.pony.ITriggerPixelMapped; import java.util.ArrayList; import java.util.List; diff --git a/src/common/java/com/minelittlepony/common/settings/PonyConfig.java b/src/common/java/com/minelittlepony/settings/PonyConfig.java similarity index 94% rename from src/common/java/com/minelittlepony/common/settings/PonyConfig.java rename to src/common/java/com/minelittlepony/settings/PonyConfig.java index d3999818..8ec7ffb1 100644 --- a/src/common/java/com/minelittlepony/common/settings/PonyConfig.java +++ b/src/common/java/com/minelittlepony/settings/PonyConfig.java @@ -1,9 +1,10 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.settings; import net.minecraft.util.math.MathHelper; import com.google.gson.annotations.Expose; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.common.SensibleConfig; +import com.minelittlepony.hdskins.HDSkinManager; /** * Storage container for MineLP client settings. diff --git a/src/common/java/com/minelittlepony/common/settings/PonyLevel.java b/src/common/java/com/minelittlepony/settings/PonyLevel.java similarity index 86% rename from src/common/java/com/minelittlepony/common/settings/PonyLevel.java rename to src/common/java/com/minelittlepony/settings/PonyLevel.java index 117136bf..ace30eb2 100644 --- a/src/common/java/com/minelittlepony/common/settings/PonyLevel.java +++ b/src/common/java/com/minelittlepony/settings/PonyLevel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.settings; +package com.minelittlepony.settings; public enum PonyLevel { PONIES, diff --git a/src/hdskins/java/com/minelittlepony/gui/Button.java b/src/hdskins/java/com/minelittlepony/common/gui/Button.java similarity index 97% rename from src/hdskins/java/com/minelittlepony/gui/Button.java rename to src/hdskins/java/com/minelittlepony/common/gui/Button.java index bd30d290..bbfa577f 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Button.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Button.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import java.util.List; diff --git a/src/hdskins/java/com/minelittlepony/gui/Checkbox.java b/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java similarity index 97% rename from src/hdskins/java/com/minelittlepony/gui/Checkbox.java rename to src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java index 76325a64..f00dcb40 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Checkbox.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import com.mumfrey.liteloader.client.gui.GuiCheckbox; diff --git a/src/hdskins/java/com/minelittlepony/gui/GameGui.java b/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java similarity index 98% rename from src/hdskins/java/com/minelittlepony/gui/GameGui.java rename to src/hdskins/java/com/minelittlepony/common/gui/GameGui.java index 562526ee..d8510578 100644 --- a/src/hdskins/java/com/minelittlepony/gui/GameGui.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import org.apache.commons.lang3.text.WordUtils; diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiAction.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java similarity index 88% rename from src/hdskins/java/com/minelittlepony/gui/IGuiAction.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java index 3aa0ae2a..249067aa 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiAction.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; /** * Response actions for UI events. diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java similarity index 88% rename from src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java index 69da7620..57918bd3 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; /** * Response actions for UI events. diff --git a/src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java b/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java rename to src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java index 32fba593..a6a059ff 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java b/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java similarity index 66% rename from src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java rename to src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java index 58611cb4..452ded55 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IStyleFactory.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; @FunctionalInterface public interface IStyleFactory { diff --git a/src/hdskins/java/com/minelittlepony/gui/IconicButton.java b/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java similarity index 95% rename from src/hdskins/java/com/minelittlepony/gui/IconicButton.java rename to src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java index 711b3b56..d2c686b2 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IconicButton.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/hdskins/java/com/minelittlepony/gui/IconicToggle.java b/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java similarity index 93% rename from src/hdskins/java/com/minelittlepony/gui/IconicToggle.java rename to src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java index a246c38e..ce7a2bf8 100644 --- a/src/hdskins/java/com/minelittlepony/gui/IconicToggle.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java @@ -1,6 +1,6 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; -import com.voxelmodpack.hdskins.util.MoreStreams; +import com.minelittlepony.hdskins.util.MoreStreams; public class IconicToggle extends IconicButton { diff --git a/src/hdskins/java/com/minelittlepony/gui/Label.java b/src/hdskins/java/com/minelittlepony/common/gui/Label.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Label.java rename to src/hdskins/java/com/minelittlepony/common/gui/Label.java index a136cd93..565080be 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Label.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Label.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java b/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java similarity index 98% rename from src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java rename to src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java index 7a6a1590..9ed7156c 100644 --- a/src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import java.io.IOException; diff --git a/src/hdskins/java/com/minelittlepony/gui/Slider.java b/src/hdskins/java/com/minelittlepony/common/gui/Slider.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Slider.java rename to src/hdskins/java/com/minelittlepony/common/gui/Slider.java index d5436400..73a7886d 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Slider.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Slider.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.gui.GuiSlider; import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; diff --git a/src/hdskins/java/com/minelittlepony/gui/Style.java b/src/hdskins/java/com/minelittlepony/common/gui/Style.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/gui/Style.java rename to src/hdskins/java/com/minelittlepony/common/gui/Style.java index 3920077c..ce75f261 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Style.java +++ b/src/hdskins/java/com/minelittlepony/common/gui/Style.java @@ -1,4 +1,4 @@ -package com.minelittlepony.gui; +package com.minelittlepony.common.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java index b21b8e8c..d5f268ad 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/HDSkinManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder; @@ -11,6 +11,20 @@ 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.hdskins.ducks.INetworkPlayerInfo; +import com.minelittlepony.hdskins.gui.GuiSkins; +import com.minelittlepony.hdskins.resources.SkinResourceManager; +import com.minelittlepony.hdskins.resources.TextureLoader; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; +import com.minelittlepony.hdskins.server.BethlehemSkinServer; +import com.minelittlepony.hdskins.server.LegacySkinServer; +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; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; @@ -18,20 +32,7 @@ import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.util.log.LiteLoaderLogger; -import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo; -import com.voxelmodpack.hdskins.gui.GuiSkins; -import com.voxelmodpack.hdskins.resources.SkinResourceManager; -import com.voxelmodpack.hdskins.resources.TextureLoader; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; -import com.voxelmodpack.hdskins.server.BethlehemSkinServer; -import com.voxelmodpack.hdskins.server.LegacySkinServer; -import com.voxelmodpack.hdskins.server.ServerType; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.ValhallaSkinServer; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.MoreStreams; -import com.voxelmodpack.hdskins.util.PlayerUtil; -import com.voxelmodpack.hdskins.util.ProfileTextureUtil; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java similarity index 73% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java index d1a21d0f..f8f2f36d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinCacheClearListener.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinCacheClearListener.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; @FunctionalInterface public interface ISkinCacheClearListener { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java similarity index 83% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java index a29d1d4b..e534ee94 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinModifier.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinModifier.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java b/src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java rename to src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java index d75bb198..06825979 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ISkinParser.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ISkinParser.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java rename to src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java index 43a63b0d..00f4490a 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/LiteModHDSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java @@ -1,7 +1,13 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.HDSkinsConfigPanel; +import com.minelittlepony.hdskins.gui.RenderPlayerModel; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinServerSerializer; +import com.minelittlepony.hdskins.upload.GLWindow; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.ViewportListener; @@ -11,12 +17,6 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel; import com.mumfrey.liteloader.modconfig.ConfigStrategy; import com.mumfrey.liteloader.modconfig.ExposableOptions; import com.mumfrey.liteloader.util.ModUtilities; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.HDSkinsConfigPanel; -import com.voxelmodpack.hdskins.gui.RenderPlayerModel; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.SkinServerSerializer; -import com.voxelmodpack.hdskins.upload.GLWindow; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java b/src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java rename to src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java index 4bcabb16..db3ce94f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/SkinChooser.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; -import com.voxelmodpack.hdskins.upload.IFileDialog; -import com.voxelmodpack.hdskins.upload.ThreadOpenFilePNG; -import com.voxelmodpack.hdskins.upload.ThreadSaveFilePNG; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.upload.IFileDialog; +import com.minelittlepony.hdskins.upload.ThreadOpenFilePNG; +import com.minelittlepony.hdskins.upload.ThreadSaveFilePNG; +import com.minelittlepony.hdskins.util.MoreHttpResponses; import net.minecraft.client.Minecraft; import org.apache.commons.io.FileUtils; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java rename to src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java index 9fa67f10..86655c41 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; @@ -8,19 +8,19 @@ import net.minecraft.util.ResourceLocation; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.resources.PreviewTextureManager; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinUpload; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.exceptions.AuthenticationUnavailableException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mumfrey.liteloader.util.log.LiteLoaderLogger; -import com.voxelmodpack.hdskins.gui.EntityPlayerModel; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.resources.PreviewTextureManager; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.server.SkinUpload; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; import java.io.Closeable; import java.io.File; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java b/src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java rename to src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java index 3595381a..289701cb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/VanillaModels.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/VanillaModels.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; public class VanillaModels { public static final String SLIM = "slim"; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java b/src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java similarity index 62% rename from src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java rename to src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java index 2a4365f8..c314b290 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ducks/INetworkPlayerInfo.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/ducks/INetworkPlayerInfo.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.ducks; +package com.minelittlepony.hdskins.ducks; public interface INetworkPlayerInfo { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java index ecfd9e02..28bb9f26 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/CubeMap.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/CubeMap.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import static net.minecraft.client.renderer.GlStateManager.color; import static net.minecraft.client.renderer.GlStateManager.colorMask; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java index cb31c298..031629d5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/DummyWorld.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/DummyWorld.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java index 59c08af9..431ce670 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/EntityPlayerModel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/EntityPlayerModel.java @@ -1,12 +1,12 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import com.minelittlepony.hdskins.SkinUploader; +import com.minelittlepony.hdskins.resources.LocalTexture; +import com.minelittlepony.hdskins.resources.LocalTexture.IBlankSkinSupplier; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.SkinUploader; -import com.voxelmodpack.hdskins.resources.LocalTexture; -import com.voxelmodpack.hdskins.resources.LocalTexture.IBlankSkinSupplier; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.SkinManager; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java index 0f77d1ab..4a4ce0e0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/Feature.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/Feature.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; /** * Represents the possible features that a skin server can implement. diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java index b58ca283..728b97a8 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java @@ -1,24 +1,24 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import com.google.common.base.Splitter; -import com.minelittlepony.gui.Button; -import com.minelittlepony.gui.GameGui; -import com.minelittlepony.gui.IGuiAction; -import com.minelittlepony.gui.IconicButton; -import com.minelittlepony.gui.IconicToggle; -import com.minelittlepony.gui.Label; -import com.minelittlepony.gui.Style; +import com.minelittlepony.common.gui.Button; +import com.minelittlepony.common.gui.GameGui; +import com.minelittlepony.common.gui.IGuiAction; +import com.minelittlepony.common.gui.IconicButton; +import com.minelittlepony.common.gui.IconicToggle; +import com.minelittlepony.common.gui.Label; +import com.minelittlepony.common.gui.Style; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.SkinChooser; +import com.minelittlepony.hdskins.SkinUploader; +import com.minelittlepony.hdskins.VanillaModels; +import com.minelittlepony.hdskins.SkinUploader.ISkinUploadHandler; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.upload.GLWindow; +import com.minelittlepony.hdskins.util.CallableFutures; +import com.minelittlepony.hdskins.util.Edge; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.SkinChooser; -import com.voxelmodpack.hdskins.SkinUploader; -import com.voxelmodpack.hdskins.SkinUploader.ISkinUploadHandler; -import com.voxelmodpack.hdskins.VanillaModels; -import com.voxelmodpack.hdskins.server.SkinServer; -import com.voxelmodpack.hdskins.upload.GLWindow; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.Edge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java similarity index 74% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java index 7844d53a..5e128ed6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; -import com.minelittlepony.gui.Checkbox; -import com.minelittlepony.gui.SettingsPanel; -import com.voxelmodpack.hdskins.LiteModHDSkins; -import com.voxelmodpack.hdskins.upload.GLWindow; +import com.minelittlepony.common.gui.Checkbox; +import com.minelittlepony.common.gui.SettingsPanel; +import com.minelittlepony.hdskins.LiteModHDSkins; +import com.minelittlepony.hdskins.upload.GLWindow; public class HDSkinsConfigPanel extends SettingsPanel { @Override diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java index b27de299..4ca1b1e7 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/RenderPlayerModel.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.gui; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java similarity index 80% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java index e502527b..be234747 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.gui; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java similarity index 84% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java index bbd6b6fb..47461256 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiMainMenu.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java @@ -1,7 +1,7 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; -import com.minelittlepony.gui.IconicButton; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.common.gui.IconicButton; +import com.minelittlepony.hdskins.HDSkinManager; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java index 58be43b9..47985127 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinImageBufferDownload.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinImageBufferDownload.java @@ -1,6 +1,5 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; -import com.voxelmodpack.hdskins.HDSkinManager; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ImageBufferDownload; import org.spongepowered.asm.mixin.Mixin; @@ -8,6 +7,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.minelittlepony.hdskins.HDSkinManager; + import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java index d85e905a..32750614 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinMinecraft.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinMinecraft.java @@ -1,11 +1,11 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.voxelmodpack.hdskins.upload.GLWindow; +import com.minelittlepony.hdskins.upload.GLWindow; import net.minecraft.client.Minecraft; import net.minecraft.crash.CrashReport; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java index a2452b3c..376ec613 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinNetworkPlayerInfo.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinNetworkPlayerInfo.java @@ -1,10 +1,11 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.ducks.INetworkPlayerInfo; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.ducks.INetworkPlayerInfo; + import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java index 45938558..eaa933ba 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinSkullRenderer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinSkullRenderer.java @@ -1,8 +1,9 @@ -package com.voxelmodpack.hdskins.mixin; +package com.minelittlepony.hdskins.mixin; +import com.minelittlepony.hdskins.HDSkinManager; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; + import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntitySkull; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java similarity index 79% rename from src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java index 60837fe6..6039acff 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.gui; +package com.minelittlepony.hdskins.mixin; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/package-info.java similarity index 81% rename from src/hdskins/java/com/voxelmodpack/hdskins/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/package-info.java index 4e927d8f..2793f2ee 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins; +package com.minelittlepony.hdskins; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java index 92770458..5fc2520a 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/AsyncCacheLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/AsyncCacheLoader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.cache.CacheLoader; import com.google.common.util.concurrent.ListenableFuture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java index f2ed6f67..b007b067 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/ImageLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/ImageLoader.java @@ -1,12 +1,12 @@ -package com.voxelmodpack.hdskins.resources; - -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.util.ResourceLocation; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; + import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java index 2d6c855b..ea4ddce5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/LocalTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/LocalTexture.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; +import com.minelittlepony.hdskins.resources.texture.DynamicTextureImage; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.resources.texture.DynamicTextureImage; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java index dd25aa9a..7f4c78b7 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTexture.java @@ -1,10 +1,10 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraft.util.ResourceLocation; -import com.voxelmodpack.hdskins.VanillaModels; +import com.minelittlepony.hdskins.VanillaModels; import javax.annotation.Nullable; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java similarity index 88% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java index b4e8500f..af3ff4df 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/PreviewTextureManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/PreviewTextureManager.java @@ -1,10 +1,10 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.collect.Maps; +import com.minelittlepony.hdskins.resources.texture.ISkinAvailableCallback; +import com.minelittlepony.hdskins.resources.texture.ImageBufferDownloadHD; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; -import com.voxelmodpack.hdskins.resources.texture.ISkinAvailableCallback; -import com.voxelmodpack.hdskins.resources.texture.ImageBufferDownloadHD; import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java similarity index 89% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java index 348ed2cc..d32100b0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinData.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinData.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.util.ResourceLocation; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java index d894617f..b72a94dd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/SkinResourceManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import com.google.common.collect.Maps; import com.google.gson.Gson; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java index 82877c3b..07c16dbd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/TextureLoader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/TextureLoader.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.ITextureObject; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java similarity index 77% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java index a8901f0a..3bd7a16b 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/package-info.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/package-info.java @@ -1,6 +1,6 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.resources; +package com.minelittlepony.hdskins.resources; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java index f076acee..1a9e5809 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/DynamicTextureImage.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/DynamicTextureImage.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import net.minecraft.client.renderer.texture.DynamicTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java similarity index 75% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java index ece6a358..a5f36d78 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/IBufferedTexture.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/IBufferedTexture.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import java.awt.image.BufferedImage; import javax.annotation.Nullable; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java similarity index 83% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java index 3f593aa6..c74b8167 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ISkinAvailableCallback.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ISkinAvailableCallback.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; import net.minecraft.client.renderer.IImageBuffer; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java index 7c438910..c5c61a6c 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ImageBufferDownloadHD.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ImageBufferDownloadHD.java @@ -1,7 +1,7 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; +import com.minelittlepony.hdskins.HDSkinManager; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.voxelmodpack.hdskins.HDSkinManager; import javax.annotation.Nullable; import java.awt.Graphics; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java similarity index 98% rename from src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java rename to src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java index 2728877b..06382d60 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/resources/texture/ThreadDownloadImageETag.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java @@ -1,6 +1,5 @@ -package com.voxelmodpack.hdskins.resources.texture; +package com.minelittlepony.hdskins.resources.texture; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureUtil; @@ -18,6 +17,8 @@ import org.apache.http.impl.client.HttpClients; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.minelittlepony.hdskins.util.MoreHttpResponses; + import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java similarity index 92% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java index 0569d146..eedfbd22 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/BethlehemSkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/BethlehemSkinServer.java @@ -1,16 +1,16 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; import java.io.IOException; import java.util.Locale; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java index f66897d3..cff02a27 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/LegacySkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/LegacySkinServer.java @@ -1,21 +1,22 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.CallableFutures; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; +import com.minelittlepony.hdskins.util.NetClient; +import com.minelittlepony.hdskins.util.TexturesPayloadBuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.CallableFutures; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; -import com.voxelmodpack.hdskins.util.NetClient; -import com.voxelmodpack.hdskins.util.TexturesPayloadBuilder; + import net.minecraft.client.Minecraft; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java b/src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java similarity index 90% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java index 1509dd56..946fc26f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/ServerType.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/ServerType.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java index 8b3552bd..3740f8ee 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java @@ -1,17 +1,18 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.CallableFutures; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; import com.mumfrey.liteloader.modconfig.Exposable; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.CallableFutures; + import net.minecraft.client.Minecraft; import net.minecraft.util.Session; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java index 01779cbf..1d5624a5 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinServerSerializer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServerSerializer.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -8,7 +8,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import com.voxelmodpack.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkinManager; import java.lang.reflect.Type; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java index 4e35bf0b..e4ab1f86 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUpload.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUpload.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import net.minecraft.util.Session; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java similarity index 91% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java index c132d694..43ea208e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/SkinUploadResponse.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinUploadResponse.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.MoreObjects; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java rename to src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java index 63f2b698..cf936339 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/server/ValhallaSkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/ValhallaSkinServer.java @@ -1,16 +1,17 @@ -package com.voxelmodpack.hdskins.server; +package com.minelittlepony.hdskins.server; import com.google.common.base.Preconditions; import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.gui.Feature; +import com.minelittlepony.hdskins.util.IndentedToStringStyle; +import com.minelittlepony.hdskins.util.MoreHttpResponses; import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.voxelmodpack.hdskins.HDSkinManager; -import com.voxelmodpack.hdskins.gui.Feature; -import com.voxelmodpack.hdskins.util.IndentedToStringStyle; -import com.voxelmodpack.hdskins.util.MoreHttpResponses; + import net.minecraft.client.Minecraft; import net.minecraft.util.Session; import org.apache.http.HttpHeaders; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java new file mode 100644 index 00000000..de870a42 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.server; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java index d6b2a84e..5cc57cc6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropListener.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropListener.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java index 42b600aa..e4f4b161 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/FileDropper.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/FileDropper.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import org.lwjgl.opengl.Display; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java similarity index 99% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java index daa9de14..ae6d44d0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/GLWindow.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/GLWindow.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import com.google.common.collect.Lists; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java similarity index 75% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java index 69a416f6..28c3de0d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileCallback.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileCallback.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import java.io.File; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java similarity index 61% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java index 7b996303..5d26ea64 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/IFileDialog.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/IFileDialog.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; public interface IFileDialog extends Runnable { void start(); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java index 913df35c..8d364f22 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/InternalDialog.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/InternalDialog.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import javax.swing.JFrame; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java index 8dccbb54..c3c92b6e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFile.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; @@ -8,7 +8,8 @@ import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; import org.apache.commons.lang3.StringUtils; -import com.voxelmodpack.hdskins.LiteModHDSkins; + +import com.minelittlepony.hdskins.LiteModHDSkins; /** * Base class for "open file" dialog threads diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java index fffbe344..b3b548bc 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadOpenFilePNG.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFilePNG.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java index a7251581..97009799 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFile.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFile.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java similarity index 95% rename from src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java rename to src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java index 786db60d..e43a40c0 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/ThreadSaveFilePNG.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadSaveFilePNG.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.upload; +package com.minelittlepony.hdskins.upload; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java new file mode 100644 index 00000000..71836634 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.upload; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java b/src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java index 11112f8e..aa8e326d 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/CallableFutures.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/CallableFutures.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.common.util.concurrent.Runnables; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java b/src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java similarity index 93% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java index 0d3a6767..385ded25 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/Edge.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/Edge.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; public abstract class Edge { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java b/src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java index e0e4c467..c8ab61cb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/IndentedToStringStyle.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/IndentedToStringStyle.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java index 2246331d..f5e0c299 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreHttpResponses.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreHttpResponses.java @@ -1,9 +1,9 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.gson.JsonObject; -import com.voxelmodpack.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.server.SkinServer; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java index b33a72da..8b583ff1 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/MoreStreams.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/MoreStreams.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import java.util.List; import java.util.function.Function; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java b/src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java similarity index 96% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java index a479d198..15148b58 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/NetClient.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/NetClient.java @@ -1,12 +1,13 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; -import com.voxelmodpack.hdskins.HDSkinManager; import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; +import com.minelittlepony.hdskins.HDSkinManager; + import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java b/src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java similarity index 94% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java index ef83a260..5c9e3ccd 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/PlayerUtil.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/PlayerUtil.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java b/src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java index 6ce74e56..69f64489 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/ProfileTextureUtil.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/ProfileTextureUtil.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.mojang.authlib.minecraft.MinecraftProfileTexture; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java b/src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java similarity index 97% rename from src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java rename to src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java index deb6fa35..59c7a399 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/util/TexturesPayloadBuilder.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/TexturesPayloadBuilder.java @@ -1,4 +1,4 @@ -package com.voxelmodpack.hdskins.util; +package com.minelittlepony.hdskins.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java deleted file mode 100644 index 188351cf..00000000 --- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -package com.voxelmodpack.hdskins.upload; - -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; From 5ce50f2d07070e60798bc4f7222cb90785a938cf Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 01:04:54 +0200 Subject: [PATCH 006/104] Update packages (again) and separate all Litemod code --- .../com/minelittlepony/client/ForgeProxy.java | 11 +-- .../minelittlepony/client/IModUtilities.java | 17 ++++ .../minelittlepony/client/MineLPClient.java | 17 +++- .../client/PonyRenderManager.java | 7 +- .../client/gui/GuiPonySettings.java | 70 ++++++++-------- .../client/gui/hdskins/GuiSkinsMineLP.java | 4 +- .../client/render/LevitatingItemRenderer.java | 4 +- .../tileentities/skull/PonySkullRenderer.java | 6 +- .../common/client}/gui/Button.java | 2 +- .../common/client/gui/Checkbox.java | 80 +++++++++++++++++++ .../common/client}/gui/GameGui.java | 6 +- .../common/client/gui/GuiHost.java | 42 ++++++++++ .../common/client}/gui/IGuiAction.java | 2 +- .../common/client}/gui/IGuiCallback.java | 2 +- .../common/client/gui/IGuiGuest.java | 16 ++++ .../common/client}/gui/IGuiTooltipped.java | 2 +- .../common/client}/gui/IStyleFactory.java | 2 +- .../common/client}/gui/IconicButton.java | 2 +- .../common/client}/gui/IconicToggle.java | 2 +- .../common/client}/gui/Label.java | 2 +- .../common/client}/gui/Slider.java | 22 ++--- .../common/client}/gui/Style.java | 2 +- src/client/resources/minelp.mixin.json | 2 +- .../minelittlepony/common/SensibleConfig.java | 2 +- .../minelittlepony/common/gui/Checkbox.java | 65 --------------- .../minelittlepony/hdskins/HDSkinManager.java | 8 +- .../com/minelittlepony/hdskins/HDSkins.java | 68 ++++++++++++++++ .../minelittlepony/hdskins/SkinUploader.java | 8 +- .../minelittlepony/hdskins/gui/GuiSkins.java | 14 ++-- .../hdskins/gui/HDSkinsConfigPanel.java | 21 ++--- .../hdskins/{ => litemod}/LiteModHDSkins.java | 76 ++++++++---------- .../hdskins/mixin/MixinGuiMainMenu.java | 2 +- .../resources/SkinResourceManager.java | 6 +- .../hdskins/server/SkinServer.java | 3 +- .../hdskins/upload/ThreadOpenFile.java | 8 +- src/hdskins/resources/hdskins.mixin.json | 2 +- .../client/LiteModMineLittlePony.java | 40 +++++++++- .../common/client/gui/GuiLiteHost.java} | 29 ++++--- 38 files changed, 438 insertions(+), 236 deletions(-) create mode 100644 src/client/java/com/minelittlepony/client/IModUtilities.java rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/Button.java (97%) create mode 100644 src/client/java/com/minelittlepony/common/client/gui/Checkbox.java rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/GameGui.java (90%) create mode 100644 src/client/java/com/minelittlepony/common/client/gui/GuiHost.java rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IGuiAction.java (86%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IGuiCallback.java (86%) create mode 100644 src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IGuiTooltipped.java (95%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IStyleFactory.java (63%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IconicButton.java (94%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/IconicToggle.java (96%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/Label.java (95%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/Slider.java (67%) rename src/{hdskins/java/com/minelittlepony/common => client/java/com/minelittlepony/common/client}/gui/Style.java (96%) delete mode 100644 src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/HDSkins.java rename src/hdskins/java/com/minelittlepony/hdskins/{ => litemod}/LiteModHDSkins.java (58%) rename src/{client => litemod}/java/com/minelittlepony/client/LiteModMineLittlePony.java (59%) rename src/{hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java => litemod/java/com/minelittlepony/common/client/gui/GuiLiteHost.java} (88%) diff --git a/src/client/java/com/minelittlepony/client/ForgeProxy.java b/src/client/java/com/minelittlepony/client/ForgeProxy.java index fe4b5690..46877c3e 100644 --- a/src/client/java/com/minelittlepony/client/ForgeProxy.java +++ b/src/client/java/com/minelittlepony/client/ForgeProxy.java @@ -1,6 +1,5 @@ package com.minelittlepony.client; -import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -15,11 +14,6 @@ import javax.annotation.Nullable; */ public class ForgeProxy { - /** - * True if forge is present. - */ - private static boolean forgeLoaded = ModUtilities.fmlIsPresent(); - /** * Gets the mod armour texture for an associated item and slot. * @@ -31,7 +25,7 @@ public class ForgeProxy { * @return */ public static String getArmorTexture(Entity entity, ItemStack item, String def, EntityEquipmentSlot slot, @Nullable String type) { - if (forgeLoaded) + if (MineLPClient.getInstance().getModUtilities().hasFml()) return ForgeHooksClient.getArmorTexture(entity, item, def, slot, type); return def; } @@ -45,8 +39,9 @@ public class ForgeProxy { * @param def Default return value if no mods present */ public static ModelBiped getArmorModel(EntityLivingBase entity, ItemStack item, EntityEquipmentSlot slot, ModelBiped def) { - if (forgeLoaded) + if (MineLPClient.getInstance().getModUtilities().hasFml()) { return ForgeHooksClient.getArmorModel(entity, item, slot, def); + } return def; } } diff --git a/src/client/java/com/minelittlepony/client/IModUtilities.java b/src/client/java/com/minelittlepony/client/IModUtilities.java new file mode 100644 index 00000000..c60f9791 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/IModUtilities.java @@ -0,0 +1,17 @@ +package com.minelittlepony.client; + +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Timer; + +public interface IModUtilities { + void addRenderer(Class type, TileEntitySpecialRenderer renderer); + + void addRenderer(Class type, Render renderer); + + boolean hasFml(); + + Timer getGameTimer(); +} diff --git a/src/client/java/com/minelittlepony/client/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java index 98cccef9..9b62370d 100644 --- a/src/client/java/com/minelittlepony/client/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -7,6 +7,7 @@ import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.pony.PonyDataSerialiser; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; +import com.minelittlepony.common.client.gui.GuiHost; import com.minelittlepony.hdskins.HDSkinManager; import com.minelittlepony.hdskins.server.LegacySkinServer; import com.minelittlepony.hdskins.server.SkinServer; @@ -42,8 +43,18 @@ public class MineLPClient extends MineLittlePony { private PonyConfig config; private PonyManager ponyManager; + private final IModUtilities utilities; + private final PonyRenderManager renderManager = PonyRenderManager.getInstance(); + public static MineLPClient getInstance() { + return (MineLPClient)MineLittlePony.getInstance(); + } + + public MineLPClient(IModUtilities utils) { + utilities = utils; + } + void init(PonyConfig newConfig) { config = newConfig; ponyManager = new PonyManager(config); @@ -83,7 +94,7 @@ public class MineLPClient extends MineLittlePony { void onTick(Minecraft minecraft, boolean inGame) { if (inGame && minecraft.currentScreen == null) { if (SETTINGS_GUI.isPressed()) { - minecraft.displayGuiScreen(new GuiPonySettings()); + minecraft.displayGuiScreen(new GuiHost(new GuiPonySettings())); } else { if ((Minecraft.getSystemTime() % 10) == 0) { @@ -126,4 +137,8 @@ public class MineLPClient extends MineLittlePony { public PonyConfig getConfig() { return config; } + + public IModUtilities getModUtilities() { + return utilities; + } } diff --git a/src/client/java/com/minelittlepony/client/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java index 49f0e4f0..27de151a 100644 --- a/src/client/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -12,7 +12,6 @@ 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 com.mumfrey.liteloader.util.ModUtilities; import javax.annotation.Nullable; @@ -48,7 +47,7 @@ public class PonyRenderManager { */ public void initialisePlayerRenderers(RenderManager manager) { // Preview on the select skin gui - ModUtilities.addRenderer(EntityPonyModel.class, new RenderPonyModel(manager)); + MineLPClient.getInstance().getModUtilities().addRenderer(EntityPonyModel.class, new RenderPonyModel(manager)); PlayerModels[] models = PlayerModels.values(); @@ -93,10 +92,10 @@ public class PonyRenderManager { if (!renderMap.containsKey(type)) { renderMap.put(type, manager.getEntityClassRenderObject(type)); } - ModUtilities.addRenderer((Class)type, renderer); + MineLPClient.getInstance().getModUtilities().addRenderer((Class)type, renderer); } else { if (renderMap.containsKey(type)) { - ModUtilities.addRenderer(type, (Render)renderMap.get(type)); + MineLPClient.getInstance().getModUtilities().addRenderer(type, (Render)renderMap.get(type)); } } } diff --git a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java index 1222242c..c9f6b74d 100644 --- a/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/client/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,11 +1,15 @@ package com.minelittlepony.client.gui; +import net.minecraft.client.gui.GuiScreen; + import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.common.gui.Checkbox; -import com.minelittlepony.common.gui.Label; -import com.minelittlepony.common.gui.SettingsPanel; -import com.minelittlepony.common.gui.Slider; +import com.minelittlepony.common.client.gui.Checkbox; +import com.minelittlepony.common.client.gui.GameGui; +import com.minelittlepony.common.client.gui.GuiHost; +import com.minelittlepony.common.client.gui.IGuiGuest; +import com.minelittlepony.common.client.gui.Label; +import com.minelittlepony.common.client.gui.Slider; import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyLevel; import com.minelittlepony.settings.PonyConfig.PonySettings; @@ -14,7 +18,7 @@ import com.minelittlepony.settings.PonyConfig.PonySettings; * In-Game options menu. * */ -public class GuiPonySettings extends SettingsPanel { +public class GuiPonySettings implements IGuiGuest { private static final String OPTIONS_PREFIX = "minelp.options."; @@ -29,29 +33,29 @@ public class GuiPonySettings extends SettingsPanel { } @Override - public void initGui() { - final int LEFT = width / 10; - final int RIGHT = mustScroll() ? LEFT : width - width / 3 - 16; + public void initGui(GuiHost host) { + final int LEFT = host.width / 10; + final int RIGHT = host.mustScroll() ? LEFT : host.width - host.width / 3 - 16; - int row = mustScroll() ? 0 : 32; + int row = host.mustScroll() ? 0 : 32; - if (!mustScroll()) { - addButton(new Label(width / 2, 12, getTitle(), -1, true)); + if (!host.mustScroll()) { + host.addButton(new Label(host.width / 2, 12, getTitle(), -1, true)); } - addButton(new Label(LEFT, row += 15, PONY_LEVEL, -1)); - addButton(new Slider(LEFT, row += 15, 0, 2, config.getPonyLevel().ordinal(), (int id, String name, float value) -> { - return format(PONY_LEVEL + "." + PonyLevel.valueFor(value).name().toLowerCase()); + host.addButton(new Label(LEFT, row += 15, PONY_LEVEL, -1)); + host.addButton(new Slider(LEFT, row += 15, 0, 2, config.getPonyLevel().ordinal(), (int id, String name, float value) -> { + return GameGui.format(PONY_LEVEL + "." + PonyLevel.valueFor(value).name().toLowerCase()); }, v -> { PonyLevel level = PonyLevel.valueFor(v); config.setPonyLevel(level); return (float)level.ordinal(); })); - if (isCtrlKeyDown() && isShiftKeyDown()) { - addButton(new Label(LEFT, row += 30, "minelp.debug.scale", -1)); - addButton(new Slider(LEFT, row += 15, 0.1F, 3, config.getGlobalScaleFactor(), (int id, String name, float value) -> { - return format("minelp.debug.scale.value", format(describeCurrentScale(value))); + if (GuiScreen.isCtrlKeyDown() && GuiScreen.isShiftKeyDown()) { + host.addButton(new Label(LEFT, row += 30, "minelp.debug.scale", -1)); + host.addButton(new Slider(LEFT, row += 15, 0.1F, 3, config.getGlobalScaleFactor(), (int id, String name, float value) -> { + return GameGui.format("minelp.debug.scale.value", GameGui.format(describeCurrentScale(value))); }, v -> { config.setGlobalScaleFactor(v); return config.getGlobalScaleFactor(); @@ -59,55 +63,55 @@ public class GuiPonySettings extends SettingsPanel { } row += 15; - addButton(new Label(LEFT, row += 15, OPTIONS_PREFIX + "options", -1)); + host.addButton(new Label(LEFT, row += 15, OPTIONS_PREFIX + "options", -1)); for (PonySettings i : PonySettings.values()) { - addButton(new Checkbox(LEFT, row += 15, OPTIONS_PREFIX + i.name().toLowerCase(), i.get(), i)); + host.addButton(new Checkbox(LEFT, row += 20, OPTIONS_PREFIX + i.name().toLowerCase(), i.get(), i)); } - if (mustScroll()) { + if (host.mustScroll()) { row += 15; } else { row = 32; } - addButton(new Label(RIGHT, row += 15, MOB_PREFIX + "title", -1)); + host.addButton(new Label(RIGHT, row += 15, MOB_PREFIX + "title", -1)); for (MobRenderers i : MobRenderers.values()) { - addButton(new Checkbox(RIGHT, row += 15, MOB_PREFIX + i.name().toLowerCase(), i.get(), i)); + host.addButton(new Checkbox(RIGHT, row += 20, MOB_PREFIX + i.name().toLowerCase(), i.get(), i)); } } public String describeCurrentScale(float value) { if (value >= 3) { - return format("minelp.debug.scale.meg"); + return GameGui.format("minelp.debug.scale.meg"); } if (value == 2) { - return format("minelp.debug.scale.max"); + return GameGui.format("minelp.debug.scale.max"); } if (value == 1) { - return format("minelp.debug.scale.mid"); + return GameGui.format("minelp.debug.scale.mid"); } if (value == 0.9F) { - return format("minelp.debug.scale.sa"); + return GameGui.format("minelp.debug.scale.sa"); } if (value <= 0.1F) { - return format("minelp.debug.scale.min"); + return GameGui.format("minelp.debug.scale.min"); } return String.format("%f", value); } @Override - public void drawContents(int mouseX, int mouseY, float partialTicks) { - drawDefaultBackground(); - super.drawContents(mouseX, mouseY, partialTicks); + public boolean drawContents(GuiHost host, int mouseX, int mouseY, float partialTicks) { + host.drawDefaultBackground(); + return true; } @Override - public void onGuiClosed() { + public void onGuiClosed(GuiHost host) { config.save(); } @Override - protected String getTitle() { + public String getTitle() { return OPTIONS_PREFIX + "title"; } } 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 e5613af5..12823dd1 100644 --- a/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/GuiSkinsMineLP.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.gui.hdskins; import com.minelittlepony.MineLittlePony; -import com.minelittlepony.common.gui.IconicToggle; -import com.minelittlepony.common.gui.Style; +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; diff --git a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index bd0ea2c7..db997aea 100644 --- a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -3,11 +3,11 @@ package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLPClient; import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.client.util.render.Color; import com.minelittlepony.pony.IPony; -import com.mumfrey.liteloader.client.overlays.IMinecraft; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; @@ -120,7 +120,7 @@ public class LevitatingItemRenderer { boolean doNormal = entity.getItemInUseCount() <= 0 || action == EnumAction.NONE; if (doNormal) { // eating, blocking, and drinking are not transformed. Only held items. - float ticks = ((IMinecraft)Minecraft.getMinecraft()).getTimer().elapsedPartialTicks - entity.ticksExisted; + float ticks = MineLPClient.getInstance().getModUtilities().getGameTimer().elapsedPartialTicks - entity.ticksExisted; float floatAmount = (float)Math.sin(ticks / 9) / 40; float driftAmount = (float)Math.cos(ticks / 6) / 40; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 0179a2d8..8a227a05 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -1,11 +1,11 @@ package com.minelittlepony.client.render.tileentities.skull; import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLPClient; import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.pony.IPony; import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; -import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.tileentity.TileEntitySkull; @@ -51,7 +51,7 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende if (MineLittlePony.getInstance().getConfig().ponyskulls) { if (!(instance instanceof PonySkullRenderer)) { backup = instance; - ModUtilities.addRenderer(TileEntitySkull.class, ponyInstance); + MineLPClient.getInstance().getModUtilities().addRenderer(TileEntitySkull.class, ponyInstance); instance = ponyInstance; } } else { @@ -60,7 +60,7 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende if (backup == null) { backup = new TileEntitySkullRenderer(); } - ModUtilities.addRenderer(TileEntitySkull.class, backup); + MineLPClient.getInstance().getModUtilities().addRenderer(TileEntitySkull.class, backup); instance = backup; } } diff --git a/src/hdskins/java/com/minelittlepony/common/gui/Button.java b/src/client/java/com/minelittlepony/common/client/gui/Button.java similarity index 97% rename from src/hdskins/java/com/minelittlepony/common/gui/Button.java rename to src/client/java/com/minelittlepony/common/client/gui/Button.java index bbfa577f..c0abd760 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/Button.java +++ b/src/client/java/com/minelittlepony/common/client/gui/Button.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import java.util.List; diff --git a/src/client/java/com/minelittlepony/common/client/gui/Checkbox.java b/src/client/java/com/minelittlepony/common/client/gui/Checkbox.java new file mode 100644 index 00000000..b5bb7e11 --- /dev/null +++ b/src/client/java/com/minelittlepony/common/client/gui/Checkbox.java @@ -0,0 +1,80 @@ +package com.minelittlepony.common.client.gui; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.ResourceLocation; + +/** + * Checkbox that supports a gui action when it changes. + * + * @author Sollace + * + */ +public class Checkbox extends Slider implements IGuiTooltipped { + + protected static final ResourceLocation RECIPE_BOOK = new ResourceLocation("textures/gui/widgets.png"); + + private int tipX = 0; + private int tipY = 0; + + private List tooltip = null; + + private boolean checked; + + private IGuiCallback switchAction; + + public Checkbox(int x, int y, String displayString, boolean value, IGuiCallback callback) { + super(x, y, 0, 1, (value ? 1 : 0), (i, name, v) -> I18n.format(displayString), null); + + checked = value; + + width = 20; + height = 20; + + switchAction = callback; + action = this::perform; + } + + @Override + public void setSliderValue(float value, boolean notifyResponder) { + super.setSliderValue(value >= 0.5F ? 1 : 0, notifyResponder); + } + + protected float perform(float v) { + boolean value = v >= 0.5F; + + if (value != checked) { + checked = switchAction.perform(value); + } + + return checked ? 1 : 0; + } + + @Override + public Checkbox setTooltip(List tooltip) { + this.tooltip = tooltip; + return this; + } + + @Override + public void renderToolTip(Minecraft mc, int mouseX, int mouseY) { + if (visible && isMouseOver() && tooltip != null) { + mc.currentScreen.drawHoveringText(tooltip, mouseX + tipX, mouseY + tipY); + } + } + + @Override + public Checkbox setTooltipOffset(int x, int y) { + tipX = x; + tipY = y; + return this; + } + + @Override + public void drawCenteredString(FontRenderer fonts, String text, int x, int y, int color) { + super.drawString(fonts, text, x + width - 5, y, color); + } +} diff --git a/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java b/src/client/java/com/minelittlepony/common/client/gui/GameGui.java similarity index 90% rename from src/hdskins/java/com/minelittlepony/common/gui/GameGui.java rename to src/client/java/com/minelittlepony/common/client/gui/GameGui.java index d8510578..c72de117 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/GameGui.java +++ b/src/client/java/com/minelittlepony/common/client/gui/GameGui.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import org.apache.commons.lang3.text.WordUtils; @@ -13,7 +13,7 @@ import net.minecraft.util.SoundEvent; public abstract class GameGui extends GuiScreen { - protected static String format(String string, Object... pars) { + public static String format(String string, Object... pars) { return string == null ? null : I18n.format(string, pars); } @@ -21,7 +21,7 @@ public abstract class GameGui extends GuiScreen { * Formats a translation string and returns it in a list wrapped to a given width. * This can be safely used in initGui, where the fontRenderer is often still null. */ - protected List formatMultiLine(String string, int width, Object...pars) { + public List formatMultiLine(String string, int width, Object...pars) { FontRenderer fr = fontRenderer; if (fr == null) { diff --git a/src/client/java/com/minelittlepony/common/client/gui/GuiHost.java b/src/client/java/com/minelittlepony/common/client/gui/GuiHost.java new file mode 100644 index 00000000..2f72a3ea --- /dev/null +++ b/src/client/java/com/minelittlepony/common/client/gui/GuiHost.java @@ -0,0 +1,42 @@ +package com.minelittlepony.common.client.gui; + +import net.minecraft.client.gui.GuiButton; + +public class GuiHost extends GameGui { + + private final IGuiGuest guest; + + public GuiHost(IGuiGuest guest) { + this.guest = guest; + } + + @Override + public void initGui() { + guest.initGui(this); + } + + @Override + public void drawContents(int mouseX, int mouseY, float partialTicks) { + if (guest.drawContents(this, mouseX, mouseY, partialTicks)) { + super.drawContents(mouseX, mouseY, partialTicks); + } + } + + @Override + public void onGuiClosed() { + guest.onGuiClosed(this); + } + + public String getTitle() { + return guest.getTitle(); + } + + @Override + public T addButton(T button) { + return super.addButton(button); + } + + public boolean mustScroll() { + return false; + } +} diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java b/src/client/java/com/minelittlepony/common/client/gui/IGuiAction.java similarity index 86% rename from src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java rename to src/client/java/com/minelittlepony/common/client/gui/IGuiAction.java index 249067aa..b3fde685 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IGuiAction.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IGuiAction.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; /** * Response actions for UI events. diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java b/src/client/java/com/minelittlepony/common/client/gui/IGuiCallback.java similarity index 86% rename from src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java rename to src/client/java/com/minelittlepony/common/client/gui/IGuiCallback.java index 57918bd3..9a85e584 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IGuiCallback.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IGuiCallback.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; /** * Response actions for UI events. diff --git a/src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java b/src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java new file mode 100644 index 00000000..85b766ac --- /dev/null +++ b/src/client/java/com/minelittlepony/common/client/gui/IGuiGuest.java @@ -0,0 +1,16 @@ +package com.minelittlepony.common.client.gui; + +public interface IGuiGuest { + + void initGui(GuiHost host); + + default boolean drawContents(GuiHost host, int mouseX, int mouseY, float partialTicks) { + return true; + } + + default void onGuiClosed(GuiHost host) { + + } + + String getTitle(); +} diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java b/src/client/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java similarity index 95% rename from src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java rename to src/client/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java index a6a059ff..0f010b46 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IGuiTooltipped.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IGuiTooltipped.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import net.minecraft.client.Minecraft; diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java b/src/client/java/com/minelittlepony/common/client/gui/IStyleFactory.java similarity index 63% rename from src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java rename to src/client/java/com/minelittlepony/common/client/gui/IStyleFactory.java index 452ded55..32cbaab7 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IStyleFactory.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IStyleFactory.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; @FunctionalInterface public interface IStyleFactory { diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java b/src/client/java/com/minelittlepony/common/client/gui/IconicButton.java similarity index 94% rename from src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java rename to src/client/java/com/minelittlepony/common/client/gui/IconicButton.java index d2c686b2..dc33bc4c 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IconicButton.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IconicButton.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java b/src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java rename to src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java index ce7a2bf8..6d8cf4b5 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/IconicToggle.java +++ b/src/client/java/com/minelittlepony/common/client/gui/IconicToggle.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import com.minelittlepony.hdskins.util.MoreStreams; diff --git a/src/hdskins/java/com/minelittlepony/common/gui/Label.java b/src/client/java/com/minelittlepony/common/client/gui/Label.java similarity index 95% rename from src/hdskins/java/com/minelittlepony/common/gui/Label.java rename to src/client/java/com/minelittlepony/common/client/gui/Label.java index 565080be..9ef4f62d 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/Label.java +++ b/src/client/java/com/minelittlepony/common/client/gui/Label.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/hdskins/java/com/minelittlepony/common/gui/Slider.java b/src/client/java/com/minelittlepony/common/client/gui/Slider.java similarity index 67% rename from src/hdskins/java/com/minelittlepony/common/gui/Slider.java rename to src/client/java/com/minelittlepony/common/client/gui/Slider.java index 73a7886d..227c9ff5 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/Slider.java +++ b/src/client/java/com/minelittlepony/common/client/gui/Slider.java @@ -1,6 +1,9 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import net.minecraft.client.gui.GuiSlider; + +import javax.annotation.Nullable; + import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; /** @@ -13,28 +16,29 @@ public class Slider extends GuiSlider { private static Responder callback; + protected IGuiCallback action; + public Slider(int x, int y, float minIn, float maxIn, float defaultValue, GuiSlider.FormatHelper formatter, IGuiCallback action) { - super(callback = new Responder(action), 0, x, y, "", minIn, maxIn, defaultValue, formatter); + super(callback = new Responder(), 0, x, y, "", minIn, maxIn, defaultValue, formatter); callback.owner = this; callback = null; + + this.action = action; } private static final class Responder implements GuiResponder { - private final IGuiCallback action; - + @Nullable private Slider owner; - private Responder(IGuiCallback callback) { - action = callback; - } - @Override public void setEntryValue(int id, boolean value) { } @Override public void setEntryValue(int id, float value) { - owner.setSliderValue(action.perform(value), false); + if (owner != null) { + owner.setSliderValue(owner.action.perform(value), false); + } } @Override diff --git a/src/hdskins/java/com/minelittlepony/common/gui/Style.java b/src/client/java/com/minelittlepony/common/client/gui/Style.java similarity index 96% rename from src/hdskins/java/com/minelittlepony/common/gui/Style.java rename to src/client/java/com/minelittlepony/common/client/gui/Style.java index ce75f261..552db07a 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/Style.java +++ b/src/client/java/com/minelittlepony/common/client/gui/Style.java @@ -1,4 +1,4 @@ -package com.minelittlepony.common.gui; +package com.minelittlepony.common.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.init.Items; diff --git a/src/client/resources/minelp.mixin.json b/src/client/resources/minelp.mixin.json index 690c59c4..cdd1d99e 100644 --- a/src/client/resources/minelp.mixin.json +++ b/src/client/resources/minelp.mixin.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.7", - "package": "com.minelittlepony.mixin", + "package": "com.minelittlepony.client.mixin", "refmap": "minelp.mixin.refmap.json", "compatibilityLevel": "JAVA_8", "mixins": [ diff --git a/src/common/java/com/minelittlepony/common/SensibleConfig.java b/src/common/java/com/minelittlepony/common/SensibleConfig.java index b9d35b51..fa3e3d47 100644 --- a/src/common/java/com/minelittlepony/common/SensibleConfig.java +++ b/src/common/java/com/minelittlepony/common/SensibleConfig.java @@ -1,6 +1,6 @@ package com.minelittlepony.common; -import com.minelittlepony.common.gui.IGuiCallback; +import com.minelittlepony.common.client.gui.IGuiCallback; /** * A sensible config container that actually lets us programmatically index values by a key. diff --git a/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java b/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java deleted file mode 100644 index f00dcb40..00000000 --- a/src/hdskins/java/com/minelittlepony/common/gui/Checkbox.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.minelittlepony.common.gui; - -import com.mumfrey.liteloader.client.gui.GuiCheckbox; - -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; - -/** - * Checkbox that supports a gui action when it changes. - * - * @author Sollace - * - */ -public class Checkbox extends GuiCheckbox implements IGuiTooltipped { - - private int tipX = 0; - private int tipY = 0; - - private List tooltip = null; - - private final IGuiCallback action; - - public Checkbox(int x, int y, String displayString, boolean value, IGuiCallback callback) { - super(0, x, y, I18n.format(displayString)); - action = callback; - checked = value; - } - - public void perform() { - checked = action.perform(!checked); - } - - @Override - public Checkbox setTooltip(List tooltip) { - this.tooltip = tooltip; - return this; - } - - @Override - public void renderToolTip(Minecraft mc, int mouseX, int mouseY) { - if (visible && isMouseOver() && tooltip != null) { - mc.currentScreen.drawHoveringText(tooltip, mouseX + tipX, mouseY + tipY); - } - } - - @Override - public Checkbox setTooltipOffset(int x, int y) { - tipX = x; - tipY = y; - return this; - } - - @Override - public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) { - if (super.mousePressed(mc, mouseX, mouseY)) { - perform(); - - return false; - } - - return false; - } -} diff --git a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java index d5f268ad..be5f0ee5 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkinManager.java @@ -30,8 +30,6 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.properties.Property; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; -import com.mumfrey.liteloader.core.LiteLoader; -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; @@ -194,7 +192,7 @@ public final class HDSkinManager implements IResourceManagerReloadListener { // schedule texture loading on the main thread. TextureLoader.loadTexture(resource, new ThreadDownloadImageData( - new File(LiteLoader.getAssetsDirectory(), "hd/" + skinDir + texture.getHash().substring(0, 2) + "/" + texture.getHash()), + new File(HDSkins.getInstance().getAssetsDirectory(), "hd/" + skinDir + texture.getHash().substring(0, 2) + "/" + texture.getHash()), texture.getUrl(), DefaultPlayerSkin.getDefaultSkinLegacy(), new ImageBufferDownloadHD(type, () -> { @@ -243,9 +241,9 @@ public final class HDSkinManager implements IResourceManagerReloadListener { } public void clearSkinCache() { - LiteLoaderLogger.info("Clearing local player skin cache"); + logger.info("Clearing local player skin cache"); - FileUtils.deleteQuietly(new File(LiteLoader.getAssetsDirectory(), "hd")); + FileUtils.deleteQuietly(new File(HDSkins.getInstance().getAssetsDirectory(), "hd")); skins.invalidateAll(); parseSkins(); diff --git a/src/hdskins/java/com/minelittlepony/hdskins/HDSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/HDSkins.java new file mode 100644 index 00000000..d15ef92c --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/HDSkins.java @@ -0,0 +1,68 @@ +package com.minelittlepony.hdskins; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.entity.Entity; + +import com.google.gson.annotations.Expose; +import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.hdskins.gui.RenderPlayerModel; +import com.minelittlepony.hdskins.server.SkinServer; +import com.minelittlepony.hdskins.upload.GLWindow; + +import java.io.File; +import java.util.List; +import java.util.function.Function; + +public abstract class HDSkins { + public static final String MOD_NAME = "HD Skins"; + public static final String VERSION = "4.0.0"; + + private static HDSkins instance; + + public static HDSkins getInstance() { + return instance; + } + + public HDSkins() { + instance = this; + } + + @Expose + public List skin_servers = SkinServer.defaultServers; + + @Expose + public boolean experimentalSkinDrop = false; + + @Expose + public String lastChosenFile = ""; + + public void init() { + IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); + irrm.registerReloadListener(HDSkinManager.INSTANCE); + } + + public abstract File getAssetsDirectory(); + + public abstract void saveConfig(); + + protected abstract void addRenderer(Class type, Function> renderer); + + public void initComplete() { + addRenderer(EntityPlayerModel.class, RenderPlayerModel::new); + + // register skin servers. + skin_servers.forEach(HDSkinManager.INSTANCE::addSkinServer); + + if (experimentalSkinDrop) { + GLWindow.create(); + } + } + + public void onToggledFullScreen(boolean fullScreen) { + GLWindow.current().refresh(fullScreen); + } + +} diff --git a/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java index 86655c41..4759c8ea 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/SkinUploader.java @@ -6,6 +6,9 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.minelittlepony.hdskins.gui.EntityPlayerModel; @@ -20,7 +23,6 @@ import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.exceptions.AuthenticationUnavailableException; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; import java.io.Closeable; import java.io.File; @@ -34,6 +36,8 @@ import java.util.function.Predicate; public class SkinUploader implements Closeable { + private static final Logger logger = LogManager.getLogger(); + private final Iterator skinServers; public static final String ERR_NO_SERVER = "hdskins.error.noserver"; @@ -187,7 +191,7 @@ public class SkinUploader implements Closeable { return gateway.uploadSkin(new SkinUpload(mc.getSession(), skinType, localSkin == null ? null : localSkin.toURI(), skinMetadata)).handle((response, throwable) -> { if (throwable == null) { - LiteLoaderLogger.info("Upload completed with: %s", response); + logger.info("Upload completed with: %s", response); setError(null); } else { setError(Throwables.getRootCause(throwable).toString()); diff --git a/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java index 728b97a8..018d44f2 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/GuiSkins.java @@ -1,13 +1,13 @@ package com.minelittlepony.hdskins.gui; import com.google.common.base.Splitter; -import com.minelittlepony.common.gui.Button; -import com.minelittlepony.common.gui.GameGui; -import com.minelittlepony.common.gui.IGuiAction; -import com.minelittlepony.common.gui.IconicButton; -import com.minelittlepony.common.gui.IconicToggle; -import com.minelittlepony.common.gui.Label; -import com.minelittlepony.common.gui.Style; +import com.minelittlepony.common.client.gui.Button; +import com.minelittlepony.common.client.gui.GameGui; +import com.minelittlepony.common.client.gui.IGuiAction; +import com.minelittlepony.common.client.gui.IconicButton; +import com.minelittlepony.common.client.gui.IconicToggle; +import com.minelittlepony.common.client.gui.Label; +import com.minelittlepony.common.client.gui.Style; import com.minelittlepony.hdskins.HDSkinManager; import com.minelittlepony.hdskins.SkinChooser; import com.minelittlepony.hdskins.SkinUploader; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java index 5e128ed6..6870a072 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/gui/HDSkinsConfigPanel.java @@ -1,19 +1,20 @@ package com.minelittlepony.hdskins.gui; -import com.minelittlepony.common.gui.Checkbox; -import com.minelittlepony.common.gui.SettingsPanel; -import com.minelittlepony.hdskins.LiteModHDSkins; +import com.minelittlepony.common.client.gui.Checkbox; +import com.minelittlepony.common.client.gui.GuiHost; +import com.minelittlepony.common.client.gui.IGuiGuest; +import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.hdskins.upload.GLWindow; -public class HDSkinsConfigPanel extends SettingsPanel { +public class HDSkinsConfigPanel implements IGuiGuest { @Override - public void initGui() { - final LiteModHDSkins mod = LiteModHDSkins.instance(); + public void initGui(GuiHost host) { + final HDSkins mod = HDSkins.getInstance(); - addButton(new Checkbox(40, 40, "hdskins.options.skindrops", mod.experimentalSkinDrop, checked -> { + host.addButton(new Checkbox(40, 40, "hdskins.options.skindrops", mod.experimentalSkinDrop, checked -> { mod.experimentalSkinDrop = checked; - mod.writeConfig(); + mod.saveConfig(); if (checked) { GLWindow.create(); @@ -22,11 +23,11 @@ public class HDSkinsConfigPanel extends SettingsPanel { } return checked; - })).setTooltip(formatMultiLine("hdskins.warning.experimental", 250)); + })).setTooltip(host.formatMultiLine("hdskins.warning.experimental", 250)); } @Override - protected String getTitle() { + public String getTitle() { return "HD Skins Settings"; } } diff --git a/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java b/src/hdskins/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java similarity index 58% rename from src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java rename to src/hdskins/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java index 00f4490a..3196cc18 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/LiteModHDSkins.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java @@ -1,13 +1,12 @@ -package com.minelittlepony.hdskins; +package com.minelittlepony.hdskins.litemod; import com.google.gson.GsonBuilder; -import com.google.gson.annotations.Expose; -import com.minelittlepony.hdskins.gui.EntityPlayerModel; +import com.minelittlepony.common.client.gui.GuiLiteHost; +import com.minelittlepony.hdskins.HDSkinManager; +import com.minelittlepony.hdskins.HDSkins; import com.minelittlepony.hdskins.gui.HDSkinsConfigPanel; -import com.minelittlepony.hdskins.gui.RenderPlayerModel; import com.minelittlepony.hdskins.server.SkinServer; import com.minelittlepony.hdskins.server.SkinServerSerializer; -import com.minelittlepony.hdskins.upload.GLWindow; import com.mumfrey.liteloader.Configurable; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.ViewportListener; @@ -20,44 +19,28 @@ import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; import java.io.File; -import java.util.List; +import java.util.function.Function; @ExposableOptions(strategy = ConfigStrategy.Unversioned, filename = "hdskins") -public class LiteModHDSkins implements InitCompleteListener, ViewportListener, Configurable, AdvancedExposable { - - private static LiteModHDSkins instance; - - public static LiteModHDSkins instance() { - return instance; - } - - @Expose - public List skin_servers = SkinServer.defaultServers; - - @Expose - public boolean experimentalSkinDrop = false; - - @Expose - public String lastChosenFile = ""; - - public LiteModHDSkins() { - instance = this; - } +public class LiteModHDSkins extends HDSkins implements InitCompleteListener, ViewportListener, Configurable, AdvancedExposable { @Override public String getName() { - return "HD Skins"; + return HDSkins.MOD_NAME; } @Override public String getVersion() { - return "4.0.0"; + return HDSkins.VERSION; } - public void writeConfig() { + @Override + public void saveConfig() { LiteLoader.getInstance().writeConfig(this); } @@ -66,9 +49,7 @@ public class LiteModHDSkins implements InitCompleteListener, ViewportListener, C // register config LiteLoader.getInstance().registerExposable(this, null); - - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); - irrm.registerReloadListener(HDSkinManager.INSTANCE); + super.init(); } @Override @@ -88,19 +69,12 @@ public class LiteModHDSkins implements InitCompleteListener, ViewportListener, C @Override public Class getConfigPanelClass() { - return HDSkinsConfigPanel.class; + return Panel.class; } @Override public void onInitCompleted(Minecraft minecraft, LiteLoader loader) { - ModUtilities.addRenderer(EntityPlayerModel.class, new RenderPlayerModel<>(minecraft.getRenderManager())); - - // register skin servers. - skin_servers.forEach(HDSkinManager.INSTANCE::addSkinServer); - - if (experimentalSkinDrop) { - GLWindow.create(); - } + initComplete(); } @Override @@ -110,6 +84,22 @@ public class LiteModHDSkins implements InitCompleteListener, ViewportListener, C @Override public void onFullScreenToggled(boolean fullScreen) { - GLWindow.current().refresh(fullScreen); + super.onToggledFullScreen(fullScreen); + } + + @Override + protected void addRenderer(Class type, Function> renderer) { + ModUtilities.addRenderer(type, renderer.apply(Minecraft.getMinecraft().getRenderManager())); + } + + @Override + public File getAssetsDirectory() { + return LiteLoader.getAssetsDirectory(); + } + + public static class Panel extends GuiLiteHost { + public Panel() { + super(new HDSkinsConfigPanel()); + } } } diff --git a/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java index 47461256..6b196d0d 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinGuiMainMenu.java @@ -1,6 +1,6 @@ package com.minelittlepony.hdskins.mixin; -import com.minelittlepony.common.gui.IconicButton; +import com.minelittlepony.common.client.gui.IconicButton; import com.minelittlepony.hdskins.HDSkinManager; import net.minecraft.client.gui.GuiMainMenu; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java index b72a94dd..b809a2a6 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/SkinResourceManager.java @@ -5,13 +5,13 @@ import com.google.gson.Gson; import com.google.gson.JsonParseException; import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.util.ResourceLocation; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import java.io.IOException; @@ -26,6 +26,8 @@ import java.util.concurrent.Future; public class SkinResourceManager implements IResourceManagerReloadListener { + private static final Logger logger = LogManager.getLogger(); + private ExecutorService executor = Executors.newSingleThreadExecutor(); private Map uuidSkins = Maps.newHashMap(); @@ -55,7 +57,7 @@ public class SkinResourceManager implements IResourceManagerReloadListener { } } } catch (JsonParseException je) { - LiteLoaderLogger.warning(je, "Invalid skins.json in %s", res.getResourcePackName()); + logger.warn("Invalid skins.json in " + res.getResourcePackName(), je); } } } catch (IOException e) { diff --git a/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java index 3740f8ee..205a85b4 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/server/SkinServer.java @@ -11,7 +11,6 @@ import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftSessionService; import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; import com.mojang.util.UUIDTypeAdapter; -import com.mumfrey.liteloader.modconfig.Exposable; import net.minecraft.client.Minecraft; import net.minecraft.util.Session; @@ -21,7 +20,7 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; -public interface SkinServer extends Exposable { +public interface SkinServer { Gson gson = new GsonBuilder() .registerTypeAdapter(UUID.class, new UUIDTypeAdapter()) diff --git a/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java index c3c92b6e..979165a8 100644 --- a/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/upload/ThreadOpenFile.java @@ -9,7 +9,7 @@ import javax.swing.filechooser.FileFilter; import org.apache.commons.lang3.StringUtils; -import com.minelittlepony.hdskins.LiteModHDSkins; +import com.minelittlepony.hdskins.HDSkins; /** * Base class for "open file" dialog threads @@ -39,7 +39,7 @@ public abstract class ThreadOpenFile extends Thread implements IFileDialog { JFileChooser fileDialog = new JFileChooser(); fileDialog.setDialogTitle(dialogTitle); - String last = LiteModHDSkins.instance().lastChosenFile; + String last = HDSkins.getInstance().lastChosenFile; if (!StringUtils.isBlank(last)) { fileDialog.setSelectedFile(new File(last)); } @@ -50,8 +50,8 @@ public abstract class ThreadOpenFile extends Thread implements IFileDialog { File f = fileDialog.getSelectedFile(); if (f != null) { - LiteModHDSkins.instance().lastChosenFile = f.getAbsolutePath(); - LiteModHDSkins.instance().writeConfig(); + HDSkins.getInstance().lastChosenFile = f.getAbsolutePath(); + HDSkins.getInstance().saveConfig(); if (!f.exists() && f.getName().indexOf('.') == -1) { f = appendMissingExtension(f); diff --git a/src/hdskins/resources/hdskins.mixin.json b/src/hdskins/resources/hdskins.mixin.json index eccc7930..04343b72 100644 --- a/src/hdskins/resources/hdskins.mixin.json +++ b/src/hdskins/resources/hdskins.mixin.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.7", - "package": "com.voxelmodpack.hdskins.mixin", + "package": "com.minelittlepony.hdskins.mixin", "refmap": "hdskins.mixin.refmap.json", "mixins": [ "MixinMinecraft", diff --git a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java b/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java similarity index 59% rename from src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java rename to src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java index bcb54573..57d1011e 100644 --- a/src/client/java/com/minelittlepony/client/LiteModMineLittlePony.java +++ b/src/litemod/java/com/minelittlepony/client/LiteModMineLittlePony.java @@ -2,23 +2,31 @@ package com.minelittlepony.client; import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; +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; +import com.mumfrey.liteloader.client.overlays.IMinecraft; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.modconfig.ConfigPanel; import com.mumfrey.liteloader.modconfig.ConfigStrategy; import com.mumfrey.liteloader.modconfig.Exposable; import com.mumfrey.liteloader.modconfig.ExposableOptions; +import com.mumfrey.liteloader.util.ModUtilities; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Timer; import java.io.File; -public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Configurable { +public class LiteModMineLittlePony implements IModUtilities, InitCompleteListener, Tickable, Configurable { - private final MineLPClient mlp = new MineLPClient(); + private final MineLPClient mlp = new MineLPClient(this); @Override public String getName() { @@ -56,7 +64,33 @@ public class LiteModMineLittlePony implements InitCompleteListener, Tickable, Co @Override public Class getConfigPanelClass() { - return GuiPonySettings.class; + return Panel.class; + } + + @Override + public void addRenderer(Class type, TileEntitySpecialRenderer renderer) { + ModUtilities.addRenderer(type, renderer); + } + + @Override + public void addRenderer(Class type, Render renderer) { + ModUtilities.addRenderer(type, renderer); + } + + @Override + public boolean hasFml() { + return ModUtilities.fmlIsPresent(); + } + + @Override + public Timer getGameTimer() { + return ((IMinecraft)Minecraft.getMinecraft()).getTimer(); + } + + public static class Panel extends GuiLiteHost { + public Panel() { + super(new GuiPonySettings()); + } } @ExposableOptions(filename = "minelittlepony", strategy = ConfigStrategy.Unversioned) diff --git a/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java b/src/litemod/java/com/minelittlepony/common/client/gui/GuiLiteHost.java similarity index 88% rename from src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java rename to src/litemod/java/com/minelittlepony/common/client/gui/GuiLiteHost.java index 9ed7156c..f10e2439 100644 --- a/src/hdskins/java/com/minelittlepony/common/gui/SettingsPanel.java +++ b/src/litemod/java/com/minelittlepony/common/client/gui/GuiLiteHost.java @@ -1,26 +1,26 @@ -package com.minelittlepony.common.gui; - -import java.io.IOException; - -import com.mumfrey.liteloader.gl.GLClippingPlanes; -import com.mumfrey.liteloader.modconfig.ConfigPanel; -import com.mumfrey.liteloader.modconfig.ConfigPanelHost; +package com.minelittlepony.common.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; +import com.mumfrey.liteloader.gl.GLClippingPlanes; +import com.mumfrey.liteloader.modconfig.ConfigPanel; +import com.mumfrey.liteloader.modconfig.ConfigPanelHost; -/** - * A GuiScreen that doubles as a liteloader panel. What is this madness!? - */ -public abstract class SettingsPanel extends GameGui implements ConfigPanel { +import java.io.IOException; + +public class GuiLiteHost extends GuiHost implements ConfigPanel { private boolean isInPanel = false; private int contentHeight; + public GuiLiteHost(IGuiGuest guest) { + super(guest); + } + @Override public String getPanelTitle() { return format(getTitle()); @@ -32,7 +32,7 @@ public abstract class SettingsPanel extends GameGui implements ConfigPanel { } @Override - protected T addButton(T button) { + public T addButton(T button) { if (button.y > contentHeight) { contentHeight = button.y; } @@ -113,9 +113,8 @@ public abstract class SettingsPanel extends GameGui implements ConfigPanel { } } - protected boolean mustScroll() { + @Override + public boolean mustScroll() { return isInPanel; } - - protected abstract String getTitle(); } From fe6157734e1b43b3306b5b7191adb4be5470b42c Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 01:18:02 +0200 Subject: [PATCH 007/104] Removed deprecated code --- .../texture/ThreadDownloadImageETag.java | 223 ------------------ 1 file changed, 223 deletions(-) delete mode 100644 src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java diff --git a/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java deleted file mode 100644 index 06382d60..00000000 --- a/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/ThreadDownloadImageETag.java +++ /dev/null @@ -1,223 +0,0 @@ -package com.minelittlepony.hdskins.resources.texture; - -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.texture.SimpleTexture; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import org.apache.http.Header; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.minelittlepony.hdskins.util.MoreHttpResponses; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collections; -import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.imageio.ImageIO; - -/** - * @deprecated - * Do not use. This will be removed in a later update. - * Now that legacy includes the etag in the hash, it is no longer required to save it to disk. - */ -@Deprecated -public class ThreadDownloadImageETag extends SimpleTexture implements IBufferedTexture { - - private static final Logger LOGGER = LogManager.getLogger(); - private static final AtomicInteger THREAD_ID = new AtomicInteger(0); - private static CloseableHttpClient client = HttpClients.createSystem(); - - @Nonnull - private final Path cacheFile; - private final Path eTagFile; - private final String imageUrl; - @Nullable - private final IImageBuffer imageBuffer; - - @Nullable - private BufferedImage bufferedImage; - @Nullable - private Thread imageThread; - private boolean textureUploaded; - - public ThreadDownloadImageETag(@Nonnull File cacheFileIn, String imageUrlIn, ResourceLocation defLocation, @Nullable IImageBuffer imageBufferIn) { - super(defLocation); - this.cacheFile = cacheFileIn.toPath(); - this.eTagFile = cacheFile.resolveSibling(cacheFile.getFileName() + ".etag"); - this.imageUrl = imageUrlIn; - this.imageBuffer = imageBufferIn; - } - - private void checkTextureUploaded() { - if (!this.textureUploaded) { - if (this.bufferedImage != null) { - if (this.textureLocation != null) { - this.deleteGlTexture(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } - } - - @Override - public int getGlTextureId() { - this.checkTextureUploaded(); - return super.getGlTextureId(); - } - - private void setBufferedImage(@Nonnull BufferedImage bufferedImageIn) { - this.bufferedImage = bufferedImageIn; - - if (this.imageBuffer != null) { - this.imageBuffer.skinAvailable(); - } - } - - @Override - @Nullable - public BufferedImage getBufferedImage() { - return bufferedImage; - } - - @Override - public void loadTexture(IResourceManager resourceManager) throws IOException { - if (this.bufferedImage == null && this.textureLocation != null) { - super.loadTexture(resourceManager); - } - - if (this.imageThread == null) { - this.imageThread = new Thread(this::loadTexture, "Texture Downloader #" + THREAD_ID.incrementAndGet()); - this.imageThread.setDaemon(true); - this.imageThread.start(); - } - } - - private void loadTexture() { - switch (checkLocalCache()) { - case GONE: - clearCache(); - break; - case OK: - case NOPE: - LOGGER.debug("Loading http texture from local cache ({})", cacheFile); - try { - // e-tag check passed. Load the local file - setLocalCache(); - break; - } catch (IOException e) { - // Nope. Local cache is corrupt. Re-download it. - // fallthrough to load from network - LOGGER.error("Couldn't load skin {}", cacheFile, e); - } - case OUTDATED: - loadTextureFromServer(); - } - } - - - private void setLocalCache() throws IOException { - if (Files.isRegularFile(cacheFile)) { - try (InputStream in = Files.newInputStream(cacheFile)) { - BufferedImage image = ImageIO.read(in); - if (imageBuffer != null) { - image = imageBuffer.parseUserSkin(image); - } - setBufferedImage(image); - } - } - } - - private void clearCache() { - try { - Files.deleteIfExists(this.cacheFile); - Files.deleteIfExists(this.eTagFile); - } catch (IOException e) { - // ignore - } - } - - private enum State { - OUTDATED, - GONE, - NOPE, - OK - } - - private State checkLocalCache() { - try (CloseableHttpResponse response = client.execute(new HttpHead(imageUrl))) { - int code = response.getStatusLine().getStatusCode(); - if (code == HttpStatus.SC_NOT_FOUND) { - return State.GONE; - } - if (code != HttpStatus.SC_OK) { - return State.NOPE; - } - return checkETag(response) ? State.OK : State.OUTDATED; - } catch (IOException e) { - LOGGER.error("Couldn't load skin {} ", imageUrl, e); - return State.NOPE; - } - } - - private boolean checkETag(HttpResponse response) { - try { - if (Files.isRegularFile(cacheFile)) { - String localETag = Files.lines(eTagFile).limit(1).findFirst().orElse(""); - Header remoteETag = response.getFirstHeader(HttpHeaders.ETAG); - // true if no remote etag or does match - return remoteETag == null || localETag.equals(remoteETag.getValue()); - } - return false; - } catch (IOException e) { - // it failed, so re-fetch. - return false; - } - } - - private void loadTextureFromServer() { - LOGGER.debug("Downloading http texture from {} to {}", imageUrl, cacheFile); - try (MoreHttpResponses resp = MoreHttpResponses.execute(client, new HttpGet(imageUrl))) { - if (resp.ok()) { - // write the image to disk - Files.createDirectories(cacheFile.getParent()); - Files.copy(resp.getInputStream(), cacheFile); - - try (InputStream in = Files.newInputStream(cacheFile)) { - BufferedImage bufferedimage = ImageIO.read(in); - - // maybe write the etag to disk - Header eTag = resp.getResponse().getFirstHeader(HttpHeaders.ETAG); - if (eTag != null) { - Files.write(eTagFile, Collections.singleton(eTag.getValue())); - } - - if (imageBuffer != null) { - bufferedimage = imageBuffer.parseUserSkin(bufferedimage); - } - setBufferedImage(bufferedimage); - } - } - } catch (Exception exception) { - LOGGER.error("Couldn\'t download http texture", exception); - } - } -} - From 92241f4db9eaf036989e07643920611acd5bf5f8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 01:19:14 +0200 Subject: [PATCH 008/104] This technically belongs to HDSkins --- src/client/resources/minelp.mixin.json | 3 +-- .../hdskins}/mixin/MixinThreadDownloadImageData.java | 2 +- src/hdskins/resources/hdskins.mixin.json | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/{client/java/com/minelittlepony/client => hdskins/java/com/minelittlepony/hdskins}/mixin/MixinThreadDownloadImageData.java (91%) diff --git a/src/client/resources/minelp.mixin.json b/src/client/resources/minelp.mixin.json index cdd1d99e..04f87b4b 100644 --- a/src/client/resources/minelp.mixin.json +++ b/src/client/resources/minelp.mixin.json @@ -9,7 +9,6 @@ "MixinGlStateManager", "MixinItemRenderer", "MixinRenderItem", - "MixinRenderManager", - "MixinThreadDownloadImageData" + "MixinRenderManager" ] } diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinThreadDownloadImageData.java similarity index 91% rename from src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java rename to src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinThreadDownloadImageData.java index 37b11984..ee3cb2ad 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinThreadDownloadImageData.java +++ b/src/hdskins/java/com/minelittlepony/hdskins/mixin/MixinThreadDownloadImageData.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.mixin; +package com.minelittlepony.hdskins.mixin; import net.minecraft.client.renderer.ThreadDownloadImageData; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/hdskins/resources/hdskins.mixin.json b/src/hdskins/resources/hdskins.mixin.json index 04343b72..6ea1f2f3 100644 --- a/src/hdskins/resources/hdskins.mixin.json +++ b/src/hdskins/resources/hdskins.mixin.json @@ -8,6 +8,7 @@ "MixinGuiMainMenu", "MixinImageBufferDownload", "MixinNetworkPlayerInfo", - "MixinSkullRenderer" + "MixinSkullRenderer", + "MixinThreadDownloadImageData" ] } From af27a1a629c4d9e1b3512d6676cdfa2b4eaf51ea Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 01:27:17 +0200 Subject: [PATCH 009/104] It's completely pointless having these, but Killjoy insists we keep them... --- .../java/com/minelittlepony/client/gui/package-info.java | 7 +++++++ .../com/minelittlepony/client/model/gear/package-info.java | 7 +++++++ .../com/minelittlepony/common/client/gui/package-info.java | 7 +++++++ .../java/com/minelittlepony/common/package-info.java | 7 +++++++ .../com/minelittlepony/hdskins/entity/package-info.java | 7 +++++++ .../minelittlepony/model/capabilities/package-info.java | 7 +++++++ src/common/java/com/minelittlepony/model/package-info.java | 7 +++++++ src/common/java/com/minelittlepony/package-info.java | 7 +++++++ .../java/com/minelittlepony/pony/meta/package-info.java | 7 +++++++ src/common/java/com/minelittlepony/pony/package-info.java | 7 +++++++ .../java/com/minelittlepony/settings/package-info.java | 7 +++++++ .../java/com/minelittlepony/util/chron/package-info.java | 7 +++++++ .../com/minelittlepony/util/resources/package-info.java | 7 +++++++ .../com/minelittlepony/util/transform/package-info.java | 7 +++++++ .../com/minelittlepony/hdskins/ducks/package-info.java | 7 +++++++ .../com/minelittlepony/hdskins/litemod/package-info.java | 7 +++++++ .../hdskins/resources/texture/package-info.java | 7 +++++++ .../java/com/minelittlepony/hdskins/util/package-info.java | 7 +++++++ 18 files changed, 126 insertions(+) create mode 100644 src/client/java/com/minelittlepony/client/gui/package-info.java create mode 100644 src/client/java/com/minelittlepony/client/model/gear/package-info.java create mode 100644 src/client/java/com/minelittlepony/common/client/gui/package-info.java create mode 100644 src/common/java/com/minelittlepony/common/package-info.java create mode 100644 src/common/java/com/minelittlepony/hdskins/entity/package-info.java create mode 100644 src/common/java/com/minelittlepony/model/capabilities/package-info.java create mode 100644 src/common/java/com/minelittlepony/model/package-info.java create mode 100644 src/common/java/com/minelittlepony/package-info.java create mode 100644 src/common/java/com/minelittlepony/pony/meta/package-info.java create mode 100644 src/common/java/com/minelittlepony/pony/package-info.java create mode 100644 src/common/java/com/minelittlepony/settings/package-info.java create mode 100644 src/common/java/com/minelittlepony/util/chron/package-info.java create mode 100644 src/common/java/com/minelittlepony/util/resources/package-info.java create mode 100644 src/common/java/com/minelittlepony/util/transform/package-info.java create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/ducks/package-info.java create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/resources/texture/package-info.java create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/util/package-info.java diff --git a/src/client/java/com/minelittlepony/client/gui/package-info.java b/src/client/java/com/minelittlepony/client/gui/package-info.java new file mode 100644 index 00000000..b5c83539 --- /dev/null +++ b/src/client/java/com/minelittlepony/client/gui/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.gui; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/client/model/gear/package-info.java b/src/client/java/com/minelittlepony/client/model/gear/package-info.java new file mode 100644 index 00000000..7aef826b --- /dev/null +++ b/src/client/java/com/minelittlepony/client/model/gear/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.client.model.gear; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/client/java/com/minelittlepony/common/client/gui/package-info.java b/src/client/java/com/minelittlepony/common/client/gui/package-info.java new file mode 100644 index 00000000..b850bd93 --- /dev/null +++ b/src/client/java/com/minelittlepony/common/client/gui/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.common.client.gui; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/common/package-info.java b/src/common/java/com/minelittlepony/common/package-info.java new file mode 100644 index 00000000..0a21fdff --- /dev/null +++ b/src/common/java/com/minelittlepony/common/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.common; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/hdskins/entity/package-info.java b/src/common/java/com/minelittlepony/hdskins/entity/package-info.java new file mode 100644 index 00000000..08755de2 --- /dev/null +++ b/src/common/java/com/minelittlepony/hdskins/entity/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.entity; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/capabilities/package-info.java b/src/common/java/com/minelittlepony/model/capabilities/package-info.java new file mode 100644 index 00000000..85345172 --- /dev/null +++ b/src/common/java/com/minelittlepony/model/capabilities/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.model.capabilities; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/model/package-info.java b/src/common/java/com/minelittlepony/model/package-info.java new file mode 100644 index 00000000..6dc6a541 --- /dev/null +++ b/src/common/java/com/minelittlepony/model/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.model; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/package-info.java b/src/common/java/com/minelittlepony/package-info.java new file mode 100644 index 00000000..a1d3fc42 --- /dev/null +++ b/src/common/java/com/minelittlepony/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/pony/meta/package-info.java b/src/common/java/com/minelittlepony/pony/meta/package-info.java new file mode 100644 index 00000000..8e62106e --- /dev/null +++ b/src/common/java/com/minelittlepony/pony/meta/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.pony.meta; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/pony/package-info.java b/src/common/java/com/minelittlepony/pony/package-info.java new file mode 100644 index 00000000..d971405b --- /dev/null +++ b/src/common/java/com/minelittlepony/pony/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.pony; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/settings/package-info.java b/src/common/java/com/minelittlepony/settings/package-info.java new file mode 100644 index 00000000..644ea348 --- /dev/null +++ b/src/common/java/com/minelittlepony/settings/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.settings; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/util/chron/package-info.java b/src/common/java/com/minelittlepony/util/chron/package-info.java new file mode 100644 index 00000000..d3f32e34 --- /dev/null +++ b/src/common/java/com/minelittlepony/util/chron/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.util.chron; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/util/resources/package-info.java b/src/common/java/com/minelittlepony/util/resources/package-info.java new file mode 100644 index 00000000..14d0aaa2 --- /dev/null +++ b/src/common/java/com/minelittlepony/util/resources/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.util.resources; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/common/java/com/minelittlepony/util/transform/package-info.java b/src/common/java/com/minelittlepony/util/transform/package-info.java new file mode 100644 index 00000000..34c49157 --- /dev/null +++ b/src/common/java/com/minelittlepony/util/transform/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.util.transform; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/ducks/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/ducks/package-info.java new file mode 100644 index 00000000..24ad0ece --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/ducks/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.ducks; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java new file mode 100644 index 00000000..167f1f93 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.litemod; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/package-info.java new file mode 100644 index 00000000..12789fb4 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/resources/texture/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.resources.texture; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/hdskins/java/com/minelittlepony/hdskins/util/package-info.java b/src/hdskins/java/com/minelittlepony/hdskins/util/package-info.java new file mode 100644 index 00000000..d663a079 --- /dev/null +++ b/src/hdskins/java/com/minelittlepony/hdskins/util/package-info.java @@ -0,0 +1,7 @@ +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault +package com.minelittlepony.hdskins.util; + +import mcp.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; From 31cbb1bad46891f9344a50acbc83e7cf6b1c001d Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 01:32:20 +0200 Subject: [PATCH 010/104] Move the liteloader classes to their own sourceset for hdskins --- .../java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java | 0 .../java/com/minelittlepony/hdskins/litemod/package-info.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/{hdskins => hdskinslitemod}/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java (100%) rename src/{hdskins => hdskinslitemod}/java/com/minelittlepony/hdskins/litemod/package-info.java (100%) diff --git a/src/hdskins/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java b/src/hdskinslitemod/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java rename to src/hdskinslitemod/java/com/minelittlepony/hdskins/litemod/LiteModHDSkins.java diff --git a/src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java b/src/hdskinslitemod/java/com/minelittlepony/hdskins/litemod/package-info.java similarity index 100% rename from src/hdskins/java/com/minelittlepony/hdskins/litemod/package-info.java rename to src/hdskinslitemod/java/com/minelittlepony/hdskins/litemod/package-info.java From 80f76ffc67e2e098652936da14d6574ce66420a1 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 11:30:57 +0200 Subject: [PATCH 011/104] 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 From 46bc7fb0cd1882248b32a185e1fde906968584dd Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 11:54:38 +0200 Subject: [PATCH 012/104] Try to get gradle working with Forge 1.13 (it's totally broken now) --- build.gradle | 70 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 7c02f3d3..919abdf3 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' } @@ -21,10 +21,16 @@ plugins { id 'org.ajoberstar.grgit' version '1.7.2' } -apply plugin: 'net.minecraftforge.gradle.liteloader' +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' apply plugin: 'org.spongepowered.mixin' apply plugin: 'com.github.johnrengelman.shadow' +sourceCompatibility = '1.8' +targetCompatibility = '1.8' +compileJava.sourceCompatibility = '1.8' +compileJava.targetCompatibility = '1.8' + ext { revision = grgit.log().size() hash = grgit.head().abbreviatedId @@ -49,9 +55,28 @@ description = project.displayname minecraft { version = project.minecraft_version - mappings = project.mappings_version - runDir = 'run' - replace '@VERSION@', project.version + mappings channel: 'snapshot', version: project.mappings_version + + runs { + client { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + replace '@VERSION@', project.version + + mods { + minelittlepony { + source sourceSets.common + source sourceSets.hdskins + source sourceSets.client + source sourceSets.main + } + } + } + } + } mixin { @@ -101,9 +126,23 @@ sourceSets { compileClasspath += litemod.output compileClasspath += hdskins.output } + + fml { + compileClasspath += main.compileClasspath + compileClasspath += main.output + compileClasspath += client.output + } + + hdskinfml { + compileClasspath += main.compileClasspath + compileClasspath += litemod.output + compileClasspath += hdskins.output + } } dependencies { + minecraft 'net.minecraftforge:forge:1.13.2-25.0.90' + // use the same version as httpclient compile('org.apache.httpcomponents:httpmime:4.3.2') { transitive = false @@ -138,8 +177,15 @@ afterEvaluate { } jar { + from sourceSets.common.output + from sourceSets.main.output + from sourceSets.hdskins.output - from litemod + from sourceSets.hdskinsfml.output + + from sourceSets.client.output + from sourceSets.fml.output + classifier 'base' extension 'jar' } @@ -161,17 +207,15 @@ task copyBGPones(type: Copy) { } shadowJar { - extension 'litemod' classifier "mc$minecraft.version" from sourceSets.common.output from sourceSets.hdskins.output - from sourceSets.hdskinslitemod.output + from sourceSets.hdskinsfml.output from sourceSets.client.output - from sourceSets.litemod.output - from litemod + from sourceSets.fml.output exclude "/assets/minelittlepony/textures/entity/pony" from(copyBGPones) { @@ -179,7 +223,6 @@ shadowJar { } dependencies { - exclude dependency('deobf.com.mumfrey:liteloader:') exclude dependency('deobf.org.ow2.asm:') exclude dependency('org.spongepowered:mixin:') exclude 'META-INF/**' @@ -196,14 +239,13 @@ task srgJar(type: Jar) { from sourceSets.common.output from sourceSets.hdskins.output - from sourceSets.hdskinslitemod.output + from sourceSets.hdskinsfml.output from sourceSets.main.output from sourceSets.client.output - from sourceSets.litemod.output + from sourceSets.fml.output from sourceSets.hdskins.output - from litemod classifier "mc$minecraft.version-srg" } From 5afee683b2172ad9e2c15754d88446ff20905b1f Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 12:04:36 +0200 Subject: [PATCH 013/104] Try to fix gradle --- build.gradle | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 919abdf3..1f04cab6 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,7 @@ if (project.release == 'SNAPSHOT') { group = project.group description = project.displayname +archivesBaseName = project.name minecraft { version = project.minecraft_version @@ -83,8 +84,6 @@ mixin { defaultObfuscationEnv notch } -targetCompatibility = 1.8 -sourceCompatibility = 1.8 sourceSets { common { // code shared between HDSkins and MineLP mods @@ -156,26 +155,6 @@ manifest { attributes 'Implementation-Version': "${project.version} (git-${project.hash})" } -litemod.json { - mcversion = project.minecraft_version - displayName = project.displayname - author = project.authors - revision = project.revision - description = project.description - description.minelittlepony = project.description_mlp - description.hdskinsmod = project.description_hd - mixinConfigs += [ - 'minelp.mixin.json', - 'hdskins.mixin.json' - ] -} - -archivesBaseName = "mod-${project.name.toLowerCase()}" - -afterEvaluate { - file('build.number').delete() -} - jar { from sourceSets.common.output from sourceSets.main.output From fe8c7b3d3b8e35338cb987eaf8e8e25eb0218a69 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 12:07:41 +0200 Subject: [PATCH 014/104] Try to fix gradle --- build.gradle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 1f04cab6..67da3ee8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' - classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' } } @@ -23,7 +22,6 @@ plugins { apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' -apply plugin: 'org.spongepowered.mixin' apply plugin: 'com.github.johnrengelman.shadow' sourceCompatibility = '1.8' @@ -80,10 +78,6 @@ minecraft { } -mixin { - defaultObfuscationEnv notch -} - sourceSets { common { // code shared between HDSkins and MineLP mods From b5c06d1bd2ae5628e646ca99c1e2e67b65374fc7 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 12:16:07 +0200 Subject: [PATCH 015/104] Update gradle wrapper --- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.jar | Bin 54417 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ebfb6352..869d9451 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false group=com.minelittlepony displayname=Mine Little Pony authors=Verdana, Rene_Z, Mumfrey, Killjoy1221, Sollace diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 758de960ec7947253b058ff79c88ce51f3abe08a..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644 GIT binary patch delta 23310 zcmZ6yQ*X~oV zQ%O~jtu>H|+;BWeC$c}mz`)d#gw=ik9$fET!NC&on%Ybl;qq#5UzcFOz_?OKm>595 zm|B1UrDwKD%Rp3JXFcnA$u$Nfgd%0QAb2>HB{EP^@p3Qxo%8L$|GctA>G->liM8H0F?n(to5Pc~eM+F4|{ zK<1$3RUf?|!#L$t6heveu2n#Yd9^SwTv3tz(F&yMSNGE8$ zUOpJTMSB>V^lPiO){EXfT5*8xV<^3%v8(T)wkq1GbEd;;7N57gfDmLKDp@1Wc*{p! zXF9?zu2jT*>N8?L&ko;~C3p!aOFp-t9t2kEq&-)yu$V1Me#hsTr2)cjSTY@WMy_zN za>nopw>vPxgm>CGMl5 z9%a6ImpM;XvX9FNn5BORH4_FMipW}=tfc%>x}6183Rrs<%WWSi#l5SSt)$FK?>;xA?m9FgT9p4aWS= zOit+(mO4XPonh~eA+^N$d=@8^3(c%GXSe|)C9D21SlI`O18>o%S@8vgre9Ff-Hm3B zBa=BMvQN4z?U8s0zM%f`O~BDi=584aSpvfY&2;0ly5GNfQ6GzQK;CE!BPQzVZ5tzs{(CNH*j>Kn)K5x$gJ(dLM$?W(1IVU$~G>5ypjvAqOoEoMD*g~=@ELk4+5H0g- zd%C1v@rQ|YZ;uzz+=UN&SX+SDbZ)l{d~E(Lksx!`c^z@~sx=1FEOkHZ`za0U2IUq= z6zAAQqS$Z4c%Qo-v=0`<&X9ZQV(eZofv`+(EoLLB1Md@fzG`hx!tq0`c|iRWUAkAp zp7O{Y67%IZAtmQdFXnIbd5 z3N-DP8)QwVJF)?HFBIXmq~5KjepYjUOsC;u_3E0}p(N2@;ty42eRf?R#aGL_C5YN{ z{3d`ZH&VZ!7mX7y`0&IO#+`^8*$&kiA)@MXLn*F?kQzN(WOc9rGHd|GYuw+^)eL(7 zyFV_+=C;X>upU zp?QEuEIs0CFdsDfz$L)cW(~8w1Hn*O6;so5?pX>BUa56BfoJ-vB9o(b=S=x{woy8t+lp&5PQ&oqQQUnRN)_4B?&qYUG0|`sqohXe z^s3_92lS`-<-)1%eIB&4-zZ}tZ%{kLJvqZaGU4w)8Y8nDuOH0Ha*$A%U|_JY|3#q) zSRO*BFa-t}*fT8{7|DMtPOerd5pt+0y_{$utm9ulsb5ZJrl%XBMLTNA(Z`8AIcV^b zNt#GWOjt<{D7=zmw-BmX3~&$s+wn8BUgc$F<*XeUJXYzfMYma^eVYC8&R0gz+S@3ps!bp$~JQ zBe{}^(+1LNXJ8)g;1<~qGDPBv6ESK zZ_Pxj2ybLN_yY9ea{=z*iU)yn+Vm5Su+s=@I)Tm37i+{wquvmEqga@o-#-{oTecPqoES z!oP8h_}m=z8?8+)29NQ7f8m2xS+F<^if9pt8;QiY7r&T1@Emz6IiC7v)8l>h;W#; zyS6nD(99fEiUd~e2HvlDwK=xW91_ZtPngVp0XS_pH{;A*>xfnf*Q-IjG#mtO;D4ZJ zI1bBulh2EjmF6!OIeGim%5t*)c|=7Ha1@Ql;!js;=a@JwvCx zr{%NIT4RFyPTI?jzfghbCpdN}iMg*X6!7s_%UFD6X;|f=-!Uw z(sX5p^M{vgK3QwSM&ttP`-!trq!gB&iz$-66KvOg7r*++0<}R-o_I2Pnx2u12FBa)ZXDW%^sAfJ;~0zeZY!Rvj4cAk#V2gJ z2?S2@d$%RK9mI2!jF-YN)fapA6YHvt+G~NZ$qpsgCkc2ih)0>$54uw`9gYofE(-8fj`yw2`IgJ#T(f>UE?(xuc#x zz=+3lbiwwh6b6t)0WD?j8VEImn&hGLnS2_WN}J=ag54DEO=oG2{%aO(l9<)JU6~1A z)=$E$vx1bbNN|2TBP}GeT2{avN?rnbjxj8rrK!=StpK-MY^n+JRdZH~z&)s0C|y6ot*h+IK0(g3ox zwjnbc(#6dF3>u-%(Q@;_L2=We($~yw?QSWth+KL|S<%F9=Q-b!=*iC4qFhw>$v0F! zhXlR*roGz;mlZ5BtNUc80BpdXaT2 zn0SeSL8<&l(i>u6?0p}uzQtuGNu|eb;8$Ogm~KF0{TP$-_)B_F+V(!QuIOK@2Ydbb zy^wrM<2n^Zj)o1=d7f4ahVGB%4$CLgl=x>G1op@GYGpITN266wxGs%=$d{;r=NiyI zhn>mR&rH!$AoT!Q(TGqE6y49MT@@SV?UD!ZulkAI5RHyW+LkF#YH+(KVpooL_OB&n*|4saIW2!t^5WL zJvfHe4-V}vCGSq@8hP?MIzi-LoU|ZaPIkCM?P78Qj3mlzN0C-{E=WlN&+}v5h_pzX zE=#?t(zQv(!fJ6=#_okBWwmANk@169W!hFWezW^$cL%LQ9(eOs-3noR_QD79 z;87_Jp+5<<|2ig=A`ekqezslgx9ZsG_!Jx|ru{f0Ohb80q5Dbc6mkdnlurZ^*s>p< z!(zS)#BIN6L(jmjAuaE8UK=z)MWgOMl*wrXgulS1S!oCj&eHz#PXmz{GvMLd*+lEc zm_V9{{mNYt)St2;gsYKEIr}IYoUQo>aZ4P%!Ky(p^N;AGmB0KU=3lb(-)4@6*hb~@ z3AHzkoe)!zf22)M8*{Bm%h?m4hRN3T0>ehuv}H=w`ACe5@k5%(Iv@X~xs+gb1;qjM z6lXrNnJZ_OwURN1s8P%l*sle&mMXL;VHt{=gUW05FSOr9cL^F_aKEb_l-?L)|8`gu zPB=Zzss}{uN+4b6d{jR1e{~N2R(=x{8DoC?B$Z33npgkA@|*gNeKkb@x{mcAk8ZbF zr{(pP{&yGD0j)Pje2x+JQ~izGFK*)Z@n(`Q(v3!rMjAQnt z3DuHx4z3BeFE~TkLfc_9H;T_F%CZtCsPee%RFBbo)dOJlN_+)iF+Qae{7rrp4!UI6 zQxO^PH=KSR^~Ayv+Y@vGYPKp}R@COb^TVld{G;DW}>o?82Gl;N|cH@3H$`$`)^24}`s=KzYaRyd|ZMSO2Cy zWk;Gk{$>-kVu-oM66@@U(Xy|jUbeXiA-eO}tn&`X7WFyQ`U?D|eM*+Up-efkU@1aj z!Z(YJ?S>pJlO7mXQ4e1mPudWa>7F;*OqUl|Ya_kqa80=qvjF?~-Y8*S@VzRQz293DfU5KFped!hZFR@W^$CPaZzozHvQ!r%f<+vor9Kp%^cI@ zb)tsSRHU&SQC87x!vp^2nf`EQ)>R-Pk~PARaZ(;^8t+8l13i`|@}5Y_JXo9zN;Z$Z zyH`!PZ@^`lkD$(Mfh8|7a;xX)vVHIW!PDM93M>~#L8pd~Ga*`c69CdwlEm(K5RSoC zNS-<}oOkU$M$_mgI|L`au!rSC!d5W}c5;~jkW|RSrx5#(#^Mb5KY4wIriN=F*t=Hs zgVq#Z=(q%~K%=bOoXhK6xGo4D3_bGq#gtgi9Hf%d*CLkOXP6fys$>&oECz~NsEcW@ z6Gb(Z!ZR!0%!wgwkHcu|z=NLHQ}d~9F(c6r3qJ!S_yB>^G$duib&@b$ga_*RNyt*7 zVi$|!2x;0H9`T^&2{DeZ!l8Yi)JwJ2@ES>?i>|2E%$@Tso~hn^$p77ae0$t`DqD;|QrHd4rIe;bdx$&80t= z?1DoF9WMZ$kh%csqOGBhLH_>QdXnu6gmd;VPdzC&gSDL;DSc7xVEza-pV~m~mA#&e zi=ntP1e2qUV4Dcq9?!(`_H>lFSj%0u@6xCz_eQGrxq_AqOU-b%51SJC}?o+fF5O$mJ_(&6OeuR zJK|wzVi@|<{UW`Q%;2%@3i+Y0#3?i_fR2c3(l$Hv86t997Q>ppunCE&C-G#?Gg}E~ zK$-u{-8O`m%$*6)8pL;IdO?xWb*9<{HOCItnrSwOOykX}xr;!4JP&M5y(#&irI7_$ zP5Ceif{~M&HeQJMz^cj@8nh-n57k1amO7b*5pxtjvH1V6G=QuBafjXSM(Ll?_k-I4 z{}s)L11YnDl}y==Da61nhrXb65mzXiOZrg{LH6IQvQ14x@i7bd_OTR;ZjgF2x1c_+ z&)N%x#<4P8r;GQJWyF-z(8IrZlHEYnQ_uVq~XrOh1A$V z`pVWs`ik%xbM?}Zkfa=xlH6y6&ARi{j7P33G_Ik0KSjoog5m{tmtH6P#MQLYY@kPO32g&-p7iqziC&{&JsA zKWKqjtMI`JYkSa}8~d`AFLw48WVS(ka0~PqP^kDP)NxewZANmza1me-;;v}72dH-Vi&YzZ34gK2^V-m75s0_-uMO`Fsh-kSN)=TCBq6!3!Y|L8X8Cs z*l30ZN}vxyPk&ffPkPcDK5nlf}lv1bef$K1K1cHxi}zmO;Vd2~5K!?DLv zLEG>({`56z`e-^A2n2vo=1s-@kxm*!r`kyeeNj)f$om?k{Q>$e20f1fWu_mI7-y z@^?H2>7*Pd7yXDrQ-i0Ej}-;f_f2a5*5zshDeR@P{V>F8!3H;iJjy^iQk?ipxOSbQ zJ+KruB-(NRjgAOgX8Y##mv*e=?C&^Yv7}3ZsY)#f_vIapjfA)Z9fOn3J5Z(4#-dGOCDkGtXZs z%~6$@fa`u@Q0e0w%M z=$_#Ylh^Ki_eaFKl@LGkn8ITd7@mky#?*z(Iqy-@_Q#9$ok$^c$HZC)g-=s>vgJ(7 zd@4cs+-&Y$kn#+r@X2?{vE};ZJhd@x{*jc& zyuM*nb+Jd*Hxr(b%J~we;79xyT;rL9K!s$6+jsEuZqc)m^3p#X`0n4LXWuiz5aR4) z*kS{p@sT6S_vBU?IfqxW<4$TGa+ir`+F% z#jM_`-^Dfpq%_Ufo8`(=qGs}!^S7P6ehWSjgTCMK12gU&2>4kj&G_QEk3H79iOjz{GjR@$OtsfHXH6{dFR&nv$Ps~nM* z8BWRx^tfY&sDYv?*QORS?0M%uD2X;u8}T@oT(hWh@I1%?E+96Qxe1`2*MPKi__mtP zoNQaVR@iv0ZO)Qx@b(@C93T|j_C7f+e>*V=&I*nv8+-p%g|!@M43sbfM4+0Gyo+<^>l0wU)>&z{<Ajsy|`DXyQzH+_VSTlh0fZ^h5FdxUPwxK9NPE^U?xvd{^jv)b?aH@V? zbBWY&DR*20!a*7(l%};oWtGg{RE4qNxr5w?h9UdEufO~#sA^4H8tpO&}l^Yx$eiOd+DoA)gE{nO=v z8$qL+c6r$}&3W{q=v$6ArWfEn_= zr%MNn7j0|=9aY5GV}b{22Qovi&*#6J<9RhTD9Nzl2}qIM66;FRO;A$`OA#hl(rdf% zJRcvsLw4V3l7lUbOFHaI`V>&7cV8Y0a-EMMcP8rH6yTZOJ#_*`Dbaz652UsMQv784 z%pi+=(Fp;u%`LUopCS~G>??vIt>sBA^pP?huFlYe=tQRYVI9MdQBhOOk%;xeHbYk> zps)9+osFbJHxyI9o6>L0uDKYZlja=l@Tg;fGFIIl@fbwL@T9%ltWSZglN>GQ%-2YG zDHf=X1w{hN2eVYHdW~t9pAA~Hd4(Canjqer&}lyK>n6KIw-}n#kF7!t>dPK54QleG z-td(C6gz!rSl$$@H1DfZEU#rqfm|1Zzv|O|wau$pc$!7$FHQNbLp?JUux_z;aiUqSzo@-&ZN2s5Y;8+m`6QGBnxkvO zOgBF35e5u%0iLFb03wt82DB5MFN0BDeQMx|bJA~7X6T6qAl!&^jOVF7MD7?g^Dngl zL(hn6_5nl1wzINKy8SD%H(d|UK@hzsw_B{MVqXLSFjV>@0ZBXueyMx2;ic>(V6B~4 z_chDm;?(u=D7on9Bx`FLdz|ntS?)s~??HGx>kme$=#1lH7G6L3hxe#I5p)IfI*-3@ z$~j~`2cbddedCU+JN1^Y`GQ+95K9J*x~HSh2fj7I~P0&|b$2eu1o<*uCN^6xY@;XsV%Mg|^JE@zPCu%N}) z^Tp4~tEHRw_m|%XGD)}u+H@qx0y@@waHMpz2y?izTz_NWran8JXn$rPKg6hnw~JC} zf!s<^AkTQ9?CaJWqiPWx!RznTjyrdAJbGc`X zW%<(nt09cikg+M|g^|@e`Mr8@ZV>uW51&5zUfpm!Ww>CW#Wg^NOTCX7UU17GylvP{ zjg?BH#MrV;GddA*A-0@Wl8qS$9$qJo=N*>^IRbR>WQoFtK|~^UcV3GSld1V6tBtO5C%ds!VJphCP`QpN!km%~j~?ST z2tO%G2~ZrT#VVqQ+If06=WGVY&|TF=b$aF%KE`Hq5kXv4vgzHCzv%IezJx|hKUXnd zN{ddJGHk45m28Bqb*xY~d%HX*aaIcV8)%7#tPpvImP$p}9!6 zp^;Pk=}WE+g~c5Ob@*_hAuPl&ul+A+Uz`mahZDZGNWNz%!*r1!<9yOm&pZh+fuNCj zb27jXR@b!TXCRDsBvo+1-aCZSEB%H3YtZ}KSHaz_h&FOkIq4tI`Hq$!E?Jw`1KkAh zDbg3aT3puz9S5g@SG>CG2(2v^P;2y)d4>M-LHuy~Qrw*bo%q9@G-osr9dPXlB~RD} z@@m%qN{vURkj?5(Bi2RXI-J3n3iT59GDo26DtU24*CuR#hp`4Ch*Q%*PCp%7P>gF7 zuL_X)L=LVBQ=8&~gKS4ose3cd4DO_K5iy8xEThT=4vhZywb2MgXrTlG42<>%7#Mp> zlRrhuo)05P#SeB|9K$`Tht)Z2%a`9pCI@w|4db|!BRC2 zxRe{+Om@x+o_5aW`#yjDy>(&+D|Im%)tSmGwltK)bt3=((6KET_H@DII%e*pG8x=z z|GQ}iuxawHz%6%_IU*C;-FQO)lQr8V*=!Ff zMvZawi7bm>U3I!$ncQ*7g_Ed;^EWx^ZRL6%-E%aY{%kb(;YB*@)w-YtJE)vT3c&S6 zq#_;-v2b_fA`m-VWRYgA+TxUWz01bgZ-(V4ep|cMI;A0Rd<*jL4^9n@IN54ry)Kn; zcir-yDz8^6totcPILEwle zyRvk^7DfK^6JIv+>{gJqC7`(X$}ADVa)?eXJCcClre7YR6DxNpGT5YN(j|fvNCp@= z>4tB+haSs-k6ts0^p>gIBkD8Fe2H~m^|sDTh+`V}zNw^y#$ln-_Mb%k$=BbkVY9?B zWazKDl3nm6x@b|Fg*{HUPv$ryK{a}bv4}Vj@^31G$l4<3kRJq1Crf6UwO@Uj#FfA^ z=llY_pK&pi#$EHH7u8ja>8B>+HA_(mwxv?Qz_}r?;<72~Fc_E1mrk_TkWPm&r7Fq`a3XHG@vrSg`nxpdtQZWPIo7mg$C~2ebgGu`ros=z6X=k8L)w032m4Lgu~LpF?&l_*xOYD;-C!=r)s4!>cQ<}YNgb^3$PM;ME>!_~b{l-J+G z3c17dWKV_gi~ONg~%uBh5EN8CD>~*rcoQbNHjxWSHghlS?d%34Cd$fAUo6x%abc{QSn+5L6RZq zE^wpRmniqlGU@^;wpk;#iIZZDkIg=0Cx$oT%OXQNrY{^$9^HX8yEq92{E8$TiqJpx zNX8UT6%|CG(*^7hsFPlDlVbEN)cox{gq_F2in9Pe#42~eZsk5cFBi*nXm;wW@8YLF z60y{f=xKG%>zB`Cj40Fkzv%EsXRe9%bBaI7hKhNz(&LbgY{H_-f_nA)swGAJZJF%z-y>~9-rsGh7sdH9r){4bp6)RwDUxb8a z-(&T0Y-R0KOiCM4N;fpm*{ia;?=XPm-vZtQRftfeR$FZ}Q{dCgwvGhne z!7W>A{-&}|I#|pYb*Vj#6o?$ga@Y9hwNa$Vntr^xJ>e`a>i%lA9mjIxFO)IFGLQ(n zxv%ThgLCy$+t<<@M{4|EJLx)$IEP|3pPeP*NN&~M!2{J!@-*|oent$bMtOoE(?7eV zY)w&&gd7tY-ydusvjPOuHQlnvedEtoT&}}qp2w@E%Qw+wt2M(WDv&L0GXlrZ7oSgd zxFRu@#k^H|X!(gacZwsn&IVX%bwQConUq-kOe?&t%@);eE@Wd6#8Ukn?BNkwQHnXj zuXj%L>+J;T>zUMoT*gdz_#%tMm1Y(W$Z|``+GU{SRCSL7W{E8H7Nt@Nk^I(>KgB~s z<%y#HBQN?Br0enqw^r%J({D+i=ZsOe$Nz@Oi|x!KXdOn)Y0Vm@8St1dRqseapZxxS zP*7;dAED8_N~<_Y{USPkZ(;1WDW(4f>?e-(_t<|96!Bm4O7Q=9P**4s$j%${7%Skn zd5R7dWOx`@kY+`8qPZIic+6ZYX>n<|Fur_j>xPM!JPbGcX4X2?)rhR#^|s+0m!@wM z?1oQ}EV^jVl3`=<-<4ve?`Pn23XyzM1=NYeF|gg z(+*74I+CNla22J;s$6rQrO1#>ccI#QDsvuoLU*q(H;I6Fu0_1 zs#_}zK3pF9a;2}J^fdp7UoLf=$9PdILPIX+_9KC;rnZg~R0Es{@m}vAp_cKjFfTWz zE;p6?ORWZ9CwL0f6k4Ydvf_;t;=H#|6HgwfYgyxL=Ckv716xe z_N!#e>h)|D-m^$*K+|5!nb4DFEh>TbOtd{%1QCvd$x)3j#gjPdT;#PKYHS*gPwP{& zZe^Lz!**+daJf}~dHH5ZV_JO?uq*oMB6Rpd$X5#*`_sI;C&P713$1hr2+G?ouTG%c zE&*_Ph`KG6I>h0-2-feItlQe7EiYQ; z*)}MivMrvVd>Pt#dh$X9LSfQ|b%<^XltX?~Sy7W=n6U*2pVJlS3*@g0H_U?-l-!OA`%FZ`GFf%FTYB;j lv_yyfWdpa?w36n65=6@+niTCwLyU5 znZH_(%`_=p6U2x8~dN^R%;!U}5V_TEn!~Yd|no(7r3#DOgHKN6$K3N~LSjAx{ z`7v0GRG!>ziNWOTSULEM1*p3GIkN_XPdJ-foB?a` znBwxoIGmBSrV1ZMMr~>piKRdf32;nKxg*)=h)IRND%jiC{t%%miJ&W`{H}Gt3s-twsWh*1+ji-@PY3bjhP0bRO=BE8~YG&J+ zPwOvTU!QUHqwsz19@1ZLt{JJGrY|?#VvRe<)~In& zp~V+{`J{>$PN$uSCPjR~9ujRM7IsV_ZMM{)DG;&g=+oLx6Qlg{OICN_FSg>COfuvNLk2C&ZF=y+m$Kcm1 zI8JslhO@NSu>B@y1|+9ji`aVzy9Yk6euh%6FuLH<&9m(;D|ULJEaH(^L{X)57mNO~ za?4TCw*nh_>dRm1I_IBgj2>!iPXM*Jx7{UXJE5WJ?{vI%fEQC$P=0I1eBPCyLE_FbKe=L zWtdnt3o^%E{4#AQN5~-Eo(9;w2ab?x*=Q?56#sRutw z!~YPN6H(22;Tqo-HKXvzSe5kgDkecGC2LEr+QdT7fy%(Dj}Sb>`#8Pfk5obS2Q*0W z!R$PjF4l4oGh)$70FtclAZJ3zuqwXPTZaxMBBpD6F6VJDYRa@y)NvdZqCh7YxKYYX z*Vs0(pWMf|PQr(A1dAP*h1ddu!Yc8zU+qe1H&+OzS2YofeqzKK5DF$_fm@`Ljk}GI zjh}7i(uUj`Yg>(zhKFVD&?$xzI?Mu?Q2VtmPJ8#s%}RpQJ>0)T6b11(3ZXz0i(I{Q-Gyw4gMyivsVuj0ualdv ze}6xJ1OjWR6NizI_?jPVL`w>C@TgeJNPmcpw8CJq(^+y-uvC~DN+gl$xaBB-ZkFWI z&Ddfy^yg_fpc*zUi!AlR#`L`{{U1>*(@0N#w)b4=6T9Qo8_-brOuI6CGYt(@IeT~b z)ejchcX`-yQ9|<9SuSHLc`uj$Q68^z=^hND{3NOT;|X9(FnmwHwC_0~Q>Opes_5yv z<|$um?L5s2)kD5!+boFsvg;ZL?P@AKgn}YXaI@&H@3nf2-6~XQJ_cR!YC0Pa{cywd)_BXM_AgJLQ_5dc~HGIuG7#f@eBah2&wa@h#eOtdZ<|j%Mm3 z#qpF3HQMt{(VXF7%Exh5eY9;1`)|jZoYL%wF9>qK_z~Hu4+R8>@iKQn*RsePzedz% z5=p{kIWz}~ODIA-s#O~yy&N%ixx3zdqjN8RbC zo~uCugRLkGeTmLe=C8>#!Si+dm&&|+I{|`<*m-=_3NI_DA=i;0cU>kyiDG5zgmCNT z(?9fRWU^ci^0y&?D|#}JWB~EJk_cmE`U3+>+%(CEC97x?;&Em8l|k9O-6%x9AY!YE#36gJIHz#Bzt|Na+Ye>0 zGHUiE;6FjtAJSJa_0LTuRWdMbkvw`A3yhxbF+q+{tDBsM9l|RtB*zr~Ml|W&CmzE64>XjPX7xrg+#4tXG&L+ILJN78 zSXtazvc()c1%UoDeSRvrp3*_;AK(kM?-e?hB7F9X=D>FahB^l`rS7y>;P$vD<9T&C zp#V(Qo1Q$57ZCD~H4q4gz$VTxQL2~R$Y3HN8U09GE318Ymw~=QX)iqoc;{jqgKxt{ z2SIxjh%j_VPz@A*OauGt09ww$IV3yQiZlhT;L0Me9!Uf*e2P zQ|KkP6dkGn(|X@zL3`fAIG7<3{?A|z@sqP=A6F!1weGzkR5!@N4iw!BFp6PxWnA4# z*W%vQ>3KUe*vILxg9aeddxtT?H2_v_)?ORa^T;`N^aegpDedXk2Jo|cbFPioK=DXA zTz)MFujPk&K^~@_WBIWnG?~I#CUo_-1Q}*DpD$0}9!-sIh$X$cQXvFCv6s5S0ihz+ zgb@g~W4KFG!oUAA72$+8&AhfL@P^%>b9|{ki~h>!d+9&7eKFtBF0}6MqO^sMdBVmo zMZzogDufM6AaKz+;NY|AOw1LG0NusGf|Ea89g2E}sT8N72C{DbFcPy>G5?pAOL?xJ z$1ipOaX{@Ef8_OKAi9xvi|!DKBkj`nn};-CM5s5OD-w#Dm255#s)*2o@`*s=cnMO# z-l{oTO5A0#!aG)`Ij<;20gckqlct+m#nY~o^tbfvjDe|f{+E@qqEn|SpCV%V{%^k{ z^E^e;YLrWZf_qfwJR9`cyWA%M=6Ggdhk}+4sZ)++hBz{v<47jeT1=VfrAPvQ*J$sc zt^bGVTzmc5l-X1lsPB^Br7hxVq2SO`^Ojf1Dbwkaphc9n)L#Y@88q3!8XJrjvWm>GobZ+aqTsuTWoU;w1CKKkkZRy~^oDH=$nLPIvg-ZUj$frfz@! z3;?e@SSP73Or+jMlxGU>OAXgf`AG41y3m|)Sn5?sxpbzr5iH56kpU$xh&y>0gl{Z7B- z5%qky*jhj6V?3nEg7vx%6xmfq;%6WQD^SOvzs$70KUfti zG;FW|@Hhjki1$7QP$ETLt-^P@_sJI@@Cr^o9{~nEt;cg?zI0P^k?|(De6F}jCrR-P zh^B^B*50*d0D44>?XrT~O+~R+zI}poARoY*~4&w&kn@T z6P4nmcA}5%Xpmsu)PPn~@8g<4+uL_{`!3q|T>UbEO zYZ0J9B|GPE&N{6j84>U;)bmeJ*{gL#bgd!m|5%va&aIjFyZaAl=;|6AC!JZ zzx%rV`Pp^ty3RST$94AF-tWEtIOlm@W_!mJA1GGTziFoh5idFhM5K{`{DQTlPA;OL zRWHj?dmU9}QES$ExsIXj(LaJlO?bBj4kZT(8g9z2>?eju%BNtapl!Wy^W2v^+1JzG z<@Y2CKAkitJx(5d+uG!**TBK>R*g*ce%Z6(F7n8tAZcSY=2BPYIi-m2h9^WF*9tgR z?wm2W`LvIw{6w9vHioW}%Es?S9;7#RLxpC3bJ`1lwj?^=Zx*23hL2)9MC8R|*O#f} zA7ENaCY3$?KPmDJNjab@ zJRs6=4mdDzn(NEzND~?%-Pqk}Fdik5oX&pI{46<|8do0G$}6V>#rvU8a42kZ4wYIz zyYn-Uj6)&9C@Ti1+zaN7>)=9WK-$kR%K|5FFtTw=-n30X%8$iO5Rs00$Gkx4#;u}M z4)BN6F9d|X{u(@$_C zi+u97#vxIQaLk4Bq1w9a?cGWE-?S`0rF|#@mH}pNpEVRCmjnq(d=C_*(P2+ZdEm&@R;F89A~gYdo}20Bt*WB{WbMBb3v(0D~@V1vBjJc zJR^Zjb-@d(b;C3Cz_c&-BX{gy! z8z1Jisn8LQFRstmm!>~8-ppTPtkCmeIsbyxAO`xXvh;waAAy{r%EDN@RS%S=Gi>cQ zAw0(n>r)m&>B2)AWQpxv({y_wG;R#U&laP&RUg0BoZ3mN8V2vXKx7SuxI^yQ_YL1) z1}F98m#41&q{u!J&lbzdAuE!HuY7h(wx#7!D0$jlBmF+|@*Y#Q8p|d1-_NAgXJ5Dw zOIhK#zZZL^I^pz^jn%H%7>_@&mG z?@$VXz+_JVgvqfI_dibrsJ!|iqGtH^ju1{{l&_XR_jixyEoK5<1kCt5S!}hPq^1r%AmTh(S=o^fsA!p--ago` z^_jmqYamw>i-qc~j}cu!&#%-KnEE#==&t#bf9W!9ujU%a>^>PQi7{INWqLYT$9J~%b6}ZCWjImg_Evpy z-DNc6DMpzGPuOQ^;<1n}UJ0*tMIC$C^x>a{bv{BxpHITvhVXhr4;FR#(xZ76tTS6( zWykBm$QfjU)zg5NwX|?EbWc6)XE7q>@ucoaa69aEz<@yF`+JoVq zPQuX4D#zn#%2K*Iv585+g-?y%yVGmQVnXL8uA)9^Mpg$;ig_Jt&6-M$)7|YUt^34y zpYb)7$@V`tr1NU|hMP9q^Tgt7oR4}HaxJwwb|;%fbk^8b)U;lN%%#*ZHjSU9^n)}- znf8v0t&sD#0Rc;3)?ElU#Wy3SS(jS&q3$jyeI=%N){@{5MV)D;e(5*E)>jnV#Prjj z!V-AJYZU0ZgiN!AbyRphBxO;@rCO*`-P^OGAi!P$r&w|nY^Th6B~XDS@N4NBW$Mh) zwJJFJd~CxI`%GHGf&H!=*?GorIs=8LFY4^n0`F^Agln@3Dh9miALjw5tiN*xId_ji zo%LZ*aGH`^pA+L5ZU>PwAal@1(xU%W7vp+zzJB>D&QHjt7}2+#xKQC?+A+FuEL-Aw z-*Pv65v)Dy5EP7k#pK?8PV1|12>Ed5w3bTUAO(?hheKawO|;>q@}%GcLOWM-_o>tt zVeHQ`F4iXaa{8f6jCgtb+|sQkpYX41~nPyIZ8Dq#Ub$Py?@35i!% zY7&*>GJw`5amFky7E$y=y3Vr@F+86}Rbv_*We*AGz?T;sIUJPtfOKJ|T_WgmH0*hY zbShhHWYlB-q9-E-!qtSjM@0dJb=Bmgu6C4U3(+>rN1IwT-7ro>A0uTg;6*uffU-Z~ zO03ox>v>*@Q_~m1uU{P^8<{7bN37_dx6Hc6iX`}@(Ipure5}8d^FFdqDMOXvyHuZz zd+V(K%^iQk?>QYgF1%9jzlZ8YtjL_!X_1iD z6|=hpS+P@mN_*FvsWOdGCMU(&1?}I`s&m|y5F(v5Kvccu`()crDa>co=lj{awhpG( zLr7NhU^u$on1@MZ^b{j9cEIL2IMat6ft;Nv8rd}D{SNV{ri|4|m-XNrKT6D1&Y`%g zG_se9$+s~$;1OB<@*z6Wrb@|ll_PlQ(T9693P|Pdh!>=ryDBO#;yl&U^`S`I*YUJn zd5>slJgMhgP|A(tIf5t`tT|;L5xCw@>o1i1J1}Hn(zmCvC@EJIas6NpvYDL8|DnPu zfCO8@H<#9_m(zV&c9R?5$Dw&<(Y19fCu&Q$a5?vNnDS0S58Y$iAB^*S1d43grKumH z6FhHfTro+BV@Y&;lT1@HKzfi&f0%Fc@B#;;5vs5dn`_%Xca> z$rYO7;;+8v%fo9}3!T^mt?$~N{BXHa4|}m83$W(^KQF+Ab-%O4TIk1)*c1rcUsnaV zhzpL3fTOw`{9>wL!|!ah2F0XwjME3-qqQa$k$Fd7JIv?_YPD2EPoQ4J(Ei1MbA_;d zYE`**ADSy>MVlYUz`jMnad|Ao&UnYbuEh$R&(7FH0}^3OD;1oWtmJJR!L6A~i?#ZL zp<$^I!s=J_^|~=$ZJgP?gu$V0S+jP)3FJ(9lA+rOJ?G&LIHN=Frva@+30z~?Ra!(W zm@b5rTVgZ$h%YQ22F1u;vLjUJ(Q}x6j?!zGT3j(3G$@Mh2qJUe+p5}HifgYHo?hHI z!wS1R_rpp3*n9*8@)%p*!zWN+aggevg^LI4Z?=W7a+GUePS>TfP&8RFNR=5xNI41y zYLxIx8Hn(rmhpAJ9kjS4oi(c~MJhcDjqw zMCN7gLTF}Uu+n4GXO^lU;id!!Jf94!Z8g@ou*!A=;g2QH2=#4L`U?vJB)qJR=z$9@ z^ad?3{`5g@C}A*ywAmmsj>D2@gdx$sZzJrk>L;l=aHrey+<9h*!%0z_CLuOV?@&Y7 z$Jb3}v;SHBdB(L{2gR9Ka>3GK(E5AL^Q|q0M}pVQTd%vzUn>*ip13!=<&=%e6dRc- z`lI-vVU6o{xl{x46}03#iFo!ai;b0@ZmEi_n2qg9P|B-Cv5)yjo(1oJi$#=ficOyP z#Ha2exx*t{wTXhLvkLMli6()^hC=SP*fkJm!Cl_RQoa=Rv#vdKWpnPwIbn@x24h8y z37kB8D^brcoBXVa!Nt9Cel zISEsR+kDzbW^E3>aS^VmK=W^YF`|6lRkLX=g^fo*E0AAyp*bQ{k@5cA92jK8^bOLj ze@swZF+*w4M<#X{S>|TZY!$&n@P-;!Qmyko6nmX-U{xY1Hu$4N$z->F5aDwF> zK$Wj#F5%s=9~l%*`1;%NZ>Ba0Ft)b@dB`(F0+_$bmFIq>siE7o(E;TnZeOWFPoMP<&Ls>Ds^2XW;G8SS+P z3s1iq#z`4_)*Y%}%Hc&!erK~Yd@|0>2>SU@Ps=~54TdtS2}_Ia1FsbLY6xn&?spxj ze`#a*?VezA9rl6$ZGeLQFR2E;%`B=HP%1n%V}m~ zD_$qr^T6{xwiJ#C(lhpou%jtTvB}FM5SnP+d)oz;mE-CDJo_{aDDkv`xfZcy8t4IF zMMaC#JaQjcS^6H=GmA{92a-s_+|snk68%+^csyCy&MEVK@yo%1`0+kQx?@9FxyjaN zUbvAf%t%09CH~njoQqGp6^p--M>GxLCELtLqnPwQiffX`2FeECs#m|iS1GiXd7rE? zb!wn*VD>7&;eo0j6TJIN@2<}&S_)dI8u-XRxbOw)j7~3NVO-UYahdBXs}omV?0{tL zbUdHaOr~K8XCZcJnNen&1dd&>fVs>gFIL;LeR_ftBiX^|@Kk@eb-F6Jms?%hB4JC) z4Z$g2pSn6*YgH-d@5sZiEH>nq0izq`aUWG42Q>3E_G^~x2vLSKf+nJPDxlfGABNqr zrocS93g?;q-S-0^wIQ0NH61O(X>=3rym(sP1lik5-is2vI0)6q_uOwPa!pYq3EqzI z(f#dQ>8N7VKG>D|0}6vSYi6-zgnxh%VWg;bSjBgh7&Kgr7B%~ho8%8$n~l6~2wa^Q z)U@aE?7wd!DST7ZA}&ZKfo=`h9@4!Il&j8*TE}M3vgFNr{RprC7ke#%Hth1{x6-9X zQ<;NJ-o!v>9QeEpM6GoAJ;}|qs*Kgl=;gt?M`U-mnrh&|SRYQg)tDY(XXXjT=itN_ z=w@lj)~DoIYP)A?TFq+7`myaUyG#scdUEU+l%4^0moyy&6<;s(LhYFp^`;I=YqA## z>CZ456QFvMhfG_>zxd{Qn8tUd6MvCi%4=1++8|A~oX+O&BevZAfi0SEoJ9(iMUhz% z0uq^64hEasN9e(n~BwcI~Pln?QQC=44O&0YmfDrh+%Q&{@$Bqwt!ab4=2rXe*8Lcy{Srb*-|{h}n=hx|$$*ZoO= zx+Xi6ywtM&C)ov+{j8zV_)<1kB~m=cH`Ti1>ocW~XF~;2>{TA*Egve!qxztP^P~6u z1{nQRX%BQR>Yy&9Q@lSg(|%f9*VL3WCy(3>oCF#ti(}l~_TOrbgi*AfpkJosWsgK{ z2^71Va63%^kYp!PJT2kM%@XPO5yN8TPSh>G(ow9FJ;3|PA6brP{-Vzb6{~B)wkH6 z2=4~d={<6ACqRA0s{gIf5?dv{Slq*2jBp54OUasAUiuZyTBE5Lp!%( zPtR+(?(E#XDA5+ZpC)bZA`eX(JKO*mSxgEFK@NS{x>w}$3j_oQV=gw5?Q^lMCiG0& zQ=yQSfcxi8tNfPLpUUFv3aL58b~d^s5lX8|Ku>&F<d~OUOFhJx$4gJorkX1eAo0R>zaxf7gD@X zxL3aaKC%u-J-DgZ&W1f3F`BuRQ?UsRn}kMQ5CcAGZhgjm;}T_SGsQKqjmec%|6xvj zFNPTXQ7Iw78?MPx%B3HBc3DzeQpukH$m&^{m+x;KtiT|(lf zX-NzRO9C!?g3V{y3+x2FCb22b@>fptVTQa-@2vNf$S~&d2|$8h#DEKmX!{FMX6UtQ znjSR7MImo+^948SFWmqkAO5(P_@eS7Qo>)=M^}pPt6bW@rP2H%oE}C%Vn3=3tqAp| z-U%!S^_Cb4_(-@{*NnA?m^Te%F?1gs~hOmA7J+k)26V zW-Q|c)6?kg-{3YM)13i>L+Oloy*1lfV_jypJAI znC>a4xK4>08q>(?9@udo)qG&Vf`vP-_Q@UnDq|0dE~APAsaw@o#5|+Un}f?*NKW&i z1ylnlr{(QWLwoH|*5z0AVJ8hCv!X zoHdeRt_-Lnh8KH^xB3%=`xsp{Zp|+ua?v|C0c;%Y(jP82%2NR8%{#FRgpfk={W%>M z;fyrENJF$Eg)v$YKao-xTZj-aHA1C}2MEGIyy>Sz=wZ+yGP-zy##p!Rn{FJ$T9*h= z2Kzr(qFWW1j{C1G1>BY`y21Ya8n%O;SKta}jO{~OTSs(-dt@n_h z7?IUY0{ZWOUSa@%^=8+9Uf2S+V2e05qNJAw^uOmB{sHO5{{;yVzk7LsL0Y%2QlA8n z1bl14`}BZxI{%u4iTy$t8VKQjD-2FVe7`vmXnC^&LcFmgLTIB&5F7(^7{myrfrl8b zh=c(-j7-GHfHjcY9zhJDMQ9G{0*9Ru=vWZK!i5?!Fvtsh?t1H54l;rMjDiCIoPYLr zVDtZd8xaIhdwv0nqd;qU(-~7C8GEL7bZhc zkCD*-GsW^9695Rr2LR;$0*Mjr!+N0q)w};e3_@-b>5hnl{?aV}A#SXLuv@4x9E6x3 zAp!jnIsNaak;mPD3WyJA63}1Tk-xH0#@}Z9e^L@o&~1PIrXy5-BQlZv3&ctM58O#0 z`RA&D{%L#`VE_PyH(yrjFPQ4xf3ORR1$5gEy~&z!(`OR>3nWke7bHM@Ls5bLYDoPB zo}}J_0_b~pZrcLZXeuBo<2IIxX1Q})HEz9$ab@4eh_V@Pf1N*7jzm12;Kfqx`X~B-j=@t& delta 23109 zcmZ6S<9cRo*Q{f+W81cE+qSI^@7T6&+eyc^ZCf2<_51yM)-KGWW{ok3Ex z#3^hXTv)qYC11`iczn*35H9+R_`QHya$iC< z%oMBQls%GxITLwAl+eu*>M@?^F?x^RtwDNgGyHK6tn``>M_@l3cDJwY14fW?V#4I3 zI}|r`5ADMoD>1yz$xk+If;}^QcaF)AGH7A)s*9`l+AYgVztW3z3V{8N7xq#2n97mp?4q5hqr!VCcfSML> z>Ct~IMK8SJu131?aEX3@h(1miDH(TKOdSlh7;mSBo1{m}&qw4&;9C=K zuvB)QB+feD8uAUZijJ_Bac4W>xKThiZz7nGO4O;A55WNy1Bma+BfgV+?0czdENOGu znB4XCvS>9aPHX!t+{tI^8(LSGWOf|*dv7%8k&K2&jOP|QZQ)v)#@%#CEgdY(*PEVx%H5#bHVOXwv{Tp1#7g610rx28>b!JV4G*#V zX}sFoU5W)W0L1kiI?vqm*K@xSb$?bDo`clxYOG+OC}gyM0+`_SVH~dSsI`8M(0z z2RhunF}I9^d^b{fr)J%dyUX`{J_e(R#h%Kh0z+}E0N#>AkX-ffCserE)%$4KA54t% zmQ)4oTcoH(>iM|* z6_2kq%lbKypt!cvOv*+_4lD0ONwsWhwey6C4MIbhJ#rt7gpB9vtG5CTFu=YSL6qdX(|iIHbdvhK`!%YR&?)dt_aiWA6cH zvFA5{zU*dIwV5%tlGI(sG_mcPnwc<<;Nykt&>+0+_8SXo3BPWiP|A$5q~-YVv=Na! z1(b<94v*h=Mi*GqbH_{cv1`4#PU6m_3p`*{R)f>9dX3p1c@*2vc#f7@>wu zv9Kb$Q|rN>R!36ZI0)Eby>*JTUU!;Mr!Y}A14K@&kPCtk_osctw<9cdvbLImKJ1orU+hXw zQ*_QfFV(&DCqF}w4u0^jjxV}i-H_drqmR>GT?<)NM3$@FDomrp{ZTdoLEvOH1T9>ksl-O%&OsukP)i4 znbm{Xf^LNl^?)F${<#zGqT?2K=?7e69Iz)Ty?r-ktKWM})Lz%9*Y-;*2HvLO?ID z;Hoef3-w2c{!$}ow0mU#;hmjd@jdcOPi3FGRBwDF$li`461Ch1#wDC385pFNNV<^P zQs5gN-NJ%13HF(;06{?ZunJHAj!@b_T-=0-R$>TjQ}x83!YimNN)D#-%(r8}0?-=r zE+mgxg)?Gg(bGEX601=*nXmP>6#lSx_bdoN6)|(f(%$TAWNY`7e|}*o%7B8Q0s%om z{TseQKy=Y{&rB;}!u5mJA*&dL6>P`dCR)@3jPfOUXb{ z5kZh4K{R`F`$X8LAs!Dxp{kWY&1>Ur?Phv65gN6I#C)eJ*p^zmmaLYRsM{X?kB!sK z_npg2ny)->3-Y8RV!}TLy&uzU*?$2u9=&m^-_K7jqO5rUoP7M5v=NFJ;uwR>Ko9^c zu$B0@0-In7ul7C@{(*-9l%oIW#1^O32xNOag(M48pBOKdVB5W^RVgJd+?;4G^<^0q z@AfPU2yc=F6)w!2DnChI)0-?-28mq5fCacEdK|)?E31-y?UR1y~zK zKV64RE{FB6aDfnI_4DH!bEEjacnHJYV~C%9Vn7QpcU)G97RKIRpM(J%RQrUR5g@jQ zQlOgsX_z($%Nj+4L5zc)b^}hhtg!(y@g|FOO(q4vYk7@nE#2aS`VXv{ffsFRdU?yFRuGIyqV^sysL) zk%wS%T!SB2GK>-$J* z3=X!2-Nssbt>@kmzY3j5l zGOp&MPPXW>)6DCF$SS?y+qa~)x?0e{QR-pGT}c{m(bjD;t8y=za|8^)6Q1fA4Z+)x zEtZhw<*!oMI6F7UaIkn@{zA^NvQ0u>%~EM_-`*-WQs#|^vYDUGv>Lm8%3r-;-s?E8 z%^v2Mrz}PcmeXr`@*=TfqH|f!Uw#`Xz!SHaSfV9CHqgJ|+?G_0k{d$X-|{S7P$378 zAvSctzNUKX8INX;aRQ8ux>b2ChKkctP3SEwl+bB*7n7lxU=yG%U%HT^_5K=^8w|@p z&smyq5x)Yl5aV3MF;_1a%2CUDLod?t8%*ts*rD4*a@FXkONT2fWORt_Ymy07rgDqI zS4i6#9D?}9-XBNE^3jJQVj9%ST^giXtoN!~1&IPO?wPNkpaZP06Uj47JXl71l+n&D zw_utl5RI+oUYsG7pW5k#SlZl%ys*ibPy?w*fRs{^6l+Sp zXqG8G{`nus@AK=mDZQxtOfPeo@iDie~-22*z5Z zoz&lpAr1?W_uzSOid9<8f*!A}QWjq-7}}Oa5vPyG@`ajNH4Ad^Ltgy!v z@Q~`00<-zWG>3KlSuQhVtc|NwYAi9JoAtLc!ItfSGcCWRtk@M6RhBf1ZCwj#zNqs^ zVR2Ylvm8LG^6Uxhc|S>T6KGtDV5zWnf&Ge1l$;lN%as30yQ(?iCfbYNHnmgDV9R4- z!{)3UG$olBNYcn92tpxZsyEYq#6@H_W+cEBrYXXUw%8Q0VG?y5bLOl~>CGJB@F00( z6&?#u(dq5tjHIF#VPo%{Hqnn=ecUjA6cKq0k_oVz=XyMuHnDc*Yh*s%v??p?&h=cF zN;B^#ta=-m_;Q`9cjmio6q5^`10iZYc!EAg=fl#5Rgk|d?jRGfNtmnT#naY-;9y9d z#>g2sS)8u&2wFqNO+-)e%>^ zU>prmhtEyI>=r*v`$SE&J=jqLV*bP~9RT!MD18KvH{TFa{`7lP`e5wRP4iI$R9M?J zjz7*uIl&<~93+S7NJ=f5*cP83?Lve*LWC{tot*6{6X%i&ehlan%RD>|&Xc{00_+p$`c{FDZ@G(rB5$juwhI=oxCu9xvI_!+EbW!l26K?A-~~hz zWcFQA^eL$uPw&Y{DoGX5?D(`txoYdV<3cesH0k1%r7Xqh0`h!$D>xf!?I*v~iAhG& z3tD)RnG@j~>|xUc48n4Hu5l)yE_5V1N7eF(ImVCXnXIk?p!povp-fD-uNN6aVB`^s z5{)Qc%uX|}L;-f*%*b+DokNRrDD@bl{GVt2QiRxZ)hnJBt4_` zd{@75|6DC;00`sgK`cMyid=_mCMZd?@+w9M1JMImW_jOC&^4ojG8LdJ?P_PN>K`9{blU$r9=gNAiZeDB?j0W~p--pG; zzkcz`JvU87E)L9xkK&EnueT*lsEGQU^i%vEuxZ}<0ifi_KWpaIie$`ilf6%}aJqm< zD!1_p*jbN%zlhBYIrBiWlDU&O70zKEC3KCXgayI~-)gNo1v*+c6Z9s=e(3E20?9hW z@!nsRkGKQkFBTGQP)c`@mQBW{fTqgZcT7qE2m*{vOjUi+GdQUXt&5%(@CYC#LoBjx zweX?50Hz$M0F-S@DNh`^aHU5NlBP>nh`)+d$j2)2^kp>R=S{CE5*o?{y4mv#$vVwn z!(Xf42h7p8VAb0Ss|8;metPgQ`aY-0e^rFmfxtIlBx1@mKBV}BizX-H;+55%f_=UTL!)W=`f7Go3}(-9z;Fs%j=N(&Ls%N?Xw6|v z)lt@6l@;=5K7q*j`J`u;%r(Fz(-7K_$rVvc^3SHa#0=8WoJw~l^uk0uSYd68as)~H z1JLK`>gyoAC(qR1xmmLy_z>r=HQBOC7xB*C&T!VQhi7;iAk&m22<(S6fml9Z%5Y2e zHh?oX)OQpXGx=n?4@c)&zB50G9d@=^dzjOAB^J|uM|FGP{j?LO-%WKh4|T^088vM`x`{ShPZ* zVP!6MuFgWn{XtWGFaJG9TV=(&Aw&3F!kXF&jJ>%p9AmD;GhM<6hgQ&3fpWrl=CdJ$ zV@aVddQT&srWEMKf`KL-vO?`# zDbsZ(#0}MiuAGQJfWTlWdT#WNKGpe4mq2JX>{gmvbT>518UB-!FBM{nB^|k(Ev>)y zZ8}9^UJGtl7AwEQE`)5yqM~_PW!^d2|K{P8Nhd(n*~6>T`L+3!s&b-;)t{FOXd|W- zlKBOsISrIwLlF$ z3mqM)7CvRPytcY9uhOPFCGg#|ZBZD=*w1DkWEj1tyJR{lAcW5DErrgmH(x`wVjK{N z4xNkc9k-C!pPpmKbBxWnB~!GQ7%>JRWE$8M@bu{a*Q;|{-HI$d4_@el2;j%BPA{UW zZ&bA&uhtZh+vpPe1oq?Uerv@e@0^0|AB0=t7hX4{eGNnho;sVlr|<5MexS0b`?mF~ z&O*u$xo}?}Mh*R#q5K})*SGl-r~*xBSEZRaPW$BqbeupH?%ljp?ha_F6R)=;NV?Ap ze~n(`M>n4lWsgko!`D4t9#HJ8`NDOT2a+w|P-Kto^A6(mMy#veztK$al~2AiIq5Zv z<@t+bw?*!Q`1{}Dl;b)f(O&{|IO<>Sf)M|52P9`t!=Ssaa9VqO0?b`E{X)Ck>ItLK z?-t_bi2JFryPyCs@23;<39*_3@K;Bi%WMUK282uCy$_ z#?2q)E4S|iIM3}aNMN)OJ4p69Sn^9I;WpyT;~l$laDb|pjO9)MwFIsVhuHZxizx;x z5ZGN8&5oJwlbzv)+Kc&5xGfn297^S^80`wAED8MG2!h4%2MQh-)p>{LYck(&*`!5@w>AY}E+BSL!*6R6E|6VZl zDRy%M?|de}ZxWBa#KLd#dWJ|7MC#nh5c0L$Efh6hLvQRz0JK#+jl2m$9&gHgZi!|K zY&Fp~c=bs=r*pw@Wq~o~4HHF(rgch~o=|v9AC5A3rcZ$-soHh4?M-@M^2W4hC$P{Y z?<|tn=PJ@0fY#0_>TnS_oq5Bay+{%2UBB~@4fEo|ClS7zkb}jOF~mNCSjZ z?i%do;p<0nJJbDQzTVc@U|Ibj+hPX`?uouYZDDoH=)6!Uc}552o)p-DN;Vu#qO zlmSA~0U2-`fp2kryW{yBhO&LiygN}71s&bL&_p(W-Quy97B19cxa0ADOY|9Y7_VdN zSAIcm2#8$&i1$BWpxXUF7W`y}fQ6fj(S{a6+95}s$0>@**K0j@Tmc)Bi~RL=5yL$V z6XKVTTJvWstXEc#HJKF9bbPf9T(k`(vVi{50b~{k|KzqtfG{18P3002e&;?G$WhnvKv6^eCWp^p#oG8~x#)}mQw(jlq%Ei|MA>G| zAZbG*7Hq{_8nh^zF54a+`EtpyH_UN74Cx46J)upX=W}QADzbDdTbd+AoaXouC|=Q~Iloo=RVBqtuOYxQdjNLK$g1iYg)nw;Iw$7TO4>BQ6$bn`*mFn@Z*? zudm`zz8+bFv#vFbpEAc^g%Me)*T4$xed#e;sUkv$-q_Syf&p7JdR9=bUeH*GcHOZ_ z#%=eIgUzwzoFUQ5S{qXW2(jR;OL0lPiBE`!8juM;AJ#RKYT-&Eq)RmDXQn9u-_}oM z+!~v0hFK3RIf19kVtKl1?`SMUe@yaH%5na$N_ zJFT1sXXk3DFZ_FJ%7$1iIHR_j)@mht4JCLw+j^=hmHy<$c*wO5fU@w>6U76Er?}ZH zNo31#IrW`ufl@o0Gb$sj;OkhrLpFDXPe+}m^`ey!rYY29u@c-w#fB6=(>v0FZge1x-@nZwRrHltuz9Kve10@m#jzCVPK>l*04-N5!w-UaQNY$CM;hy%w`u%fRr( zRE*;xQ?XCHMRg$(@J3ams}5VO&A$9_XUrH*DN!8RXRogXdQP~{9U2x`emSWa=)q@% zc_Ie@*-!?x?W@^YL3OA|gPZmcotMgA(aV;9eb*?sT-W}H1^e4r3n5>OT}-jyMEO^s z9#?BN6OE=UXI|{_2}~XyS`{49DX6ecjI%5?4NI(F{wmQ4pwdrwrB*Ki2WouW8u;QQ zF#-w0Ka?C8=cpm9VZvnUQ@w}cGqJFoPw|&|ILVd>68xjypr6a9lrRW2$*bZyS5Ms$ z!U7Gq+?i%MtjD6i1Cm3=6X7Zn>sJA z$Ni^OD&=b}Kr;N|26l{hHD%|8nLMycmD7!{X4`nlasF+|Lq8?avXUD-z9^HTyHQG~*|M zGw|7)>IXvgg<24$F!v0#|1`UH2bHi9nXM(JI+5jw+yDt*H)Mc- z@#W|3l4yP-{2M`%mceBFk_N29vCx zX-FC)0EBZz9+&uWuo=y-ibkUQqeu3VQmL|S!kK)=7HJ8e6S7hM*YE*9g(aG45KcY} z^GJ(^;}p1Okb#h}yoD$^{_mGau1Qc=c^*Z+WfOdj^%~ijD$Vnkc6^V4?g^z}t|>I9 zQobIn`xZeWgM6Y+3*YR`ZNXpitl;ZwaHebffK|97(h-^$_NF+7$A3#>IXNAK&fFY`74@tkbKXjNAJw$tu!&V)5Q!bs^j+vR1%NAqc@WwtGDeJdBhawoM@p%u<&>v>cY@w(RGRPOT(l67d&9hF#Z!7+&U(JPWNPNzX;?j2DUitj< zzu+V(cN#mX&20;24S{=$7ZeC+0y;_15-rI;;8zmg3^rg`{Zbx93F&*LwZ5KC5s7*S znI=Gg4PCU4SX+@^Sz9s%?1#>*2G%Ui7ULex2WS@*1)e(MJ})BfKm_yj3Y`|cGbH}? zbSgW8Yd0e!CxcG_0QiC+3^0SPiO;f%kg*J+O|TscGulF7B0k_>jg~@UqCW@-hlb{t zm5#rY90HgiQ-z9Owy47lWBudTTJf-@jryv`K1xYtF*S5z1`0NvoyF;7%d&}ogG+5z zNC$2IbiMsSZ~fgfK+jb_u$RNWq87?dKXzqXQ*q*ARwJ1h+nk^gNfTLd@2hooe8cQo zs;^baRg^(S)7GROYI-+&*=a40k)kX`R;8ptAOfJ+SIqAHG?+wDR>6Z7i7Ggy9d2&i zOf^3vF2&lw+v$i*MmOrYQgEPjKMkXVz5|y zK2jC4TyLyiY4fm6B+g~@H+mH2@Am!;-NhN)=G062$~=Trd5Rm9%;G-P&0TaK39Y^k z_W*c$oez-l1Dm5is32fTM`Jo2<;`V!YBviq+FDM)crUfTx}ZoFe6gYysNLuGuub@f z=>kJk_JYc&jNMj}RalnfQgm+ALm9L}6I@!<_?WmjO5M>^`0y94A`6;cpi{cM(UxgJ zM#C>;$4{4)saVm=sPSrxm>{xewi=oXy8-34j}=a`f_S=$bfLWyL(U9~ zWY}t>!rmSWzdQWhtFu}Dvfm2p71ioD8=PYDw$OB^dU{@b)h&t521eq)Pqxi_`-6k{ zbWvyNln^?+PKPZ=fN1}RbNShXYa)S1FjU;8$FJsAt6npEG@8H8)$`X*WD?ubX||+VcO

>Y0qoIt?wB%nO@p&gUI z8>6&fV)9V0)7N*?ao&vBRe>QIL-E+wF7*= zKZ6P)%V4X@T1%Q#rjhCmH;0m%v!$o2D5)~d##gle<^C6l(b0y^Ctfa3WsX+GnyKS% z`b_kMs_Ah(X&FmyH-ud8nqlTe13dDmSx7ausQXRWYoTe~fMHi;$;$7>wRrucL& z3YgAs*Wg31deVB2`8*FdYvV5}ky6_Z?!*U)mwB2@kV{29$0^ODFL!1L~Ipwusby zknLbiyLImtD$6-*3P4xZqA41?rVQe}SL&X?re#Oaw) z*4!Gpvnh^!CrO-&AfXg((J5=F@EJ(Vf{c`pZG&=r+MQT%K{F-{Kx+mp8aW#gE6xgB zOyY(oF)Q>N3p&GSwv41t8ixhP&y$FJwE>pJLWB&#K-5x-uuE;f zBJ7gc%k4OfESf65L%xH*VR;r2v`1QZxfdC}2)>YWa=UOu7z5yAS-zYNW_)kB zW__QxnqKPu**?4=HlkVf&;pY+GxLDv!Pt0wJuOL;46yD9TCBp5X^4qhAAbtbA@yhr zk?v_b(IGj15`Zb%Ew(!viJcP$w+##8`u0iOHP(pOL3>$sS-H(dyHa^k#m2m+7JJik zd(OT}U8Ko5Sbqh6yLZabcLV2}e1OTpW6zl-3vMB^qlPIPDKy5sr&`Nn$vK9$pj%7H zCaba}%5#zux)W|+?Yh9qYSp#M2qWt_RRQ9-)W~v08z5)L${I-LnHc@-DoO#b`kc=< zbj}YuSZ{@Dx7-M;V7txA*=vaDG-^+)-8{a!;`*KN-ji8bAUEyPvt`)o4_M^1I53~(0&Q(&)a+s4gOIJ3wXbdQH^p-TGTdOR` z^^q?N1t6!*`Up4g_sldV)?}qdDJO~$>uzKovIQe=B->B9bJ{)_&zl%+{HO<>^_qA{ z15RekB-%}?>WKJ)#hjaPgB=I|STRq6rGVF5yhlq8R^@MJpPnxtk4O-27IQ{hevG&;^ z|7?3hW~;u;wsKzhLC36MNOk2p+$pzJXU2n+xd2iv zeaDCv6ZJSp-0xMirR>itBx{$Di@;xL+HY8&hTq1J-+7idgJDbf7&f-Rpti`s?)U@= zcF8MHaZV5L7NX0kwr~W8x|5f?m;*q6Hvsg-%DnyVjP=MLSiKmSvfW@W`-pI6B~0fE z#d?no1jrj9x{-^lNF?14J{W@~b57@I^2wj$2e4osj1M35!ek93T;x6Cy)WHzFRYyN z(@4v-BU%V3wph^a&|K~zJ5f~#Ut(#RS-qiDvM6>;nFR@mz_vu8V0gaSM^eV<$^ax% ztxmUgkQ&J)7YVx7vXy+t!IKe|7nG;RDuIa#N1_5N zSN1w2#;i{?&}>$`qJ0xFbfZQ<4zU1&+h;b^k>m&^DJN#GUZ*m+4)4ouZv}wL4=F+M zhT+tg5(fC(wpJVJ2FUQx@YL|wLS0q3nJt+}rH@fUO*ipiLR)HGhaLgr?F`)}J8e{n zx1FH&d5#K|-ng<5b;YywizmHjoV|`dSYs~pu)OD*b{;+>eE9A7LGw}iAA!Ge z-SuXf>EaOWj1X+Cez{NO6jZ(^diUN%%249Ky%TmT;e3?bPzjutPUB5R$H%-$c8GA@ zXc6j_)jmxDo5#gTt}6m!#o?-5BEH0aRN(?ge2TZ`@BM*^{3<%VMBsJ2ea93(F<1w! z6|@l$$)z1072xGStg`-uE@iK-5m(C2=KKb|m#x&$OsDb4PlPjd9PR^_1r1}wa!#v& ztNvFDj(NEM>7CkLBN2kbi9%(%qRT@c^yKfqI*gLWjafHXw`#f(flR&2?6bR{d4hBi zeIq;zdt*&Kqz$?v5ID3x(BjO+qgK(o)&WY)_~*XGBz_pa~w?T^nRp1*iBgd(^Z1pFol6bUsE zx<4Yd3jPt%j0guJHsWT+4}b_7TEL6+445_)**{u8m+vY}3k;T>g$%S@kbvQX>Q)AK$$P~}Ck=jp)3v1z=FvLc~wM21I8k_=2l@0&#Ea^3og<9Ag zS)}sG>q|~Q_Z9^y(zoQ{>&+DY5`HV2h;r!wq-@ z>Vyh3DCs=(44bygs&(QrX5qm-AV{wtKk>O89XL6t zGdPxe1qor~_^A)|(P1`k`00VzFq&lvtVI`e*ky0saJk$FnbGE3lqPKUd+RzNE+fM0 z#+efcy%xW1@&M77^~&OG7iO&aO5!M~6PlrD%p3DWioQm9${Ee>gq2?V1{Zd#cJiY^IVtNq#Skm_ zdY)sOHOmbegnLTo%Z8UU&x8iy#25@aMRxZI5%fMnB>rrFzsm2fAj*oof+qoh8Bha$LX_s9s+oJ5BvKE#JA2;wdh%tkh< zRaV#PO3_z!ujUhZ1Q#-9&RwIN4+!MUHJ3HP=b7LEJK_ zH;Rch;0+JKm7~}8qv|+p{t>fq#54_Sr02<4)^I`>7<3WA^Lh4IOA2Ju+LLa-=Z73; zsp{Qe3{9U`D?l`hMT;uUQrPHi@^xC=CR!KxxB;+wWQT#5tKIYpzGi`U?KcEd#mefg zH0T0yV@BI=Q#I8SveXD#wCvB{@#ASaawO|rVuz$TeEp_n6Cf-UNRmUU-qF2JPLmAi zPXN@7EaXB00i$;(wQxcX?o9BGRW1W-kC`;?+{Y4o$-2Z#tK2ZP;o&V|ym8)}@@5y5 znrEUsNY|dj#+X5$KQm=sY%FgB!JX|u zokf0W1OO>-bRnqbZwO}%$I@G!sf!6j0DQ$GD?N_T{mb%Tdd>!dx&2~yy%(y>LwyM9 zG+ze)Fo?KdH=-0S$*sW9FDKmT1F(&u(HZEIj+I4JG~9}<$2j8TBc34i(p5ekj7!|1I`w3M>?FBdiUwDs0*BK3q2D~)u| zW%2LuWO96zs6jN$;`%6aQ1IA_+5wrv!5^%k173s(11I&*P?rOb zPvURKJ8SZ%XXOdI{QMIW40K}>dx{(j=s})rFg~G(n*}Hy#8va|NO{{pO2Ek*I)gCz zc_Jso{zc}7vVm1U)KG<#(#D~t-swY0lJtn4YVJUWnvV^q`Zg->D=AnueHu`;!bEt^m1?8>d-Q##|Vq ziO6ZaRaY$Z%Ghd*%fwaNrgl4>;mAcxN2Mz50l3f7SRr-FiAplsTYM3&O+>=Bexxc+ zwh0SKtlDe#R@t{mhjmwGWw+Ljp8k@Or#r@zo)*gO`P0-(?LvIQ+et6YW#wDiPA_Gu zbBLdIvqbWqJv^~-b-?aDpMG;kImRlVls!#{TqtFlTgq-j8eCB9nV_w^kZZv6>Q^$! z3a%3-^)k~go>)V=g6tnx3x%%J1KBR?-x zDz7&HE~#g;pV2pPA1p>*^JX96{JYP?RwX23GS|z<^$%JXyvlF54E>q0IY?UQ7HJY| zY*MT6a_ISSMk@u$s5zDt3&`*zSOMg13O3;r!beKa8$sg>_BCSQpa%G}P32 zH~d2)SFT{|H-Ioog9BYIM9Y%59d6C=ydyA%FM^%an5XzX6)4;ZfN*0-(5Mvp`U823 zf*=hVPN%&esf;wI7;0RD5jpTS6q+0@-8q`zUxRy+X+4l!hs)fNPBg`rPgE(k?x#&b z7AxH$>$>G5>G3qfY9ZLkHBTt=lgu zBJpuJ9S%83QQB!vC@&BrC zsmN4jtSd}uU#GU|J~B$M=D;QI;l1@R-FWdN*W#BwS@YzUA^CgVIXVEK!ZMEXO%!TG zYp`?3;5mOH-=ujTa?H94qkvhc%W5|0D}^0#dDTAS5O|beehXg+d;4mcr9EsH)!AV- zemMSAa9R==i@LxqZz46yD1Y7_;Dk2GZEq|#Tp7z&%|aVO?ZEq2uE7j?wyxPmDAUMQ zQL}Q}IGqRobpLIx?+Ku<;XGGMm**G?*Yx9@N`3Q>K6CrDxJ2bF$LQ?b_R9xfa}P2) zu-^Q62CsAOvimm6sQgm(y42WOi(8kW39(>A-NTlNrba881WhF5*d`3OioymU-Wu0kF<}ye;e!NV$vV{I>w?m zA>LabRD@Jx<|mR?6)|1c7}_Cr0dmvuViw66-6eAKAF|)GCg{w}G&OVyZ+gSuR@P`k zJrj3qQArx+YGi_-qB#F>R*#s|LU$BPFvtKghfW~WA>Fw&O^E&Z|E`mz5othw5>Dd3 zp5Olr*zaa#UWpyEZo)^%X#ysiSr91_YQ{2^){t4`V3ax2Q))G_mE;=^0A=tABK~X8 z;wMJw5B97cPPVPGZ0nB8tmll&%s+tpd|5YZ0EBukEQHMh^FCaJ*u;E-Dw(b^)=Fri zG?ExtyhhPLYa-T{H>R1=KrUi&rgaKnf8oG9@N`QPqUQP_9~2DPJaKPou;_G%=8Iw# zK`S%Y>0 zD{(O;Ld~(<^{U?K+b+EfNyb!rr`wx63|D-5REko~s#)?w;%H@*Fzh0F@+`*mAgAYa zj@>rzvI^}}0Ax!~9VK5>&t9%{?BUuK+;VN^y+?&_CV2a&U~Vv2aHV&sILx_B)w)gh zLUfxFmepNCcc-SdrS&1FtlogM&Hj2UtVYw{=IhV0n}_@Y%seIvqJ+wr5)u3Qs>@*X zlZv0W=RcQ*LZ_JGoh`8tTwb*0Zf=W+fpc!SQ&n~*ifq1L6HQ>Wa7EYmbWzSQX9uj` zs?R#=b)NkkP!A~C(9qbteYiVzjVqudKAm6eiUgVo zZm~&%a-AbOJ{txIb676iMv@LDM*vAHaOF4yWoVYL$E-}!M|hU&=z1MtIny6l4A!nd0CU(_DaY*srya9(>A3m1uk5TAh5dT_o|&$GdEjW4ly3f;^@ zV9Gv(b|~uUX^QLJ{9GLnxO9&uAq&~he2@k!rEV1y^4Dnlk_8=zo>^{>2tPsZi0sa@ zyv7Zi!!oBhvqXuoj&>Y8GKEww06U>XK^{0R;S2u1?wmv7+MGn0;sgdL5GZTPNeKpq zhj)z@PX1@u+5gHOEJ?_jj7j=w2!JNLe^Hegok5``jJj1@a!Gg|A-0WdG?*+S<|jw9 zjaK8fojXQR+yTlf#;*WT6oS5gIgmvs;T(C0fX7V_%ju5G&D7`j$03G4Ozz7eOe8jz ziU;IK$27$P>@dJ5imgbw`+HekgIl~dm& zpFBq7^Aw}r8SiQal|3VAmEX2GrmhpOw_96>8RYG2s!f!n`N=6HeRS}LIAb` z2s1p7*Lg5q8bIq^65x)K8T;8&_$?15HU^U)<(vbTJZ}SRk2Y)47G~)_?gx(*<1hC+EQ)Iu3 z(v?c%dv)1Q1x1u0y);{*c~d`056Q>NF2X z{($~h#~rB>Jbp>gnMwfn&5)9iNJTU{Vs%TZMpPtW>G0wRsU&e(Mp7@FiDEb{_wk$5 z*Sfy(EJ*KrkO=aTCP4E2bZen<^T^=L2h*`cU$1M;?{3PU~-6tQaA&fT83vuL6XcMsNY?me)37raTMMN3AP% ztuvH2X}7Q5RS1+Y)=}N8s!=_5gP52F>|YTlVqA^ia%Dl)PhOF1k@ttTX4AcpjvYOs za!`n$gv7YsUxNV6PGw8)TSfLl>AEt_CPBlY*WOba4cD}{EV0nfKlxY?9;%BdN-_k# zhYG>k3C=lrUmIt9H{>Oa9-r!S@w3UjUA7AUuZyz|i?Zn+Kc%#UG)pbg?Mj0PsC07>Rt#f@ z09J0Wg5EyX3@QZ2a&yG$d<8p$J%g5gsQgR#;@bEsuo4R!Nhg0hn)t{}niI88J1-bO z6AqzIUl5m^Cyj{SDVf#g{_NC?NlTJ*tImB-Qoz_YuCC-3X>)21YXSpPEx1@FT2FF|@eJ^$8(+>&y%{&W|jZ&W-eT&py zs<%S5>wV#invm;_jAQ6U8D+rlm;8*OM6V4>b7hE)R_yd%eF1~@zOf{R|Ab?!z zGw9S?B0(O9>E0}hHS{!%ubO7K4jkS)-KA)W9&7%3E^QeSY6m|@1sh4OgfB$TkuPH# zR$ienh~3Pl@eN)NM4<&3W`Gqg4Dc!|uXUsqoRRR}P*Q!X&mgO#r3>`kdV;ic;J;QL zEv`*7SSX)UgFd9@wc}}(f4yzEAN09Q=Lnh>rqG7%52|ZYyKxw|Nx?t$aU%VUXOXQw z)PbiW#vfp!AFn8VVcDp#MUeR3#a<9HJ&=Lh*RH7Z*&9-tp0h>Jmmgi@V3r|;kfEZB zb6Ozz{w8;=um2p8LeA|BBxO5tw-i~X7;qRY@}iC(d=vKpwY z=lsHVM2d?aO`@`H&3EhQb79F1Dy$2SuQ-WLmSuI9`@krbZBW%GKg;#D@s9Cr$~P+3 zBd8m0k-KTmS3&0Pu`$^?xoZoYVPc<~u;Zwu#BQ+hG2U7f<}*?OX)iBXG!iAipn+|lOA;+LAYI=5*@&Lfv> z&7C>L+E&F1i%0W!5QzGLx@o9i&G?%2g_}gT zyPImet<&{!N#xS1t3dqH*s&)zw5Ofwgn>d}aVjQE#PT{U(#tD4==*BB&>huFr6|Ls z=v9rFkL%kB?38ki0wy6G)IJv_`4X?*t?zCV3sbvWbSg$MSUak=Dd=YHZOc0cp7cr=q-9`7n3H{0!A>l>=4` z>H>N7B1#!2er5Uhl{rb{8~Rx(l+ngXtg2%k&g-Eci#~XiV)Q^QE}Gv05T`1pR_yC& zhN*)l!;pUxkr%wIEZ+;TV{1>s>cC@HkF`kayPWAh-)utUsCXk z{&&*KilGIjo_>w#PGm?ET|%?{7%Vq}twED4iQLuJ0y@jlti>4(`1?xKl}*%|d8cKSyax zthJ&7tAM^shUsP98kXitw&|lhIWwc)TA@6G?}X4DBO3^(oa`qv=CN3D?eX~NSB}9% z0B@4eoFOwhe+K@f*xSSD%d(fM+3}TwMuF#%+yitPHeGu>h818-dLH4q?Zlbh(WPW* zk{Ywx?C;Wt*g$UThZkEBlNjaTM5&X&90yjbNER-Q>|Q3_~uyQzxR-e-Q_1lKPy#(ew0 zI8ade%^hc^x|#qj*Z*$iyUh4V(g6C(ecWuT?Q*HgTPz2uRlVc z8SFNVkcL%oRdwj7XpJ=cOTSXZR`Y)eoxu0`yH_Ke!>M3RCSS_&0M; zqU5)7Z=3+e`AXik9mQ~Azl>nb9a#I);?zWr!E?`fQOg4gXRY|3!=}&>iAN&;@mR9P9|GH&GwY_(**8!`?(8}GG?wB%3%!&vZq z_1z?f{<%giI90$>5dRJnI@l5QfBqqh_mC5 zLh*Eo2o(J5*Nn@6zwC<9@igC zZfv=_Ar-33O&F-fuF9CHKt+npkzp zQsm?<_EOe8TN{}BRa$yVbiJ;XNR4zR>R4rZC(mxPM{Wa753P6Y8)#g6QkevSY0?=> zXL?BV2EWvbp)GgdJe{j);wUaOEb$jcBKHmWX;#5>i^xhkHvdumI`a+kZzT24$+hvS#w=u*k?==M`(N+k=49ZT74H~Vq}&UHj(OUQz# z0)R^R3&GPjTqXF+q;=rT`^$qhUap0sicWi34jnZzT{TcBaq>!nvCAct*!5JCyj;LC zmPl9C#-}GbNSS-Q6ha$gmN~t@&l+iRoU|U1ts($Qa%&5x3%v@$7w*I?B%UOxMNA)A zCl3??M_HW8DdXLu2+}i^^O2!n5xc&oMTZb%WHt$#_-}TIQFKxWhpVB!XC1oxU^>%& z7{E=HTqb|aeFLM3VtNCWXP&FuJWXwi=k{m13Z>Xlzc|z;+z1q6R~Wv}aKraJhR{Dt zI)2&YC5G4CprJs&w7{|Wi7x%F{y8b*%b^_ao%Lm>c?zG33!zJTj;}wTxqj|l_P#7d zi0jUCWor7wRV(Ink!&BpUO+g_)hxc@y&*OjFG}M39oi`0!GelEb0gI0DmHs+-IdV;Su>G!e zFygAZ8{k*{Fu6VpK;_?=C+fGk5I_A5v;4Y;Lv+*I9t#{$u@lLy>IiNAE)4*uP9i#s zUXEtd6Ry#_jyaLP-gm$+a>g8F5EkUPQ4UEjEQ#_NYyMUKTici_FFiBi6*#H616Eg% zwq#8=9Uop$Dkv;Bt>m`0)!8gKVwlH75ltLX^_n&xfoM9G2?`;L^GUOr5KLW#dD?`e zA`-cbZLAQ-_l{G9U0&E=<~w3SGDH`CDKE06)Sd#Q0*}>|bRnKUezcRdtwi}!!NTPI zMtQf*)wvJv@MF>=K1Pa9X`V!?F@&f1+8r-$;8tS`Er@EJn@FwgAyV#Z5*rJ1ifX=PK+XO}*) zp*QUGR3Y2aMX4c^R=i~Hm+rh&armXsUf%JGlFoh0{jXn~_jfcxN>#Gk`%Yup7xy`f z?PBIrKJ#*mC;j9_<;ocg4Kh$M{h6DM`z4B819fbo`55XWJJN6$9R-x5ZXq78piC?} zz_M&QalIzfmIg$0q7QD0Em#wZZS1|$#mE+uZW>c3l9bc(N?tO!@@pux$ZUx=D9Sogdez407b#RQW*Z%M;vUXfEoLoIgUu zIYuLmp$M%MuMN7@U7hbg(fNI{Ih4gT?npd1kVSHY<}mm6OO3KnK#Kl4dY~SbzVsQ| z=^S%`5!!oA=Ad^id!Kl>DY{;?in_lU#CWvSdG4X>Jj@$Rin=lKrL@cp7lM>P;Vq>Uiv9D>yxv_wua$-%rrv)%D4O?^Qs7$bQFOrT z3m;>bVUh3v{_`tYy8d*bk;x|_a(yLJR?=)z?#>rzeT-il%M5ViLTepxl`VwwU*ck6 zW&WgwV)*&S)_r)yo4=7nq^oW7uEat8K%X^B+3URv;ndy?_##_Un5`mrqh5=Y?{Xet zQjxg#18<$k$I*~;rPuWo6>r#(sn`lAJ64(F6etDL(_Rs#CvznSlpz$GwGgHFo!!i1 zJe?~eCjLTYU5h`b{zNdrRqzDCWrayA_iSc9WlPI@H)0JfMvtA zR^|7{y^YdZ(U)xz{QRs6akqYq**ZS+LAN)JPtT4CL7V%Cvei>BEKK+s#yc~{+-AMJ z2%)-u?Dj=82m0$ug)W}FEsl;rr9-1Xs#M-P)F9qh{fq4gQ+H<3rpL}hUSDI=muZ9s zEDW`CcB3oBuOD05ert@7IA$z#^1UNl>ZsX1>sAV|eJ`A*T>NBPsPzUoFGXgPsmo;6 zDLj6OtCmX-o)I>e}LDo0kpM7izCoPB82qFqDzh-;xiXo+j1Xgp&Ulh2%@}vq)Go z_ykGMQJz?33uWft*`f5$G6$8V9IGp+X^*@m(Bk)3W}7hgqUf@yH$bu6u7~V4O?>0s z4bhi^HfEYg1zl5cVM`BagqFud6GFeU(-{c|yr`()mXNmLy zL*xx7?Mfuz`RJZC_hzjoN|*$TAk7)Y^o*cjIJ=|yqmbq$jak5!T`Tzj_HH}hRMs{z z7tMH(fnSBX`Ic(0o+Yp9;OANMH!lMeswIZCwhTQOVXza{CUaOsA7=ZsQ6+RPC|ymt zcIK9K$nxxKgo@}M^|#?K8_Gg(2v*{_36rUzx)F)0=DmUCoT z%iJ8*n?+$Z{9&%>?+u>HOd5r}Rm;3p*LN+KJTy!M8Mplk-?@;f=I9}Hdp8MPq1)-gF%r>%X`X}%MN#$2xGC$QoV+*N4!B@-5ZRPPW zVVNf7#QaSDh^(wFk?e~*iBAQNlM1z)J$y;9llQQk5}ydUOOfxZlEQXFXtN{(2ZM_f zaU5;BZbN~g`ujarvWiJovb)}nPiSgFeHZJBrM>rE@)J!jTFR$LW-#v)sNcr1Rihn$ zNM+bu<8JHtfkr99Fnsq3`sz$zXnD(ut=g=k^uVkrmq*#EMyLJz@Hgr$so|}>Q{7%n z&r8RjDy^Lw(l>N$!%SPwV5i61bLX~pPG5ejqRb$st$eh?5zZ=lsWGGF>{OjMq`98z zNOD^k+9NPE^vP z=ixbZLozMR_9)KQ1s5Q(uXTNo(`E0{G*j7)ON--cm;(@OKScQG>`v1m+v-1Fq|g4| zK6J%5(3HX*&5wS525IJHz|2hn3mYyG3Q5sx3R80PF+G zpEpY6vrX%%23ytfgEmkpve~HIj9+H>v$pzP%5v)jD95(fSL;*du&mJV)3U7?F7M0H z@S{weKN%>WZ$#7`))F1NcyEdZ=!A%KA+IFxcMJjZiL;1{5orct<|7X+FutS5xM$^Yg(Pt zt=}S*xYZyW{K{bn3WA~xDw=z=xGv#+#OzZ*s6+bSn_z*cj`wIO@JL!y4nU*>1U&A1 zg4hBOcJd+a!SALs>SRWuL0Heaiy0`kDUnmv4QV;wX_)bLt%y%;*ae@C+ zL<}Sh;sPve|I1Uc!7Jt2aDbpbT+shrU5kT&0RC^E@FzMu9OPsF2Yhhz-UBe48xG2H zWB=_D2$TF@b7PY5$`VN|z_yne$wcN}1q1RjB=Dgz%Hd-E+n3$vzV}EeAK(ov`XrFN z)Zt=J-)kf_Ex1VAFM?!j46qo}0U`a&h#f#xzYyXXaMG`X=mRJYm?6~SsuZII)IPEgh-W< z09TX Date: Sun, 24 Mar 2019 12:18:38 +0200 Subject: [PATCH 016/104] Try to fix gradle --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 67da3ee8..b93b3c77 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,6 @@ description = project.displayname archivesBaseName = project.name minecraft { - version = project.minecraft_version mappings channel: 'snapshot', version: project.mappings_version runs { @@ -63,14 +62,14 @@ minecraft { property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'debug' - replace '@VERSION@', project.version - mods { minelittlepony { source sourceSets.common source sourceSets.hdskins source sourceSets.client source sourceSets.main + + replace '@VERSION@', project.version } } } From 3aec485f153b5453367a518a2224f1a9ec503822 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 12:22:25 +0200 Subject: [PATCH 017/104] Try to fix gradle --- build.gradle | 63 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index b93b3c77..fcb01557 100644 --- a/build.gradle +++ b/build.gradle @@ -52,31 +52,6 @@ group = project.group description = project.displayname archivesBaseName = project.name -minecraft { - mappings channel: 'snapshot', version: project.mappings_version - - runs { - client { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - - mods { - minelittlepony { - source sourceSets.common - source sourceSets.hdskins - source sourceSets.client - source sourceSets.main - - replace '@VERSION@', project.version - } - } - } - } - -} - sourceSets { common { // code shared between HDSkins and MineLP mods @@ -132,6 +107,36 @@ sourceSets { } } +minecraft { + mappings channel: 'snapshot', version: project.mappings_version + + runs { + client { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + // replace '@VERSION@', project.version + + mods { + minelittlepony { + source sourceSets.common + source sourceSets.hdskins + source sourceSets.client + source sourceSets.main + + // replace '@VERSION@', project.version + } + + // replace '@VERSION@', project.version + } + } + } + + // replace '@VERSION@', project.version +} + dependencies { minecraft 'net.minecraftforge:forge:1.13.2-25.0.90' @@ -158,6 +163,8 @@ jar { from sourceSets.client.output from sourceSets.fml.output + replace '@VERSION@', project.version + classifier 'base' extension 'jar' } @@ -194,6 +201,8 @@ shadowJar { into "/assets/minelittlepony/textures/entity/pony" } + replace '@VERSION@', project.version + dependencies { exclude dependency('deobf.org.ow2.asm:') exclude dependency('org.spongepowered:mixin:') @@ -219,6 +228,8 @@ task srgJar(type: Jar) { from sourceSets.hdskins.output + replace '@VERSION@', project.version + classifier "mc$minecraft.version-srg" } @@ -227,6 +238,8 @@ task horseLib(type: Jar) { from sourceSets.main.output + replace '@VERSION@', project.version + baseName = "HoarseLib" } From 62238a6417dd5a4711c8dd5058cd51854012a9a3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 12:23:46 +0200 Subject: [PATCH 018/104] Try to fix gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fcb01557..16c74029 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ sourceSets { compileClasspath += client.output } - hdskinfml { + hdskinsfml { compileClasspath += main.compileClasspath compileClasspath += litemod.output compileClasspath += hdskins.output From b78558c72fbfb54209e9b4a413b1753b77da34f5 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 24 Mar 2019 19:55:15 +0200 Subject: [PATCH 019/104] Update to 1.13: The first of the saga --- .../client/ForgeHooksClient.java | 2 +- .../com/minelittlepony/client/ForgeProxy.java | 2 +- .../minelittlepony/client/IModUtilities.java | 4 +- .../minelittlepony/client/MineLPClient.java | 25 ++++--- .../client/PonyRenderManager.java | 2 +- .../client/PonySkinModifier.java | 27 +++----- .../client/gui/hdskins/RenderPonyModel.java | 8 +-- .../client/mixin/MixinDefaultPlayerSkin.java | 1 - .../client/mixin/MixinItemRenderer.java | 8 ++- .../client/mixin/MixinRenderItem.java | 9 +-- .../client/model/AbstractPonyModel.java | 14 ++-- .../client/model/IClientModel.java | 2 +- .../client/model/ModelMobPony.java | 2 +- .../DefaultPonyArmorTextureResolver.java | 9 +-- .../client/model/armour/ModelPonyArmor.java | 2 +- .../client/model/components/BatWings.java | 2 +- .../model/components/ModelDeadMau5Ears.java | 4 +- .../model/components/ModelPonyHead.java | 4 +- .../client/model/components/ModelWing.java | 2 +- .../client/model/components/PonyElytra.java | 2 +- .../client/model/components/PonySnout.java | 4 +- .../client/model/components/PonyTail.java | 2 +- .../client/model/components/UnicornHorn.java | 4 +- .../client/model/entities/ModelBreezie.java | 4 +- .../model/entities/ModelEnderStallion.java | 4 +- .../model/entities/ModelIllagerPony.java | 2 +- .../client/model/entities/ModelSeapony.java | 4 +- .../model/entities/ModelVillagerPony.java | 3 +- .../client/model/entities/ModelWitchPony.java | 2 +- .../client/model/gear/AbstractGear.java | 6 +- .../client/model/gear/IGear.java | 2 +- .../client/model/gear/SaddleBags.java | 2 +- .../client/model/races/ModelZebra.java | 8 +-- .../com/minelittlepony/client/pony/Pony.java | 30 ++++----- .../minelittlepony/client/pony/PonyData.java | 24 +++++-- .../client/pony/PonyDataSerialiser.java | 22 +++---- .../client/pony/PonyManager.java | 12 ++-- .../render/DebugBoundingBoxRenderer.java | 10 +-- .../client/render/LevitatingItemRenderer.java | 57 ++++++++-------- .../client/render/RenderPony.java | 17 +++-- .../client/render/RenderPonyMob.java | 6 +- .../client/render/entities/MobRenderers.java | 2 +- .../render/entities/RenderEnderStallion.java | 7 +- .../render/entities/RenderPonyGuardian.java | 2 +- .../render/entities/RenderPonyIllager.java | 2 +- .../render/entities/RenderPonySkeleton.java | 2 +- .../client/render/entities/RenderPonyVex.java | 2 +- .../render/entities/RenderPonyVillager.java | 5 +- .../render/entities/RenderPonyWitch.java | 8 +-- .../render/entities/RenderPonyZombie.java | 4 +- .../entities/RenderPonyZombieVillager.java | 3 +- .../VillagerProfessionTextureCache.java | 2 +- .../entities/player/RenderPonyPlayer.java | 14 ++-- .../entities/player/RenderSeaponyPlayer.java | 4 +- .../render/layer/AbstractPonyLayer.java | 4 +- .../client/render/layer/LayerDJPon3Head.java | 8 +-- .../layer/LayerEntityOnPonyShoulder.java | 14 ++-- .../client/render/layer/LayerEyeGlow.java | 14 ++-- .../client/render/layer/LayerGear.java | 4 +- .../render/layer/LayerHeldItemIllager.java | 4 +- .../render/layer/LayerHeldPonyItem.java | 22 +++---- .../layer/LayerHeldPonyItemMagical.java | 4 +- .../client/render/layer/LayerOverlayBase.java | 4 +- .../client/render/layer/LayerPonyArmor.java | 19 ++++-- .../client/render/layer/LayerPonyCape.java | 14 ++-- .../render/layer/LayerPonyCustomHead.java | 54 +++++++-------- .../client/render/layer/LayerPonyElytra.java | 10 +-- .../render/layer/LayerPonyStrayOverlay.java | 2 +- .../skull/PlayerSkullRenderer.java | 2 +- .../render/tileentities/skull/PonySkull.java | 2 +- .../tileentities/skull/PonySkullRenderer.java | 37 ++++++----- .../client/transform/PonyTransformation.java | 14 ++-- .../client/transform/PostureElytra.java | 4 +- .../client/transform/PostureFlight.java | 4 +- .../client/util/render/AbstractRenderer.java | 18 ++--- .../client/util/render/Box.java | 4 +- .../client/util/render/Color.java | 2 +- .../client/util/render/GlowRenderer.java | 4 +- .../client/util/render/PonyRenderer.java | 2 +- .../client/util/render/Quad.java | 2 +- .../client/util/render/Vertex.java | 2 +- .../util/render/plane/PlaneRenderer.java | 2 +- .../common/client/gui/Button.java | 15 +---- .../common/client/gui/GameGui.java | 17 +++-- .../common/client/gui/IconicButton.java | 9 ++- .../common/client/gui/IconicToggle.java | 4 +- .../common/client/gui/Label.java | 6 +- .../common/client/gui/Slider.java | 1 + .../common/client/gui/Style.java | 3 +- .../minelittlepony/hdskins/HDSkinManager.java | 39 ++++++----- .../com/minelittlepony/hdskins/HDSkins.java | 6 +- .../minelittlepony/hdskins/ISkinModifier.java | 13 +++- .../minelittlepony/hdskins/SkinUploader.java | 2 +- .../minelittlepony/hdskins/gui/CubeMap.java | 65 +++++++------------ .../hdskins/gui/DummyWorld.java | 54 +++++++++++++-- .../hdskins/gui/EntityPlayerModel.java | 12 ++-- .../minelittlepony/hdskins/gui/GuiSkins.java | 4 +- .../hdskins/gui/RenderPlayerModel.java | 40 ++++++------ .../mixin/MixinImageBufferDownload.java | 19 +++--- .../hdskins/mixin/MixinMinecraft.java | 62 ++---------------- .../hdskins/mixin/MixinSkullRenderer.java | 5 +- .../mixin/MixinThreadDownloadImageData.java | 8 +-- .../hdskins/resources/ImageLoader.java | 15 ++--- .../hdskins/resources/LocalTexture.java | 14 ++-- .../hdskins/resources/PreviewTexture.java | 6 +- .../resources/PreviewTextureManager.java | 2 +- .../resources/SkinResourceManager.java | 10 +-- .../hdskins/resources/TextureLoader.java | 2 +- .../texture/DynamicTextureImage.java | 9 ++- .../resources/texture/IBufferedTexture.java | 5 +- .../texture/ISkinAvailableCallback.java | 5 +- .../texture/ImageBufferDownloadHD.java | 54 +++++++-------- .../resources/texture/SimpleDrawer.java | 41 ++++++++++++ .../hdskins/server/LegacySkinServer.java | 2 +- .../hdskins/server/SkinServer.java | 2 +- .../hdskins/server/ValhallaSkinServer.java | 2 +- .../hdskins/upload/FileDropper.java | 8 ++- .../hdskins/upload/GLWindow.java | 1 + .../hdskins/upload/ThreadOpenFile.java | 2 +- .../hdskins/util/CallableFutures.java | 2 +- .../hdskins/util/NetClient.java | 4 +- .../hdskins/util/ProfileTextureUtil.java | 15 ++--- .../client/LiteModMineLittlePony.java | 6 +- .../pony/meta/TriggerPixels.java | 18 ++--- .../util/transform/MotionCompositor.java | 2 +- 125 files changed, 664 insertions(+), 636 deletions(-) create mode 100644 src/hdskins/java/com/minelittlepony/hdskins/resources/texture/SimpleDrawer.java diff --git a/src/api/java/net/minecraftforge/client/ForgeHooksClient.java b/src/api/java/net/minecraftforge/client/ForgeHooksClient.java index 97899be4..c5baa429 100644 --- a/src/api/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/api/java/net/minecraftforge/client/ForgeHooksClient.java @@ -1,6 +1,6 @@ package net.minecraftforge.client; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/client/java/com/minelittlepony/client/ForgeProxy.java b/src/client/java/com/minelittlepony/client/ForgeProxy.java index 46877c3e..515cd6ed 100644 --- a/src/client/java/com/minelittlepony/client/ForgeProxy.java +++ b/src/client/java/com/minelittlepony/client/ForgeProxy.java @@ -1,6 +1,6 @@ package com.minelittlepony.client; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/client/java/com/minelittlepony/client/IModUtilities.java b/src/client/java/com/minelittlepony/client/IModUtilities.java index c60f9791..ae91fff5 100644 --- a/src/client/java/com/minelittlepony/client/IModUtilities.java +++ b/src/client/java/com/minelittlepony/client/IModUtilities.java @@ -1,13 +1,13 @@ package com.minelittlepony.client; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Timer; public interface IModUtilities { - void addRenderer(Class type, TileEntitySpecialRenderer renderer); + void addRenderer(Class type, TileEntityRenderer renderer); void addRenderer(Class type, Render renderer); diff --git a/src/client/java/com/minelittlepony/client/MineLPClient.java b/src/client/java/com/minelittlepony/client/MineLPClient.java index 9b62370d..29b19700 100644 --- a/src/client/java/com/minelittlepony/client/MineLPClient.java +++ b/src/client/java/com/minelittlepony/client/MineLPClient.java @@ -3,8 +3,6 @@ package com.minelittlepony.client; import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.gui.GuiPonySettings; import com.minelittlepony.client.gui.hdskins.GuiSkinsMineLP; -import com.minelittlepony.client.pony.PonyData; -import com.minelittlepony.client.pony.PonyDataSerialiser; import com.minelittlepony.client.pony.PonyManager; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.common.client.gui.GuiHost; @@ -16,16 +14,15 @@ import com.minelittlepony.settings.PonyConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.data.MetadataSerializer; +import net.minecraft.resources.IReloadableResourceManager; import net.minecraft.client.settings.KeyBinding; +import net.minecraft.client.util.InputMappings; +import net.minecraft.util.Util; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import org.lwjgl.input.Keyboard; - /** * Static MineLittlePony singleton class. Everything's controlled from up here. */ @@ -35,7 +32,10 @@ public class MineLPClient extends MineLittlePony { private static final String MINELP_LEGACY_SERVER = "http://minelpskins.voxelmodpack.com"; private static final String MINELP_LEGACY_GATEWAY = "http://minelpskinmanager.voxelmodpack.com"; - static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", Keyboard.KEY_F9, "Mine Little Pony"); + public static final int KEY_M = 0x32; + public static final int KEY_F3 = 0x3D; + public static final int KEY_F9 = 0x43; + static final KeyBinding SETTINGS_GUI = new KeyBinding("Settings", KEY_F9, "Mine Little Pony"); private static int modelUpdateCounter = 0; private static boolean reloadingModels = false; @@ -59,11 +59,8 @@ public class MineLPClient extends MineLittlePony { config = newConfig; ponyManager = new PonyManager(config); - IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager(); - irrm.registerReloadListener(ponyManager); - - MetadataSerializer ms = Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer; - ms.registerMetadataSectionType(new PonyDataSerialiser(), PonyData.class); + IReloadableResourceManager irrm = (IReloadableResourceManager) Minecraft.getInstance().getResourceManager(); + irrm.addReloadListener(ponyManager); // This also makes it the default gateway server. SkinServer.defaultServers.add(new LegacySkinServer(MINELP_LEGACY_SERVER, MINELP_LEGACY_GATEWAY)); @@ -97,8 +94,8 @@ public class MineLPClient extends MineLittlePony { minecraft.displayGuiScreen(new GuiHost(new GuiPonySettings())); } else { - if ((Minecraft.getSystemTime() % 10) == 0) { - if (Keyboard.isKeyDown(Keyboard.KEY_F3) && Keyboard.isKeyDown(Keyboard.KEY_M)) { + if ((Util.milliTime() % 10) == 0) { + if (InputMappings.isKeyDown(KEY_F3) && InputMappings.isKeyDown(KEY_M)) { if (!reloadingModels) { minecraft.ingameGUI.getChatGUI().printChatMessage( (new TextComponentString("")).appendSibling( diff --git a/src/client/java/com/minelittlepony/client/PonyRenderManager.java b/src/client/java/com/minelittlepony/client/PonyRenderManager.java index 74b40e85..f4953f7e 100644 --- a/src/client/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/client/java/com/minelittlepony/client/PonyRenderManager.java @@ -111,7 +111,7 @@ public class PonyRenderManager { return null; } - Render renderer = Minecraft.getMinecraft().getRenderManager().getEntityRenderObject(entity); + Render renderer = Minecraft.getInstance().getRenderManager().getEntityRenderObject(entity); if (renderer instanceof RenderLivingBase && renderer instanceof IRenderPony) { return (R)(Object)renderer; diff --git a/src/client/java/com/minelittlepony/client/PonySkinModifier.java b/src/client/java/com/minelittlepony/client/PonySkinModifier.java index ce98efa8..ab1410fe 100644 --- a/src/client/java/com/minelittlepony/client/PonySkinModifier.java +++ b/src/client/java/com/minelittlepony/client/PonySkinModifier.java @@ -2,34 +2,23 @@ package com.minelittlepony.client; import com.minelittlepony.hdskins.ISkinModifier; -import java.awt.Graphics; -import java.awt.Image; -import java.awt.image.BufferedImage; - public class PonySkinModifier implements ISkinModifier { @Override - public void convertSkin(BufferedImage skin, Graphics dest) { - int scale = skin.getWidth() / 64; + public void convertSkin(ISkinModifier.IDrawer drawer) { + int scale = drawer.getImage().getWidth() / 64; //top, mirror - drawImage(dest, skin, scale, 60, 32, 58, 34, 58, 16, 60, 18); + drawer.draw(scale, 60, 32, 58, 34, 58, 16, 60, 18); //bottom, mirror - drawImage(dest, skin, scale, 62, 32, 60, 34, 60, 16, 62, 18); + drawer.draw(scale, 62, 32, 60, 34, 60, 16, 62, 18); //inside - drawImage(dest, skin, scale, 58, 34, 56, 48, 60, 18, 62, 32); + drawer.draw(scale, 58, 34, 56, 48, 60, 18, 62, 32); //back - drawImage(dest, skin, scale, 60, 34, 58, 48, 58, 18, 60, 32); + drawer.draw(scale, 60, 34, 58, 48, 58, 18, 60, 32); //outside - drawImage(dest, skin, scale, 62, 34, 60, 48, 56, 18, 58, 32); + drawer.draw(scale, 62, 34, 60, 48, 56, 18, 58, 32); //back - drawImage(dest, skin, scale, 64, 34, 62, 48, 62, 18, 64, 32); - } - - private void drawImage(Graphics graphics, Image image, int scale, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2) { - graphics.drawImage(image, - dx1 * scale, dy1 * scale, dx2 * scale, dy2 * scale, - sx1 * scale, sy1 * scale, sx2 * scale, sy2 * scale, - null); + drawer.draw(scale, 64, 34, 62, 48, 62, 18, 64, 32); } } 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 fe75a2dd..7b496f57 100644 --- a/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java +++ b/src/client/java/com/minelittlepony/client/gui/hdskins/RenderPonyModel.java @@ -13,9 +13,9 @@ import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelElytra; -import net.minecraft.client.model.ModelPlayer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelElytra; +import net.minecraft.client.renderer.entity.model.ModelPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.layers.LayerRenderer; @@ -55,7 +55,7 @@ public class RenderPonyModel extends RenderPlayerModel implemen } else { renderPony.preRenderCallback(entity, ticks); - GlStateManager.translate(0, 0, -entity.width / 2); // move us to the center of the shadow + GlStateManager.translatef(0, 0, -entity.width / 2); // move us to the center of the shadow } } diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index d7da649b..1581a369 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -41,5 +41,4 @@ public abstract class MixinDefaultPlayerSkin { .getId(IPonyManager.isSlimSkin(uuid))); } } - } diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java b/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java index ab5b8bef..db94784c 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinItemRenderer.java @@ -7,20 +7,22 @@ import org.spongepowered.asm.mixin.injection.Redirect; import com.minelittlepony.client.PonyRenderManager; import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.FirstPersonRenderer; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -@Mixin(ItemRenderer.class) +@Mixin(FirstPersonRenderer.class) public class MixinItemRenderer { private static final String AbstractClientPlayer = "Lnet/minecraft/client/entity/AbstractClientPlayer;"; private static final String ItemStack = "Lnet/minecraft/item/ItemStack;"; private static final String EnumHand = "Lnet/minecraft/util/EnumHand;"; private static final String EntityLivingBase = "Lnet/minecraft/entity/EntityLivingBase;"; - private static final String TransformType = "Lnet/minecraft/client/renderer/block/model/ItemCameraTransforms$TransformType;"; + private static final String TransformType = "Lnet/minecraft/client/renderer/block/ItemCameraTransforms$TransformType;"; + // TODO: This has moved to mc.getFirstPersonRenderer() //public void renderItemInFirstPerson(AbstractClientPlayer player, float p_187457_2_, float p_187457_3_, EnumHand hand, float p_187457_5_, ItemStack stack, float p_187457_7_) //public void renderItemSide(EntityLivingBase entitylivingbaseIn, ItemStack heldStack, ItemCameraTransforms.TransformType transform, boolean leftHanded) @Redirect(method = "renderItemInFirstPerson(" + AbstractClientPlayer + "FF" + EnumHand + "F" + ItemStack + "F)V", diff --git a/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java b/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java index e36f9b53..c7a31d21 100644 --- a/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java +++ b/src/client/java/com/minelittlepony/client/mixin/MixinRenderItem.java @@ -3,9 +3,10 @@ package com.minelittlepony.client.mixin; import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.client.render.LevitatingItemRenderer; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.resources.IResourceManagerReloadListener; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(RenderItem.class) +@Mixin(ItemRenderer.class) public abstract class MixinRenderItem implements IResourceManagerReloadListener, IRenderItem { private boolean transparency; diff --git a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java index 6bd63628..fbc52714 100644 --- a/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/client/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -20,9 +20,9 @@ import com.minelittlepony.util.math.MathUtil; import javax.annotation.Nullable; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelPlayer; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelPlayer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -890,7 +890,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IClientMo } protected void renderNeck(float scale) { - GlStateManager.scale(0.9, 0.9, 0.9); + GlStateManager.scalef(0.9F, 0.9F, 0.9F); neck.render(scale); } @@ -930,12 +930,12 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IClientMo @Override public void transform(BodyPart part) { if (isSleeping()) { - rotate(90, 1, 0, 0); - rotate(180, 0, 1, 0); + rotatef(90, 1, 0, 0); + rotatef(180, 0, 1, 0); } if (part == BodyPart.HEAD) { - rotate(motionPitch, 1, 0, 0); + rotatef(motionPitch, 1, 0, 0); } PonyTransformation.forSize(getSize()).transform(this, part); diff --git a/src/client/java/com/minelittlepony/client/model/IClientModel.java b/src/client/java/com/minelittlepony/client/model/IClientModel.java index a844f68a..1ac95209 100644 --- a/src/client/java/com/minelittlepony/client/model/IClientModel.java +++ b/src/client/java/com/minelittlepony/client/model/IClientModel.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import com.minelittlepony.model.ICapitated; import com.minelittlepony.model.IModel; diff --git a/src/client/java/com/minelittlepony/client/model/ModelMobPony.java b/src/client/java/com/minelittlepony/client/model/ModelMobPony.java index 9283d1e6..35712457 100644 --- a/src/client/java/com/minelittlepony/client/model/ModelMobPony.java +++ b/src/client/java/com/minelittlepony/client/model/ModelMobPony.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.races.ModelAlicorn; diff --git a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java index 6fec91f8..15aa044a 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java +++ b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java @@ -1,11 +1,12 @@ package com.minelittlepony.client.model.armour; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.ResourcePackInfoClient; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.resources.ResourcePackType; import net.minecraft.util.ResourceLocation; import com.google.common.collect.Maps; @@ -52,9 +53,9 @@ public class DefaultPonyArmorTextureResolver impleme private ResourceLocation resolve(ResourceLocation... resources) { // check resource packs for either texture. - for (ResourcePackRepository.Entry entry : Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries()) { + for (ResourcePackInfoClient entry : Minecraft.getInstance().getResourcePackList().getPackInfos()) { for (ResourceLocation candidate : resources) { - if (entry.getResourcePack().resourceExists(candidate)) { + if (entry.getResourcePack().resourceExists(ResourcePackType.CLIENT_RESOURCES, candidate)) { // ponies are more important return candidate; } @@ -64,7 +65,7 @@ public class DefaultPonyArmorTextureResolver impleme // the default pack for (ResourceLocation candidate : resources) { try { - Minecraft.getMinecraft().getResourceManager().getResource(candidate); + Minecraft.getInstance().getResourceManager().getResource(candidate); return candidate; } catch (IOException e) { } } diff --git a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java index e9fdb9dc..fbb9ff7e 100644 --- a/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/model/armour/ModelPonyArmor.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model.armour; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.entity.Entity; import com.minelittlepony.client.model.AbstractPonyModel; diff --git a/src/client/java/com/minelittlepony/client/model/components/BatWings.java b/src/client/java/com/minelittlepony/client/model/components/BatWings.java index f6f7a221..12e18481 100644 --- a/src/client/java/com/minelittlepony/client/model/components/BatWings.java +++ b/src/client/java/com/minelittlepony/client/model/components/BatWings.java @@ -28,7 +28,7 @@ public class BatWings extends PegasusWin public void renderPart(float scale, UUID interpolatorId) { GlStateManager.pushMatrix(); - GlStateManager.scale(1.3F, 1.3F, 1.3F); + GlStateManager.scalef(1.3F, 1.3F, 1.3F); super.renderPart(scale, interpolatorId); diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java b/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java index dbcccff9..b6fc9697 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelDeadMau5Ears.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.components; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.model.ModelSkeletonHead; +import net.minecraft.client.renderer.entity.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelSkeletonHead; public class ModelDeadMau5Ears extends ModelSkeletonHead { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java index d36c1e41..1c4b17eb 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelPonyHead.java @@ -7,8 +7,8 @@ import com.minelittlepony.pony.IPonyData; import javax.annotation.Nullable; -import net.minecraft.client.model.ModelHumanoidHead; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelHumanoidHead; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelPonyHead extends ModelHumanoidHead implements ICapitated { diff --git a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java index f465a1f5..f51ada90 100644 --- a/src/client/java/com/minelittlepony/client/model/components/ModelWing.java +++ b/src/client/java/com/minelittlepony/client/model/components/ModelWing.java @@ -67,7 +67,7 @@ public class ModelWing implements PonyMo boolean bags = pegasus.isWearing(Wearable.SADDLE_BAGS); if (bags) { GlStateManager.pushMatrix(); - GlStateManager.translate(0, 0, 0.198F); + GlStateManager.translatef(0, 0, 0.198F); } folded.render(scale); if (bags) { diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java index a4e6a7eb..378e9130 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyElytra.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.components; import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java index 4caa6c7f..f6122f97 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonySnout.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonySnout.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.components; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import com.minelittlepony.MineLittlePony; import com.minelittlepony.client.util.render.plane.PlaneRenderer; diff --git a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java index 2ab3057c..e6e1e615 100644 --- a/src/client/java/com/minelittlepony/client/model/components/PonyTail.java +++ b/src/client/java/com/minelittlepony/client/model/components/PonyTail.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model.components; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import net.minecraft.util.math.MathHelper; import com.minelittlepony.client.model.AbstractPonyModel; diff --git a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java index 20599373..313be559 100644 --- a/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java +++ b/src/client/java/com/minelittlepony/client/model/components/UnicornHorn.java @@ -9,8 +9,8 @@ import java.util.UUID; import static com.minelittlepony.model.PonyModelConstants.*; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import static org.lwjgl.opengl.GL11.*; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java index 8b665de6..e9034d32 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelBreezie.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model.entities; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.MathHelper; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java b/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java index 288b6397..08fa8c59 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model.entities; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -63,7 +63,7 @@ public class ModelEnderStallion extends ModelSkeletonPony { public void render(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) { GlStateManager.pushMatrix(); - GlStateManager.translate(0, -1.15F, 0); + GlStateManager.translatef(0, -1.15F, 0); super.render(entity, move, swing, ticks, headYaw, headPitch, scale); GlStateManager.popMatrix(); } diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java index 31c2a235..6becb5ac 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model.entities; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.AbstractIllager; import net.minecraft.entity.monster.AbstractIllager.IllagerArmPose; diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java index 9376d877..7c87cfce 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelSeapony.java @@ -142,7 +142,7 @@ public class ModelSeapony extends ModelUnicorn { @Override public void transform(BodyPart part) { - GlStateManager.translate(0, 0.6F, 0); + GlStateManager.translatef(0, 0.6F, 0); super.transform(part); } @@ -207,7 +207,7 @@ public class ModelSeapony extends ModelUnicorn { @Override public void transform(BodyPart part) { - GlStateManager.translate(0, 0.6F, 0); + GlStateManager.translatef(0, 0.6F, 0); super.transform(part); } diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java index d0a9b75f..62bdc457 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java @@ -29,7 +29,7 @@ public class ModelVillagerPony extends ModelMobPony { @Override public void setLivingAnimations(EntityLivingBase entity, float limbSwing, float limbSwingAmount, float partialTickTime) { profession = getProfession(entity); - special = "Derpy".equals(entity.getCustomNameTag()); + special = "Derpy".equals(entity.getCustomName().getUnformattedComponentText()); special2 = special && entity.getUniqueID().getLeastSignificantBits() % 20 == 0; } @@ -64,6 +64,7 @@ public class ModelVillagerPony extends ModelMobPony { return super.isWearing(wearable); } + @SuppressWarnings("deprecation") protected int getProfession(Entity entity) { if (entity instanceof EntityVillager) { return ((EntityVillager) entity).getProfession(); diff --git a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java index c06f4ec0..8ff9fd7d 100644 --- a/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java +++ b/src/client/java/com/minelittlepony/client/model/entities/ModelWitchPony.java @@ -20,7 +20,7 @@ public class ModelWitchPony extends ModelZebra { super.updateLivingState(entity, pony); EntityWitch witch = ((EntityWitch) entity); - if ("Filly".equals(entity.getCustomNameTag())) { + if ("Filly".equals(entity.getCustomName().getUnformattedComponentText())) { isChild = true; } leftArmPose = ArmPose.EMPTY; diff --git a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java index 4d12823a..8d105269 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/AbstractGear.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.model.gear; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; @@ -36,7 +36,7 @@ public abstract class AbstractGear extends ModelBase implements IGear, PonyModel public void renderSeparately(Entity entity, float scale) { GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - TextureManager tex = Minecraft.getMinecraft().getRenderManager().renderEngine; + TextureManager tex = Minecraft.getInstance().getRenderManager().textureManager; tex.bindTexture(getTexture(entity)); renderPart(scale, entity.getUniqueID()); diff --git a/src/client/java/com/minelittlepony/client/model/gear/IGear.java b/src/client/java/com/minelittlepony/client/model/gear/IGear.java index 6da7757c..744878ab 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/IGear.java +++ b/src/client/java/com/minelittlepony/client/model/gear/IGear.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.model.gear; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java index fc726f2f..73d5fffe 100644 --- a/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java +++ b/src/client/java/com/minelittlepony/client/model/gear/SaddleBags.java @@ -115,7 +115,7 @@ public class SaddleBags extends AbstractGear { dropAmount = model.getMetadata().getInterpolator(interpolatorId).interpolate("dropAmount", dropAmount, 3); GlStateManager.pushMatrix(); - GlStateManager.translate(0, dropAmount, 0); + GlStateManager.translatef(0, dropAmount, 0); leftBag.render(scale); rightBag.render(scale); diff --git a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java index 3c18b44b..01d4648c 100644 --- a/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java +++ b/src/client/java/com/minelittlepony/client/model/races/ModelZebra.java @@ -24,10 +24,10 @@ public class ModelZebra extends ModelEarthPony { @Override public void transform(BodyPart part) { if (part == BodyPart.HEAD || part == BodyPart.NECK) { - GlStateManager.translate(0, -0.1F, 0); + GlStateManager.translatef(0, -0.1F, 0); } if (part == BodyPart.NECK) { - GlStateManager.scale(1, 1.3F, 1); + GlStateManager.scalef(1, 1.3F, 1); } super.transform(part); } @@ -55,10 +55,10 @@ public class ModelZebra extends ModelEarthPony { @Override public void transform(BodyPart part) { if (part == BodyPart.HEAD || part == BodyPart.NECK) { - GlStateManager.translate(0, -0.1F, 0); + GlStateManager.translatef(0, -0.1F, 0); } if (part == BodyPart.NECK) { - GlStateManager.scale(1, 1.3F, 1); + GlStateManager.scalef(1, 1.3F, 1); } super.transform(part); } diff --git a/src/client/java/com/minelittlepony/client/pony/Pony.java b/src/client/java/com/minelittlepony/client/pony/Pony.java index ef7a1683..32eb199a 100644 --- a/src/client/java/com/minelittlepony/client/pony/Pony.java +++ b/src/client/java/com/minelittlepony/client/pony/Pony.java @@ -17,8 +17,9 @@ import com.minelittlepony.util.chron.Touchable; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.resources.IResource; +import net.minecraft.client.renderer.texture.MissingTextureSprite; +import net.minecraft.client.renderer.texture.NativeImage; +import net.minecraft.resources.IResource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +32,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import java.awt.image.BufferedImage; import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; @@ -60,12 +60,12 @@ public class Pony extends Touchable implements IPony { return data; } - BufferedImage ponyTexture = getBufferedImage(resource); + NativeImage ponyTexture = getBufferedImage(resource); if (ponyTexture == null) { - ponyTexture = ProfileTextureUtil.getDynamicBufferedImage(16, 16, TextureUtil.MISSING_TEXTURE); + ponyTexture = ProfileTextureUtil.getDynamicBufferedImage(16, 16, MissingTextureSprite.getDynamicTexture()); - Minecraft.getMinecraft().getTextureManager().loadTexture(resource, new DynamicTextureImage(ponyTexture)); + Minecraft.getInstance().getTextureManager().loadTexture(resource, new DynamicTextureImage(ponyTexture)); } return checkSkin(ponyTexture); @@ -74,10 +74,10 @@ public class Pony extends Touchable implements IPony { @Nullable private IPonyData checkPonyMeta(ResourceLocation resource) { try { - IResource res = Minecraft.getMinecraft().getResourceManager().getResource(resource); + IResource res = Minecraft.getInstance().getResourceManager().getResource(resource); if (res.hasMetadata()) { - PonyData data = res.getMetadata(PonyDataSerialiser.NAME); + PonyData data = res.getMetadata(PonyData.SERIALISER); if (data != null) { return data; @@ -93,17 +93,17 @@ public class Pony extends Touchable implements IPony { } @Nullable - public static BufferedImage getBufferedImage(@Nonnull ResourceLocation resource) { + public static NativeImage getBufferedImage(@Nonnull ResourceLocation resource) { try { - IResource skin = Minecraft.getMinecraft().getResourceManager().getResource(resource); - BufferedImage skinImage = TextureUtil.readBufferedImage(skin.getInputStream()); + IResource skin = Minecraft.getInstance().getResourceManager().getResource(resource); + NativeImage skinImage = NativeImage.read(skin.getInputStream()); MineLittlePony.logger.debug("Obtained skin from resource location {}", resource); return skinImage; } catch (IOException ignored) { } - ITextureObject texture = Minecraft.getMinecraft().getTextureManager().getTexture(resource); + ITextureObject texture = Minecraft.getInstance().getTextureManager().getTexture(resource); if (texture instanceof IBufferedTexture) { return ((IBufferedTexture) texture).getBufferedImage(); @@ -112,7 +112,7 @@ public class Pony extends Touchable implements IPony { return null; } - private IPonyData checkSkin(BufferedImage bufferedimage) { + private IPonyData checkSkin(NativeImage bufferedimage) { MineLittlePony.logger.debug("\tStart skin check for pony #{} with image {}.", ponyId, bufferedimage); return PonyData.parse(bufferedimage); } @@ -137,8 +137,8 @@ public class Pony extends Touchable implements IPony { @Override public boolean isFlying(EntityLivingBase entity) { return !(entity.onGround - || entity.isRiding() - || (entity.isOnLadder() && !(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isFlying)) + || entity.getRidingEntity() != null + || (entity.isOnLadder() && !(entity instanceof EntityPlayer && ((EntityPlayer)entity).abilities.isFlying)) || entity.isInWater() || entity.isPlayerSleeping()); } diff --git a/src/client/java/com/minelittlepony/client/pony/PonyData.java b/src/client/java/com/minelittlepony/client/pony/PonyData.java index a2d29c70..e7e36ce3 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyData.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyData.java @@ -1,8 +1,9 @@ package com.minelittlepony.client.pony; -import net.minecraft.client.resources.data.IMetadataSection; +import net.minecraft.client.renderer.texture.NativeImage; import com.google.common.base.MoreObjects; +import com.google.gson.annotations.Expose; import com.minelittlepony.pony.IPonyData; import com.minelittlepony.pony.meta.Gender; import com.minelittlepony.pony.meta.Race; @@ -13,24 +14,35 @@ import com.minelittlepony.pony.meta.Wearable; import com.minelittlepony.util.animation.BasicEasingInterpolator; import com.minelittlepony.util.animation.IInterpolator; -import java.awt.image.BufferedImage; import java.util.UUID; import javax.annotation.concurrent.Immutable; - /** * Implementation for IPonyData. * */ @Immutable -public class PonyData implements IPonyData, IMetadataSection { +public class PonyData implements IPonyData { + + public static final PonyDataSerialiser SERIALISER = new PonyDataSerialiser(); + + @Expose private final Race race; + + @Expose private final TailLength tailSize; + + @Expose private final Gender gender; + + @Expose private final Size size; + + @Expose private final int glowColor; + @Expose private final boolean[] wearables; public PonyData() { @@ -43,7 +55,7 @@ public class PonyData implements IPonyData, IMetadataSection { wearables = new boolean[Wearable.values().length]; } - private PonyData(BufferedImage image) { + private PonyData(NativeImage image) { race = TriggerPixels.RACE.readValue(image); tailSize = TriggerPixels.TAIL.readValue(image); size = TriggerPixels.SIZE.readValue(image); @@ -108,7 +120,7 @@ public class PonyData implements IPonyData, IMetadataSection { /** * Parses an image buffer into a new IPonyData representing the values stored in it's individual trigger pixels. */ - public static IPonyData parse(BufferedImage image) { + public static IPonyData parse(NativeImage image) { return new PonyData(image); } } diff --git a/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java b/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java index 7ec677f4..1fced28f 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyDataSerialiser.java @@ -1,24 +1,24 @@ package com.minelittlepony.client.pony; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import net.minecraft.client.resources.data.IMetadataSectionSerializer; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import net.minecraft.resources.data.IMetadataSectionSerializer; -import java.lang.reflect.Type; +class PonyDataSerialiser implements IMetadataSectionSerializer { -public class PonyDataSerialiser implements IMetadataSectionSerializer { - - public static final String NAME = "pony"; + private static final Gson gson = new GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .create(); @Override public String getSectionName() { - return NAME; + return "pony"; } @Override - public PonyData deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - return context.deserialize(json, PonyData.class); + public PonyData deserialize(JsonObject json) { + return gson.fromJson(json, PonyData.class); } } diff --git a/src/client/java/com/minelittlepony/client/pony/PonyManager.java b/src/client/java/com/minelittlepony/client/pony/PonyManager.java index 4c623a1a..813ad430 100644 --- a/src/client/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/client/java/com/minelittlepony/client/pony/PonyManager.java @@ -19,9 +19,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; import net.minecraft.client.resources.DefaultPlayerSkin; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.IResourceManagerReloadListener; +import net.minecraft.resources.IResource; +import net.minecraft.resources.IResourceManager; +import net.minecraft.resources.IResourceManagerReloadListener; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; @@ -124,7 +124,7 @@ public class PonyManager implements IPonyManager, IResourceManagerReloadListener } private boolean isUser(UUID uuid) { - return Minecraft.getMinecraft().player != null && Minecraft.getMinecraft().player.getUniqueID().equals(uuid); + return Minecraft.getInstance().player != null && Minecraft.getInstance().player.getUniqueID().equals(uuid); } @Override @@ -142,7 +142,7 @@ public class PonyManager implements IPonyManager, IResourceManagerReloadListener Queue processingQueue = new LinkedList<>(); - for (String domain : resourceManager.getResourceDomains()) { + for (String domain : resourceManager.getResourceNamespaces()) { processingQueue.addAll(loadBgPonies(resourceManager, new ResourceLocation(domain, BGPONIES_JSON))); } @@ -186,7 +186,7 @@ public class PonyManager implements IPonyManager, IResourceManagerReloadListener collectedPonies.add(ponies); } catch (JsonParseException e) { - MineLittlePony.logger.error("Invalid bgponies.json in " + res.getResourcePackName(), e); + MineLittlePony.logger.error("Invalid bgponies.json in " + res.getPackName(), e); } } } catch (IOException ignored) { diff --git a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java index cccbeb5d..dd8d156f 100644 --- a/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderGlobal; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -19,7 +19,7 @@ public class DebugBoundingBoxRenderer { } public void render(IPony pony, EntityLivingBase entity, float ticks) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); EntityPlayer player = mc.player; if (!mc.getRenderManager().isDebugBoundingBox() || entity.getDistanceSq(player) > 70) { @@ -34,12 +34,12 @@ public class DebugBoundingBoxRenderer { double renderPosZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)ticks; enableBlend(); - tryBlendFuncSeparate(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); - glLineWidth(2.0F); + blendFuncSeparate(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); + lineWidth(2); disableTexture2D(); depthMask(false); - RenderGlobal.drawSelectionBoundingBox(boundingBox.grow(0.003D).offset(-renderPosX, -renderPosY, -renderPosZ), 1, 1, 0, 1); + WorldRenderer.drawSelectionBoundingBox(boundingBox.grow(0.003D).offset(-renderPosX, -renderPosY, -renderPosZ), 1, 1, 0, 1); depthMask(true); enableTexture2D(); diff --git a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index db997aea..e3bc5dc5 100644 --- a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -13,10 +13,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.GlStateManager.DestFactor; import net.minecraft.client.renderer.GlStateManager.SourceFactor; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; @@ -26,9 +25,9 @@ import static net.minecraft.client.renderer.GlStateManager.*; public class LevitatingItemRenderer { public static void enableItemGlowRenderProfile() { - GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO); - Minecraft.getMinecraft().entityRenderer.disableLightmap(); + enableBlend(); + blendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO); + Minecraft.getInstance().entityRenderer.disableLightmap(); } /** @@ -39,15 +38,15 @@ public class LevitatingItemRenderer { disableLighting(); setColor(glowColor); - RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); + ItemRenderer renderItem = Minecraft.getInstance().getItemRenderer(); ((IRenderItem) renderItem).useTransparency(true); PonySkullRenderer.ponyInstance.useTransparency(true); - scale(1.1, 1.1, 1.1); + scalef(1.1F, 1.1F, 1.1F); - translate(0, 0.01F, 0.01F); + translatef(0, 0.01F, 0.01F); renderItem.renderItem(drop, entity, transform, hand == EnumHandSide.LEFT); - translate(0.01F, -0.01F, -0.02F); + translatef(0.01F, -0.01F, -0.02F); renderItem.renderItem(drop, entity, transform, hand == EnumHandSide.LEFT); ((IRenderItem) renderItem).useTransparency(false); @@ -78,28 +77,28 @@ public class LevitatingItemRenderer { boolean doMagic = MineLittlePony.getInstance().getConfig().fpsmagic && pony.getMetadata().hasMagic(); if (doMagic) { - setupPerspective(entity, stack, left); + setupPerspective(renderer, entity, stack, left); } - renderer.renderItemSide(entity, stack, transform, left); + renderer.renderItem(stack, entity, transform, left); if (doMagic) { disableLighting(); - IRenderItem renderItem = (IRenderItem)Minecraft.getMinecraft().getRenderItem(); - renderItem.useTransparency(true); + ((IRenderItem)renderer).useTransparency(true); PonySkullRenderer.ponyInstance.useTransparency(true); setColor(pony.getMetadata().getGlowColor()); - scale(1.1, 1.1, 1.1); + scalef(1.1F, 1.1F, 1.1F); - translate(-0.015F, 0.01F, 0.01F); - renderer.renderItemSide(entity, stack, transform, left); - translate(0.03F, -0.01F, -0.02F); - renderer.renderItemSide(entity, stack, transform, left); + translatef(-0.015F, 0.01F, 0.01F); + renderer.renderItem(stack, entity, transform, left); + translatef(0.03F, -0.01F, -0.02F); + renderer.renderItem(stack, entity, transform, left); + + ((IRenderItem)renderer).useTransparency(false); - renderItem.useTransparency(false); PonySkullRenderer.ponyInstance.useTransparency(false); unsetColor(); @@ -114,8 +113,8 @@ public class LevitatingItemRenderer { /** * Moves held items to look like they're floating in the player's field. */ - private void setupPerspective(EntityLivingBase entity, ItemStack stack, boolean left) { - EnumAction action = stack.getItemUseAction(); + private void setupPerspective(ItemRenderer renderer, EntityLivingBase entity, ItemStack stack, boolean left) { + EnumAction action = stack.getUseAction(); boolean doNormal = entity.getItemInUseCount() <= 0 || action == EnumAction.NONE; @@ -125,18 +124,18 @@ public class LevitatingItemRenderer { float floatAmount = (float)Math.sin(ticks / 9) / 40; float driftAmount = (float)Math.cos(ticks / 6) / 40; - boolean handHeldTool = stack.getItemUseAction() == EnumAction.BOW - || stack.getItemUseAction() == EnumAction.BLOCK; + boolean handHeldTool = stack.getUseAction() == EnumAction.BOW + || stack.getUseAction() == EnumAction.BLOCK; - translate(driftAmount - floatAmount / 4, floatAmount, handHeldTool ? -0.3F : -0.6F); + translatef(driftAmount - floatAmount / 4, floatAmount, handHeldTool ? -0.3F : -0.6F); - if (!stack.getItem().isFull3D() && !handHeldTool) { // bows have to point forwards + if (!renderer.shouldRenderItemIn3D(stack) && !handHeldTool) { // bows have to point forwards if (left) { - rotate(-60, 0, 1, 0); - rotate(30, 0, 0, 1); + rotatef(-60, 0, 1, 0); + rotatef(30, 0, 0, 1); } else { - rotate(60, 0, 1, 0); - rotate(-30, 0, 0, 1); + rotatef(60, 0, 1, 0); + rotatef(-30, 0, 0, 1); } } } diff --git a/src/client/java/com/minelittlepony/client/render/RenderPony.java b/src/client/java/com/minelittlepony/client/render/RenderPony.java index 3cc464f4..79a9e0e8 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPony.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPony.java @@ -9,6 +9,8 @@ import com.minelittlepony.client.transform.PonyPosture; import com.minelittlepony.pony.IPony; import com.minelittlepony.util.math.MathUtil; +import javax.annotation.Nullable; + import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.Entity; @@ -53,14 +55,14 @@ public class RenderPony { ponyModel.updateLivingState(entity, pony); float s = getScaleFactor(); - GlStateManager.scale(s, s, s); + GlStateManager.scalef(s, s, s); enableModelRenderProfile(); translateRider(entity, ticks); } public float getRenderYaw(T entity, float rotationYaw, float partialTicks) { - if (entity.isRiding()) { + if (entity.getRidingEntity() != null) { Entity mount = entity.getRidingEntity(); if (mount instanceof EntityLivingBase) { return MathUtil.interpolateDegress(((EntityLivingBase)mount).prevRenderYawOffset, ((EntityLivingBase)mount).renderYawOffset, partialTicks); @@ -71,7 +73,7 @@ public class RenderPony { } protected void translateRider(EntityLivingBase entity, float ticks) { - if (entity.isRiding()) { + if (entity.getRidingEntity() != null) { Entity ridingEntity = entity.getRidingEntity(); if (ridingEntity instanceof EntityLivingBase) { @@ -79,7 +81,7 @@ public class RenderPony { if (renderer != null) { // negate vanilla translations so the rider begins at the ridees feet. - GlStateManager.translate(0, -ridingEntity.height, 0); + GlStateManager.translatef(0, -ridingEntity.height, 0); @SuppressWarnings("unchecked") IPony riderPony = renderer.getEntityPony((EntityLivingBase)ridingEntity); @@ -113,12 +115,15 @@ public class RenderPony { } } + @Nullable private PonyPosture getPosture(T entity) { if (entity.isElytraFlying()) { return PonyPosture.ELYTRA; } - if (entity.isEntityAlive() && entity.isPlayerSleeping()) return null; + if (entity.isAlive() && entity.isPlayerSleeping()) { + return null; + } if (ponyModel.isSwimming()) { return PonyPosture.SWIMMING; @@ -168,7 +173,7 @@ public class RenderPony { y -= 0.25F; } - if (entity.isRiding()) { + if (entity.getRidingEntity() != null) { y += entity.getRidingEntity().getEyeHeight(); } diff --git a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java index e660cfa2..4ffd4f86 100644 --- a/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java +++ b/src/client/java/com/minelittlepony/client/render/RenderPonyMob.java @@ -80,10 +80,10 @@ public abstract class RenderPonyMob extends RenderLiving shadowSize *= 3; // undo vanilla shadow scaling } - if (!entity.isRiding()) { - GlStateManager.translate(0, 0, -entity.width / 2); // move us to the center of the shadow + if (entity.getRidingEntity() == null) { + GlStateManager.translatef(0, 0, -entity.width / 2); // move us to the center of the shadow } else { - GlStateManager.translate(0, entity.getYOffset(), 0); + GlStateManager.translated(0, entity.getYOffset(), 0); } } diff --git a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java index f4630712..c0abd8a0 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/client/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -71,7 +71,7 @@ public enum MobRenderers implements Setting { @Override public void set(boolean value) { Setting.super.set(value); - apply(PonyRenderManager.getInstance(), Minecraft.getMinecraft().getRenderManager()); + apply(PonyRenderManager.getInstance(), Minecraft.getInstance().getRenderManager()); } public void apply(PonyRenderManager pony, RenderManager manager) { diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java index b5a09d62..3a18db91 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java @@ -42,11 +42,12 @@ public class RenderEnderStallion extends RenderPonyMob implement return new LayerHeldPonyItemMagical(this) { @Override protected ItemStack getRightItem(EntityEnderman entity) { - IBlockState state = entity.getHeldBlockState(); + IBlockState state = entity.func_195405_dq(); if (state == null) { return ItemStack.EMPTY; } - return new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); + + return new ItemStack(state.getBlock().asItem()); } }; } @@ -60,7 +61,7 @@ public class RenderEnderStallion extends RenderPonyMob implement public void doRender(EntityEnderman entity, double x, double y, double z, float entityYaw, float partialTicks) { ModelEnderStallion modelenderman = (ModelEnderStallion)getMainModel(); - modelenderman.isCarrying = entity.getHeldBlockState() != null; + modelenderman.isCarrying = entity.func_195405_dq() != null; modelenderman.isAttacking = entity.isScreaming(); if (entity.isScreaming()) { diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java index 473b8e92..3763fdde 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java @@ -70,7 +70,7 @@ public class RenderPonyGuardian extends RenderGuardian { @Override protected void preRenderCallback(EntityGuardian entity, float ticks) { super.preRenderCallback(entity, ticks); - GlStateManager.scale(2.35F, 2.35F, 2.35F); + GlStateManager.scalef(2.35F, 2.35F, 2.35F); } } } diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java index 7836b5e4..5a244ad7 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java @@ -36,7 +36,7 @@ public abstract class RenderPonyIllager extends Rende @Override public void preRenderCallback(T entity, float ticks) { super.preRenderCallback(entity, ticks); - GlStateManager.scale(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); + GlStateManager.scalef(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); } public static class Vindicator extends RenderPonyIllager { diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java index 9c7b9307..18a2a43a 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java @@ -56,7 +56,7 @@ public class RenderPonySkeleton extends Rende @Override public void preRenderCallback(EntityWitherSkeleton skeleton, float ticks) { super.preRenderCallback(skeleton, ticks); - GlStateManager.scale(1.2F, 1.2F, 1.2F); + GlStateManager.scalef(1.2F, 1.2F, 1.2F); } } diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java index 66b4c120..5c2cbd22 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVex.java @@ -22,7 +22,7 @@ public class RenderPonyVex extends RenderBiped { @Override protected void preRenderCallback(EntityVex entity, float ticks) { - GlStateManager.scale(0.4F, 0.4F, 0.4F); + GlStateManager.scalef(0.4F, 0.4F, 0.4F); } @Override diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java index 811ea80a..16bfe553 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java @@ -36,12 +36,13 @@ public class RenderPonyVillager extends RenderPonyMob { @Override public void preRenderCallback(EntityVillager villager, float ticks) { super.preRenderCallback(villager, ticks); - GlStateManager.scale(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); + GlStateManager.scalef(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); } + @SuppressWarnings("deprecation") @Override public ResourceLocation getTexture(EntityVillager entity) { - String name = entity.getCustomNameTag(); + String name = entity.getCustomName().getUnformattedComponentText(); if ("Derpy".equals(name) || (entity.isChild() && "Dinky".equals(name))) { if (entity.isChild()) { return EGG_2; diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java index e70e19b0..13a96afe 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java @@ -6,7 +6,7 @@ import com.minelittlepony.client.render.RenderPonyMob; import com.minelittlepony.client.render.layer.LayerHeldPonyItem; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.item.ItemStack; @@ -28,8 +28,8 @@ public class RenderPonyWitch extends RenderPonyMob { return new LayerHeldPonyItem(this) { @Override protected void preItemRender(EntityWitch entity, ItemStack drop, TransformType transform, EnumHandSide hand) { - GlStateManager.translate(0, -0.3F, -0.8F); - GlStateManager.rotate(10, 1, 0, 0); + GlStateManager.translatef(0, -0.3F, -0.8F); + GlStateManager.rotatef(10, 1, 0, 0); } }; } @@ -37,7 +37,7 @@ public class RenderPonyWitch extends RenderPonyMob { @Override public void preRenderCallback(EntityWitch entity, float ticks) { super.preRenderCallback(entity, ticks); - GlStateManager.scale(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); + GlStateManager.scalef(BASE_MODEL_SCALE, BASE_MODEL_SCALE, BASE_MODEL_SCALE); } @Override diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java index 91702804..2fa68775 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java @@ -50,7 +50,7 @@ public class RenderPonyZombie extends RenderPonyMob @Override public void preRenderCallback(EntityHusk entity, float ticks) { super.preRenderCallback(entity, ticks); - GlStateManager.scale(1.0625F, 1.0625F, 1.0625F); + GlStateManager.scalef(1.0625F, 1.0625F, 1.0625F); } @Override @@ -69,7 +69,7 @@ public class RenderPonyZombie extends RenderPonyMob @Override public void preRenderCallback(EntityGiantZombie entity, float ticks) { super.preRenderCallback(entity, ticks); - GlStateManager.scale(3, 3, 3); + GlStateManager.scalef(3, 3, 3); } @Override diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java index 2b091201..bee29832 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java +++ b/src/client/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java @@ -33,9 +33,10 @@ public class RenderPonyZombieVillager extends RenderPonyMob { ResourceLocation generated = formatter.supplyTexture(keyMapper.apply(professionId)); try { - Minecraft.getMinecraft().getResourceManager().getResource(generated); + Minecraft.getInstance().getResourceManager().getResource(generated); } catch (IOException e) { MineLittlePony.logger.error("Error loading villager texture `" + generated + "`.", e); diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java index 6241f54e..88d99762 100644 --- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java +++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java @@ -56,7 +56,7 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony implements L * @param scale Scaling factor used to render this model. Determined by the return value of {@link RenderLivingBase.prepareScale}. Usually {@code 0.0625F}. */ @Override - public abstract void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale); + public abstract void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale); protected RenderLivingBase getRenderer() { return renderer; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java index 411f4027..58d2e713 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java @@ -16,16 +16,16 @@ public class LayerDJPon3Head extends AbstractPonyLayer { } @Override - public void doRenderLayer(AbstractClientPlayer entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { - if ("deadmau5".equals(entity.getName())) { + public void render(AbstractClientPlayer entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + if ("deadmau5".equals(entity.getName().getUnformattedComponentText())) { getRenderer().bindTexture(entity.getLocationSkin()); GlStateManager.pushMatrix(); getPlayerModel().transform(BodyPart.HEAD); getPlayerModel().bipedHead.postRender(scale); - GlStateManager.scale(1.3333334F, 1.3333334F, 1.3333334F); - GlStateManager.translate(0, 0.3F, 0); + GlStateManager.scalef(1.3333334F, 1.3333334F, 1.3333334F); + GlStateManager.translatef(0, 0.3F, 0); deadMau5.setVisible(true); deadMau5.render(entity, move, swing, partialTicks, 0, 0, scale); diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java index 798cdac4..d7ab82c4 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java @@ -6,8 +6,8 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EntityType; import net.minecraft.nbt.NBTTagCompound; import com.minelittlepony.model.BodyPart; @@ -27,10 +27,10 @@ public class LayerEntityOnPonyShoulder extends AbstractPonyLayer extends AbstractPonyLayer { } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { getRenderer().bindTexture(eyeTexture); enableBlend(); - disableAlpha(); + disableAlphaTest(); blendFunc(SourceFactor.ONE, DestFactor.ONE); disableLighting(); depthMask(!entity.isInvisible()); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 61680, 0); + OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 61680, 0); enableLighting(); - color(1, 1, 1, 1); + color4f(1, 1, 1, 1); - Minecraft.getMinecraft().entityRenderer.setupFogColor(true); + Minecraft.getInstance().entityRenderer.setupFogColor(true); getMainModel().render(entity, move, swing, ticks, headYaw, headPitch, scale); - Minecraft.getMinecraft().entityRenderer.setupFogColor(false); + Minecraft.getInstance().entityRenderer.setupFogColor(false); ((RenderLiving)getRenderer()).setLightmap(entity); @@ -44,7 +44,7 @@ public class LayerEyeGlow extends AbstractPonyLayer { blendFunc(SourceFactor.ONE, DestFactor.ZERO); disableBlend(); - enableAlpha(); + enableAlphaTest(); } public interface IGlowingRenderer { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java index 8417e02e..d344cf78 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerGear.java @@ -39,7 +39,7 @@ public class LayerGear extends AbstractPonyLayer } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { if (entity.isInvisible()) { return; @@ -60,7 +60,7 @@ public class LayerGear extends AbstractPonyLayer renderStackingOffsets.compute(part, (k, v) -> { float offset = ((IStackable)gear).getStackingOffset(); if (v != null) { - GlStateManager.translate(0, -v, 0); + GlStateManager.translatef(0, -v, 0); offset += v; } return offset; diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java index 9207fd7a..3faed4db 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java @@ -14,9 +14,9 @@ public class LayerHeldItemIllager extends LayerHeldPo } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { if (shouldRender(entity)) { - super.doRenderLayer(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale); + super.render(entity, move, swing, partialTicks, ticks, headYaw, headPitch, scale); } } diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java index 14462e65..9157e799 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java @@ -4,9 +4,9 @@ import com.minelittlepony.client.model.IClientModel; import com.minelittlepony.model.BodyPart; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -32,7 +32,7 @@ public class LayerHeldPonyItem extends AbstractPonyL } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { ItemStack left = getLeftItem(entity); ItemStack right = getRightItem(entity); @@ -57,21 +57,21 @@ public class LayerHeldPonyItem extends AbstractPonyL renderArm(hand); if (entity.isSneaking()) { - GlStateManager.translate(0, 0.2F, 0); + GlStateManager.translatef(0, 0.2F, 0); } float left = hand == EnumHandSide.LEFT ? 1 : -1; - if (entity.isRiding()) { - GlStateManager.translate(left / 10, -0.2F, -0.5F); + if (entity.getRidingEntity() != null) { + GlStateManager.translatef(left / 10, -0.2F, -0.5F); } - GlStateManager.rotate(-90, 1, 0, 0); - GlStateManager.rotate(left * 180, 0, 1, 0); - GlStateManager.translate(left * -0.2F, 0, 0); + GlStateManager.rotatef(-90, 1, 0, 0); + GlStateManager.rotatef(left * 180, 0, 1, 0); + GlStateManager.translatef(left * -0.2F, 0, 0); preItemRender(entity, drop, transform, hand); - Minecraft.getMinecraft().getItemRenderer().renderItemSide(entity, drop, transform, hand == EnumHandSide.LEFT); + Minecraft.getInstance().getItemRenderer().renderItem(drop, entity, transform, hand == EnumHandSide.LEFT); postItemRender(entity, drop, transform, hand); GlStateManager.popMatrix(); @@ -79,7 +79,7 @@ public class LayerHeldPonyItem extends AbstractPonyL } protected void preItemRender(T entity, ItemStack drop, TransformType transform, EnumHandSide hand) { - GlStateManager.translate(0, 0.125F, -1); + GlStateManager.translatef(0, 0.125F, -1); } protected void postItemRender(T entity, ItemStack drop, TransformType transform, EnumHandSide hand) { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java index c2fa9bcb..abcd354d 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java @@ -5,7 +5,7 @@ import com.minelittlepony.client.util.render.PonyRenderer; import com.minelittlepony.model.IUnicorn; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -24,7 +24,7 @@ public class LayerHeldPonyItemMagical extends LayerH @Override protected void preItemRender(T entity, ItemStack drop, TransformType transform, EnumHandSide hand) { if (isUnicorn()) { - GlStateManager.translate(hand == EnumHandSide.LEFT ? -0.6F : 0, 0.5F, -0.3F); + GlStateManager.translatef(hand == EnumHandSide.LEFT ? -0.6F : 0, 0.5F, -0.3F); } else { super.preItemRender(entity, drop, transform, hand); } diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java b/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java index 43748def..abe17515 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.render.layer; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.entity.EntityLiving; @@ -21,7 +21,7 @@ public abstract class LayerOverlayBase implements LayerR } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { ModelBase overlayModel = getOverlayModel(); overlayModel.setModelAttributes(renderer.getMainModel()); diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java index 9f5f5d12..2d41875d 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java @@ -9,8 +9,8 @@ import com.minelittlepony.model.armour.IArmour; import com.minelittlepony.model.armour.IArmourTextureResolver; import com.minelittlepony.model.armour.IEquestrianArmour; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.layers.LayerArmorBase; @@ -18,7 +18,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot.Type; import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemArmorDyeable; +import net.minecraft.item.IArmorMaterial; +import net.minecraft.item.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -33,7 +35,7 @@ public class LayerPonyArmor extends AbstractPonyLaye } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { pony = getPonyRenderer().getModelWrapper(); for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) { @@ -68,16 +70,19 @@ public class LayerPonyArmor extends AbstractPonyLaye ItemArmor itemarmor = (ItemArmor) itemstack.getItem(); if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) { - Color.glColor(itemarmor.getColor(itemstack), 1); + if (itemarmor instanceof ItemArmorDyeable) { + Color.glColor(((ItemArmorDyeable)itemarmor).getColor(itemstack), 1); + } + armour.render(entity, move, swing, ticks, headYaw, headPitch, scale); armourTexture = resolver.getArmourTexture(entity, itemstack, armorSlot, layer, "overlay"); getRenderer().bindTexture(armourTexture); } - GlStateManager.color(1, 1, 1, 1); + GlStateManager.color4f(1, 1, 1, 1); armour.render(entity, move, swing, ticks, headYaw, headPitch, scale); - if (itemstack.isItemEnchanted()) { + if (itemstack.isEnchanted()) { LayerArmorBase.renderEnchantedGlint(getRenderer(), entity, armour, move, swing, partialTicks, ticks, headYaw, headPitch, scale); } } diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java index 20164c9a..c0948705 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCape.java @@ -22,7 +22,7 @@ public class LayerPonyCape extends AbstractPonyLayer { } @Override - public void doRenderLayer(@Nonnull AbstractClientPlayer player, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(@Nonnull AbstractClientPlayer player, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { AbstractPonyModel model = getPlayerModel(); if (player.hasPlayerInfo() && !player.isInvisible() @@ -32,7 +32,7 @@ public class LayerPonyCape extends AbstractPonyLayer { pushMatrix(); model.transform(BodyPart.BODY); - translate(0, 0.24F, 0); + translatef(0, 0.24F, 0); model.getBody().postRender(scale); double capeX = player.prevChasingPosX + (player.chasingPosX - player.prevChasingPosX) * scale - (player.prevPosX + (player.posX - player.prevPosX) * scale); @@ -58,11 +58,11 @@ public class LayerPonyCape extends AbstractPonyLayer { float camera = player.prevCameraYaw + (player.cameraYaw - player.prevCameraYaw) * scale; capeMotionY += MathHelper.sin((player.prevDistanceWalkedModified + (player.distanceWalkedModified - player.prevDistanceWalkedModified) * scale) * 6) * 32 * camera; - rotate(2 + capeMotionX / 12 + capeMotionY, 1, 0, 0); - rotate( diagMotion / 2, 0, 0, 1); - rotate(-diagMotion / 2, 0, 1, 0); - rotate(180, 0, 0, 1); - rotate(90, 1, 0, 0); + rotatef(2 + capeMotionX / 12 + capeMotionY, 1, 0, 0); + rotatef( diagMotion / 2, 0, 0, 1); + rotatef(-diagMotion / 2, 0, 1, 0); + rotatef(180, 0, 0, 1); + rotatef(90, 1, 0, 0); getRenderer().bindTexture(player.getLocationCape()); model.renderCape(0.0625F); popMatrix(); diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java index 18be4670..f268ffc1 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java @@ -1,11 +1,6 @@ package com.minelittlepony.client.render.layer; -import static net.minecraft.client.renderer.GlStateManager.color; -import static net.minecraft.client.renderer.GlStateManager.popMatrix; -import static net.minecraft.client.renderer.GlStateManager.pushMatrix; -import static net.minecraft.client.renderer.GlStateManager.rotate; -import static net.minecraft.client.renderer.GlStateManager.scale; -import static net.minecraft.client.renderer.GlStateManager.translate; +import static net.minecraft.client.renderer.GlStateManager.*; import com.minelittlepony.client.ducks.IRenderPony; import com.minelittlepony.client.model.AbstractPonyModel; @@ -14,17 +9,20 @@ import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; import com.minelittlepony.model.BodyPart; import com.mojang.authlib.GameProfile; + +import net.minecraft.block.BlockAbstractSkull; +import net.minecraft.block.BlockSkull.ISkullType; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityZombieVillager; import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; @@ -40,7 +38,7 @@ public class LayerPonyCustomHead implements LayerRen } @Override - public void doRenderLayer(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { + public void render(T entity, float move, float swing, float partialTicks, float ticks, float headYaw, float headPitch, float scale) { ItemStack itemstack = entity.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if (!itemstack.isEmpty()) { IClientModel model = getModel().getBody(); @@ -52,14 +50,14 @@ public class LayerPonyCustomHead implements LayerRen model.getHead().postRender(0.0625f); if (model instanceof AbstractPonyModel) { - translate(0, 0.2F, 0); + translatef(0, 0.2F, 0); } else { - translate(0, 0, 0.15F); + translatef(0, 0, 0.15F); } - color(1, 1, 1, 1); + color4f(1, 1, 1, 1); - if (item == Items.SKULL) { + if (item instanceof ItemBlock && ((ItemBlock) item).getBlock() instanceof BlockAbstractSkull) { boolean isVillager = entity instanceof EntityVillager || entity instanceof EntityZombieVillager; renderSkull(itemstack, isVillager, move); @@ -73,37 +71,39 @@ public class LayerPonyCustomHead implements LayerRen } private void renderBlock(T entity, ItemStack itemstack) { - rotate(180, 0, 1, 0); - scale(0.625, -0.625F, -0.625F); - translate(0, 0.4F, -0.21F); + rotatef(180, 0, 1, 0); + scalef(0.625F, -0.625F, -0.625F); + translatef(0, 0.4F, -0.21F); - Minecraft.getMinecraft().getItemRenderer().renderItem(entity, itemstack, TransformType.HEAD); + Minecraft.getInstance().getFirstPersonRenderer().renderItem(entity, itemstack, TransformType.HEAD); } private void renderSkull(ItemStack itemstack, boolean isVillager, float limbSwing) { - translate(0, 0, -0.14F); + translatef(0, 0, -0.14F); float f = 1.1875f; - scale(f, -f, -f); + scalef(f, -f, -f); if (isVillager) { - translate(0, 0.0625F, 0); + translatef(0, 0.0625F, 0); } - translate(0, 0, -0.05F); + translatef(0, 0, -0.05F); GameProfile profile = null; - if (itemstack.hasTagCompound()) { - NBTTagCompound nbt = itemstack.getTagCompound(); + if (itemstack.hasTag()) { + NBTTagCompound nbt = itemstack.getTag(); assert nbt != null; - if (nbt.hasKey("SkullOwner", 10)) { - profile = NBTUtil.readGameProfileFromNBT(nbt.getCompoundTag("SkullOwner")); - } else if (nbt.hasKey("SkullOwner", 8)) { + if (nbt.contains("SkullOwner", 10)) { + profile = NBTUtil.readGameProfile(nbt.getCompound("SkullOwner")); + } else if (nbt.contains("SkullOwner", 8)) { profile = TileEntitySkull.updateGameProfile(new GameProfile(null, nbt.getString("SkullOwner"))); nbt.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), profile)); } } - PonySkullRenderer.resolve().renderSkull(-0.5F, 0, -0.45F, EnumFacing.UP, 180, itemstack.getMetadata(), profile, -1, limbSwing); + ISkullType type = ((BlockAbstractSkull) ((ItemBlock) itemstack.getItem()).getBlock()).getSkullType(); + + PonySkullRenderer.resolve().render(-0.5F, 0, -0.45F, EnumFacing.UP, 180, type, profile, -1, limbSwing); } private ModelWrapper getModel() { diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java index 8d0f0446..67b68856 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java @@ -4,7 +4,7 @@ import com.minelittlepony.client.model.components.PonyElytra; import com.minelittlepony.model.BodyPart; import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.client.renderer.entity.layers.LayerArmorBase; @@ -28,11 +28,11 @@ public class LayerPonyElytra extends AbstractPonyLay } @Override - public void doRenderLayer(@Nonnull T entity, float move, float swing, float partialTicks, float ticks, float yaw, float head, float scale) { + public void render(@Nonnull T entity, float move, float swing, float partialTicks, float ticks, float yaw, float head, float scale) { ItemStack itemstack = entity.getItemStackFromSlot(EntityEquipmentSlot.CHEST); if (itemstack.getItem() == Items.ELYTRA) { - GlStateManager.color(1, 1, 1, 1); + GlStateManager.color4f(1, 1, 1, 1); getRenderer().bindTexture(getElytraTexture(entity)); @@ -48,7 +48,7 @@ public class LayerPonyElytra extends AbstractPonyLay elytra.setRotationAngles(move, swing, ticks, yaw, head, scale, entity); elytra.render(entity, move, swing, ticks, yaw, head, scale); - if (itemstack.isItemEnchanted()) { + if (itemstack.isEnchanted()) { LayerArmorBase.renderEnchantedGlint(getRenderer(), entity, elytra, move, swing, partialTicks, ticks, yaw, head, scale); } @@ -57,7 +57,7 @@ public class LayerPonyElytra extends AbstractPonyLay } protected void preRenderCallback() { - GlStateManager.translate(0, getPlayerModel().getRiderYOffset(), 0.125F); + GlStateManager.translatef(0, getPlayerModel().getRiderYOffset(), 0.125F); getPlayerModel().transform(BodyPart.BODY); } diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java index a06da7b6..bee1b7f1 100644 --- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java +++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.render.layer; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLivingBase; import net.minecraft.entity.monster.EntityStray; import net.minecraft.util.ResourceLocation; diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java index b9a94c97..a47a2e12 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java @@ -48,7 +48,7 @@ public class PlayerSkullRenderer extends PonySkull { return skin; } - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); Map map = minecraft.getSkinManager().loadSkinFromCache(profile); if (map.containsKey(Type.SKIN)) { diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java index e767abf2..ad3bbd45 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java @@ -22,6 +22,6 @@ public abstract class PonySkull implements ISkull { @Override public void render(float animateTicks, float rotation, float scale) { - ponyHead.render(Minecraft.getMinecraft().player, animateTicks, 0, 0, rotation, 0, scale); + ponyHead.render(Minecraft.getInstance().player, animateTicks, 0, 0, rotation, 0, scale); } } \ No newline at end of file diff --git a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 8a227a05..9b0a3dc2 100644 --- a/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/client/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -6,6 +6,9 @@ import com.minelittlepony.client.ducks.IRenderItem; import com.minelittlepony.pony.IPony; import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; + +import net.minecraft.block.BlockSkull; +import net.minecraft.block.BlockSkull.ISkullType; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.tileentity.TileEntitySkull; @@ -32,13 +35,13 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende public static PonySkullRenderer ponyInstance = new PonySkullRenderer(); private static TileEntitySkullRenderer backup = null; - private final Map skullMap = new HashMap<>(); + private final Map skullMap = new HashMap<>(); private PonySkullRenderer() { - skullMap.put(SKELETON, new SkeletonSkullRenderer()); - skullMap.put(WITHER, new WitherSkullRenderer()); - skullMap.put(ZOMBIE, new ZombieSkullRenderer()); - skullMap.put(PLAYER, new PlayerSkullRenderer()); + skullMap.put(BlockSkull.Types.SKELETON, new SkeletonSkullRenderer()); + skullMap.put(BlockSkull.Types.WITHER_SKELETON, new WitherSkullRenderer()); + skullMap.put(BlockSkull.Types.ZOMBIE, new ZombieSkullRenderer()); + skullMap.put(BlockSkull.Types.PLAYER, new PlayerSkullRenderer()); } /** @@ -71,15 +74,15 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende protected boolean transparency = false; @Override - public void renderSkull(float x, float y, float z, EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { + public void render(float x, float y, float z, EnumFacing facing, float rotation, ISkullType skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) { ISkull skull = skullMap.get(skullType); if (skull == null || !skull.canRender(MineLittlePony.getInstance().getConfig())) { if (backup != null) { - backup.renderSkull(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); + backup.render(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); } else { - super.renderSkull(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); + super.render(x, y, z, facing, rotation, skullType, profile, destroyStage, animateTicks); } return; @@ -91,8 +94,8 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende bindTexture(DESTROY_STAGES[destroyStage]); GlStateManager.matrixMode(GL11.GL_TEXTURE); GlStateManager.pushMatrix(); - GlStateManager.scale(4, 2, 1); - GlStateManager.translate(scale, scale, scale); + GlStateManager.scalef(4, 2, 1); + GlStateManager.translatef(scale, scale, scale); GlStateManager.matrixMode(GL11.GL_MODELVIEW); } else { ResourceLocation skin = skull.getSkinResource(profile); @@ -108,8 +111,8 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende rotation = handleRotation(x, y, z, facing, rotation); GlStateManager.enableRescaleNormal(); - GlStateManager.scale(-1, -1, 1); - GlStateManager.enableAlpha(); + GlStateManager.scalef(-1, -1, 1); + GlStateManager.enableAlphaTest(); skull.preRender(transparency); skull.render(animateTicks, rotation, scale); @@ -127,19 +130,19 @@ public class PonySkullRenderer extends TileEntitySkullRenderer implements IRende switch (facing) { case EAST: default: - GlStateManager.translate(x + 0.26F, y + 0.25F, z + 0.5F); + GlStateManager.translatef(x + 0.26F, y + 0.25F, z + 0.5F); return 90; case UP: - GlStateManager.translate(x + 0.5F, y, z + 0.5F); + GlStateManager.translatef(x + 0.5F, y, z + 0.5F); break; case NORTH: - GlStateManager.translate(x + 0.5F, y + 0.25F, z + 0.74F); + GlStateManager.translatef(x + 0.5F, y + 0.25F, z + 0.74F); break; case SOUTH: - GlStateManager.translate(x + 0.5F, y + 0.25F, z + 0.26F); + GlStateManager.translatef(x + 0.5F, y + 0.25F, z + 0.26F); return 180; case WEST: - GlStateManager.translate(x + 0.74F, y + 0.25F, z + 0.5F); + GlStateManager.translatef(x + 0.74F, y + 0.25F, z + 0.5F); return 270; } diff --git a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java index 372ece64..d9a5229e 100644 --- a/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java +++ b/src/client/java/com/minelittlepony/client/transform/PonyTransformation.java @@ -1,8 +1,6 @@ package com.minelittlepony.client.transform; -import static net.minecraft.client.renderer.GlStateManager.scale; -import static net.minecraft.client.renderer.GlStateManager.translate; - +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.math.Vec3d; import com.google.common.collect.Maps; @@ -217,7 +215,15 @@ public enum PonyTransformation { } public static void translateVec(Vec3d offset) { - translate(offset.x, offset.y, offset.z); + GlStateManager.translated(offset.x, offset.y, offset.z); + } + + protected void scale(float x, float y, float z) { + GlStateManager.scalef(x, y, z); + } + + protected void translate(float x, float y, float z) { + GlStateManager.translatef(x, y, z); } public Vec3d getRiderOffset() { diff --git a/src/client/java/com/minelittlepony/client/transform/PostureElytra.java b/src/client/java/com/minelittlepony/client/transform/PostureElytra.java index a681ca11..92bf2c67 100644 --- a/src/client/java/com/minelittlepony/client/transform/PostureElytra.java +++ b/src/client/java/com/minelittlepony/client/transform/PostureElytra.java @@ -8,7 +8,7 @@ import com.minelittlepony.client.model.IClientModel; public class PostureElytra implements PonyPosture { @Override public void transform(IClientModel model, EntityLivingBase entity, double motionX, double motionY, double motionZ, float yaw, float ticks) { - GlStateManager.rotate(90, 1, 0, 0); - GlStateManager.translate(0, entity.isSneaking() ? 0.2F : -1, 0); + GlStateManager.rotatef(90, 1, 0, 0); + GlStateManager.translatef(0, entity.isSneaking() ? 0.2F : -1, 0); } } diff --git a/src/client/java/com/minelittlepony/client/transform/PostureFlight.java b/src/client/java/com/minelittlepony/client/transform/PostureFlight.java index 15109883..e5f10cb5 100644 --- a/src/client/java/com/minelittlepony/client/transform/PostureFlight.java +++ b/src/client/java/com/minelittlepony/client/transform/PostureFlight.java @@ -17,12 +17,12 @@ public class PostureFlight extends MotionCompositor implements PonyPosture> extends ModelRenderer { @@ -194,15 +194,17 @@ public abstract class AbstractRenderer> extends Mo addBox(offX, offY, offZ, width, height, depth, scaleFactor, mirror); } + @Override + public void addBox(float offX, float offY, float offZ, int width, int height, int depth, float scaleFactor, boolean mirrored) { + createBox(modelOffsetX + offX, modelOffsetY + offY, modelOffsetZ + offZ, width, height, depth, scaleFactor, mirrored); + } + /** * Creates a textured box. */ public T box(float offX, float offY, float offZ, int width, int height, int depth, float scaleFactor) { - return addBox(offX, offY, offZ, width, height, depth, scaleFactor, mirror); - } + addBox(offX, offY, offZ, width, height, depth, scaleFactor, mirror); - private T addBox(float offX, float offY, float offZ, int width, int height, int depth, float scaleFactor, boolean mirrored) { - createBox(modelOffsetX + offX, modelOffsetY + offY, modelOffsetZ + offZ, width, height, depth, scaleFactor, mirrored); return (T)this; } diff --git a/src/client/java/com/minelittlepony/client/util/render/Box.java b/src/client/java/com/minelittlepony/client/util/render/Box.java index eb9dd164..f4416ab4 100644 --- a/src/client/java/com/minelittlepony/client/util/render/Box.java +++ b/src/client/java/com/minelittlepony/client/util/render/Box.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.util.render; -import net.minecraft.client.model.ModelBox; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBox; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public abstract class Box extends ModelBox { diff --git a/src/client/java/com/minelittlepony/client/util/render/Color.java b/src/client/java/com/minelittlepony/client/util/render/Color.java index 9f162c95..93a112b3 100644 --- a/src/client/java/com/minelittlepony/client/util/render/Color.java +++ b/src/client/java/com/minelittlepony/client/util/render/Color.java @@ -48,6 +48,6 @@ public interface Color { * @param alpha The opacity to use */ static void glColor(int color, float alpha) { - GlStateManager.color(r(color), g(color), b(color), alpha); + GlStateManager.color4f(r(color), g(color), b(color), alpha); } } diff --git a/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java index 903b5104..7b294bca 100644 --- a/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.util.render; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import org.lwjgl.opengl.GL11; @@ -38,7 +38,7 @@ public class GlowRenderer extends AbstractRenderer { @Override public void render(float scale) { GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - Minecraft.getMinecraft().entityRenderer.disableLightmap(); + Minecraft.getInstance().entityRenderer.disableLightmap(); super.render(scale); GL11.glPopAttrib(); } diff --git a/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java b/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java index 338e3c1f..7e07349f 100644 --- a/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/PonyRenderer.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.util.render; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; public class PonyRenderer extends AbstractRenderer { diff --git a/src/client/java/com/minelittlepony/client/util/render/Quad.java b/src/client/java/com/minelittlepony/client/util/render/Quad.java index ef3b03ad..9fd947d3 100644 --- a/src/client/java/com/minelittlepony/client/util/render/Quad.java +++ b/src/client/java/com/minelittlepony/client/util/render/Quad.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.util.render; -import net.minecraft.client.model.TexturedQuad; +import net.minecraft.client.renderer.entity.model.TexturedQuad; public class Quad extends TexturedQuad { diff --git a/src/client/java/com/minelittlepony/client/util/render/Vertex.java b/src/client/java/com/minelittlepony/client/util/render/Vertex.java index f1b6110f..63021cfe 100644 --- a/src/client/java/com/minelittlepony/client/util/render/Vertex.java +++ b/src/client/java/com/minelittlepony/client/util/render/Vertex.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.util.render; -import net.minecraft.client.model.PositionTextureVertex; +import net.minecraft.client.renderer.entity.model.PositionTextureVertex; public class Vertex extends PositionTextureVertex { diff --git a/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java b/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java index b426993c..d22f3ba3 100644 --- a/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java +++ b/src/client/java/com/minelittlepony/client/util/render/plane/PlaneRenderer.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.util.render.plane; -import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelBase; import com.minelittlepony.client.util.render.AbstractRenderer; diff --git a/src/common/java/com/minelittlepony/common/client/gui/Button.java b/src/common/java/com/minelittlepony/common/client/gui/Button.java index c0abd760..f38528cb 100644 --- a/src/common/java/com/minelittlepony/common/client/gui/Button.java +++ b/src/common/java/com/minelittlepony/common/client/gui/Button.java @@ -24,10 +24,6 @@ public class Button extends GuiButton implements IGuiTooltipped