chore: revert meaningless changes

gnembon · Dec 1, 2023 · 9284a35 · 9284a35
1 parent 54f88ba
commit 9284a35
Show file tree

Hide file tree

Showing 2 changed files with 172 additions and 162 deletions.
diff --git a/src/main/java/carpet/mixins/ServerLevel_tickMixin.java b/src/main/java/carpet/mixins/ServerLevel_tickMixin.java
@@ -42,7 +42,6 @@ private void startWeatherSection(BooleanSupplier booleanSupplier_1, CallbackInfo
     ))
     private void stopWeatherStartTileTicks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        System.out.println("NTE start");
         if (currentSection != null)
         {
             CarpetProfiler.end_current_section(currentSection);
@@ -102,7 +101,6 @@ private void stopBlockEventsStartEntitySection(BooleanSupplier booleanSupplier_1
     ))
     private void endEntitySection(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        System.out.println("EU end");
         CarpetProfiler.end_current_section(currentSection);
         currentSection = null;
     }

diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
@@ -3,195 +3,207 @@
   "package": "carpet.mixins",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "AbstractArrowMixin",
-    "AbstractCauldronBlock_stackableSBoxesMixin",
-    "AbstractContainerMenu_ctrlQCraftingMixin",
-    "AbstractContainerMenu_scarpetMixin",
-    "AbstractContainerMenu_stackableSBoxesMixin",
-    "AbstractContainerMenuSubclasses_scarpetMixin",
-    "AbstractMinecart_scarpetEventsMixin",
-    "ArmorStand_scarpetMarkerMixin",
     "BarrierBlock_updateSuppressionBlockMixin",
-    "Biome_scarpetMixin",
-    "BlockBehaviourBlockStateBase_mixin",
-    "BlockEntity_movableBEMixin",
-    "BlockInput_fillUpdatesMixin",
-    "BlockInput_scarpetMixin",
-    "BlockItem_creativeNoClipMixin",
-    "BlockItem_scarpetEventMixin",
-    "BlockPredicate_scarpetMixin",
-    "BoundTickingBlockEntity_profilerMixin",
-    "BuddingAmethystBlock_movableAmethystMixin",
-    "ChainBlock_customStickyMixin",
-    "ChestBlock_customStickyMixin",
-    "ChunkGenerator_customMobSpawnsMixin",
-    "ChunkHolder_scarpetChunkCreationMixin",
-    "ChunkMap_creativePlayersLoadChunksMixin",
-    "ChunkMap_profilerMixin",
-    "ChunkMap_scarpetChunkCreationMixin",
-    "ClientboundCustomPayloadPacket_customPacketMixin",
-    "CloneCommands_fillUpdatesMixin",
-    "CollectingNeighborUpdaterAccessor",
-    "CommandDispatcher_scarpetCommandsMixin",
-    "CommandNode_scarpetCommandsMixin",
+    "SpawnState_scarpetMixin",
+    "MobCategory_spawnMixin",
     "Commands_customCommandsMixin",
-    "Connection_packetCounterMixin",
-    "CoralFanBlock_renewableCoralMixin",
-    "CoralFeature_renewableCoralMixin",
-    "CoralPlantBlock_renewableCoralMixin",
-    "DirectionMixin",
-    "DispenserBlock_cactusMixin",
-    "DispenserBlock_qcMixin",
-    "Display_scarpetEventMixin",
-    "DistanceManager_scarpetChunkCreationMixin",
-    "DistanceManager_scarpetMixin",
-    "DistanceManager_spawnChunksMixin",
-    "DynamicGraphMinFixedPoint_resetChunkInterface",
-    "EndCrystal_scarpetEventsMixin",
-    "Entity_scarpetEventsMixin",
-    "EntityMixin",
-    "ExperienceOrb_xpNoCooldownMixin",
-    "Explosion_optimizedTntMixin",
-    "Explosion_scarpetEventMixin",
-    "Explosion_xpFromBlocksMixin",
-    "ExplosionAccessor",
-    "FallingBlockEntity_scarpetEventsMixin",
-    "FallingBlockEntityMixin",
+    "ServerGamePacketListenerImplMixin",
+
+    "PerfCommand_permissionMixin",
     "FillCommandMixin",
-    "FlowingFluid_liquidDamageDisabledMixin",
+    "CloneCommands_fillUpdatesMixin",
+    "SetBlockCommand_fillUpdatesMixin",
     "ForceLoadCommand_forceLoadLimitMixin",
-    "Guardian_renewableSpongesMixin",
-    "HangingEntity_scarpetEventsMixin",
-    "HopperBlock_cactusMixin",
-    "HopperBlockEntity_counterMixin",
-    "HorseBaseEntity_scarpetMixin",
-    "HugeFungusFeatureMixin",
-    "Husk_templesMixin",
-    "InfestedBlock_gravelMixin",
-    "Ingredient_scarpetMixin",
-    "Inventory_scarpetEventMixin",
-    "ItemEntityMixin",
-    "LavaFluid_renewableDeepslateMixin",
-    "LayerLightEngine_scarpetChunkCreationMixin",
-    "LayerLightSectionStorage_scarpetChunkCreationMixin",
+    "BlockInput_fillUpdatesMixin",
     "Level_fillUpdatesMixin",
-    "Level_getOtherEntitiesLimited",
-    "Level_movableBEMixin",
-    "Level_scarpetPlopMixin",
-    "Level_tickMixin",
     "LevelChunk_fillUpdatesMixin",
-    "LevelChunk_movableBEMixin",
+    "StructureBlockEntity_fillUpdatesMixin",
+    "StructureBlockEntity_limitsMixin",
+    "ServerboundSetStructureBlockPacketMixin",
+    "StructureTemplate_fillUpdatesMixin",
+    "ServerGamePacketListenerImpl_interactionUpdatesMixin",
+    "FlowingFluid_liquidDamageDisabledMixin",
+    "ServerStatus_motdMixin",
+    "MinecraftServer_pingPlayerSampleLimit",
+    "HugeFungusFeatureMixin",
+    "PiglinBrute_getPlacementTypeMixin",
+    "MinecraftServer_coreMixin",
+
+    "MinecraftServer_tickspeedMixin",
+    "Level_tickMixin",
+    "ServerLevel_tickMixin",
+    "BoundTickingBlockEntity_profilerMixin",
+    "ServerChunkCache_profilerMixin",
+    "ChunkMap_profilerMixin",
+    "ServerFunctionManager_profilerMixin",
+    "WorldBorder_syncedWorldBorderMixin",
+    "ChunkMap_scarpetChunkCreationMixin",
     "LevelEntityGetterAdapter_scarpetMixin",
+    "ChunkHolder_scarpetChunkCreationMixin",
+    "ThreadedLevelLightEngine_scarpetMixin",
+    "DynamicGraphMinFixedPoint_resetChunkInterface",
+    "DistanceManager_scarpetChunkCreationMixin",
     "LevelLightEngine_scarpetChunkCreationMixin",
-    "LiquidBlock_renewableBlackstoneMixin",
-    "LiquidBlock_renewableDeepslateMixin",
+    "LayerLightEngine_scarpetChunkCreationMixin",
+    "LayerLightSectionStorage_scarpetChunkCreationMixin",
+    "DistanceManager_spawnChunksMixin",
+    "ServerLevel_spawnChunksMixin",
+    "ThreadedLevelLightEngine_scarpetChunkCreationMixin",
     "LivingEntity_cleanLogsMixin",
-    "LivingEntity_creativeFlyMixin",
-    "LivingEntity_maxCollisionsMixin",
-    "LivingEntity_scarpetEventsMixin",
-    "MerchantResultSlot_scarpetEventMixin",
-    "MinecraftServer_coreMixin",
-    "ServerConnectionListener_fakePlayersMixin",
-    "MinecraftServer_pingPlayerSampleLimit",
-    "MinecraftServer_scarpetMixin",
-    "MinecraftServer_tickspeedMixin",
-    "MobCategory_spawnMixin",
     "MobMixin",
-    "NaturalSpawnerMixin",
-    "Objective_scarpetMixin",
-    "PathNavigation_pathfindingMixin",
-    "PerfCommand_permissionMixin",
-    "PersistentEntitySectionManager_scarpetMixin",
-    "PickaxeItem_missingToolsMixin",
-    "PieceGeneratorSupplier_plopMixin",
-    "PiglinBrute_getPlacementTypeMixin",
-    "PistonBaseBlock_movableBEMixin",
-    "PistonBaseBlock_qcMixin",
-    "PistonBaseBlock_rotatorBlockMixin",
-    "PistonMovingBlockEntity_movableBEMixin",
-    "PistonMovingBlockEntity_playerHandlingMixin",
-    "PistonStructureResolver_customStickyMixin",
-    "PistonStructureResolver_pushLimitMixin",
-    "Player_antiCheatDisabledMixin",
-    "Player_creativeNoClipMixin",
+    "Villager_aiMixin",
     "Player_fakePlayersMixin",
-    "Player_parrotMixin",
-    "Player_scarpetEventsMixin",
+    "ServerGamePacketListenerImpl_coreMixin",
+    "MinecraftServer_scarpetMixin",
+    "ExperienceOrb_xpNoCooldownMixin",
     "Player_xpNoCooldownMixin",
+    "ServerConnectionListener_fakePlayersMixin",
+    "ServerPlayer_actionPackMixin",
     "PlayerList_coreMixin",
     "PlayerList_fakePlayersMixin",
-    "PlayerList_scarpetEventsMixin",
-    "PoiRecord_scarpetMixin",
-    "PoweredRailBlock_powerLimitMixin",
-    "PrimedTnt_scarpetEventsMixin",
-    "PrimedTntMixin",
-    "RandomState_ScarpetMixin",
-    "RecipeBookMenu_scarpetMixin",
-    "RecipeManager_scarpetMixin",
     "RedstoneWireBlock_fastMixin",
-    "ReloadCommand_reloadAppsMixin",
+    "WoolCarpetBlock_placeMixin",
+    "SummonCommand_lightningMixin",
+    "PistonStructureResolver_pushLimitMixin",
+    "PoweredRailBlock_powerLimitMixin",
+    "LivingEntity_maxCollisionsMixin",
+    "Level_getOtherEntitiesLimited",
+    "CoralPlantBlock_renewableCoralMixin",
+    "CoralFanBlock_renewableCoralMixin",
+    "CoralFeature_renewableCoralMixin",
+    "BuddingAmethystBlock_movableAmethystMixin",
+    "LiquidBlock_renewableBlackstoneMixin",
+    "LiquidBlock_renewableDeepslateMixin",
+    "LavaFluid_renewableDeepslateMixin",
+    "Level_scarpetPlopMixin",
+    "WorldGenRegion_scarpetPlopMixin",
+    "StructurePiece_scarpetPlopMixin",
+    "PieceGeneratorSupplier_plopMixin",
+    "ServerGamePacketListenerImpl_scarpetEventsMixin",
+    "ServerPlayerGameMode_scarpetEventsMixin",
+    "Player_parrotMixin",
     "SaplingBlock_desertShrubsMixin",
-    "Scoreboard_scarpetMixin",
-    "SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin",
-    "ServerboundCustomPayloadPacket_mixin",
-    "ServerboundSetStructureBlockPacketMixin",
-    "ServerChunkCache_profilerMixin",
+    "EntityMixin",
+    "Guardian_renewableSpongesMixin",
+    "Husk_templesMixin",
+    "ChunkGenerator_customMobSpawnsMixin",
     "ServerChunkCacheMixin",
-    "ServerCommonPacketListenerimpl_connectionMixin",
-    "ServerFunctionManager_profilerMixin",
+    "NaturalSpawnerMixin",
+
+    "DirectionMixin",
+    "ServerPlayerGameMode_cactusMixin",
+    "HopperBlock_cactusMixin",
+    "UseOnContext_cactusMixin",
+    "DispenserBlock_cactusMixin",
+    "PistonBaseBlock_rotatorBlockMixin",
     "ServerGamePacketListenerImpl_antiCheatDisabledMixin",
-    "ServerGamePacketListenerImpl_coreMixin",
-    "ServerGamePacketListenerImpl_interactionUpdatesMixin",
-    "ServerGamePacketListenerImpl_scarpetEventsMixin",
-    "ServerGamePacketListenerImplMixin",
-    "ServerLevel_scarpetMixin",
-    "ServerLevel_spawnChunksMixin",
-    "ServerLevel_tickMixin",
-    "ServerPlayer_actionPackMixin",
-    "ServerPlayer_scarpetEventMixin",
+    "Player_antiCheatDisabledMixin",
     "ServerPlayerGameMode_antiCheatMixin",
-    "ServerPlayerGameMode_cactusMixin",
-    "ServerPlayerGameMode_scarpetEventsMixin",
-    "ServerStatus_motdMixin",
-    "SetBlockCommand_fillUpdatesMixin",
-    "ShulkerBoxBlockEntity_creativeNoClipMixin",
+    "HopperBlockEntity_counterMixin",
+    "AbstractContainerMenu_ctrlQCraftingMixin",
+    "Connection_packetCounterMixin",
+    "AbstractCauldronBlock_stackableSBoxesMixin",
     "Slot_stackableSBoxesMixin",
-    "SpawnState_scarpetMixin",
-    "StandingAndWallBlockItem_creativeNoClipMixin",
-    "StructureBlockEntity_fillUpdatesMixin",
-    "StructureBlockEntity_limitsMixin",
-    "StructurePiece_scarpetPlopMixin",
-    "StructureTemplate_fillUpdatesMixin",
-    "SummonCommand_lightningMixin",
+    "AbstractContainerMenu_stackableSBoxesMixin",
+    "ItemEntityMixin",
+    "TntBlock_noUpdateMixin",
+    "Explosion_optimizedTntMixin",
+    "ExplosionAccessor",
+    "Explosion_scarpetEventMixin",
+    "Explosion_xpFromBlocksMixin",
+    "PrimedTntMixin",
+    "AbstractArrowMixin",
+    "FallingBlockEntityMixin",
+    "ThrowableProjectileMixin",
+    "PathNavigation_pathfindingMixin",
+
+    "InfestedBlock_gravelMixin",
+    "PistonBaseBlock_qcMixin",
+    "DispenserBlock_qcMixin",
+
+    "PickaxeItem_missingToolsMixin",
+    "WitherBoss_moreBlueMixin",
+    "ArmorStand_scarpetMarkerMixin",
+    "Entity_scarpetEventsMixin",
+    "LivingEntity_scarpetEventsMixin",
+    "Player_scarpetEventsMixin",
+    "ServerPlayer_scarpetEventMixin",
+    "AbstractMinecart_scarpetEventsMixin",
+    "EndCrystal_scarpetEventsMixin",
+    "FallingBlockEntity_scarpetEventsMixin",
+    "HangingEntity_scarpetEventsMixin",
+    "PrimedTnt_scarpetEventsMixin",
+    "Display_scarpetEventMixin",
+    "BlockItem_scarpetEventMixin",
+    "PlayerList_scarpetEventsMixin",
+    "Inventory_scarpetEventMixin",
+    "Objective_scarpetMixin",
+    "Scoreboard_scarpetMixin",
+    "MerchantResultSlot_scarpetEventMixin",
+    "AbstractContainerMenu_scarpetMixin",
+    "AbstractContainerMenuSubclasses_scarpetMixin",
+    "RecipeBookMenu_scarpetMixin",
+    "DistanceManager_scarpetMixin",
+    "PoiRecord_scarpetMixin",
+    "ServerLevel_scarpetMixin",
+    "PersistentEntitySectionManager_scarpetMixin",
+    "ReloadCommand_reloadAppsMixin",
     "SystemReport_addScarpetAppsMixin",
+    "CommandNode_scarpetCommandsMixin",
+    "CommandDispatcher_scarpetCommandsMixin",
+
+    "RecipeManager_scarpetMixin",
+    "Ingredient_scarpetMixin",
+    "BlockInput_scarpetMixin",
+    "BlockPredicate_scarpetMixin",
     "TagPredicate_scarpetMixin",
+    "HorseBaseEntity_scarpetMixin",
+    "RandomState_ScarpetMixin",
+    "Biome_scarpetMixin",
+
+    "BlockEntity_movableBEMixin",
+    "PistonBaseBlock_movableBEMixin",
+    "PistonMovingBlockEntity_movableBEMixin",
+    "Level_movableBEMixin",
+    "LevelChunk_movableBEMixin",
+    "Player_creativeNoClipMixin",
+    "PistonMovingBlockEntity_playerHandlingMixin",
+    "BlockItem_creativeNoClipMixin",
+    "StandingAndWallBlockItem_creativeNoClipMixin",
+    "ShulkerBoxBlockEntity_creativeNoClipMixin",
     "TheEndGatewayBlockEntity_creativeNoClipMixin",
-    "ThreadedLevelLightEngine_scarpetChunkCreationMixin",
-    "ThreadedLevelLightEngine_scarpetMixin",
-    "ThrowableProjectileMixin",
-    "TntBlock_noUpdateMixin",
-    "UseOnContext_cactusMixin",
-    "Villager_aiMixin",
-    "WitherBoss_moreBlueMixin",
-    "WoolCarpetBlock_placeMixin",
-    "WorldBorder_syncedWorldBorderMixin",
-    "WorldGenRegion_scarpetPlopMixin"
+    "LivingEntity_creativeFlyMixin",
+    "ChunkMap_creativePlayersLoadChunksMixin",
+    "SculkSensorBlockEntityVibrationConfig_sculkSensorRangeMixin",
+    "CollectingNeighborUpdaterAccessor",
+
+    "BlockBehaviourBlockStateBase_mixin",
+    "ChainBlock_customStickyMixin",
+    "ChestBlock_customStickyMixin",
+    "PistonStructureResolver_customStickyMixin",
+
+    "ServerboundCustomPayloadPacket_mixin",
+    "ServerCommonPacketListenerimpl_connectionMixin",
+    "ClientboundCustomPayloadPacket_customPacketMixin"
+
   ],
   "client": [
-    "ClientCommonPacketListenerImpl_customPacketMixin",
+    "Minecraft_tickMixin",
+    "ShulkerBoxAccessMixin",
+    "MinecraftMixin",
+    "Gui_tablistMixin",
+    "PlayerTabOverlayMixin",
+    "PistonHeadRenderer_movableBEMixin",
+    "StructureBlockRenderer_mixin",
     "ClientPacketListener_clientCommandMixin",
+    "LevelRenderer_fogOffMixin",
+    "LevelRenderer_creativeNoClipMixin",
     "ClientPacketListener_customPacketsMixin",
     "DebugRenderer_scarpetRenderMixin",
-    "Gui_tablistMixin",
-    "LevelRenderer_creativeNoClipMixin",
-    "LevelRenderer_fogOffMixin",
     "LevelRenderer_scarpetRenderMixin",
-    "Minecraft_tickMixin",
-    "MinecraftMixin",
-    "PistonHeadRenderer_movableBEMixin",
-    "PlayerTabOverlayMixin",
-    "ShulkerBoxAccessMixin",
-    "StructureBlockRenderer_mixin"
+
+
+    "ClientCommonPacketListenerImpl_customPacketMixin"
   ],
   "injectors": {
     "defaultRequire": 1