From e02608d306284af0a400cbb0d18dbb22daa2c3b3 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 11 Apr 2023 16:40:14 +0200
Subject: [PATCH] More compatibility fixes

---
 src/main/java/com/minelittlepony/api/model/IModel.java        | 2 +-
 src/main/java/com/minelittlepony/api/pony/IPony.java          | 2 +-
 src/main/java/com/minelittlepony/api/pony/meta/Sizes.java     | 2 +-
 src/main/java/com/minelittlepony/client/MineLittlePony.java   | 2 +-
 .../minelittlepony/client/mixin/MixinDefaultSkinHelper.java   | 2 +-
 .../client/model/armour/DefaultArmourTextureResolver.java     | 2 +-
 src/main/java/com/minelittlepony/client/pony/PonyManager.java | 4 ++--
 .../client/render/blockentity/skull/MobSkull.java             | 2 +-
 .../client/render/blockentity/skull/PlayerPonySkull.java      | 4 ++--
 .../client/render/blockentity/skull/PonySkullRenderer.java    | 2 +-
 .../com/minelittlepony/client/settings/ClientPonyConfig.java  | 2 +-
 .../minelittlepony/{api/config => settings}/PonyConfig.java   | 2 +-
 .../minelittlepony/{api/config => settings}/PonyLevel.java    | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)
 rename src/main/java/com/minelittlepony/{api/config => settings}/PonyConfig.java (99%)
 rename src/main/java/com/minelittlepony/{api/config => settings}/PonyLevel.java (87%)

diff --git a/src/main/java/com/minelittlepony/api/model/IModel.java b/src/main/java/com/minelittlepony/api/model/IModel.java
index 6a748c87..b0fef7a7 100644
--- a/src/main/java/com/minelittlepony/api/model/IModel.java
+++ b/src/main/java/com/minelittlepony/api/model/IModel.java
@@ -3,9 +3,9 @@ package com.minelittlepony.api.model;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.MathHelper;
 
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.pony.IPonyData;
 import com.minelittlepony.api.pony.meta.*;
+import com.minelittlepony.settings.PonyConfig;
 
 public interface IModel {
     /**
diff --git a/src/main/java/com/minelittlepony/api/pony/IPony.java b/src/main/java/com/minelittlepony/api/pony/IPony.java
index 0ea98043..eec33193 100644
--- a/src/main/java/com/minelittlepony/api/pony/IPony.java
+++ b/src/main/java/com/minelittlepony/api/pony/IPony.java
@@ -5,9 +5,9 @@ import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.ComparisonChain;
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.pony.meta.Race;
 import com.minelittlepony.api.pony.meta.Size;
+import com.minelittlepony.settings.PonyConfig;
 
 public interface IPony extends Comparable<IPony> {
     /**
diff --git a/src/main/java/com/minelittlepony/api/pony/meta/Sizes.java b/src/main/java/com/minelittlepony/api/pony/meta/Sizes.java
index e286444f..50aa5ed4 100644
--- a/src/main/java/com/minelittlepony/api/pony/meta/Sizes.java
+++ b/src/main/java/com/minelittlepony/api/pony/meta/Sizes.java
@@ -1,6 +1,6 @@
 package com.minelittlepony.api.pony.meta;
 
-import com.minelittlepony.api.config.PonyConfig;
+import com.minelittlepony.settings.PonyConfig;
 
 /**
  * Represents the different model sizes that are possible.
diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java
index a0c47ec1..2fbe6f6a 100644
--- a/src/main/java/com/minelittlepony/client/MineLittlePony.java
+++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java
@@ -1,6 +1,5 @@
 package com.minelittlepony.client;
 
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.pony.IPonyManager;
 import com.minelittlepony.api.pony.network.fabric.Channel;
 import com.minelittlepony.client.model.ModelType;
@@ -15,6 +14,7 @@ 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.PonyConfig;
 
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
diff --git a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java
index 5cb4758f..08e9bff7 100644
--- a/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java
+++ b/src/main/java/com/minelittlepony/client/mixin/MixinDefaultSkinHelper.java
@@ -1,9 +1,9 @@
 package com.minelittlepony.client.mixin;
 
-import com.minelittlepony.api.config.PonyLevel;
 import com.minelittlepony.api.pony.DefaultPonySkinHelper;
 import com.minelittlepony.api.pony.IPony;
 import com.minelittlepony.client.MineLittlePony;
+import com.minelittlepony.settings.PonyLevel;
 
 import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java b/src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java
index f89e9540..117459e9 100644
--- a/src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java
+++ b/src/main/java/com/minelittlepony/client/model/armour/DefaultArmourTextureResolver.java
@@ -12,10 +12,10 @@ import net.minecraft.util.Identifier;
 import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.model.armour.ArmourLayer;
 import com.minelittlepony.api.model.armour.ArmourVariant;
 import com.minelittlepony.api.model.armour.IArmourTextureResolver;
+import com.minelittlepony.settings.PonyConfig;
 import com.minelittlepony.util.ResourceUtil;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/com/minelittlepony/client/pony/PonyManager.java b/src/main/java/com/minelittlepony/client/pony/PonyManager.java
index e9d86b30..ab0bb259 100644
--- a/src/main/java/com/minelittlepony/client/pony/PonyManager.java
+++ b/src/main/java/com/minelittlepony/client/pony/PonyManager.java
@@ -1,13 +1,13 @@
 package com.minelittlepony.client.pony;
 
 import com.google.common.cache.*;
-import com.minelittlepony.api.config.PonyConfig;
-import com.minelittlepony.api.config.PonyLevel;
 import com.minelittlepony.api.pony.IPony;
 import com.minelittlepony.api.pony.IPonyManager;
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.render.PonyRenderDispatcher;
 import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer;
+import com.minelittlepony.settings.PonyConfig;
+import com.minelittlepony.settings.PonyLevel;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java
index dd21b0aa..6f02574e 100644
--- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java
+++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/MobSkull.java
@@ -1,12 +1,12 @@
 package com.minelittlepony.client.render.blockentity.skull;
 
 import com.google.common.base.Suppliers;
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.pony.IPony;
 import com.minelittlepony.client.model.AbstractPonyModel;
 import com.minelittlepony.client.render.MobRenderers;
 import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull;
 import com.minelittlepony.mson.api.ModelKey;
+import com.minelittlepony.settings.PonyConfig;
 import com.mojang.authlib.GameProfile;
 
 import java.util.function.Supplier;
diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java
index 693b4315..8ec75e51 100644
--- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java
+++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PlayerPonySkull.java
@@ -1,12 +1,12 @@
 package com.minelittlepony.client.render.blockentity.skull;
 
-import com.minelittlepony.api.config.PonyConfig;
-import com.minelittlepony.api.config.PonyLevel;
 import com.minelittlepony.api.pony.IPony;
 import com.minelittlepony.api.pony.meta.Race;
 import com.minelittlepony.client.SkinsProxy;
 import com.minelittlepony.client.model.*;
 import com.minelittlepony.client.render.blockentity.skull.PonySkullRenderer.ISkull;
+import com.minelittlepony.settings.PonyConfig;
+import com.minelittlepony.settings.PonyLevel;
 import com.mojang.authlib.GameProfile;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java
index 91f03ce2..9feb374e 100644
--- a/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/blockentity/skull/PonySkullRenderer.java
@@ -1,13 +1,13 @@
 package com.minelittlepony.client.render.blockentity.skull;
 
 import com.google.common.collect.Maps;
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.api.pony.IPony;
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.model.ModelType;
 import com.minelittlepony.client.render.MobRenderers;
 import com.minelittlepony.client.render.entity.SkeleponyRenderer;
 import com.minelittlepony.client.render.entity.ZomponyRenderer;
+import com.minelittlepony.settings.PonyConfig;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.block.SkullBlock;
diff --git a/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java b/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java
index 47a833f5..dff29032 100644
--- a/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java
+++ b/src/main/java/com/minelittlepony/client/settings/ClientPonyConfig.java
@@ -3,11 +3,11 @@ package com.minelittlepony.client.settings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
 
-import com.minelittlepony.api.config.PonyConfig;
 import com.minelittlepony.client.model.armour.DefaultArmourTextureResolver;
 import com.minelittlepony.client.render.MobRenderers;
 import com.minelittlepony.common.client.gui.VisibilityMode;
 import com.minelittlepony.common.util.settings.Setting;
+import com.minelittlepony.settings.PonyConfig;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/com/minelittlepony/api/config/PonyConfig.java b/src/main/java/com/minelittlepony/settings/PonyConfig.java
similarity index 99%
rename from src/main/java/com/minelittlepony/api/config/PonyConfig.java
rename to src/main/java/com/minelittlepony/settings/PonyConfig.java
index 1dd18610..7ee34307 100644
--- a/src/main/java/com/minelittlepony/api/config/PonyConfig.java
+++ b/src/main/java/com/minelittlepony/settings/PonyConfig.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.api.config;
+package com.minelittlepony.settings;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/src/main/java/com/minelittlepony/api/config/PonyLevel.java b/src/main/java/com/minelittlepony/settings/PonyLevel.java
similarity index 87%
rename from src/main/java/com/minelittlepony/api/config/PonyLevel.java
rename to src/main/java/com/minelittlepony/settings/PonyLevel.java
index 9bcb3fe7..ff50392e 100644
--- a/src/main/java/com/minelittlepony/api/config/PonyLevel.java
+++ b/src/main/java/com/minelittlepony/settings/PonyLevel.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.api.config;
+package com.minelittlepony.settings;
 
 public enum PonyLevel {
     PONIES,