Merge branch 'v1-rewrite'

79 files changed, 2802 insertions, 2844 deletions

diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java b/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java
deleted file mode 100644
index 8d56a35..0000000
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/ActiveCITs.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package shcm.shsupercm.fabric.citresewn;
-
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.ArmorItem;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.util.Hand;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.World;
-import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
-import shcm.shsupercm.fabric.citresewn.pack.CITPack;
-import shcm.shsupercm.fabric.citresewn.pack.cits.*;
-
-import java.util.*;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-public class ActiveCITs {
-    public final List<CITPack> packs;
-    public final CITPack effectiveGlobalProperties = new CITPack(null);
-
-    public final List<CIT> cits;
-
-    public final Map<Item, List<CITItem>> citItems = new HashMap<>();
-    public final Map<ArmorItem, List<CITArmor>> citArmor = new HashMap<>();
-    public final List<CITElytra> citElytra = new ArrayList<>();
-    public final List<List<CITEnchantment>> citEnchantments = new ArrayList<>();
-
-
-    public ActiveCITs(List<CITPack> packs, List<CIT> cits) {
-        this.packs = packs;
-        this.cits = cits;
-
-        for (CITPack pack : packs)
-            effectiveGlobalProperties.loadGlobalProperties(pack);
-        for (CITPack pack : packs)
-            pack.loadGlobalProperties(effectiveGlobalProperties);
-
-        Map<Integer, List<CITEnchantment>> citEnchantmentLayers = new TreeMap<>(); // order citEnchantments by layers
-
-        for (CIT cit : cits.stream().sorted(Comparator.<CIT>comparingInt(cit -> cit.weight).reversed().thenComparing(cit -> cit.propertiesIdentifier.toString())).collect(Collectors.toList())) {
-            if (cit instanceof CITItem item)
-                for (Item type : item.items)
-                    citItems.computeIfAbsent(type, t -> new ArrayList<>()).add(item);
-            else if (cit instanceof CITArmor armor)
-                for (Item type : armor.items)
-                    if (type instanceof ArmorItem armorType)
-                        citArmor.computeIfAbsent(armorType, t -> new ArrayList<>()).add(armor);
-                    else
-                        CITResewn.logErrorLoading("Ignoring item type: " + Registry.ITEM.getId(type) + " is not armor in " + cit.pack.resourcePack.getName() + " -> " + cit.propertiesIdentifier.toString());
-            else if (cit instanceof CITElytra elytra)
-                citElytra.add(elytra);
-            else if (cit instanceof CITEnchantment enchantment)
-                citEnchantmentLayers.computeIfAbsent(enchantment.layer, l -> new ArrayList<>()).add(enchantment);
-        }
-
-        for (List<CITEnchantment> layer : citEnchantmentLayers.values()) {
-            for (CITEnchantment enchantment : layer)
-                enchantment.activate();
-            citEnchantments.add(layer);
-        }
-    }
-
-    public void dispose() {
-        for (CIT cit : cits)
-            cit.dispose();
-        cits.clear();
-        citItems.clear();
-        citArmor.clear();
-        citElytra.clear();
-        citEnchantments.clear();
-    }
-
-    public CITItem getCITItem(ItemStack stack, World world, LivingEntity entity) {
-        Hand hand = entity != null && stack == entity.getOffHandStack() ? Hand.OFF_HAND : Hand.MAIN_HAND;
-
-        ((CITItem.Cached) (Object) stack).citresewn_setMojankCIT(false);
-
-        List<CITItem> citItems = this.citItems.get(stack.getItem());
-        if (citItems != null)
-            for (CITItem citItem : citItems)
-                if (citItem.test(stack, hand, world, entity, true)) {
-                    if (stack.isOf(Items.TRIDENT) || stack.isOf(Items.SPYGLASS))
-                        ((CITItem.Cached) (Object) stack).citresewn_setMojankCIT(true);
-                    return citItem;
-                }
-        return null;
-    }
-
-    public CITElytra getCITElytra(ItemStack stack, World world, LivingEntity livingEntity) {
-        for (CITElytra citElytra : citElytra)
-            if (citElytra.test(stack, Hand.MAIN_HAND, world, livingEntity, true))
-                return citElytra;
-        return null;
-    }
-
-    public CITArmor getCITArmor(ItemStack stack, World world, LivingEntity livingEntity) {
-        Item item = stack.getItem();
-        if (item instanceof ArmorItem) {
-            List<CITArmor> citArmor = this.citArmor.get(item);
-            if (citArmor != null)
-                for (CITArmor armor : citArmor)
-                    if (armor.test(stack, null, world, livingEntity, true))
-                        return armor;
-        }
-        return null;
-    }
-
-    public List<CITEnchantment> getCITEnchantment(ItemStack stack, World world, LivingEntity livingEntity) {
-        Hand hand = livingEntity != null && stack == livingEntity.getOffHandStack() ? Hand.OFF_HAND : Hand.MAIN_HAND;
-
-        List<CITEnchantment> applied = new ArrayList<>();
-
-        for (List<CITEnchantment> layer : this.citEnchantments)
-            for (CITEnchantment cit : layer)
-                if (cit.test(stack, hand, world, livingEntity, false)) {
-                    applied.add(cit);
-                    break;
-                }
-
-        return applied;
-    }
-
-    public BakedModel getItemModelCached(ItemStack stack, World world, LivingEntity entity, int seed) {
-        BakedModel bakedModel = null;
-
-        Supplier<CITItem> realtime = () -> getCITItem(stack, world, entity);
-
-        //noinspection ConstantConditions
-        CITItem citItem = CITResewnConfig.INSTANCE().cache_ms == 0 ? realtime.get() : ((CITItem.Cached) (Object) stack).citresewn_getCachedCITItem(realtime);
-
-        if (citItem != null)
-            bakedModel = citItem.getItemModel(stack, (ClientWorld) world, entity, seed);
-
-        return bakedModel;
-    }
-
-    public Identifier getElytraTextureCached(ItemStack stack, World world, LivingEntity livingEntity) {
-        Supplier<CITElytra> realtime = () -> getCITElytra(stack, world, livingEntity);
-
-        //noinspection ConstantConditions
-        CITElytra citElytra = CITResewnConfig.INSTANCE().cache_ms == 0 ? realtime.get() : ((CITElytra.Cached) (Object) stack).citresewn_getCachedCITElytra(realtime);
-
-        if (citElytra != null)
-            return citElytra.textureIdentifier;
-
-        return null;
-    }
-
-    public Map<String, Identifier> getArmorTexturesCached(ItemStack stack, World world, LivingEntity livingEntity) {
-        Supplier<CITArmor> realtime = () -> getCITArmor(stack, world, livingEntity);
-
-        //noinspection ConstantConditions
-        CITArmor citArmor = CITResewnConfig.INSTANCE().cache_ms == 0 ? realtime.get() : ((CITArmor.Cached) (Object) stack).citresewn_getCachedCITArmor(realtime);
-
-        if (citArmor != null)
-            return citArmor.textures;
-
-        return null;
-    }
-
-    public void setEnchantmentAppliedContextCached(ItemStack stack, World world, LivingEntity entity) {
-        if (stack == null) {
-            CITEnchantment.appliedContext = null;
-            return;
-        }
-
-        Supplier<List<CITEnchantment>> realtime = () -> getCITEnchantment(stack, world, entity);
-
-        //noinspection ConstantConditions
-        List<CITEnchantment> citEnchantments = CITResewnConfig.INSTANCE().cache_ms == 0 ? realtime.get() : ((CITEnchantment.Cached) (Object) stack).citresewn_getCachedCITEnchantment(realtime);
-
-        if (citEnchantments == null || citEnchantments.isEmpty()) {
-            CITEnchantment.appliedContext = null;
-            return;
-        }
-
-        if (effectiveGlobalProperties.method != null)
-            effectiveGlobalProperties.method.applyMethod(citEnchantments, stack);
-
-        CITEnchantment.appliedContext = citEnchantments;
-    }
-}
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/CITResewn.java b/src/main/java/shcm/shsupercm/fabric/citresewn/CITResewn.java
index e53ba52..7d4be88 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/CITResewn.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/CITResewn.java
@@ -1,45 +1,55 @@
 package shcm.shsupercm.fabric.citresewn;
 
+import io.shcm.shsupercm.fabric.fletchingtable.api.Entrypoint;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
+import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
+import shcm.shsupercm.fabric.citresewn.cit.CITRegistry;
 
-@Environment(EnvType.CLIENT)
+/**
+ * Main initializer for CIT Resewn. Contains various internal utilities(just logging for now).
+ */
 public class CITResewn implements ClientModInitializer {
     public static final Logger LOG = LogManager.getLogger("CITResewn");
-    public static CITResewn INSTANCE;
-
-    public ActiveCITs activeCITs = null;
-
-    public CITResewnConfig config = null;
-
-
-    public boolean processingBrokenPaths = false;
+    @Entrypoint(Entrypoint.CLIENT)
+    public static final CITResewn INSTANCE = new CITResewn();
 
     @Override
     public void onInitializeClient() {
-        INSTANCE = this;
-
-        config = CITResewnConfig.read();
+        CITRegistry.registerAll();
 
-        CITResewnCommand.register();
+        if (FabricLoader.getInstance().isModLoaded("fabric-command-api-v1"))
+            CITResewnCommand.register();
     }
 
+    /**
+     * Logs an info line in CIT Resewn's name.
+     * @param message log message
+     */
     public static void info(String message) {
         LOG.info("[citresewn] " + message);
     }
 
+    /**
+     * Logs a warning line in CIT Resewn's name if enabled in config.
+     * @see CITResewnConfig#mute_warns
+     * @param message warn message
+     */
     public static void logWarnLoading(String message) {
-        if (CITResewn