diff --git a/build.gradle b/build.gradle index 85820a93..cedaecfc 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { modApi "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+" modApi "net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.0+" - modCompile "com.minelittlepony:Kirin:${project.kirin_version}" + modApi "com.minelittlepony:Kirin:${project.kirin_version}" include "com.minelittlepony:Kirin:${project.kirin_version}" modImplementation "com.minelittlepony:HDSkins:${project.hd_skins_version}" diff --git a/gradle.properties b/gradle.properties index 3eb07bec..3a22d83a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ org.gradle.daemon=false # Dependencies fabric_version=0.3.0+ - kirin_version=1.14.3-1.3.0-SNAPSHOT + kirin_version=1.14.3-1.3.1-SNAPSHOT hd_skins_version=1.14.3-5.3-SNAPSHOT diff --git a/src/main/java/com/minelittlepony/MineLittlePony.java b/src/main/java/com/minelittlepony/MineLittlePony.java deleted file mode 100644 index 1e58f5eb..00000000 --- a/src/main/java/com/minelittlepony/MineLittlePony.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.minelittlepony; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.minelittlepony.pony.IPonyManager; -import com.minelittlepony.settings.PonyConfig; - -public abstract class MineLittlePony { - - private static MineLittlePony instance; - - public static final Logger logger = LogManager.getLogger("MineLittlePony"); - - public static final String MOD_NAME = "Mine Little Pony"; - public static final String MOD_VERSION = "@VERSION@"; - - protected MineLittlePony() { - instance = this; - } - - /** - * Gets the global MineLP instance. - */ - public static MineLittlePony getInstance() { - return instance; - } - - /** - * Gets the global MineLP client configuration. - */ - public abstract PonyConfig getConfig(); - - /** - * Gets the static pony manager instance. - */ - public abstract IPonyManager getManager(); - - /** - * Gets the global revision number, used for reloading models on demand. - */ - public abstract int getModelRevisionNumber(); -} - diff --git a/src/main/java/com/minelittlepony/MissingRendererException.java b/src/main/java/com/minelittlepony/MissingRendererException.java deleted file mode 100644 index 4ae09414..00000000 --- a/src/main/java/com/minelittlepony/MissingRendererException.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.minelittlepony; - -public class MissingRendererException extends RuntimeException { - private static final long serialVersionUID = -6059469512902628663L; - - public MissingRendererException(Class cl) { - super("Could not find a renderer for " + cl.getName() + ". This is a bug."); - } -} diff --git a/src/main/java/com/minelittlepony/client/ClientReadyCallback.java b/src/main/java/com/minelittlepony/client/ClientReadyCallback.java deleted file mode 100644 index 9ac40675..00000000 --- a/src/main/java/com/minelittlepony/client/ClientReadyCallback.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.minelittlepony.client; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.fabricmc.fabric.api.event.client.ClientTickCallback; -import net.minecraft.client.MinecraftClient; - -public interface ClientReadyCallback { - - Event EVENT = EventFactory.createArrayBacked(ClientReadyCallback.class, listeners -> client -> { - for (ClientReadyCallback event : listeners) { - event.onClientPostInit(client); - } - }); - - void onClientPostInit(MinecraftClient client); - - class Handler implements ClientTickCallback { - - private static Handler instance; - - private boolean firstTick = true; - - private Handler() {} - - public static void register() { - // make sure to only register once - if (instance == null) { - instance = new Handler(); - ClientTickCallback.EVENT.register(instance); - } - } - - @Override - public void tick(MinecraftClient client) { - if (firstTick) { - ClientReadyCallback.EVENT.invoker().onClientPostInit(client); - firstTick = false; - } - - } - } -} diff --git a/src/main/java/com/minelittlepony/client/FabMod.java b/src/main/java/com/minelittlepony/client/FabMod.java deleted file mode 100644 index a38423ff..00000000 --- a/src/main/java/com/minelittlepony/client/FabMod.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.minelittlepony.client; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.event.client.ClientTickCallback; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.util.Identifier; - -import com.minelittlepony.client.gui.GuiPonySettings; -import com.minelittlepony.client.hdskins.IndirectHDSkins; -import com.minelittlepony.common.client.gui.element.Button; -import com.minelittlepony.common.client.gui.sprite.TextureSprite; -import com.minelittlepony.common.client.gui.style.Style; -import com.minelittlepony.common.event.ScreenInitCallback; - -public class FabMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - MineLPClient mlp = new MineLPClient(); - ClientReadyCallback.Handler.register(); - ClientTickCallback.EVENT.register(mlp::onTick); - ClientReadyCallback.EVENT.register(mlp::postInit); - ScreenInitCallback.EVENT.register(this::onScreenInit); - - if (FabricLoader.getInstance().isModLoaded("hdskins")) { - IndirectHDSkins.initialize(); - } - } - - private void onScreenInit(Screen screen, ScreenInitCallback.ButtonList buttons) { - if (screen instanceof TitleScreen) { - int y = FabricLoader.getInstance().isModLoaded("hdskins") ? 80 : 50; - - buttons.add(new Button(screen.width - 50, screen.height - y, 20, 20).onClick(sender -> { - MinecraftClient.getInstance().openScreen(new GuiPonySettings()); - }).setStyle(new Style() - .setIcon(new TextureSprite() - .setPosition(2, 2) - .setTexture(new Identifier("minelittlepony", "textures/gui/pony.png")) - .setTextureSize(16, 16) - .setSize(16, 16)) - )); - } - } -} diff --git a/src/main/java/com/minelittlepony/client/MineLPClient.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java similarity index 65% rename from src/main/java/com/minelittlepony/client/MineLPClient.java rename to src/main/java/com/minelittlepony/client/MineLittlePony.java index ccb3e2c9..705a5993 100644 --- a/src/main/java/com/minelittlepony/client/MineLPClient.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -1,18 +1,25 @@ package com.minelittlepony.client; -import com.minelittlepony.MineLittlePony; 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.settings.ClientPonyConfig; +import com.minelittlepony.common.client.gui.element.Button; +import com.minelittlepony.common.client.gui.sprite.TextureSprite; +import com.minelittlepony.common.event.ClientReadyCallback; +import com.minelittlepony.common.event.ScreenInitCallback; import com.minelittlepony.common.event.SkinFilterCallback; import com.minelittlepony.common.util.GamePaths; import com.minelittlepony.settings.JsonConfig; -import com.minelittlepony.settings.PonyConfig; +import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding; import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry; +import net.fabricmc.fabric.api.event.client.ClientTickCallback; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.render.entity.EntityRenderDispatcher; @@ -24,42 +31,58 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.SystemUtil; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.minelittlepony.settings.PonyConfig; import org.lwjgl.glfw.GLFW; -/** - * Static MineLittlePony singleton class. Everything's controlled from up here. - */ -public class MineLPClient extends MineLittlePony { +public abstract class MineLittlePony implements ClientModInitializer { + + private static MineLittlePony instance; + + public static final Logger logger = LogManager.getLogger("MineLittlePony"); private static int modelUpdateCounter = 0; private static boolean reloadingModels = false; - + private final PonyRenderManager renderManager = PonyRenderManager.getInstance(); private PonyConfig config; private PonyManager ponyManager; - - private final PonyRenderManager renderManager = PonyRenderManager.getInstance(); - private FabricKeyBinding keyBinding; - public static MineLPClient getInstance() { - return (MineLPClient)MineLittlePony.getInstance(); + public MineLittlePony() { + instance = this; } - public MineLPClient() { - config = JsonConfig.of(GamePaths.getConfigDirectory().resolve("minelp.json"), this::createConfig); - ponyManager = new PonyManager(config); + /** + * Gets the global MineLP instance. + */ + public static MineLittlePony getInstance() { + return instance; + } + @Override + public void onInitializeClient() { + config = JsonConfig.of(GamePaths.getConfigDirectory().resolve("minelp.json"), ClientPonyConfig::new); + ponyManager = new PonyManager(config); keyBinding = FabricKeyBinding.Builder.create(new Identifier("minelittlepony", "settings"), InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_F9, "key.categories.misc").build(); + KeyBindingRegistry.INSTANCE.register(keyBinding); ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(ponyManager); // convert legacy pony skins SkinFilterCallback.EVENT.register(new LegacySkinConverter()); - } - protected ClientPonyConfig createConfig() { - return new ClientPonyConfig(); + // general events + ClientReadyCallback.Handler.register(); + ClientTickCallback.EVENT.register(this::onTick); + ClientReadyCallback.EVENT.register(this::postInit); + ScreenInitCallback.EVENT.register(this::onScreenInit); + + if (FabricLoader.getInstance().isModLoaded("hdskins")) { + IndirectHDSkins.initialize(); + } } /** @@ -106,22 +129,35 @@ public class MineLPClient extends MineLittlePony { PonySkullRenderer.resolve(); } - @Override - public PonyManager getManager() { - return ponyManager; - } + private void onScreenInit(Screen screen, ScreenInitCallback.ButtonList buttons) { + if (screen instanceof TitleScreen) { + int y = FabricLoader.getInstance().isModLoaded("hdskins") ? 80 : 50; - @Override - public int getModelRevisionNumber() { - return modelUpdateCounter; + buttons.add(new Button(screen.width - 50, screen.height - y, 20, 20).onClick(sender -> { + MinecraftClient.getInstance().openScreen(new GuiPonySettings()); + }).setStyle(new com.minelittlepony.common.client.gui.style.Style() + .setIcon(new TextureSprite() + .setPosition(2, 2) + .setTexture(new Identifier("minelittlepony", "textures/gui/pony.png")) + .setTextureSize(16, 16) + .setSize(16, 16)) + )); + } } /** * Gets the global MineLP client configuration. */ - @Override public PonyConfig getConfig() { return config; } + public PonyManager getManager() { + return ponyManager; + } + + public int getModelRevisionNumber() { + return modelUpdateCounter; + } } + diff --git a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java index 334d5865..8dfdf2c7 100644 --- a/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java @@ -1,11 +1,10 @@ package com.minelittlepony.client.gui; -import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.LiteralText; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.render.entities.MobRenderers; import com.minelittlepony.common.client.gui.GameGui; import com.minelittlepony.common.client.gui.ScrollContainer; @@ -18,8 +17,6 @@ import com.minelittlepony.settings.PonyConfig; import com.minelittlepony.settings.PonyLevel; import com.minelittlepony.settings.PonySettings; -import java.util.List; - /** * In-Game options menu. * diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java index cb219158..62dbb2ee 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java @@ -1,11 +1,11 @@ package com.minelittlepony.client.hdskins; -import com.minelittlepony.MineLittlePony; -import com.minelittlepony.client.ClientReadyCallback; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.client.hdskins.gui.DummyPony; import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP; import com.minelittlepony.client.hdskins.gui.RenderDummyPony; +import com.minelittlepony.common.event.ClientReadyCallback; import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java index 62341de6..c2c460f3 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/GuiSkinsMineLP.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.hdskins.gui; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.common.client.gui.element.IconicToggle; import com.minelittlepony.common.client.gui.style.Style; import com.minelittlepony.hdskins.dummy.PlayerPreview; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java index bbeaea44..f546033e 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.hdskins.gui; import net.minecraft.util.Identifier; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.pony.Pony; import com.minelittlepony.hdskins.dummy.DummyPlayer; import com.minelittlepony.hdskins.dummy.PlayerPreview; diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java index 11cc48e2..f3390c03 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.hdskins.gui; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.model.races.PlayerModels; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java index 31daf3c3..b9480f06 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinCamera.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.IPony; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java index 06faafd1..ea6af857 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinClientPlayerEntity.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.mixin; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.IPony; import com.mojang.authlib.GameProfile; import net.minecraft.client.network.AbstractClientPlayerEntity; diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java index 26cb0007..99fa07e5 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultPlayerSkin.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.mixin; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.races.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 8baf6d7d..2a0af6a9 100644 --- a/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java +++ b/src/main/java/com/minelittlepony/client/mixin/MixinEntityRenderDispatcher.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.mixin; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.races.PlayerModels; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/src/main/java/com/minelittlepony/client/model/ModelWrapper.java b/src/main/java/com/minelittlepony/client/model/ModelWrapper.java index c876ae31..17a5365b 100644 --- a/src/main/java/com/minelittlepony/client/model/ModelWrapper.java +++ b/src/main/java/com/minelittlepony/client/model/ModelWrapper.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.model; import net.minecraft.entity.LivingEntity; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.model.IModel; import com.minelittlepony.model.armour.IArmour; import com.minelittlepony.model.armour.IEquestrianArmour; diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java index d2b1082f..5f96ce8d 100644 --- a/src/main/java/com/minelittlepony/client/pony/Pony.java +++ b/src/main/java/com/minelittlepony/client/pony/Pony.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.pony; import com.google.common.base.MoreObjects; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.client.render.IPonyRender; import com.minelittlepony.client.transform.PonyTransformation; diff --git a/src/main/java/com/minelittlepony/client/pony/PonyManager.java b/src/main/java/com/minelittlepony/client/pony/PonyManager.java index f1a00223..cc55f8b3 100644 --- a/src/main/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/main/java/com/minelittlepony/client/pony/PonyManager.java @@ -6,7 +6,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.JsonParseException; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.common.util.MoreStreams; import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.IPonyManager; diff --git a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java index 7d912406..c5e0fac6 100644 --- a/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/LevitatingItemRenderer.java @@ -2,7 +2,7 @@ package com.minelittlepony.client.render; import org.lwjgl.opengl.GL14; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.util.render.Color; import com.minelittlepony.pony.IPony; import com.minelittlepony.settings.PonySettings; diff --git a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java index 26ae6cc3..cc0ea742 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.entities; import com.google.common.collect.Lists; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.PonyRenderManager; import com.minelittlepony.settings.Config; import com.minelittlepony.settings.Config.Setting; diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java index a5f4712d..d98762b8 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java +++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyMob.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.render.entities; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.model.IPonyModel; import com.minelittlepony.client.model.ModelWrapper; diff --git a/src/main/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java b/src/main/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java index fddba3a0..7b9ecd31 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java +++ b/src/main/java/com/minelittlepony/client/render/entities/VillagerProfessionTextureCache.java @@ -8,7 +8,7 @@ import net.minecraft.village.VillagerDataContainer; import net.minecraft.village.VillagerProfession; import net.minecraft.village.VillagerType; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.util.resources.ITextureSupplier; import java.util.HashMap; diff --git a/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java b/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java index fee44fef..9ce88557 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java +++ b/src/main/java/com/minelittlepony/client/render/entities/player/RenderPonyPlayer.java @@ -1,6 +1,6 @@ package com.minelittlepony.client.render.entities.player; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.model.ClientPonyModel; import com.minelittlepony.client.model.ModelWrapper; import com.minelittlepony.client.render.DebugBoundingBoxRenderer; diff --git a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java index 1849ae7d..88592738 100644 --- a/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/tileentities/skull/PonySkullRenderer.java @@ -1,7 +1,7 @@ package com.minelittlepony.client.render.tileentities.skull; import com.google.common.collect.Maps; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.render.LevitatingItemRenderer; import com.minelittlepony.pony.IPony; import com.minelittlepony.settings.PonyConfig; diff --git a/src/main/java/com/minelittlepony/pony/IPony.java b/src/main/java/com/minelittlepony/pony/IPony.java index 8f2c0aee..7ab4dad7 100644 --- a/src/main/java/com/minelittlepony/pony/IPony.java +++ b/src/main/java/com/minelittlepony/pony/IPony.java @@ -6,7 +6,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.meta.Race; public interface IPony { diff --git a/src/main/java/com/minelittlepony/pony/meta/Race.java b/src/main/java/com/minelittlepony/pony/meta/Race.java index 052cd89d..feeca3d3 100644 --- a/src/main/java/com/minelittlepony/pony/meta/Race.java +++ b/src/main/java/com/minelittlepony/pony/meta/Race.java @@ -1,6 +1,6 @@ package com.minelittlepony.pony.meta; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.ITriggerPixelMapped; import com.minelittlepony.settings.PonyLevel; diff --git a/src/main/java/com/minelittlepony/pony/meta/Size.java b/src/main/java/com/minelittlepony/pony/meta/Size.java index e792b2c9..7704582e 100644 --- a/src/main/java/com/minelittlepony/pony/meta/Size.java +++ b/src/main/java/com/minelittlepony/pony/meta/Size.java @@ -1,6 +1,6 @@ package com.minelittlepony.pony.meta; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.pony.ITriggerPixelMapped; import com.minelittlepony.settings.PonySettings; diff --git a/src/main/java/com/minelittlepony/settings/PonySettings.java b/src/main/java/com/minelittlepony/settings/PonySettings.java index a41fedd0..3c8f3e67 100644 --- a/src/main/java/com/minelittlepony/settings/PonySettings.java +++ b/src/main/java/com/minelittlepony/settings/PonySettings.java @@ -1,6 +1,6 @@ package com.minelittlepony.settings; -import com.minelittlepony.MineLittlePony; +import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.settings.Config.Setting; /** diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 610ef9d9..476b8f55 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ "environment": "client", "entrypoints": { "client": [ - "com.minelittlepony.client.FabMod" + "com.minelittlepony.client.MineLittlePony" ], "modmenu": [ "com.minelittlepony.client.modmenu.MineLPModMenuFactory"