Add itemNoClip logger

Author: Fallen-Breath

patches/net/minecraft/entity/item/EntityItem.java.patch

@@ -1,27 +1,28 @@
 --- a/net/minecraft/entity/item/EntityItem.java
 +++ b/net/minecraft/entity/item/EntityItem.java
-@@ -2,6 +2,12 @@
+@@ -2,6 +2,13 @@
 
  import java.util.UUID;
  import javax.annotation.Nullable;
 +
 +import carpet.commands.lifetime.removal.LiteralRemovalReason;
 +import carpet.commands.lifetime.removal.MobPickupRemovalReason;
 +import carpet.helpers.InventoryHelper;
++import carpet.logging.itemNoClip.ItemNoClipLogger;
 +import carpet.settings.CarpetSettings;
 +import net.minecraft.block.BlockShulkerBox;
  import net.minecraft.entity.Entity;
  import net.minecraft.entity.EntityType;
  import net.minecraft.entity.MoverType;
-@@ -9,6 +15,7 @@
+@@ -9,6 +16,7 @@
  import net.minecraft.init.Items;
  import net.minecraft.init.SoundEvents;
  import net.minecraft.item.Item;
 +import net.minecraft.item.ItemBlock;
  import net.minecraft.item.ItemStack;
  import net.minecraft.nbt.NBTTagCompound;
  import net.minecraft.nbt.NBTUtil;
-@@ -37,6 +44,12 @@
+@@ -37,6 +45,12 @@
      private UUID owner;
      public float hoverStart = (float)(Math.random() * Math.PI * 2.0D);
 
@@ -34,7 +35,7 @@
      public EntityItem(World worldIn)
      {
          super(EntityType.ITEM, worldIn);
-@@ -57,6 +70,15 @@
+@@ -57,6 +71,15 @@
      {
          this(worldIn, x, y, z);
          this.setItem(stack);
@@ -50,15 +51,32 @@
      }
 
      protected boolean canTriggerWalking()
-@@ -166,6 +188,7 @@
+@@ -106,7 +129,16 @@
+             }
+             else
+             {
++                // TISCM itemNoClip logger
++                boolean wasNoClip = this.noClip;
++
+                 this.noClip = this.pushOutOfBlocks(this.posX, (this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D, this.posZ);
++
++                // TISCM itemNoClip logger
++                if (!wasNoClip && this.noClip)
++                {
++                    ItemNoClipLogger.getInstance().onItemBecomeNoClip(this);
++                }
+             }
+ 
+             this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ);
+@@ -166,6 +198,7 @@
 
              if (!this.world.isRemote && this.age >= 6000)
              {
 +                this.recordRemoval(LiteralRemovalReason.DESPAWN_TIMEOUT);  // TISCM lifetime tracker
                  this.remove();
              }
          }
-@@ -205,8 +228,12 @@
+@@ -205,8 +238,12 @@
              {
                  if (this.age != -32768 && other.age != -32768)
                  {
@@ -72,7 +90,7 @@
                          return false;
                      }
                      else if (itemstack1.hasTag() ^ itemstack.hasTag())
-@@ -229,12 +256,23 @@
+@@ -229,12 +266,23 @@
                      {
                          return false;
                      }
@@ -96,15 +114,15 @@
                          this.remove();
                          return true;
                      }
-@@ -282,6 +320,7 @@
+@@ -282,6 +330,7 @@
 
              if (this.health <= 0)
              {
 +                this.setDeathDamageSource(source);  // TISCM lifetime tracker
                  this.remove();
              }
 
-@@ -354,6 +393,12 @@
+@@ -354,6 +403,12 @@
 
                  if (itemstack.isEmpty())
                  {
@@ -117,7 +135,7 @@
                      this.remove();
                      itemstack.setCount(i);
                  }
-@@ -460,4 +505,44 @@
+@@ -460,4 +515,44 @@
          this.setInfinitePickupDelay();
          this.age = 5999;
      }

src/main/java/carpet/logging/LoggerRegistry.java

@@ -3,6 +3,7 @@
 import carpet.logging.commandblock.CommandBlockLogger;
 import carpet.logging.ghostPlayer.GhostPlayerLogger;
 import carpet.logging.instantfall.InstantFallLogger;
+import carpet.logging.itemNoClip.ItemNoClipLogger;
 import carpet.logging.lifetime.LifeTimeHUDLogger;
 import carpet.logging.microtiming.utils.MicroTimingStandardCarpetLogger;
 import carpet.logging.phantom.PhantomLogger;
@@ -51,6 +52,7 @@ public class LoggerRegistry
     public static boolean __phantom;
     public static boolean __threadstone;
     public static boolean __instantFall;
+    public static boolean __itemNoClip;
     public static boolean __playerCheckLight;
     public static boolean __ghostPlayer;
     public static boolean __portalCache;
@@ -83,6 +85,7 @@ public static void initLoggers()
         registerLogger("phantom", PhantomLogger.getInstance().createCarpetLogger());
         registerLogger(ThreadstoneLogger.NAME, ThreadstoneLogger.getInstance().createCarpetLogger());
         registerLogger(InstantFallLogger.NAME, InstantFallLogger.getInstance().createCarpetLogger());
+        registerLogger(ItemNoClipLogger.NAME, ItemNoClipLogger.getInstance().createCarpetLogger());
         registerLogger(PlayerCheckLightLogger.NAME, PlayerCheckLightLogger.getInstance().createCarpetLogger());
         registerLogger(GhostPlayerLogger.NAME, GhostPlayerLogger.getInstance().createCarpetLogger());
         registerLogger(PortalCacheLogger.NAME, PortalCacheLogger.getInstance().createCarpetLogger());

src/main/java/carpet/logging/itemNoClip/ItemNoClipLogger.java

@@ -0,0 +1,39 @@
+package carpet.logging.itemNoClip;
+
+import carpet.logging.AbstractLogger;
+import carpet.logging.LoggerRegistry;
+import carpet.utils.Messenger;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.ITextComponent;
+
+public class ItemNoClipLogger extends AbstractLogger
+{
+	public static final String NAME = "itemNoClip";
+	private static final ItemNoClipLogger INSTANCE = new ItemNoClipLogger();
+
+	public ItemNoClipLogger()
+	{
+		super(NAME);
+	}
+
+	public static ItemNoClipLogger getInstance()
+	{
+		return INSTANCE;
+	}
+
+	public void onItemBecomeNoClip(EntityItem item)
+	{
+		if (!LoggerRegistry.__itemNoClip)
+		{
+			return;
+		}
+		this.log(() -> new ITextComponent[]{
+				advTr(
+						"become_no_clip", "%s changed to noClip state @ %s",
+						Messenger.entity(item),
+						Messenger.coord(new Vec3d(item.posX, item.posY, item.posZ), item.dimension)
+				),
+		});
+	}
+}

src/main/resources/assets/carpet/lang/zh_cn.yml

@@ -594,6 +594,8 @@ logger:
         hint: 点击以启用
   instantfall:
     flag_changed: 瞬时落沙flag已切换为%s
+  itemNoClip:
+    become_no_clip: '%1$s已进入noClip状态 @ %2$s'
   portalCache:
     added: '地狱门缓存已创建: %s -> %s'
     added_hover: |-