PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 08:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move this stuff into an api package

Browse source
This commit is contained in:
Sollace 2020-04-03 23:54:12 +02:00
parent 1b270149a2
commit 01188a9ea6
64 changed files with 248 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/pony/IPony.java → src/main/java/com/minelittlepony/api/pony/IPony.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.pony;
package com.minelittlepony.api.pony;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
@ -6,8 +6,8 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Vec3d;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.meta.Race;
public interface IPony {

12
src/main/java/com/minelittlepony/pony/IPonyData.java → src/main/java/com/minelittlepony/api/pony/IPonyData.java
View file

@ -1,10 +1,10 @@
package com.minelittlepony.pony;
package com.minelittlepony.api.pony;
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.api.pony.meta.Gender;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.api.pony.meta.TailLength;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.util.IInterpolator;
import java.util.UUID;

2
src/main/java/com/minelittlepony/pony/IPonyManager.java → src/main/java/com/minelittlepony/api/pony/IPonyManager.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.pony;
package com.minelittlepony.api.pony;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.Identifier;

2
src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java → src/main/java/com/minelittlepony/api/pony/ITriggerPixelMapped.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.pony;
package com.minelittlepony.api.pony;
/**
* Interface for enums that can be parsed from an image trigger pixel value.

4
src/main/java/com/minelittlepony/pony/meta/Gender.java → src/main/java/com/minelittlepony/api/pony/meta/Gender.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import com.minelittlepony.pony.ITriggerPixelMapped;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
public enum Gender implements ITriggerPixelMapped<Gender> {
MARE(0),

4
src/main/java/com/minelittlepony/pony/meta/Race.java → src/main/java/com/minelittlepony/api/pony/meta/Race.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.ITriggerPixelMapped;
import com.minelittlepony.settings.PonyLevel;
import javax.annotation.Nonnull;

4
src/main/java/com/minelittlepony/pony/meta/Size.java → src/main/java/com/minelittlepony/api/pony/meta/Size.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.ITriggerPixelMapped;
public enum Size implements ITriggerPixelMapped<Size> {
TALL (0x534b76, 0.45f, 1.1F, 1.15F),

4
src/main/java/com/minelittlepony/pony/meta/TailLength.java → src/main/java/com/minelittlepony/api/pony/meta/TailLength.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import com.minelittlepony.pony.ITriggerPixelMapped;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
public enum TailLength implements ITriggerPixelMapped<TailLength> {

4
src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java → src/main/java/com/minelittlepony/api/pony/meta/TriggerPixels.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import net.minecraft.client.texture.NativeImage;
import com.minelittlepony.pony.ITriggerPixelMapped;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
import com.minelittlepony.util.Color;
/**

4
src/main/java/com/minelittlepony/pony/meta/Wearable.java → src/main/java/com/minelittlepony/api/pony/meta/Wearable.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import com.minelittlepony.pony.ITriggerPixelMapped;
import com.minelittlepony.api.pony.ITriggerPixelMapped;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/com/minelittlepony/pony/meta/package-info.java → src/main/java/com/minelittlepony/api/pony/meta/package-info.java
View file

@ -1,4 +1,4 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.pony.meta;
package com.minelittlepony.api.pony.meta;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/pony/package-info.java → src/main/java/com/minelittlepony/api/pony/package-info.java
View file

@ -1,4 +1,4 @@
@ParametersAreNonnullByDefault
package com.minelittlepony.pony;
package com.minelittlepony.api.pony;
import javax.annotation.ParametersAreNonnullByDefault;

2
src/main/java/com/minelittlepony/client/HorseCam.java
View file

@ -5,7 +5,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.Vec3d;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.api.pony.IPony;
public class HorseCam {
/**

2
src/main/java/com/minelittlepony/client/MineLittlePony.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client;
import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.client.pony.PonyManager;
import com.minelittlepony.client.render.PonyRenderDispatcher;
@ -12,7 +13,6 @@ import com.minelittlepony.common.event.ClientReadyCallback;
import com.minelittlepony.common.event.ScreenInitCallback;
import com.minelittlepony.common.event.SkinFilterCallback;
import com.minelittlepony.common.util.GamePaths;
import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.settings.PonyConfig;
import net.fabricmc.api.ClientModInitializer;

4
src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java
View file

@ -1,5 +1,7 @@
package com.minelittlepony.client.hdskins;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.model.ClientPonyModel;
import com.minelittlepony.client.model.ModelType;
@ -13,8 +15,6 @@ import com.minelittlepony.client.render.entity.feature.ElytraFeature;
import com.minelittlepony.hdskins.client.dummy.DummyPlayerRenderer;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderDispatcher;

2
src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client.hdskins;
import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.common.client.gui.element.Cycler;
import com.minelittlepony.common.client.gui.style.Style;
@ -7,7 +8,6 @@ import com.minelittlepony.hdskins.client.dummy.PlayerPreview;
import com.minelittlepony.hdskins.client.gui.GuiSkins;
import com.minelittlepony.hdskins.server.SkinServerList;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.pony.IPonyManager;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import net.minecraft.item.Items;

4
src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java
View file

@ -2,12 +2,12 @@ package com.minelittlepony.client.hdskins;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.hdskins.client.dummy.DummyPlayer;
import com.minelittlepony.hdskins.client.dummy.PlayerPreview;
import com.minelittlepony.hdskins.profile.SkinType;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;
class PonyPreview extends PlayerPreview {

2
src/main/java/com/minelittlepony/client/mixin/MixinCamera.java
View file

@ -5,8 +5,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.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.IPony;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.Camera;

3
src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java
View file

@ -1,7 +1,8 @@
package com.minelittlepony.client.mixin;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.IPony;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.EntityDimensions;

2
src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.client.mixin;
import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.model.entity.race.PlayerModels;
import com.minelittlepony.pony.IPonyManager;
import com.minelittlepony.settings.PonyLevel;
import net.minecraft.client.util.DefaultSkinHelper;

2
src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
View file

@ -1,13 +1,13 @@
package com.minelittlepony.client.model;
import com.minelittlepony.client.model.armour.PonyArmourModel;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.model.armour.ArmourWrapper;
import com.minelittlepony.client.transform.PonyTransformation;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.model.MsonPart;
import com.minelittlepony.pony.meta.Race;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.VertexConsumer;

6
src/main/java/com/minelittlepony/client/model/ClientPonyModel.java
View file

@ -5,13 +5,13 @@ import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.Arm;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.client.pony.PonyData;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.model.ModelAttributes;
import com.minelittlepony.mson.api.model.biped.MsonPlayer;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.pony.meta.Size;
/**
* The raw pony model without any implementations.

6
src/main/java/com/minelittlepony/client/model/IPonyMixinModel.java
View file

@ -6,6 +6,9 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.Arm;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IUnicorn;
@ -13,9 +16,6 @@ import com.minelittlepony.model.ModelAttributes;
import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.model.BoxBuilder.RenderLayerSetter;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.pony.meta.Size;
public interface IPonyMixinModel<T extends LivingEntity, M extends IPonyModel<T>> extends IPonyModel<T> {

8
src/main/java/com/minelittlepony/client/model/IPonyModel.java
View file

@ -4,17 +4,19 @@ import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.entity.LivingEntity;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.ICapitated;
import com.minelittlepony.model.ICompartmented;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.mson.api.MsonModel;
import com.minelittlepony.pony.IPony;
public interface IPonyModel<T extends LivingEntity> extends PonyModelConstants, IModel, ICapitated<ModelPart>, ICompartmented<ModelPart>, MsonModel {
public interface IPonyModel<T extends LivingEntity> extends PonyModelConstants, IModel, ICapitated<ModelPart>, MsonModel {
void copyAttributes(BipedEntityModel<T> other);
void updateLivingState(T entity, IPony pony, EquineRenderManager.Mode mode);
ModelPart getBodyPart(BodyPart part);
}

4
src/main/java/com/minelittlepony/client/model/ModelType.java
View file

@ -5,6 +5,8 @@ import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.mob.VexEntity;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.armour.PonyArmourModel;
import com.minelittlepony.client.model.entity.BreezieModel;
import com.minelittlepony.client.model.entity.EnderStallionModel;
@ -35,8 +37,6 @@ import com.minelittlepony.model.gear.IGear;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.mson.api.Mson;
import com.minelittlepony.mson.api.MsonModel;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.pony.meta.Wearable;
import javax.annotation.Nullable;

2
src/main/java/com/minelittlepony/client/model/ModelWrapper.java
View file

@ -2,12 +2,12 @@ package com.minelittlepony.client.model;
import net.minecraft.entity.LivingEntity;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.armour.IArmour;
import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.model.capabilities.IModelWrapper;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPonyData;
/**
* Container class for the various models and their associated piece of armour.

3
src/main/java/com/minelittlepony/client/model/PonySkullModel.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client.model;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.client.model.part.PonyEars;
import com.minelittlepony.client.model.part.PonySnout;
import com.minelittlepony.client.model.part.UnicornHorn;
@ -7,7 +8,7 @@ import com.minelittlepony.client.pony.PonyData;
import com.minelittlepony.model.ICapitated;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.MsonModel;
import com.minelittlepony.pony.IPonyData;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.entity.model.SkullOverlayEntityModel;

2
src/main/java/com/minelittlepony/client/model/armour/ArmourWrapper.java
View file

@ -2,10 +2,10 @@ package com.minelittlepony.client.model.armour;
import net.minecraft.entity.LivingEntity;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.model.armour.ArmourLayer;
import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.pony.IPonyData;
import java.util.function.Supplier;

2
src/main/java/com/minelittlepony/client/model/entity/PiglinPonyModel.java
View file

@ -4,8 +4,8 @@ import net.minecraft.entity.mob.HostileEntity;
import net.minecraft.entity.mob.PiglinEntity;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.pony.IPony;
public class PiglinPonyModel extends ZomponyModel<HostileEntity> {

4
src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java
View file

@ -10,8 +10,8 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.village.VillagerDataContainer;
import net.minecraft.village.VillagerProfession;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.model.entity.race.AlicornModel;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.client.render.entity.npc.PonyTextures;

4
src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java
View file

@ -3,10 +3,10 @@ package com.minelittlepony.client.model.entity;
import net.minecraft.entity.mob.WitchEntity;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.entity.race.ZebraModel;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Wearable;
public class WitchPonyModel extends ZebraModel<WitchEntity> {

2
src/main/java/com/minelittlepony/client/model/entity/race/PlayerModels.java
View file

@ -1,9 +1,9 @@
package com.minelittlepony.client.model.entity.race;
import com.google.common.collect.Maps;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.client.model.PlayerModelKey;
import com.minelittlepony.pony.meta.Race;
import java.util.Arrays;
import java.util.List;

2
src/main/java/com/minelittlepony/client/model/entity/race/SeaponyModel.java
View file

@ -2,11 +2,11 @@ package com.minelittlepony.client.model.entity.race;
import com.minelittlepony.client.model.armour.PonyArmourModel;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.model.armour.ArmourWrapper;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.armour.IEquestrianArmour;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.IPony;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.VertexConsumer;

2
src/main/java/com/minelittlepony/client/model/gear/ChristmasHat.java
View file

@ -7,10 +7,10 @@ import net.minecraft.entity.Entity;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.meta.Wearable;
import com.minelittlepony.util.Color;
import java.util.Calendar;

2
src/main/java/com/minelittlepony/client/model/gear/IRenderContext.java
View file

@ -3,9 +3,9 @@ package com.minelittlepony.client.model.gear;
import net.minecraft.entity.Entity;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.gear.IGear;
import com.minelittlepony.pony.meta.Wearable;
import javax.annotation.Nullable;

2
src/main/java/com/minelittlepony/client/model/gear/Muffin.java
View file

@ -3,11 +3,11 @@ package com.minelittlepony.client.model.gear;
import net.minecraft.entity.Entity;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.gear.IStackable;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.meta.Wearable;
public class Muffin extends AbstractGear implements IStackable {

4
src/main/java/com/minelittlepony/client/model/gear/SaddleBags.java
View file

@ -1,11 +1,11 @@
package com.minelittlepony.client.model.gear;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.IPegasus;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID;

2
src/main/java/com/minelittlepony/client/model/gear/Stetson.java
View file

@ -3,11 +3,11 @@ package com.minelittlepony.client.model.gear;
import net.minecraft.entity.Entity;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.gear.IStackable;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.meta.Wearable;
public class Stetson extends AbstractGear implements IStackable {
private static final Identifier TEXTURE = new Identifier("minelittlepony", "textures/models/stetson.png");

2
src/main/java/com/minelittlepony/client/model/gear/WitchHat.java
View file

@ -3,11 +3,11 @@ package com.minelittlepony.client.model.gear;
import net.minecraft.entity.Entity;
import net.minecraft.util.Identifier;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.model.gear.IStackable;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.pony.meta.Wearable;
public class WitchHat extends AbstractGear implements IStackable {

2
src/main/java/com/minelittlepony/client/model/part/PegasusWings.java
View file

@ -6,11 +6,11 @@ import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.model.IPart;
import com.minelittlepony.model.IPegasus;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.MsonModel;
import com.minelittlepony.pony.meta.Wearable;
import java.util.UUID;

2
src/main/java/com/minelittlepony/client/model/part/PonySnout.java
View file

@ -4,13 +4,13 @@ import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.util.math.MatrixStack;
import com.minelittlepony.api.pony.meta.Gender;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.model.IPart;
import com.minelittlepony.mson.api.ModelContext;
import com.minelittlepony.mson.api.MsonModel;
import com.minelittlepony.mson.api.model.MsonPart;
import com.minelittlepony.mson.api.model.BoxBuilder.ContentAccessor;
import com.minelittlepony.pony.meta.Gender;
import java.util.UUID;

142
src/main/java/com/minelittlepony/client/pony/BackgroundPonyList.java Normal file
View file

@ -0,0 +1,142 @@
package com.minelittlepony.client.pony;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourceReloadListener.Synchronizer;
import net.minecraft.util.Identifier;
import net.minecraft.util.profiler.Profiler;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.common.util.MoreStreams;
import com.minelittlepony.util.MathUtil;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
public class BackgroundPonyList {
private static final Gson GSON = new Gson();
/**
* All currently loaded background ponies.
*/
private List<Identifier> backgroundPonyList = Lists.newArrayList();
public IPony getBackgroundPony(UUID uuid) {
if (getNumberOfPonies() == 0 || isUser(uuid)) {
return getPony(IPonyManager.getDefaultSkin(uuid));
}
int bgi = MathUtil.mod(uuid.hashCode(), getNumberOfPonies());
return getPony(backgroundPonyList.get(bgi));
}
public void reloadAll(ResourceManager resourceManager) {
backgroundPonyList.clear();
List<Identifier> collectedPaths = new LinkedList<>();
List<BackgroundPonies> collectedPonies = new LinkedList<>();
Queue<BackgroundPonies> processingQueue = new LinkedList<>();
for (String domain : resourceManager.getAllNamespaces()) {
processingQueue.addAll(loadBgPonies(resourceManager, new Identifier(domain, BGPONIES_JSON)));
}
BackgroundPonies item;
while ((item = processingQueue.poll()) != null) {
for (Identifier imp : item.getImports()) {
if (!collectedPaths.contains(imp)) {
collectedPaths.add(imp);
processingQueue.addAll(loadBgPonies(resourceManager, imp));
}
}
collectedPonies.add(item);
}
for (BackgroundPonies i : collectedPonies) {
if (i.override) {
backgroundPonyList.clear();
}
backgroundPonyList.addAll(i.getPonies());
}
backgroundPonyList = MoreStreams.distinct(backgroundPonyList);
MineLittlePony.logger.info("Detected {} background ponies installed.", getNumberOfPonies());
}
private Queue<BackgroundPonies> loadBgPonies(ResourceManager resourceManager, Identifier location) {
Queue<BackgroundPonies> collectedPonies = new LinkedList<>();
try {
String path = location.getPath().replace("bgponies.json", "");
for (Resource res : resourceManager.getAllResources(location)) {
try (Reader reader = new InputStreamReader((res.getInputStream()))) {
BackgroundPonies ponies = GSON.fromJson(reader, BackgroundPonies.class);
ponies.domain = location.getNamespace();
ponies.path = path;
collectedPonies.add(ponies);
} catch (JsonParseException e) {
MineLittlePony.logger.error("Invalid bgponies.json in " + res.getResourcePackName(), e);
}
}
} catch (IOException ignored) {
// this isn't the exception you're looking for.
}
return collectedPonies;
}
private int getNumberOfPonies() {
return backgroundPonyList.size();
}
private static class BackgroundPonies {
private boolean override;
private List<String> ponies;
private List<String> imports = new ArrayList<>();
private String domain;
private String path;
private Identifier apply(String input) {
return new Identifier(domain, String.format("%s%s.png", path, input));
}
private Identifier makeImport(String input) {
return new Identifier(domain, String.format("%s%s/bgponies.json", path, input));
}
public List<Identifier> getPonies() {
return MoreStreams.map(ponies, this::apply);
}
public List<Identifier> getImports() {
return MoreStreams.map(imports, this::makeImport);
}
}
}

8
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -1,13 +1,13 @@
package com.minelittlepony.client.pony;
import com.google.common.base.MoreObjects;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.client.render.IPonyRenderContext;
import com.minelittlepony.client.render.PonyRenderDispatcher;
import com.minelittlepony.client.transform.PonyTransformation;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.pony.meta.Size;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;

14
src/main/java/com/minelittlepony/client/pony/PonyData.java
View file

@ -7,15 +7,15 @@ import net.minecraft.util.Identifier;
import com.google.common.base.MoreObjects;
import com.google.gson.annotations.Expose;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.api.pony.meta.Gender;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.api.pony.meta.TailLength;
import com.minelittlepony.api.pony.meta.TriggerPixels;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.util.render.NativeUtil;
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.BasicEasingInterpolator;
import com.minelittlepony.util.IInterpolator;

4
src/main/java/com/minelittlepony/client/pony/PonyManager.java
View file

@ -6,10 +6,10 @@ import com.google.common.cache.LoadingCache;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.IPonyManager;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.common.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.MathUtil;

2
src/main/java/com/minelittlepony/client/render/DebugBoundingBoxRenderer.java
View file

@ -12,7 +12,7 @@ import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.api.pony.IPony;
public final class DebugBoundingBoxRenderer {

2
src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
View file

@ -1,11 +1,11 @@
package com.minelittlepony.client.render;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.transform.PonyPosture;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.util.MathUtil;
import com.mojang.blaze3d.platform.GlStateManager.DstFactor;
import com.mojang.blaze3d.platform.GlStateManager.SrcFactor;

2
src/main/java/com/minelittlepony/client/render/FrustrumCheck.java
View file

@ -5,7 +5,7 @@ import net.minecraft.client.util.math.Matrix4f;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.math.Box;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.api.pony.IPony;
public class FrustrumCheck<T extends LivingEntity> extends Frustum {

4
src/main/java/com/minelittlepony/client/render/IPonyRenderContext.java
View file

@ -1,12 +1,12 @@
package com.minelittlepony.client.render;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.model.gear.IRenderContext;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.PonyModelConstants;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Wearable;
import com.minelittlepony.util.MathUtil;
import net.minecraft.client.render.entity.model.EntityModel;

2
src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.client.render;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.util.Color;
import javax.annotation.Nullable;

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/AbstractPonySkull.java
View file

@ -5,8 +5,8 @@ import net.minecraft.client.util.math.MatrixStack;
import com.minelittlepony.client.model.PonySkullModel;
import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.pony.IPony;
public abstract class AbstractPonySkull implements ISkull {

2
src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java
View file

@ -1,13 +1,13 @@
package com.minelittlepony.client.render.blockentity.skull;
import com.google.common.collect.Maps;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.render.LevitatingItemRenderer;
import com.minelittlepony.client.render.MobRenderers;
import com.minelittlepony.client.render.entity.SkeleponyRenderer;
import com.minelittlepony.client.render.entity.ZomponyRenderer;
import com.minelittlepony.mson.api.Mson;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.settings.PonyConfig;
import com.mojang.authlib.GameProfile;

6
src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java
View file

@ -1,5 +1,8 @@
package com.minelittlepony.client.render.entity;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.model.ClientPonyModel;
import com.minelittlepony.client.model.ModelWrapper;
@ -17,9 +20,6 @@ import com.minelittlepony.client.render.entity.feature.CapeFeature;
import com.minelittlepony.client.render.entity.feature.SkullFeature;
import com.minelittlepony.client.render.entity.feature.ElytraFeature;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.pony.meta.Wearable;
import java.util.List;

4
src/main/java/com/minelittlepony/client/render/entity/PlayerSeaponyRenderer.java
View file

@ -1,11 +1,11 @@
package com.minelittlepony.client.render.entity;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.model.ClientPonyModel;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race;
import com.minelittlepony.util.MathUtil;
import net.minecraft.client.network.AbstractClientPlayerEntity;

2
src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.client.render.entity;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.model.ClientPonyModel;
import com.minelittlepony.client.model.IPonyModel;
@ -15,7 +16,6 @@ import com.minelittlepony.client.render.entity.feature.SkullFeature;
import com.minelittlepony.client.render.entity.feature.ElytraFeature;
import com.minelittlepony.model.IUnicorn;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.IPony;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.Frustum;

2
src/main/java/com/minelittlepony/client/render/entity/PonyStandRenderer.java
View file

@ -13,13 +13,13 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.decoration.ArmorStandEntity;
import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.client.model.ModelWrapper;
import com.minelittlepony.client.model.entity.race.EarthPonyModel;
import com.minelittlepony.client.pony.PonyData;
import com.minelittlepony.client.render.entity.feature.ArmourFeature;
import com.minelittlepony.model.armour.ArmourLayer;
import com.minelittlepony.pony.meta.Race;
public class PonyStandRenderer extends ArmorStandEntityRenderer {

2
src/main/java/com/minelittlepony/client/render/entity/feature/GearFeature.java
View file

@ -8,13 +8,13 @@ import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.IPonyModel;
import com.minelittlepony.client.model.ModelType;
import com.minelittlepony.client.render.IPonyRenderContext;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.gear.IGear;
import com.minelittlepony.model.gear.IStackable;
import com.minelittlepony.pony.meta.Wearable;
import java.util.HashMap;
import java.util.Map;

2
src/main/java/com/minelittlepony/client/render/entity/npc/AbstractNpcRenderer.java
View file

@ -8,12 +8,12 @@ import net.minecraft.util.Identifier;
import net.minecraft.village.VillagerDataContainer;
import net.minecraft.village.VillagerProfession;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.ClientPonyModel;
import com.minelittlepony.client.render.entity.PonyRenderer;
import com.minelittlepony.model.IUnicorn;
import com.minelittlepony.model.gear.IGear;
import com.minelittlepony.mson.api.ModelKey;
import com.minelittlepony.pony.meta.Wearable;
abstract class AbstractNpcRenderer<
T extends MobEntity & VillagerDataContainer,

2
src/main/java/com/minelittlepony/client/transform/PonyTransformation.java
View file

@ -4,9 +4,9 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.Vec3d;
import com.google.common.collect.Maps;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.model.BodyPart;
import com.minelittlepony.model.IModel;
import com.minelittlepony.pony.meta.Size;
import java.util.Map;

5
src/main/java/com/minelittlepony/model/ICompartmented.java
View file

@ -1,5 +0,0 @@
package com.minelittlepony.model;
public interface ICompartmented<Part> {
Part getBodyPart(BodyPart part);
}

6
src/main/java/com/minelittlepony/model/IModel.java
View file

@ -4,10 +4,10 @@ import net.minecraft.client.render.entity.model.ModelWithArms;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.IPonyData;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.api.pony.meta.Wearable;
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 extends ModelWithArms {

2
src/main/java/com/minelittlepony/model/ModelAttributes.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.model;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.client.render.EquineRenderManager;
import com.minelittlepony.client.render.EquineRenderManager.Mode;
import com.minelittlepony.pony.IPony;
import com.minelittlepony.util.MathUtil;
import net.minecraft.entity.LivingEntity;

2
src/main/java/com/minelittlepony/model/capabilities/IModelWrapper.java
View file

@ -1,6 +1,6 @@
package com.minelittlepony.model.capabilities;
import com.minelittlepony.pony.IPonyData;
import com.minelittlepony.api.pony.IPonyData;
public interface IModelWrapper {
/**

2
src/main/java/com/minelittlepony/settings/PonyConfig.java
View file

@ -2,9 +2,9 @@ package com.minelittlepony.settings;
import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.pony.meta.Size;
import com.minelittlepony.common.util.settings.JsonConfig;
import com.minelittlepony.common.util.settings.Setting;
import com.minelittlepony.pony.meta.Size;
import java.nio.file.Path;