Merge branch 'master' into 1.16

src/main/java/carpet/mixins/ItemEntityMixin.java

@@ -30,12 +30,12 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
     }
 
     @Override
-    public int getAge() {
+    public int getAgeCM() {
         return this.age;
     }
 
     @Override
-    public int getPickupDelay() {
+    public int getPickupDelayCM() {
         return this.pickupDelay;
     }
 
@@ -91,8 +91,8 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
             selfStack.increment(amount);
             self.setStack(selfStack);
 
-            this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelay(), this.pickupDelay);
-            this.age = Math.min(((ItemEntityInterface)other).getAge(), this.age);
+            this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelayCM(), this.pickupDelay);
+            this.age = Math.min(((ItemEntityInterface)other).getAgeCM(), this.age);
 
             otherStack.decrement(amount);
             if (otherStack.isEmpty())

src/main/java/carpet/mixins/ServerChunkManagerMixin.java

@@ -35,7 +35,7 @@ public abstract class ServerChunkManagerMixin implements ServerChunkManagerInter
     @Shadow @Final private ChunkTicketManager ticketManager;
 
     @Override // shared between scarpet and spawnChunks setting
-    public ChunkTicketManager getTicketManager()
+    public ChunkTicketManager getCMTicketManager()
     {
         return ticketManager;
     }