1.1.0

Skipping 1.0.4 because this deserves a minor version update

Author: ekulxam

changelog.md

@@ -1,3 +1,7 @@
-Crossbow Scoping 1.0.4+1.21.1
-- Removed direct apoli compat
-- Scoped Crossbow firing payload now tracks what hand the crossbow is in
+Crossbow Scoping 1.1.0+1.21.1
+- Removed direct apoli compat (works without it now)
+- Scoped Crossbow firing payload now tracks what hand the crossbow is in
+- Fixed scope rendering in third person
+- Fixed offhand hotbar rendering when using crossbow
+- Internals rework
+  - Minecraft now thinks the slot's ItemStack is a spyglass and not a crossbow

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.0.3+1.21.1
+mod_version=1.1.0+1.21.1
 maven_group=survivalblock.crossbow_scoping
 archives_base_name=crossbow_scoping
 

src/main/java/survivalblock/crossbow_scoping/mixin/crossbow/PlayerEntityMixin.java

@@ -51,7 +51,7 @@ public abstract class PlayerEntityMixin extends LivingEntityMixin implements Cro
             return false;
         }
         if (!this.crossbow_scoping$initialScope.isEmpty()) {
-            boolean initial = ItemStack.areItemsAndComponentsEqual(this.crossbow_scoping$initialScope, scope);
+            boolean initial = ItemStack.areEqual(this.crossbow_scoping$initialScope, scope);
             if (initial) {
                 return true;
             }
@@ -60,7 +60,7 @@ public abstract class PlayerEntityMixin extends LivingEntityMixin implements Cro
         if (active == null || active.isEmpty()) {
             return false;
         }
-        return ItemStack.areItemsAndComponentsEqual(active, scope);
+        return ItemStack.areEqual(active, scope);
     }
 
     /*

src/main/java/survivalblock/crossbow_scoping/mixin/crossbow/client/PlayerHeldItemFeatureRendererMixin.java

@@ -47,7 +47,7 @@ private ItemStack renderCrossbowToo(ItemStack scope, @Local(argsOnly = true)Livi
         player.crossbow_scoping$setAttacking(true);
         ItemStack crossbow = player.getStackInHand(player.getActiveHand());
         player.crossbow_scoping$setAttacking(false);
-        if (ItemStack.areItemsAndComponentsEqual(scope, crossbow.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY))) {
+        if (ItemStack.areEqual(scope, crossbow.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY))) {
             localBooleanRef.set(true);
             return crossbow;
         }