V 1.6.1 - BETA-1.6.5

Trying To BackPort to 1.16.5

build.properties

@@ -1,3 +1,3 @@
-#Thu Nov 11 01:33:21 CET 2021
+#Thu Nov 11 21:11:45 CET 2021
 mod_version=1.6.1
-mod_buildnumber=1
+mod_buildnumber=4

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.63
+minecraft_version=1.16.5
+yarn_mappings=1.16.5+build.10
 loader_version=0.12.4
-carpet_core_version=1.4.52+v211104
+carpet_core_version=1.4.44+v210714
 # Mod Properties
 mod_version=1.6.1
-mod_suffix=-BETA
+mod_suffix=-BETA-1.16.5
 maven_group=carpet-shadow-item
 archives_base_name=carpet-shadow
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.41.3+1.17
+fabric_version=0.42.0+1.16

src/main/java/com/carpet_shadow/CarpetShadowSettings.java

@@ -15,12 +15,6 @@ public class CarpetShadowSettings {
     public static boolean shadowItemPersistence = false;
     @Rule(desc = "Shadow Items Id Length", category = {SHADOW, EXPERIMENTAL}, validate = {IdSizeValidator.class})
     public static int shadowItemIdSize = 5;
-    @Rule(desc = "Show Shadow Items Id in Item Names", category = {SHADOW, EXPERIMENTAL})
-    public static boolean shadowItemTooltip = false;
-    @Rule(desc = "Prevent Unlinking Shadow Items on base inventory movements", category = {SHADOW, EXPERIMENTAL})
-    public static boolean shadowItemFragilityFixes = false;
-    @Rule(desc = "Prevent Merging Shadow Items instances on base inventory movements", category = {SHADOW, EXPERIMENTAL})
-    public static boolean shadowItemPreventCombine = false;
 
     private static class IdSizeValidator extends Validator<Integer> {
         @Override

src/main/java/com/carpet_shadow/Globals.java

@@ -19,27 +19,4 @@ public static ItemStack getByIdOrNull(String shadow_id) {
         return null;
     }
 
-    public static ItemStack getByIdOrAdd(String shadow_id, ItemStack stack) {
-        Reference<ItemStack> reference = CarpetShadow.shadowMap.get(shadow_id);
-        if (reference != null && !reference.refersTo(null)) {
-            return reference.get();
-        }
-        CarpetShadow.shadowMap.put(shadow_id, new WeakReference<>(stack));
-        return stack;
-    }
-
-
-    public static void shadow_merge_check(ItemStack stack1, ItemStack stack2, CallbackInfoReturnable<Boolean> cir) {
-        if (CarpetShadowSettings.shadowItemFragilityFixes && cir.getReturnValue()) {
-            String shadow1 = ((ShadowItem) (Object) stack1).getShadowId();
-            String shadow2 = ((ShadowItem) (Object) stack2).getShadowId();
-            if (CarpetShadowSettings.shadowItemPreventCombine) {
-                if (shadow1 != null && shadow2 != null)
-                    cir.setReturnValue(false);
-            } else {
-                if (shadow1 != null && shadow1.equals(shadow2))
-                    cir.setReturnValue(false);
-            }
-        }
-    }
 }