From d5f825523e68f4dcf089419166546fb5cb586d73 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 23 Nov 2019 23:19:13 +0200 Subject: [PATCH] Organise the packages --- .../client/{gui => }/GuiPonySettings.java | 7 ++-- .../client/LegacySkinConverter.java | 2 +- .../minelittlepony/client/MineLittlePony.java | 3 +- .../client/PonyRenderManager.java | 6 +-- .../client/hdskins/{gui => }/DummyPony.java | 4 +- .../hdskins/{gui => }/DummyPonyRenderer.java | 14 +++---- .../hdskins/{gui => }/GuiSkinsMineLP.java | 2 +- .../client/hdskins/MineLPHDSkins.java | 2 - .../client/hdskins/{gui => }/PonyPreview.java | 2 +- .../client/mixin/MixinDefaultPlayerSkin.java | 2 +- .../mixin/MixinEntityRenderDispatcher.java | 3 +- .../client/model/AbstractPonyModel.java | 2 +- .../client/model/ModelPonyHead.java | 4 +- .../{entities => entity}/ModelBreezie.java | 2 +- .../ModelEnderStallion.java | 2 +- .../ModelGuardianPony.java | 2 +- .../ModelIllagerPony.java | 4 +- .../ModelPillagerPony.java | 4 +- .../{entities => entity}/ModelSeapony.java | 4 +- .../ModelSkeletonPony.java | 4 +- .../ModelVillagerPony.java | 6 +-- .../{entities => entity}/ModelWitchPony.java | 4 +- .../{entities => entity}/ModelZombiePony.java | 4 +- .../ModelZombieVillagerPony.java | 2 +- .../gui => model/entity}/package-info.java | 2 +- .../{races => entity/race}/ModelAlicorn.java | 2 +- .../{races => entity/race}/ModelBatpony.java | 2 +- .../race}/ModelChangeling.java | 2 +- .../race}/ModelEarthPony.java | 2 +- .../{races => entity/race}/ModelPegasus.java | 4 +- .../{races => entity/race}/ModelUnicorn.java | 4 +- .../{races => entity/race}/ModelZebra.java | 2 +- .../{races => entity/race}/PlayerModels.java | 8 ++-- .../race}/package-info.java | 2 +- .../model/{components => part}/BatWings.java | 2 +- .../model/{components => part}/BugWings.java | 2 +- .../{components => part}/PegasusWings.java | 2 +- .../model/{components => part}/PonyEars.java | 2 +- .../model/{components => part}/PonySnout.java | 2 +- .../model/{components => part}/PonyTail.java | 2 +- .../{components => part}/SeaponyTail.java | 2 +- .../{components => part}/UnicornHorn.java | 2 +- .../{gui => model/part}/package-info.java | 2 +- .../client/render/LevitatingItemRenderer.java | 2 +- .../skull/PlayerSkullRenderer.java | 2 +- .../skull/PonySkull.java | 4 +- .../skull/PonySkullRenderer.java | 2 +- .../skull/SkeletonSkullRenderer.java | 6 +-- .../skull/WitherSkullRenderer.java | 6 +-- .../skull/ZombieSkullRenderer.java | 6 +-- .../blockentity/skull/package-info.java | 4 ++ .../client/render/entities/package-info.java | 4 -- .../render/entities/player/package-info.java | 4 -- .../{entities => entity}/MobRenderers.java | 4 +- .../RenderEnderStallion.java | 12 +++--- .../RenderPonyGuardian.java | 10 ++--- .../RenderPonyIllager.java | 8 ++-- .../{entities => entity}/RenderPonyMob.java | 14 +++---- .../RenderPonyPillager.java | 8 ++-- .../player => entity}/RenderPonyPlayer.java | 18 ++++---- .../RenderPonySkeleton.java | 10 ++--- .../RenderPonyTrader.java | 4 +- .../{entities => entity}/RenderPonyVex.java | 4 +- .../{entities => entity}/RenderPonyWitch.java | 6 +-- .../RenderPonyZombie.java | 6 +-- .../RenderSeaponyPlayer.java | 2 +- .../feature}/AbstractPonyLayer.java | 2 +- .../feature}/LayerDJPon3Head.java | 2 +- .../feature}/LayerEntityOnPonyShoulder.java | 2 +- .../feature}/LayerEyeGlow.java | 2 +- .../{layer => entity/feature}/LayerGear.java | 2 +- .../feature}/LayerHeldItemIllager.java | 4 +- .../feature}/LayerHeldPonyItem.java | 2 +- .../feature}/LayerHeldPonyItemMagical.java | 2 +- .../feature}/LayerOverlayBase.java | 2 +- .../feature}/LayerPonyArmor.java | 2 +- .../feature}/LayerPonyCape.java | 2 +- .../feature}/LayerPonyCustomHead.java | 2 +- .../feature}/LayerPonyElytra.java | 2 +- .../feature}/LayerPonyStrayOverlay.java | 4 +- .../entity/feature}/package-info.java | 2 +- .../races => render/entity}/package-info.java | 2 +- .../villager/AbstractVillagerRenderer.java | 6 +-- .../villager/ClothingLayer.java | 2 +- .../villager/PonyTextures.java | 2 +- .../villager/RenderPonyVillager.java | 4 +- .../villager/RenderPonyZombieVillager.java | 4 +- .../client/render/layer/package-info.java | 4 -- .../tileentities/skull/package-info.java | 4 -- .../client/settings/ClientPonyConfig.java | 2 +- .../client/util/render/Color.java | 42 ------------------- 91 files changed, 167 insertions(+), 224 deletions(-) rename src/main/java/com/minelittlepony/client/{gui => }/GuiPonySettings.java (96%) rename src/main/java/com/minelittlepony/client/hdskins/{gui => }/DummyPony.java (88%) rename src/main/java/com/minelittlepony/client/hdskins/{gui => }/DummyPonyRenderer.java (87%) rename src/main/java/com/minelittlepony/client/hdskins/{gui => }/GuiSkinsMineLP.java (98%) rename src/main/java/com/minelittlepony/client/hdskins/{gui => }/PonyPreview.java (97%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelBreezie.java (98%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelEnderStallion.java (98%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelGuardianPony.java (96%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelIllagerPony.java (94%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelPillagerPony.java (90%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelSeapony.java (97%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelSkeletonPony.java (96%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelVillagerPony.java (94%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelWitchPony.java (94%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelZombiePony.java (92%) rename src/main/java/com/minelittlepony/client/model/{entities => entity}/ModelZombieVillagerPony.java (95%) rename src/main/java/com/minelittlepony/client/{hdskins/gui => model/entity}/package-info.java (64%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelAlicorn.java (96%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelBatpony.java (78%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelChangeling.java (91%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelEarthPony.java (94%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelPegasus.java (92%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelUnicorn.java (96%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/ModelZebra.java (95%) rename src/main/java/com/minelittlepony/client/model/{races => entity/race}/PlayerModels.java (92%) rename src/main/java/com/minelittlepony/client/model/{components => entity/race}/package-info.java (62%) rename src/main/java/com/minelittlepony/client/model/{components => part}/BatWings.java (98%) rename src/main/java/com/minelittlepony/client/model/{components => part}/BugWings.java (96%) rename src/main/java/com/minelittlepony/client/model/{components => part}/PegasusWings.java (98%) rename src/main/java/com/minelittlepony/client/model/{components => part}/PonyEars.java (96%) rename src/main/java/com/minelittlepony/client/model/{components => part}/PonySnout.java (98%) rename src/main/java/com/minelittlepony/client/model/{components => part}/PonyTail.java (98%) rename src/main/java/com/minelittlepony/client/model/{components => part}/SeaponyTail.java (97%) rename src/main/java/com/minelittlepony/client/model/{components => part}/UnicornHorn.java (97%) rename src/main/java/com/minelittlepony/client/{gui => model/part}/package-info.java (65%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/PlayerSkullRenderer.java (96%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/PonySkull.java (83%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/PonySkullRenderer.java (98%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/SkeletonSkullRenderer.java (70%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/WitherSkullRenderer.java (70%) rename src/main/java/com/minelittlepony/client/render/{tileentities => blockentity}/skull/ZombieSkullRenderer.java (70%) create mode 100644 src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java delete mode 100644 src/main/java/com/minelittlepony/client/render/entities/package-info.java delete mode 100644 src/main/java/com/minelittlepony/client/render/entities/player/package-info.java rename src/main/java/com/minelittlepony/client/render/{entities => entity}/MobRenderers.java (96%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderEnderStallion.java (86%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyGuardian.java (89%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyIllager.java (93%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyMob.java (91%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyPillager.java (77%) rename src/main/java/com/minelittlepony/client/render/{entities/player => entity}/RenderPonyPlayer.java (92%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonySkeleton.java (86%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyTrader.java (89%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyVex.java (91%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyWitch.java (89%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/RenderPonyZombie.java (96%) rename src/main/java/com/minelittlepony/client/render/{entities/player => entity}/RenderSeaponyPlayer.java (97%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/AbstractPonyLayer.java (97%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerDJPon3Head.java (96%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerEntityOnPonyShoulder.java (97%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerEyeGlow.java (94%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerGear.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerHeldItemIllager.java (90%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerHeldPonyItem.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerHeldPonyItemMagical.java (97%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerOverlayBase.java (96%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerPonyArmor.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerPonyCape.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerPonyCustomHead.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerPonyElytra.java (98%) rename src/main/java/com/minelittlepony/client/render/{layer => entity/feature}/LayerPonyStrayOverlay.java (87%) rename src/main/java/com/minelittlepony/client/{model/entities => render/entity/feature}/package-info.java (60%) rename src/main/java/com/minelittlepony/client/{model/races => render/entity}/package-info.java (63%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/villager/AbstractVillagerRenderer.java (92%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/villager/ClothingLayer.java (97%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/villager/PonyTextures.java (98%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/villager/RenderPonyVillager.java (89%) rename src/main/java/com/minelittlepony/client/render/{entities => entity}/villager/RenderPonyZombieVillager.java (89%) delete mode 100644 src/main/java/com/minelittlepony/client/render/layer/package-info.java delete mode 100644 src/main/java/com/minelittlepony/client/render/tileentities/skull/package-info.java diff --git a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/GuiPonySettings.java similarity index 96% rename from src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java rename to src/main/java/com/minelittlepony/client/GuiPonySettings.java index 0be1596f..31c039c4 100644 --- a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/GuiPonySettings.java @@ -1,11 +1,10 @@ -package com.minelittlepony.client.gui; +package com.minelittlepony.client; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.LiteralText; -import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.client.render.entities.MobRenderers; +import com.minelittlepony.client.render.entity.MobRenderers; import com.minelittlepony.client.settings.ClientPonyConfig; import com.minelittlepony.common.client.gui.GameGui; import com.minelittlepony.common.client.gui.ScrollContainer; @@ -23,7 +22,7 @@ import javax.annotation.Nullable; * In-Game options menu. * */ -public class GuiPonySettings extends GameGui { +class GuiPonySettings extends GameGui { private static final String OPTIONS_PREFIX = "minelp.options."; diff --git a/src/main/java/com/minelittlepony/client/LegacySkinConverter.java b/src/main/java/com/minelittlepony/client/LegacySkinConverter.java index d384284c..15661ac6 100644 --- a/src/main/java/com/minelittlepony/client/LegacySkinConverter.java +++ b/src/main/java/com/minelittlepony/client/LegacySkinConverter.java @@ -12,7 +12,7 @@ import static com.minelittlepony.common.event.SkinFilterCallback.copy; * do is copy the wing across. * */ -public class LegacySkinConverter implements SkinFilterCallback { +class LegacySkinConverter implements SkinFilterCallback { @Override public void processImage(NativeImage image, boolean legacy) { diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java index dda76cbe..7ed60e05 100644 --- a/src/main/java/com/minelittlepony/client/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -1,9 +1,8 @@ package com.minelittlepony.client; -import com.minelittlepony.client.gui.GuiPonySettings; import com.minelittlepony.client.hdskins.IndirectHDSkins; import com.minelittlepony.client.pony.PonyManager; -import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer; +import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer; import com.minelittlepony.client.settings.ClientPonyConfig; import com.minelittlepony.common.client.gui.VisibilityMode; import com.minelittlepony.common.client.gui.element.Button; diff --git a/src/main/java/com/minelittlepony/client/PonyRenderManager.java b/src/main/java/com/minelittlepony/client/PonyRenderManager.java index 5ccd9b14..ce020596 100644 --- a/src/main/java/com/minelittlepony/client/PonyRenderManager.java +++ b/src/main/java/com/minelittlepony/client/PonyRenderManager.java @@ -4,11 +4,11 @@ import java.util.Map; import com.google.common.collect.Maps; import com.minelittlepony.client.model.IPonyModel; -import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.client.model.entity.race.PlayerModels; import com.minelittlepony.client.render.LevitatingItemRenderer; +import com.minelittlepony.client.render.entity.MobRenderers; +import com.minelittlepony.client.render.entity.RenderPonyPlayer; import com.minelittlepony.client.render.IPonyRender; -import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.client.render.entities.player.RenderPonyPlayer; import javax.annotation.Nullable; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java similarity index 88% rename from src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java rename to src/main/java/com/minelittlepony/client/hdskins/DummyPony.java index f34cf8a8..12cdb13b 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.hdskins.gui; +package com.minelittlepony.client.hdskins; import com.minelittlepony.hdskins.dummy.DummyPlayer; import com.minelittlepony.hdskins.dummy.TextureProxy; @@ -8,7 +8,7 @@ import com.minelittlepony.hdskins.resources.LocalTexture; /** * Dummy model used for the skin uploading screen. */ -public class DummyPony extends DummyPlayer { +class DummyPony extends DummyPlayer { public boolean wet = false; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java similarity index 87% rename from src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java rename to src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java index 4f031033..7d19176e 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/hdskins/DummyPonyRenderer.java @@ -1,15 +1,15 @@ -package com.minelittlepony.client.hdskins.gui; +package com.minelittlepony.client.hdskins; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.model.ModelWrapper; -import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.client.model.entity.race.PlayerModels; import com.minelittlepony.client.render.IPonyRender; import com.minelittlepony.client.render.RenderPony; -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.LayerPonyElytra; +import com.minelittlepony.client.render.entity.feature.LayerGear; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.entity.feature.LayerPonyArmor; +import com.minelittlepony.client.render.entity.feature.LayerPonyElytra; import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer; import com.minelittlepony.hdskins.profile.SkinType; import com.minelittlepony.pony.IPony; @@ -24,7 +24,7 @@ import net.minecraft.util.Identifier; /** * Renderer used for the dummy pony model when selecting a skin. */ -public class DummyPonyRenderer extends DummyPlayerRenderer> implements IPonyRender> { +class DummyPonyRenderer extends DummyPlayerRenderer> implements IPonyRender> { protected final RenderPony> renderPony = new RenderPony<>(this); diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java similarity index 98% rename from src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java rename to src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java index 2bab9458..6a641cc3 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.hdskins.gui; +package com.minelittlepony.client.hdskins; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.common.client.gui.element.IconicToggle; diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index a9e630da..0b08afd4 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -2,8 +2,6 @@ package com.minelittlepony.client.hdskins; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.SkinsProxy; -import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP; -import com.minelittlepony.client.hdskins.gui.DummyPonyRenderer; import com.minelittlepony.common.event.ClientReadyCallback; import com.minelittlepony.hdskins.SkinCacheClearCallback; import com.minelittlepony.hdskins.dummy.DummyPlayer; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java similarity index 97% rename from src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java rename to src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java index cb0544cb..75d83e29 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/PonyPreview.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.hdskins.gui; +package com.minelittlepony.client.hdskins; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index edaf47ff..7de7485b 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.mixin; import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.client.model.entity.race.PlayerModels; import com.minelittlepony.pony.IPonyManager; import com.minelittlepony.settings.PonyLevel; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java b/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java index 2a0af6a9..eee1d6e1 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java @@ -1,7 +1,8 @@ package com.minelittlepony.client.mixin; import com.minelittlepony.client.MineLittlePony; -import com.minelittlepony.client.model.races.PlayerModels; +import com.minelittlepony.client.model.entity.race.PlayerModels; + import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 9368c737..d20cec83 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -1,8 +1,8 @@ package com.minelittlepony.client.model; import com.minelittlepony.client.model.armour.ModelPonyArmour; +import com.minelittlepony.client.model.part.PonySnout; import com.minelittlepony.client.model.armour.ArmourWrapper; -import com.minelittlepony.client.model.components.PonySnout; import com.minelittlepony.client.transform.PonyTransformation; import com.minelittlepony.model.BodyPart; import com.minelittlepony.model.IPart; diff --git a/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java b/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java index e75b52c7..1b19ada4 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java +++ b/src/main/java/com/minelittlepony/client/model/ModelPonyHead.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.model; -import com.minelittlepony.client.model.components.PonySnout; -import com.minelittlepony.client.model.components.UnicornHorn; +import com.minelittlepony.client.model.part.PonySnout; +import com.minelittlepony.client.model.part.UnicornHorn; import com.minelittlepony.client.pony.PonyData; import com.minelittlepony.client.util.render.Part; import com.minelittlepony.model.ICapitated; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelBreezie.java b/src/main/java/com/minelittlepony/client/model/entity/ModelBreezie.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/entities/ModelBreezie.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelBreezie.java index e05e4aa3..dddbc41f 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelBreezie.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelBreezie.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.entity.model.BipedEntityModel; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java b/src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java index 586be457..9dc756bf 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelEnderStallion.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelEnderStallion.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelGuardianPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/entities/ModelGuardianPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java index cd30e30b..50fbcb46 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelGuardianPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelGuardianPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java similarity index 94% rename from src/main/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java index e223f1d8..55dea469 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelIllagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelIllagerPony.java @@ -1,11 +1,11 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.util.Arm; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.client.model.races.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; public class ModelIllagerPony extends ModelAlicorn { diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelPillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java similarity index 90% rename from src/main/java/com/minelittlepony/client/model/entities/ModelPillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java index 3ddb4656..28e668a1 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelPillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelPillagerPony.java @@ -1,10 +1,10 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.entity.mob.PillagerEntity; import net.minecraft.util.Arm; -import com.minelittlepony.client.model.races.ModelChangeling; +import com.minelittlepony.client.model.entity.race.ModelChangeling; public class ModelPillagerPony extends ModelChangeling { diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelSeapony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java similarity index 97% rename from src/main/java/com/minelittlepony/client/model/entities/ModelSeapony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java index a7e7bd9d..b9bc2652 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelSeapony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelSeapony.java @@ -1,8 +1,8 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import com.minelittlepony.client.model.armour.ModelPonyArmour; +import com.minelittlepony.client.model.entity.race.ModelUnicorn; import com.minelittlepony.client.model.armour.ArmourWrapper; -import com.minelittlepony.client.model.races.ModelUnicorn; import com.minelittlepony.model.BodyPart; import com.minelittlepony.model.armour.IEquestrianArmour; import com.minelittlepony.pony.IPony; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java index b07baec3..2d71edf6 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelSkeletonPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelSkeletonPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.entity.mob.WitherSkeletonEntity; import net.minecraft.client.render.VertexConsumer; @@ -10,7 +10,7 @@ import net.minecraft.util.Arm; import net.minecraft.util.Hand; import com.minelittlepony.client.model.IMobModel; -import com.minelittlepony.client.model.races.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; public class ModelSkeletonPony extends ModelAlicorn implements IMobModel { diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java similarity index 94% rename from src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java index ddee03db..48e37998 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelVillagerPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; @@ -10,8 +10,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; -import com.minelittlepony.client.model.races.ModelAlicorn; -import com.minelittlepony.client.render.entities.villager.PonyTextures; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; +import com.minelittlepony.client.render.entity.villager.PonyTextures; import com.minelittlepony.model.IPart; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java similarity index 94% rename from src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java index 636c309c..2ac2ba9a 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelWitchPony.java @@ -1,9 +1,9 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.entity.mob.WitchEntity; import net.minecraft.util.math.MathHelper; -import com.minelittlepony.client.model.races.ModelZebra; +import com.minelittlepony.client.model.entity.race.ModelZebra; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Wearable; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelZombiePony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java similarity index 92% rename from src/main/java/com/minelittlepony/client/model/entities/ModelZombiePony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java index 6abcfb77..f858323a 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelZombiePony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelZombiePony.java @@ -1,7 +1,7 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import com.minelittlepony.client.model.IMobModel; -import com.minelittlepony.client.model.races.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; import com.minelittlepony.mson.api.model.MsonPart; import net.minecraft.entity.mob.HostileEntity; diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java b/src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java similarity index 95% rename from src/main/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java rename to src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java index b88bb197..d65a00e6 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/ModelZombieVillagerPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/ModelZombieVillagerPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.model.entity; import net.minecraft.entity.mob.ZombieVillagerEntity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/package-info.java b/src/main/java/com/minelittlepony/client/model/entity/package-info.java similarity index 64% rename from src/main/java/com/minelittlepony/client/hdskins/gui/package-info.java rename to src/main/java/com/minelittlepony/client/model/entity/package-info.java index 807d0d6b..77d91b35 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/package-info.java +++ b/src/main/java/com/minelittlepony/client/model/entity/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.minelittlepony.client.hdskins.gui; +package com.minelittlepony.client.model.entity; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelAlicorn.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/races/ModelAlicorn.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java index d8e7a0d3..73a16b64 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelAlicorn.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelAlicorn.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import com.minelittlepony.model.IPart; import com.minelittlepony.model.IPegasus; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelBatpony.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelBatpony.java similarity index 78% rename from src/main/java/com/minelittlepony/client/model/races/ModelBatpony.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelBatpony.java index be77f963..f0376f3f 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelBatpony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelBatpony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelChangeling.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java similarity index 91% rename from src/main/java/com/minelittlepony/client/model/races/ModelChangeling.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java index 388899bd..5f66cd05 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelChangeling.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelChangeling.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelEarthPony.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java similarity index 94% rename from src/main/java/com/minelittlepony/client/model/races/ModelEarthPony.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java index 6c94c13e..68d74b8b 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelEarthPony.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import com.minelittlepony.client.model.AbstractPonyModel; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelPegasus.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java similarity index 92% rename from src/main/java/com/minelittlepony/client/model/races/ModelPegasus.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java index 4ca09193..f920be84 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelPegasus.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelPegasus.java @@ -1,6 +1,6 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; -import com.minelittlepony.client.model.components.PegasusWings; +import com.minelittlepony.client.model.part.PegasusWings; import com.minelittlepony.model.IPart; import com.minelittlepony.model.IPegasus; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java index 2d9a7524..10546836 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelUnicorn.java @@ -1,6 +1,6 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; -import com.minelittlepony.client.model.components.UnicornHorn; +import com.minelittlepony.client.model.part.UnicornHorn; import com.minelittlepony.model.IUnicorn; import com.minelittlepony.mson.api.model.MsonPart; diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelZebra.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java similarity index 95% rename from src/main/java/com/minelittlepony/client/model/races/ModelZebra.java rename to src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java index e5511e41..0d727dfb 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelZebra.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelZebra.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/minelittlepony/client/model/races/PlayerModels.java b/src/main/java/com/minelittlepony/client/model/entity/race/PlayerModels.java similarity index 92% rename from src/main/java/com/minelittlepony/client/model/races/PlayerModels.java rename to src/main/java/com/minelittlepony/client/model/entity/race/PlayerModels.java index 230c156f..6b0fc871 100644 --- a/src/main/java/com/minelittlepony/client/model/races/PlayerModels.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/PlayerModels.java @@ -1,10 +1,10 @@ -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.model.entity.race; import com.google.common.collect.Maps; 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.client.model.entity.ModelSeapony; +import com.minelittlepony.client.render.entity.RenderPonyPlayer; +import com.minelittlepony.client.render.entity.RenderSeaponyPlayer; import com.minelittlepony.model.IModel; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/model/components/package-info.java b/src/main/java/com/minelittlepony/client/model/entity/race/package-info.java similarity index 62% rename from src/main/java/com/minelittlepony/client/model/components/package-info.java rename to src/main/java/com/minelittlepony/client/model/entity/race/package-info.java index 229429d4..f5041cfa 100644 --- a/src/main/java/com/minelittlepony/client/model/components/package-info.java +++ b/src/main/java/com/minelittlepony/client/model/entity/race/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.entity.race; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/model/components/BatWings.java b/src/main/java/com/minelittlepony/client/model/part/BatWings.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/components/BatWings.java rename to src/main/java/com/minelittlepony/client/model/part/BatWings.java index f619ac6c..6ca297e8 100644 --- a/src/main/java/com/minelittlepony/client/model/components/BatWings.java +++ b/src/main/java/com/minelittlepony/client/model/part/BatWings.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/client/model/components/BugWings.java b/src/main/java/com/minelittlepony/client/model/part/BugWings.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/components/BugWings.java rename to src/main/java/com/minelittlepony/client/model/part/BugWings.java index e8b3bdc0..a35b8762 100644 --- a/src/main/java/com/minelittlepony/client/model/components/BugWings.java +++ b/src/main/java/com/minelittlepony/client/model/part/BugWings.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; diff --git a/src/main/java/com/minelittlepony/client/model/components/PegasusWings.java b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/components/PegasusWings.java rename to src/main/java/com/minelittlepony/client/model/part/PegasusWings.java index 8ab54472..9df48604 100644 --- a/src/main/java/com/minelittlepony/client/model/components/PegasusWings.java +++ b/src/main/java/com/minelittlepony/client/model/part/PegasusWings.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/com/minelittlepony/client/model/components/PonyEars.java b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java similarity index 96% rename from src/main/java/com/minelittlepony/client/model/components/PonyEars.java rename to src/main/java/com/minelittlepony/client/model/part/PonyEars.java index 91121bb8..17c52d57 100644 --- a/src/main/java/com/minelittlepony/client/model/components/PonyEars.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/com/minelittlepony/client/model/components/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/components/PonySnout.java rename to src/main/java/com/minelittlepony/client/model/part/PonySnout.java index fe9b5fcb..dff16f38 100644 --- a/src/main/java/com/minelittlepony/client/model/components/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/com/minelittlepony/client/model/components/PonyTail.java b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java similarity index 98% rename from src/main/java/com/minelittlepony/client/model/components/PonyTail.java rename to src/main/java/com/minelittlepony/client/model/part/PonyTail.java index e7ff5300..7e120191 100644 --- a/src/main/java/com/minelittlepony/client/model/components/PonyTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.model.Model; import net.minecraft.client.model.ModelPart; diff --git a/src/main/java/com/minelittlepony/client/model/components/SeaponyTail.java b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java similarity index 97% rename from src/main/java/com/minelittlepony/client/model/components/SeaponyTail.java rename to src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java index cc2ddfdd..ec34b15d 100644 --- a/src/main/java/com/minelittlepony/client/model/components/SeaponyTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/SeaponyTail.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IPonyModel; diff --git a/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java b/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java similarity index 97% rename from src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java rename to src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java index 5bfb3d3f..240aaae8 100644 --- a/src/main/java/com/minelittlepony/client/model/components/UnicornHorn.java +++ b/src/main/java/com/minelittlepony/client/model/part/UnicornHorn.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.model.components; +package com.minelittlepony.client.model.part; import net.minecraft.client.MinecraftClient; import net.minecraft.client.model.Model; diff --git a/src/main/java/com/minelittlepony/client/gui/package-info.java b/src/main/java/com/minelittlepony/client/model/part/package-info.java similarity index 65% rename from src/main/java/com/minelittlepony/client/gui/package-info.java rename to src/main/java/com/minelittlepony/client/model/part/package-info.java index 13eee0ea..8af3241d 100644 --- a/src/main/java/com/minelittlepony/client/gui/package-info.java +++ b/src/main/java/com/minelittlepony/client/model/part/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.minelittlepony.client.gui; +package com.minelittlepony.client.model.part; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index 3a61690a..c2698506 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -72,7 +72,7 @@ public class LevitatingItemRenderer { } private void setColor(int glowColor) { - Color.glBlendColour(glowColor, 0.2F); + GL14.glBlendColor(Color.r(glowColor), Color.g(glowColor), Color.b(glowColor), 0.2F); } private void unsetColor() { diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerSkullRenderer.java similarity index 96% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerSkullRenderer.java index ad131af6..ad3e065d 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PlayerSkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerSkullRenderer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.client.model.ModelDeadMau5Ears; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java similarity index 83% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java index 07137086..36e78335 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkull.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkull.java @@ -1,10 +1,10 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import com.minelittlepony.client.model.ModelPonyHead; -import com.minelittlepony.client.render.tileentities.skull.PonySkullRenderer.ISkull; +import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull; import com.minelittlepony.pony.IPony; public abstract class PonySkull implements ISkull { diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java index f005dfae..6ce24f97 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; import com.google.common.collect.Maps; import com.minelittlepony.client.MineLittlePony; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/SkeletonSkullRenderer.java similarity index 70% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/SkeletonSkullRenderer.java index f5f72de5..73aaca44 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/SkeletonSkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/SkeletonSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; -import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.client.render.entities.RenderPonySkeleton; +import com.minelittlepony.client.render.entity.MobRenderers; +import com.minelittlepony.client.render.entity.RenderPonySkeleton; import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/WitherSkullRenderer.java similarity index 70% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/WitherSkullRenderer.java index 4e773e5e..d1cf9a2b 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/WitherSkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/WitherSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; -import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.client.render.entities.RenderPonySkeleton; +import com.minelittlepony.client.render.entity.MobRenderers; +import com.minelittlepony.client.render.entity.RenderPonySkeleton; import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/ZombieSkullRenderer.java similarity index 70% rename from src/main/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java rename to src/main/java/com/minelittlepony/client/render/blockentity/skull/ZombieSkullRenderer.java index 20df3b22..abe2b826 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/ZombieSkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/ZombieSkullRenderer.java @@ -1,7 +1,7 @@ -package com.minelittlepony.client.render.tileentities.skull; +package com.minelittlepony.client.render.blockentity.skull; -import com.minelittlepony.client.render.entities.MobRenderers; -import com.minelittlepony.client.render.entities.RenderPonyZombie; +import com.minelittlepony.client.render.entity.MobRenderers; +import com.minelittlepony.client.render.entity.RenderPonyZombie; import com.minelittlepony.settings.PonyConfig; import com.mojang.authlib.GameProfile; import net.minecraft.util.Identifier; diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java new file mode 100644 index 00000000..771a4e68 --- /dev/null +++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/package-info.java @@ -0,0 +1,4 @@ +@ParametersAreNonnullByDefault +package com.minelittlepony.client.render.blockentity.skull; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/entities/package-info.java b/src/main/java/com/minelittlepony/client/render/entities/package-info.java deleted file mode 100644 index cf134897..00000000 --- a/src/main/java/com/minelittlepony/client/render/entities/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ParametersAreNonnullByDefault -package com.minelittlepony.client.render.entities; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/entities/player/package-info.java b/src/main/java/com/minelittlepony/client/render/entities/player/package-info.java deleted file mode 100644 index c2e79dc5..00000000 --- a/src/main/java/com/minelittlepony/client/render/entities/player/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ParametersAreNonnullByDefault -package com.minelittlepony.client.render.entities.player; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/main/java/com/minelittlepony/client/render/entity/MobRenderers.java similarity index 96% rename from src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java rename to src/main/java/com/minelittlepony/client/render/entity/MobRenderers.java index 65f3598e..e195b6a2 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/main/java/com/minelittlepony/client/render/entity/MobRenderers.java @@ -1,8 +1,8 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; -import com.minelittlepony.client.render.entities.villager.*; +import com.minelittlepony.client.render.entity.villager.*; import com.minelittlepony.common.util.settings.Setting; import java.util.Arrays; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java b/src/main/java/com/minelittlepony/client/render/entity/RenderEnderStallion.java similarity index 86% rename from src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderEnderStallion.java index 78aad59f..0fda09f4 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderEnderStallion.java @@ -1,10 +1,10 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; -import com.minelittlepony.client.model.entities.ModelEnderStallion; -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 com.minelittlepony.client.model.entity.ModelEnderStallion; +import com.minelittlepony.client.render.entity.feature.LayerEyeGlow; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.entity.feature.LayerEyeGlow.IGlowingRenderer; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyGuardian.java similarity index 89% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyGuardian.java index a178af1d..a8f5a959 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyGuardian.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyGuardian.java @@ -1,12 +1,12 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import javax.annotation.Nonnull; import com.minelittlepony.client.mixin.IResizeable; -import com.minelittlepony.client.model.entities.ModelGuardianPony; -import com.minelittlepony.client.render.entities.RenderPonyMob.Proxy; -import com.minelittlepony.client.render.layer.LayerHeldPonyItem; -import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; +import com.minelittlepony.client.model.entity.ModelGuardianPony; +import com.minelittlepony.client.render.entity.RenderPonyMob.Proxy; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyIllager.java similarity index 93% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyIllager.java index d41dd68c..5d066752 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyIllager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyIllager.java @@ -1,8 +1,8 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; -import com.minelittlepony.client.model.entities.ModelIllagerPony; -import com.minelittlepony.client.render.layer.LayerHeldItemIllager; -import com.minelittlepony.client.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.model.entity.ModelIllagerPony; +import com.minelittlepony.client.render.entity.feature.LayerHeldItemIllager; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java similarity index 91% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java index f64ef337..f332faaf 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; @@ -7,12 +7,12 @@ import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.DebugBoundingBoxRenderer; import com.minelittlepony.client.render.IPonyRender; import com.minelittlepony.client.render.RenderPony; -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.client.render.entity.feature.LayerGear; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.entity.feature.LayerPonyArmor; +import com.minelittlepony.client.render.entity.feature.LayerPonyCustomHead; +import com.minelittlepony.client.render.entity.feature.LayerPonyElytra; import com.minelittlepony.model.IUnicorn; import com.minelittlepony.pony.IPony; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyPillager.java similarity index 77% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyPillager.java index 938f426f..a397188e 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyPillager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyPillager.java @@ -1,13 +1,13 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.mob.PillagerEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.entities.ModelPillagerPony; -import com.minelittlepony.client.render.layer.LayerHeldItemIllager; -import com.minelittlepony.client.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.model.entity.ModelPillagerPony; +import com.minelittlepony.client.render.entity.feature.LayerHeldItemIllager; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; public class RenderPonyPillager extends RenderPonyMob> { diff --git a/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyPlayer.java similarity index 92% rename from src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyPlayer.java index 0acc058f..9886a552 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyPlayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities.player; +package com.minelittlepony.client.render.entity; import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; @@ -7,14 +7,14 @@ import com.minelittlepony.client.model.gear.SaddleBags; import com.minelittlepony.client.render.DebugBoundingBoxRenderer; import com.minelittlepony.client.render.IPonyRender; 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.client.render.entity.feature.LayerDJPon3Head; +import com.minelittlepony.client.render.entity.feature.LayerEntityOnPonyShoulder; +import com.minelittlepony.client.render.entity.feature.LayerGear; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.entity.feature.LayerPonyArmor; +import com.minelittlepony.client.render.entity.feature.LayerPonyCape; +import com.minelittlepony.client.render.entity.feature.LayerPonyCustomHead; +import com.minelittlepony.client.render.entity.feature.LayerPonyElytra; import com.minelittlepony.model.gear.IGear; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.meta.Race; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonySkeleton.java similarity index 86% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonySkeleton.java index 8ae3951e..de714864 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonySkeleton.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonySkeleton.java @@ -1,9 +1,9 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; -import com.minelittlepony.client.model.entities.ModelSkeletonPony; -import com.minelittlepony.client.render.layer.LayerHeldPonyItem; -import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical; -import com.minelittlepony.client.render.layer.LayerPonyStrayOverlay; +import com.minelittlepony.client.model.entity.ModelSkeletonPony; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItemMagical; +import com.minelittlepony.client.render.entity.feature.LayerPonyStrayOverlay; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyTrader.java similarity index 89% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyTrader.java index f1e9f5fa..b550eaf3 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyTrader.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyTrader.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; @@ -6,7 +6,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.passive.WanderingTraderEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.races.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; public class RenderPonyTrader extends RenderPonyMob.Caster> { diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyVex.java similarity index 91% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyVex.java index fe10b2d8..2a24ced6 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVex.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyVex.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.BipedEntityRenderer; @@ -7,7 +7,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.VexEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.entities.ModelBreezie; +import com.minelittlepony.client.model.entity.ModelBreezie; /** * AKA a breezie :D diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyWitch.java similarity index 89% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyWitch.java index f0a7a55b..a5ba6deb 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyWitch.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyWitch.java @@ -1,7 +1,7 @@ -package com.minelittlepony.client.render.entities; +package com.minelittlepony.client.render.entity; -import com.minelittlepony.client.model.entities.ModelWitchPony; -import com.minelittlepony.client.render.layer.LayerHeldPonyItem; +import com.minelittlepony.client.model.entity.ModelWitchPony; +import com.minelittlepony.client.render.entity.feature.LayerHeldPonyItem; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyZombie.java similarity index 96% rename from src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderPonyZombie.java index a82e2c7c..285204d1 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombie.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyZombie.java @@ -1,6 +1,4 @@ -package com.minelittlepony.client.render.entities; - -import com.minelittlepony.client.model.entities.ModelZombiePony; +package com.minelittlepony.client.render.entity; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; import net.minecraft.client.render.entity.EntityRenderDispatcher; @@ -12,6 +10,8 @@ import net.minecraft.entity.mob.ZombieEntity; import net.minecraft.entity.mob.ZombiePigmanEntity; import net.minecraft.util.Identifier; +import com.minelittlepony.client.model.entity.ModelZombiePony; + public class RenderPonyZombie extends RenderPonyMob.Caster> { public static final Identifier ZOMBIE = new Identifier("minelittlepony", "textures/entity/zombie/zombie_pony.png"); diff --git a/src/main/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java b/src/main/java/com/minelittlepony/client/render/entity/RenderSeaponyPlayer.java similarity index 97% rename from src/main/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java rename to src/main/java/com/minelittlepony/client/render/entity/RenderSeaponyPlayer.java index f7653360..d26255b4 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/RenderSeaponyPlayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities.player; +package com.minelittlepony.client.render.entity; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.model.ModelWrapper; diff --git a/src/main/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java b/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractPonyLayer.java similarity index 97% rename from src/main/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/AbstractPonyLayer.java index ea026079..b7a6ec9e 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/AbstractPonyLayer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/AbstractPonyLayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.client.render.IPonyRender; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerDJPon3Head.java similarity index 96% rename from src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerDJPon3Head.java index 1e5c95e7..482ea24b 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerDJPon3Head.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerDJPon3Head.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.render.OverlayTexture; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerEntityOnPonyShoulder.java similarity index 97% rename from src/main/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerEntityOnPonyShoulder.java index 08ab15bf..e2afd661 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerEntityOnPonyShoulder.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerEntityOnPonyShoulder.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerEyeGlow.java similarity index 94% rename from src/main/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerEyeGlow.java index 05cc69bf..5df33f16 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerEyeGlow.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.feature.EyesFeatureRenderer; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerGear.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerGear.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerGear.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerGear.java index 04e89677..fa4c1b94 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerGear.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerGear.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldItemIllager.java similarity index 90% rename from src/main/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldItemIllager.java index 12225afe..52f2b181 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldItemIllager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldItemIllager.java @@ -1,11 +1,11 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.mob.IllagerEntity; import net.minecraft.util.Arm; -import com.minelittlepony.client.model.races.ModelAlicorn; +import com.minelittlepony.client.model.entity.race.ModelAlicorn; import com.minelittlepony.client.render.IPonyRender; public class LayerHeldItemIllager> extends LayerHeldPonyItem { diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItem.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItem.java index a3e53074..0051be6e 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItem.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItem.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.client.render.IPonyRender; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItemMagical.java similarity index 97% rename from src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItemMagical.java index 2283f150..3704e7dd 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerHeldPonyItemMagical.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerHeldPonyItemMagical.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.model.IPonyModel; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerOverlayBase.java similarity index 96% rename from src/main/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerOverlayBase.java index be843adc..7004c5ce 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerOverlayBase.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerOverlayBase.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java index 0bc1771f..1763dece 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyArmor.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyArmor.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.ForgeProxy; import com.minelittlepony.client.model.IPonyModel; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCape.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCape.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerPonyCape.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCape.java index 76084942..478b2492 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCape.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCape.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.render.IPonyRender; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCustomHead.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCustomHead.java index 9211da9b..070a6643 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyCustomHead.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.model.AbstractPonyModel; import com.minelittlepony.client.model.IPonyModel; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyElytra.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyElytra.java index 52c353ed..327e9853 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyElytra.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyElytra.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.client.model.PonyElytra; diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyStrayOverlay.java similarity index 87% rename from src/main/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyStrayOverlay.java index 2fdef0cc..82cf3f48 100644 --- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyStrayOverlay.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/LayerPonyStrayOverlay.java @@ -1,10 +1,10 @@ -package com.minelittlepony.client.render.layer; +package com.minelittlepony.client.render.entity.feature; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.entity.mob.AbstractSkeletonEntity; import net.minecraft.util.Identifier; -import com.minelittlepony.client.model.entities.ModelSkeletonPony; +import com.minelittlepony.client.model.entity.ModelSkeletonPony; public class LayerPonyStrayOverlay extends LayerOverlayBase> { diff --git a/src/main/java/com/minelittlepony/client/model/entities/package-info.java b/src/main/java/com/minelittlepony/client/render/entity/feature/package-info.java similarity index 60% rename from src/main/java/com/minelittlepony/client/model/entities/package-info.java rename to src/main/java/com/minelittlepony/client/render/entity/feature/package-info.java index a1c17c0d..72de15a1 100644 --- a/src/main/java/com/minelittlepony/client/model/entities/package-info.java +++ b/src/main/java/com/minelittlepony/client/render/entity/feature/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.minelittlepony.client.model.entities; +package com.minelittlepony.client.render.entity.feature; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/model/races/package-info.java b/src/main/java/com/minelittlepony/client/render/entity/package-info.java similarity index 63% rename from src/main/java/com/minelittlepony/client/model/races/package-info.java rename to src/main/java/com/minelittlepony/client/render/entity/package-info.java index a2757385..11643dfa 100644 --- a/src/main/java/com/minelittlepony/client/model/races/package-info.java +++ b/src/main/java/com/minelittlepony/client/render/entity/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.minelittlepony.client.model.races; +package com.minelittlepony.client.render.entity; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/villager/AbstractVillagerRenderer.java similarity index 92% rename from src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java rename to src/main/java/com/minelittlepony/client/render/entity/villager/AbstractVillagerRenderer.java index f9669445..7723b02a 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/villager/AbstractVillagerRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/villager/AbstractVillagerRenderer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities.villager; +package com.minelittlepony.client.render.entity.villager; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.entity.EntityRenderDispatcher; @@ -9,8 +9,8 @@ import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; import com.minelittlepony.client.model.ClientPonyModel; -import com.minelittlepony.client.render.entities.RenderPonyMob; -import com.minelittlepony.client.render.layer.LayerGear; +import com.minelittlepony.client.render.entity.RenderPonyMob; +import com.minelittlepony.client.render.entity.feature.LayerGear; import com.minelittlepony.model.IUnicorn; import com.minelittlepony.model.gear.IGear; import com.minelittlepony.util.resources.ITextureSupplier; diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java b/src/main/java/com/minelittlepony/client/render/entity/villager/ClothingLayer.java similarity index 97% rename from src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java rename to src/main/java/com/minelittlepony/client/render/entity/villager/ClothingLayer.java index 0df56822..d77fcc10 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/villager/ClothingLayer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/villager/ClothingLayer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities.villager; +package com.minelittlepony.client.render.entity.villager; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.entity.feature.FeatureRendererContext; diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/PonyTextures.java b/src/main/java/com/minelittlepony/client/render/entity/villager/PonyTextures.java similarity index 98% rename from src/main/java/com/minelittlepony/client/render/entities/villager/PonyTextures.java rename to src/main/java/com/minelittlepony/client/render/entity/villager/PonyTextures.java index 572e5c76..33451ea5 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/villager/PonyTextures.java +++ b/src/main/java/com/minelittlepony/client/render/entity/villager/PonyTextures.java @@ -1,4 +1,4 @@ -package com.minelittlepony.client.render.entities.villager; +package com.minelittlepony.client.render.entity.villager; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java b/src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyVillager.java similarity index 89% rename from src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java rename to src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyVillager.java index 6df3f1d6..924ad46b 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyVillager.java @@ -1,6 +1,6 @@ -package com.minelittlepony.client.render.entities.villager; +package com.minelittlepony.client.render.entity.villager; -import com.minelittlepony.client.model.entities.ModelVillagerPony; +import com.minelittlepony.client.model.entity.ModelVillagerPony; import com.minelittlepony.util.resources.ITextureSupplier; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; diff --git a/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java b/src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyZombieVillager.java similarity index 89% rename from src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java rename to src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyZombieVillager.java index e7f4f460..d8cf1298 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/villager/RenderPonyZombieVillager.java +++ b/src/main/java/com/minelittlepony/client/render/entity/villager/RenderPonyZombieVillager.java @@ -1,6 +1,6 @@ -package com.minelittlepony.client.render.entities.villager; +package com.minelittlepony.client.render.entity.villager; -import com.minelittlepony.client.model.entities.ModelZombieVillagerPony; +import com.minelittlepony.client.model.entity.ModelZombieVillagerPony; import com.minelittlepony.util.resources.ITextureSupplier; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; diff --git a/src/main/java/com/minelittlepony/client/render/layer/package-info.java b/src/main/java/com/minelittlepony/client/render/layer/package-info.java deleted file mode 100644 index 3d952696..00000000 --- a/src/main/java/com/minelittlepony/client/render/layer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ParametersAreNonnullByDefault -package com.minelittlepony.client.render.layer; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/package-info.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/package-info.java deleted file mode 100644 index 15070b06..00000000 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@ParametersAreNonnullByDefault -package com.minelittlepony.client.render.tileentities.skull; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java b/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java index de8ff380..e77b2305 100644 --- a/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java +++ b/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java @@ -3,7 +3,7 @@ package com.minelittlepony.client.settings; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; -import com.minelittlepony.client.render.entities.MobRenderers; +import com.minelittlepony.client.render.entity.MobRenderers; import com.minelittlepony.common.client.gui.VisibilityMode; import com.minelittlepony.common.util.settings.Setting; import com.minelittlepony.settings.PonyConfig; diff --git a/src/main/java/com/minelittlepony/client/util/render/Color.java b/src/main/java/com/minelittlepony/client/util/render/Color.java index 1e671e7a..72febcf2 100644 --- a/src/main/java/com/minelittlepony/client/util/render/Color.java +++ b/src/main/java/com/minelittlepony/client/util/render/Color.java @@ -1,9 +1,5 @@ package com.minelittlepony.client.util.render; -import org.lwjgl.opengl.GL14; - -import com.mojang.blaze3d.platform.GlStateManager; - /** * Colouration Utilities */ @@ -57,42 +53,4 @@ public interface Color { static int abgrToArgb(int color) { return argbToHex(a(color), b(color), g(color), r(color)); } - - /** - * Applies a GLTint based on the given colour hex code. - * - * @param hex The colour to apply - */ - static void glColor(int hex) { - glColor(hex, a(hex)); - } - - /** - * Applies a GLTint based on the given colour hex code. - * - * @param hex The colour to apply - * @param alpha The opacity to use - */ - static void glColor(int hex, float alpha) { - GlStateManager.color4f(r(hex), g(hex), b(hex), alpha); - } - - /** - * Applies a GLBlendTint based on the given colour hex code. - * - * @param hex The colour to apply - */ - static void glBlendColour(int hex) { - glBlendColour(hex, a(hex)); - } - - /** - * Applies a GLBlendTint based on the given colour hex code. - * - * @param hex The colour to apply - * @param alpha The opacity to use - */ - static void glBlendColour(int hex, float alpha) { - GL14.glBlendColor(r(hex), g(hex), b(hex), alpha); - } }